ncurses 6.0 - patch 20170827

[ncurses.git] / ncurses / tty / tty_update.c

diff --git a/ncurses/tty/tty_update.c b/ncurses/tty/tty_update.c
index 16811f5e58ec79c5c68cd8799e9c22d13e53a664..f86ee7292f78c78c7568b9a62c25a884faf6fc96 100644 (file)
--- a/ncurses/tty/tty_update.c
+++ b/ncurses/tty/tty_update.c
@@ -43,6 +43,8 @@
  *
  *-----------------------------------------------------------------*/
 
  *
  *-----------------------------------------------------------------*/
 

+#define NEW_PAIR_INTERNAL 1
+

 #include <curses.priv.h>
 
 #ifndef CUR
 #include <curses.priv.h>
 
 #ifndef CUR


@@ -82,7 +84,7 @@
 
 #include <ctype.h>
 
 
 #include <ctype.h>
 

-MODULE_ID("$Id: tty_update.c,v 1.286 2017/02/12 17:15:15 tom Exp $")
+MODULE_ID("$Id: tty_update.c,v 1.296 2017/08/27 19:40:17 tom Exp $")

 
 /*
  * This define controls the line-breakout optimization.  Every once in a
 
 /*
  * This define controls the line-breakout optimization.  Every once in a


@@ -578,14 +580,15 @@ can_clear_with(NCURSES_SP_DCLx ARG_CH_T ch)
 
        if (!SP_PARM->_default_color)
            return FALSE;
 
        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
            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;
            }
        }
                return FALSE;
            }
        }


@@ -663,7 +666,14 @@ EmitRange(NCURSES_SP_DCLx const NCURSES_CH_T * ntext, int num)
                } else {
                    return 1;   /* cursor stays in the middle */
                }
                } 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 &&
+                       ((AttrOf(ntext0) & A_ALTCHARSET) == 0 ||
+                        (CharOf(ntext0) < ACS_LEN))) &&
+#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;
                bool wrap_possible = (SP_PARM->_curscol + runcount >=
                                      screen_columns(SP_PARM));
                int rep_count = runcount;


@@ -672,9 +682,17 @@ EmitRange(NCURSES_SP_DCLx const NCURSES_CH_T * ntext, int num)
                    rep_count--;
 
                UpdateAttrs(SP_PARM, ntext0);
                    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,
                NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx
                                        TPARM_2(repeat_char,

-                                               CharOf(ntext0),
+                                               CharOf(temp),

                                                rep_count),
                                        1,
                                        NCURSES_SP_NAME(_nc_outch));
                                                rep_count),
                                        1,
                                        NCURSES_SP_NAME(_nc_outch));


@@ -766,9 +784,12 @@ TINFO_DOUPDATE(NCURSES_SP_DCL0)
 
     T((T_CALLED("_nc_tinfo:doupdate(%p)"), (void *) SP_PARM));
 
 
     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
 #if !USE_REENTRANT
     /*
      * It is "legal" but unlikely that an application could assign a new


@@ -789,9 +810,10 @@ TINFO_DOUPDATE(NCURSES_SP_DCL0)
 
     if (CurScreen(SP_PARM) == 0
        || NewScreen(SP_PARM) == 0
 
     if (CurScreen(SP_PARM) == 0
        || NewScreen(SP_PARM) == 0

-       || StdScreen(SP_PARM) == 0)
+       || StdScreen(SP_PARM) == 0) {
+       _nc_unlock_global(update);

        returnCode(ERR);
        returnCode(ERR);

-
+    }

 #ifdef TRACE
     if (USE_TRACEF(TRACE_UPDATE)) {
        if (CurScreen(SP_PARM)->_clear)
 #ifdef TRACE
     if (USE_TRACEF(TRACE_UPDATE)) {
        if (CurScreen(SP_PARM)->_clear)


@@ -809,7 +831,8 @@ TINFO_DOUPDATE(NCURSES_SP_DCL0)
        SP_PARM->_fifohold--;
 
 #if USE_SIZECHANGE
        SP_PARM->_fifohold--;
 
 #if USE_SIZECHANGE

-    if (SP_PARM->_endwin || _nc_handle_sigwinch(SP_PARM)) {
+    if ((SP_PARM->_endwin == ewRunning)
+       || _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.
        /*
         * This is a transparent extension:  XSI does not address it,
         * and applications need not know that ncurses can do it.


@@ -822,7 +845,7 @@ TINFO_DOUPDATE(NCURSES_SP_DCL0)
     }
 #endif
 
     }
 #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);
 
        T(("coming back from shell mode"));
        NCURSES_SP_NAME(reset_prog_mode) (NCURSES_SP_ARG);


@@ -831,7 +854,7 @@ TINFO_DOUPDATE(NCURSES_SP_DCL0)
        NCURSES_SP_NAME(_nc_screen_resume) (NCURSES_SP_ARG);
        SP_PARM->_mouse_resume(SP_PARM);
 
        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 */
     }
 #if USE_TRACE_TIMES
     /* zero the metering machinery */


@@ -1099,6 +1122,7 @@ TINFO_DOUPDATE(NCURSES_SP_DCL0)
 
     _nc_signal_handler(TRUE);
 
 
     _nc_signal_handler(TRUE);
 

+    _nc_unlock_global(update);

     returnCode(OK);
 }
 
     returnCode(OK);
 }
 


@@ -1345,8 +1369,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
                    && 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]));
                    }
                }
                        SetPair(oldLine[n], GetPair(newLine[n]));
                    }
                }


@@ -2172,16 +2196,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 */
        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) {
        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);

            }
        }
     }
            }
        }
     }