| teken_subr.h (197117) | teken_subr.h (197470) |
|---|---|
| 1/*- 2 * Copyright (c) 2008-2009 Ed Schouten <ed@FreeBSD.org> 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 9 unchanged lines hidden (view full) --- 18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 24 * SUCH DAMAGE. 25 * | 1/*- 2 * Copyright (c) 2008-2009 Ed Schouten <ed@FreeBSD.org> 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 9 unchanged lines hidden (view full) --- 18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 24 * SUCH DAMAGE. 25 * |
| 26 * $FreeBSD: head/sys/teken/teken_subr.h 197117 2009-09-12 12:44:21Z ed $ | 26 * $FreeBSD: head/sys/teken/teken_subr.h 197470 2009-09-24 20:33:14Z ed $ |
| 27 */ 28 29static void teken_subr_cursor_up(teken_t *, unsigned int); 30static void teken_subr_erase_line(teken_t *, unsigned int); 31static void teken_subr_regular_character(teken_t *, teken_char_t); 32static void teken_subr_reset_to_initial_state(teken_t *); 33static void teken_subr_save_cursor(teken_t *); 34 --- 762 unchanged lines hidden (view full) --- 797} 798 799static void 800teken_subr_regular_character(teken_t *t, teken_char_t c) 801{ 802 int width; 803 804 if (t->t_stateflags & TS_8BIT) { | 27 */ 28 29static void teken_subr_cursor_up(teken_t *, unsigned int); 30static void teken_subr_erase_line(teken_t *, unsigned int); 31static void teken_subr_regular_character(teken_t *, teken_char_t); 32static void teken_subr_reset_to_initial_state(teken_t *); 33static void teken_subr_save_cursor(teken_t *); 34 --- 762 unchanged lines hidden (view full) --- 797} 798 799static void 800teken_subr_regular_character(teken_t *t, teken_char_t c) 801{ 802 int width; 803 804 if (t->t_stateflags & TS_8BIT) { |
| 805 if (!(t->t_stateflags & TS_CONS25) && c <= 0x1B) | 805 if (!(t->t_stateflags & TS_CONS25) && (c <= 0x1b || c == 0x7f)) |
| 806 return; | 806 return; |
| 807 c = teken_scs_process(t, c); |
|
| 807 width = 1; 808 } else { 809 c = teken_scs_process(t, c); 810 width = teken_wcwidth(c); 811 /* XXX: Don't process zero-width characters yet. */ 812 if (width <= 0) 813 return; 814 } --- 417 unchanged lines hidden --- | 808 width = 1; 809 } else { 810 c = teken_scs_process(t, c); 811 width = teken_wcwidth(c); 812 /* XXX: Don't process zero-width characters yet. */ 813 if (width <= 0) 814 return; 815 } --- 417 unchanged lines hidden --- |