| teken_subr.h (197114) | teken_subr.h (197115) |
|---|---|
| 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 197114 2009-09-12 08:19:24Z ed $ | 26 * $FreeBSD: head/sys/teken/teken_subr.h 197115 2009-09-12 10:34:34Z 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 --- 746 unchanged lines hidden (view full) --- 781 782 teken_funcs_putchar(t, tp, c, &t->t_curattr); 783} 784 785static void 786teken_subr_regular_character(teken_t *t, teken_char_t c) 787{ 788 int width; | 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 --- 746 unchanged lines hidden (view full) --- 781 782 teken_funcs_putchar(t, tp, c, &t->t_curattr); 783} 784 785static void 786teken_subr_regular_character(teken_t *t, teken_char_t c) 787{ 788 int width; |
| 789 790 c = teken_scs_process(t, c); | |
| 791 | 789 |
| 792 /* XXX: Don't process zero-width characters yet. */ 793 width = teken_wcwidth(c); 794 if (width <= 0) 795 return; | 790 if (t->t_utf8_left == -1) { 791#ifdef TEKEN_XTERM 792 if (c <= 0x1B) 793 return; 794#endif /* TEKEN_XTERM */ 795 width = 1; 796 } else { 797 c = teken_scs_process(t, c); 798 width = teken_wcwidth(c); 799 /* XXX: Don't process zero-width characters yet. */ 800 if (width <= 0) 801 return; 802 } |
| 796 797#ifdef TEKEN_XTERM 798 if (t->t_cursor.tp_col == t->t_winsize.tp_col - 1 && 799 (t->t_stateflags & (TS_WRAPPED|TS_AUTOWRAP)) == 800 (TS_WRAPPED|TS_AUTOWRAP)) { 801 teken_pos_t tp; 802 803 /* Perform line wrapping. */ --- 409 unchanged lines hidden --- | 803 804#ifdef TEKEN_XTERM 805 if (t->t_cursor.tp_col == t->t_winsize.tp_col - 1 && 806 (t->t_stateflags & (TS_WRAPPED|TS_AUTOWRAP)) == 807 (TS_WRAPPED|TS_AUTOWRAP)) { 808 teken_pos_t tp; 809 810 /* Perform line wrapping. */ --- 409 unchanged lines hidden --- |