X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Ftty%2Ftty_update.c;h=162303433c30e096ea2664aef6e91a02ba863ee7;hp=c8f8b2f8e0f1e037be07e59bcf1b94792501aa8e;hb=c55d387cebf1cee4757ca2c2ef4fbeae59ee4175;hpb=c3b21f65a2687f3894a0d3217006c23f162c893a diff --git a/ncurses/tty/tty_update.c b/ncurses/tty/tty_update.c index c8f8b2f8..16230343 100644 --- a/ncurses/tty/tty_update.c +++ b/ncurses/tty/tty_update.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2015,2016 Free Software Foundation, Inc. * + * Copyright (c) 1998-2018,2019 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -43,6 +43,8 @@ * *-----------------------------------------------------------------*/ +#define NEW_PAIR_INTERNAL 1 + #include #ifndef CUR @@ -82,7 +84,7 @@ #include -MODULE_ID("$Id: tty_update.c,v 1.284 2016/10/15 23:00:29 tom Exp $") +MODULE_ID("$Id: tty_update.c,v 1.304 2019/06/23 16:22:17 tom Exp $") /* * This define controls the line-breakout optimization. Every once in a @@ -208,73 +210,8 @@ GoTo(NCURSES_SP_DCLx int const row, int const col) } #if !NCURSES_WCWIDTH_GRAPHICS -static bool -is_wacs_value(unsigned ch) -{ - bool result; - switch (ch) { - case 0x00a3: /* FALLTHRU - ncurses pound-sterling symbol */ - case 0x00b0: /* FALLTHRU - VT100 degree symbol */ - case 0x00b1: /* FALLTHRU - VT100 plus/minus */ - case 0x00b7: /* FALLTHRU - VT100 bullet */ - case 0x03c0: /* FALLTHRU - ncurses greek pi */ - case 0x2190: /* FALLTHRU - Teletype arrow pointing left */ - case 0x2191: /* FALLTHRU - Teletype arrow pointing up */ - case 0x2192: /* FALLTHRU - Teletype arrow pointing right */ - case 0x2193: /* FALLTHRU - Teletype arrow pointing down */ - case 0x2260: /* FALLTHRU - ncurses not-equal */ - case 0x2264: /* FALLTHRU - ncurses less-than-or-equal-to */ - case 0x2265: /* FALLTHRU - ncurses greater-than-or-equal-to */ - case 0x23ba: /* FALLTHRU - VT100 scan line 1 */ - case 0x23bb: /* FALLTHRU - ncurses scan line 3 */ - case 0x23bc: /* FALLTHRU - ncurses scan line 7 */ - case 0x23bd: /* FALLTHRU - VT100 scan line 9 */ - case 0x2500: /* FALLTHRU - VT100 horizontal line */ - case 0x2501: /* FALLTHRU - thick horizontal line */ - case 0x2502: /* FALLTHRU - VT100 vertical line */ - case 0x2503: /* FALLTHRU - thick vertical line */ - case 0x250c: /* FALLTHRU - VT100 upper left corner */ - case 0x250f: /* FALLTHRU - thick upper left corner */ - case 0x2510: /* FALLTHRU - VT100 upper right corner */ - case 0x2513: /* FALLTHRU - thick upper right corner */ - case 0x2514: /* FALLTHRU - VT100 lower left corner */ - case 0x2517: /* FALLTHRU - thick lower left corner */ - case 0x2518: /* FALLTHRU - VT100 lower right corner */ - case 0x251b: /* FALLTHRU - thick lower right corner */ - case 0x251c: /* FALLTHRU - VT100 tee pointing left */ - case 0x2523: /* FALLTHRU - thick tee pointing left */ - case 0x2524: /* FALLTHRU - VT100 tee pointing right */ - case 0x252b: /* FALLTHRU - thick tee pointing right */ - case 0x252c: /* FALLTHRU - VT100 tee pointing down */ - case 0x2533: /* FALLTHRU - thick tee pointing down */ - case 0x2534: /* FALLTHRU - VT100 tee pointing up */ - case 0x253b: /* FALLTHRU - thick tee pointing up */ - case 0x253c: /* FALLTHRU - VT100 large plus or crossover */ - case 0x254b: /* FALLTHRU - thick large plus or crossover */ - case 0x2550: /* FALLTHRU - double horizontal line */ - case 0x2551: /* FALLTHRU - double vertical line */ - case 0x2554: /* FALLTHRU - double upper left corner */ - case 0x2557: /* FALLTHRU - double upper right corner */ - case 0x255a: /* FALLTHRU - double lower left corner */ - case 0x255d: /* FALLTHRU - double lower right corner */ - case 0x2560: /* FALLTHRU - double tee pointing right */ - case 0x2563: /* FALLTHRU - double tee pointing left */ - case 0x2566: /* FALLTHRU - double tee pointing down */ - case 0x2569: /* FALLTHRU - double tee pointing up */ - case 0x256c: /* FALLTHRU - double large plus or crossover */ - case 0x2592: /* FALLTHRU - VT100 checker board (stipple) */ - case 0x25ae: /* FALLTHRU - Teletype solid square block */ - case 0x25c6: /* FALLTHRU - VT100 diamond */ - case 0x2603: /* FALLTHRU - Teletype lantern symbol */ - result = TRUE; - break; - default: - result = FALSE; - break; - } - return result; -} -#endif +#define is_wacs_value(ch) (_nc_wacs_width(ch) == 1 && wcwidth(ch) > 1) +#endif /* !NCURSES_WCWIDTH_GRAPHICS */ static NCURSES_INLINE void PutAttrChar(NCURSES_SP_DCLx CARG_CH_T ch) @@ -302,7 +239,7 @@ PutAttrChar(NCURSES_SP_DCLx CARG_CH_T ch) * Determine the number of character cells which the 'ch' value will use * on the screen. It should be at least one. */ - if ((chlen = wcwidth(CharOf(CHDEREF(ch)))) <= 0) { + if ((chlen = _nc_wacs_width(CharOf(CHDEREF(ch)))) <= 0) { static const NCURSES_CH_T blank = NewChar(BLANK_TEXT); /* @@ -342,7 +279,9 @@ PutAttrChar(NCURSES_SP_DCLx CARG_CH_T ch) || is_wacs_value(CharOfD(ch)) #endif )) { + int c8; my_ch = CHDEREF(ch); /* work around const param */ + c8 = CharOf(my_ch); #if USE_WIDEC_SUPPORT /* * This is crude & ugly, but works most of the time. It checks if the @@ -366,8 +305,23 @@ PutAttrChar(NCURSES_SP_DCLx CARG_CH_T ch) chlen = 1; } #endif /* !NCURSES_WCWIDTH_GRAPHICS */ - } + } else #endif + if (!SP_PARM->_screen_acs_map[c8]) { + /* + * If we found no mapping for a given alternate-character set item + * in the terminal description, attempt to use the ASCII fallback + * code which is populated in the _acs_map[] array. If that did + * not correspond to a line-drawing, etc., graphics character, the + * array entry would be empty. + */ + chtype temp = UChar(SP_PARM->_acs_map[c8]); + if (temp) { + RemAttr(attr, A_ALTCHARSET); + SetChar(my_ch, temp, AttrOf(attr)); + } + } + /* * If we (still) have alternate character set, it is the normal 8bit * flavor. The _screen_acs_map[] array tells if the character was @@ -533,7 +487,7 @@ wrap_cursor(NCURSES_SP_DCL0) TR(TRACE_CHARPUT, ("turning off (%#lx) %s before wrapping", (unsigned long) AttrOf(SCREEN_ATTRS(SP_PARM)), _traceattr(AttrOf(SCREEN_ATTRS(SP_PARM))))); - (void) VIDATTR(SP_PARM, A_NORMAL, 0); + VIDPUTS(SP_PARM, A_NORMAL, 0); } } else { SP_PARM->_curscol--; @@ -578,14 +532,15 @@ can_clear_with(NCURSES_SP_DCLx ARG_CH_T ch) if (!SP_PARM->_default_color) return FALSE; - if (SP_PARM->_default_fg != C_MASK || SP_PARM->_default_bg != C_MASK) + if (!(isDefaultColor(SP_PARM->_default_fg) && + isDefaultColor(SP_PARM->_default_bg))) return FALSE; if ((pair = GetPair(CHDEREF(ch))) != 0) { NCURSES_COLOR_T fg, bg; if (NCURSES_SP_NAME(pair_content) (NCURSES_SP_ARGx (short) pair, &fg, &bg) == ERR - || (fg != C_MASK || bg != C_MASK)) { + || !(isDefaultColor(fg) && isDefaultColor(bg))) { return FALSE; } } @@ -663,7 +618,15 @@ EmitRange(NCURSES_SP_DCLx const NCURSES_CH_T * ntext, int num) } else { return 1; /* cursor stays in the middle */ } - } else if (repeat_char && runcount > SP_PARM->_rep_cost) { + } else if (repeat_char != 0 && +#if USE_WIDEC_SUPPORT + (!SP_PARM->_screen_unicode && + (CharOf(ntext0) < ((AttrOf(ntext0) & A_ALTCHARSET) + ? ACS_LEN + : 256))) && +#endif + runcount > SP_PARM->_rep_cost) { + NCURSES_CH_T temp; bool wrap_possible = (SP_PARM->_curscol + runcount >= screen_columns(SP_PARM)); int rep_count = runcount; @@ -672,9 +635,17 @@ EmitRange(NCURSES_SP_DCLx const NCURSES_CH_T * ntext, int num) rep_count--; UpdateAttrs(SP_PARM, ntext0); + temp = ntext0; + if ((AttrOf(temp) & A_ALTCHARSET) && + SP_PARM->_acs_map != 0 && + (SP_PARM->_acs_map[CharOf(temp)] & A_CHARTEXT) != 0) { + SetChar(temp, + (SP_PARM->_acs_map[CharOf(ntext0)] & A_CHARTEXT), + AttrOf(ntext0) | A_ALTCHARSET); + } NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx TPARM_2(repeat_char, - CharOf(ntext0), + CharOf(temp), rep_count), 1, NCURSES_SP_NAME(_nc_outch)); @@ -766,9 +737,12 @@ TINFO_DOUPDATE(NCURSES_SP_DCL0) T((T_CALLED("_nc_tinfo:doupdate(%p)"), (void *) SP_PARM)); - if (SP_PARM == 0) - returnCode(ERR); + _nc_lock_global(update); + if (SP_PARM == 0) { + _nc_unlock_global(update); + returnCode(ERR); + } #if !USE_REENTRANT /* * It is "legal" but unlikely that an application could assign a new @@ -789,9 +763,10 @@ TINFO_DOUPDATE(NCURSES_SP_DCL0) if (CurScreen(SP_PARM) == 0 || NewScreen(SP_PARM) == 0 - || StdScreen(SP_PARM) == 0) + || StdScreen(SP_PARM) == 0) { + _nc_unlock_global(update); returnCode(ERR); - + } #ifdef TRACE if (USE_TRACEF(TRACE_UPDATE)) { if (CurScreen(SP_PARM)->_clear) @@ -809,7 +784,8 @@ TINFO_DOUPDATE(NCURSES_SP_DCL0) SP_PARM->_fifohold--; #if USE_SIZECHANGE - if (SP_PARM->_endwin || _nc_handle_sigwinch(SP_PARM)) { + if ((SP_PARM->_endwin == ewSuspend) + || _nc_handle_sigwinch(SP_PARM)) { /* * This is a transparent extension: XSI does not address it, * and applications need not know that ncurses can do it. @@ -822,7 +798,7 @@ TINFO_DOUPDATE(NCURSES_SP_DCL0) } #endif - if (SP_PARM->_endwin) { + if (SP_PARM->_endwin == ewSuspend) { T(("coming back from shell mode")); NCURSES_SP_NAME(reset_prog_mode) (NCURSES_SP_ARG); @@ -831,7 +807,7 @@ TINFO_DOUPDATE(NCURSES_SP_DCL0) NCURSES_SP_NAME(_nc_screen_resume) (NCURSES_SP_ARG); SP_PARM->_mouse_resume(SP_PARM); - SP_PARM->_endwin = FALSE; + SP_PARM->_endwin = ewRunning; } #if USE_TRACE_TIMES /* zero the metering machinery */ @@ -1099,6 +1075,7 @@ TINFO_DOUPDATE(NCURSES_SP_DCL0) _nc_signal_handler(TRUE); + _nc_unlock_global(update); returnCode(OK); } @@ -1345,8 +1322,8 @@ TransformLine(NCURSES_SP_DCLx int const lineno) && unColor(oldLine[n]) == unColor(newLine[n])) { if (oldPair < SP_PARM->_pair_limit && newPair < SP_PARM->_pair_limit - && (SP_PARM->_color_pairs[oldPair] == - SP_PARM->_color_pairs[newPair])) { + && (isSamePair(SP_PARM->_color_pairs[oldPair], + SP_PARM->_color_pairs[newPair]))) { SetPair(oldLine[n], GetPair(newLine[n])); } } @@ -1738,14 +1715,14 @@ InsStr(NCURSES_SP_DCLx NCURSES_CH_T * line, int count) TPARM_1(parm_ich, count), 1, NCURSES_SP_NAME(_nc_outch)); - while (count) { + while (count > 0) { PutAttrChar(NCURSES_SP_ARGx CHREF(*line)); line++; count--; } } else if (enter_insert_mode && exit_insert_mode) { NCURSES_PUTP2("enter_insert_mode", enter_insert_mode); - while (count) { + while (count > 0) { PutAttrChar(NCURSES_SP_ARGx CHREF(*line)); if (insert_padding) { NCURSES_PUTP2("insert_padding", insert_padding); @@ -1755,7 +1732,7 @@ InsStr(NCURSES_SP_DCLx NCURSES_CH_T * line, int count) } NCURSES_PUTP2("exit_insert_mode", exit_insert_mode); } else { - while (count) { + while (count > 0) { NCURSES_PUTP2("insert_character", insert_character); PutAttrChar(NCURSES_SP_ARGx CHREF(*line)); if (insert_padding) { @@ -2172,16 +2149,16 @@ NCURSES_SP_NAME(_nc_screen_resume) (NCURSES_SP_DCL0) NCURSES_SP_NAME(_nc_reset_colors) (NCURSES_SP_ARG); /* restore user-defined colors, if any */ - if (SP_PARM->_color_defs < 0) { + if (SP_PARM->_color_defs < 0 && !SP_PARM->_direct_color.value) { int n; SP_PARM->_color_defs = -(SP_PARM->_color_defs); for (n = 0; n < SP_PARM->_color_defs; ++n) { if (SP_PARM->_color_table[n].init) { - NCURSES_SP_NAME(init_color) (NCURSES_SP_ARGx - (short) n, - SP_PARM->_color_table[n].r, - SP_PARM->_color_table[n].g, - SP_PARM->_color_table[n].b); + _nc_init_color(SP_PARM, + n, + SP_PARM->_color_table[n].r, + SP_PARM->_color_table[n].g, + SP_PARM->_color_table[n].b); } } }