ncurses 6.0 - patch 20170325

[ncurses.git] / ncurses / base / lib_set_term.c

diff --git a/ncurses/base/lib_set_term.c b/ncurses/base/lib_set_term.c
index 816ab041d647c81c1c076bda82313ba9426216e6..864968c120a8133e3b2595f1919d621b244344c3 100644 (file)
--- a/ncurses/base/lib_set_term.c
+++ b/ncurses/base/lib_set_term.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2016,2017 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            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *


@@ -47,7 +47,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
 #define CUR SP_TERMTYPE
 #endif
 

-MODULE_ID("$Id: lib_set_term.c,v 1.135 2009/11/28 21:49:24 tom Exp $")
+MODULE_ID("$Id: lib_set_term.c,v 1.156 2017/03/01 00:10:41 tom Exp $")

 
 #ifdef USE_TERM_DRIVER
 #define MaxColors      InfoOf(sp).maxcolors
 
 #ifdef USE_TERM_DRIVER
 #define MaxColors      InfoOf(sp).maxcolors


@@ -117,7 +117,7 @@ delink_screen(SCREEN *sp)
     for (each_screen(temp)) {
        if (temp == sp) {
            if (last)
     for (each_screen(temp)) {
        if (temp == sp) {
            if (last)

-               last = sp->_next_screen;
+               last->_next_screen = sp->_next_screen;

            else
                _nc_screen_chain = sp->_next_screen;
            result = TRUE;
            else
                _nc_screen_chain = sp->_next_screen;
            result = TRUE;


@@ -134,7 +134,6 @@ delink_screen(SCREEN *sp)
 NCURSES_EXPORT(void)
 delscreen(SCREEN *sp)
 {
 NCURSES_EXPORT(void)
 delscreen(SCREEN *sp)
 {

-    int i;

 
     T((T_CALLED("delscreen(%p)"), (void *) sp));
 
 
     T((T_CALLED("delscreen(%p)"), (void *) sp));
 


@@ -159,7 +158,10 @@ delscreen(SCREEN *sp)
        (void) _nc_freewin(StdScreen(sp));
 
        if (sp->_slk != 0) {
        (void) _nc_freewin(StdScreen(sp));
 
        if (sp->_slk != 0) {

+

            if (sp->_slk->ent != 0) {
            if (sp->_slk->ent != 0) {

+               int i;
+

                for (i = 0; i < sp->_slk->labcnt; ++i) {
                    FreeIfNeeded(sp->_slk->ent[i].ent_text);
                    FreeIfNeeded(sp->_slk->ent[i].form_text);
                for (i = 0; i < sp->_slk->labcnt; ++i) {
                    FreeIfNeeded(sp->_slk->ent[i].ent_text);
                    FreeIfNeeded(sp->_slk->ent[i].form_text);


@@ -188,19 +190,9 @@ delscreen(SCREEN *sp)
        FreeIfNeeded(sp->_acs_map);
        FreeIfNeeded(sp->_screen_acs_map);
 
        FreeIfNeeded(sp->_acs_map);
        FreeIfNeeded(sp->_screen_acs_map);
 

-       /*
-        * If the associated output stream has been closed, we can discard the
-        * set-buffer.  Limit the error check to EBADF, since fflush may fail
-        * for other reasons than trying to operate upon a closed stream.
-        */
-       if (sp->_ofp != 0
-           && sp->_setbuf != 0
-           && fflush(sp->_ofp) != 0
-           && errno == EBADF) {
-           free(sp->_setbuf);
-       }
-
+       NCURSES_SP_NAME(_nc_flush) (NCURSES_SP_ARG);

        NCURSES_SP_NAME(del_curterm) (NCURSES_SP_ARGx sp->_term);
        NCURSES_SP_NAME(del_curterm) (NCURSES_SP_ARGx sp->_term);

+       FreeIfNeeded(sp->out_buffer);

        free(sp);
 
        /*
        free(sp);
 
        /*


@@ -217,6 +209,12 @@ delscreen(SCREEN *sp)
            COLOR_PAIRS = 0;
 #endif
            _nc_set_screen(0);
            COLOR_PAIRS = 0;
 #endif
            _nc_set_screen(0);

+#if USE_WIDEC_SUPPORT
+           if (SP == 0) {
+               FreeIfNeeded(_nc_wacs);
+               _nc_wacs = 0;
+           }
+#endif

        }
     }
     _nc_unlock_global(curses);
        }
     }
     _nc_unlock_global(curses);


@@ -253,13 +251,14 @@ no_mouse_wrap(SCREEN *sp GCC_UNUSED)
 }
 
 #if NCURSES_EXT_FUNCS && USE_COLORFGBG
 }
 
 #if NCURSES_EXT_FUNCS && USE_COLORFGBG

-static char *
-extract_fgbg(char *src, int *result)
+static const char *
+extract_fgbg(const char *src, int *result)

 {
 {

-    char *dst = 0;
-    long value = strtol(src, &dst, 0);
+    const char *dst = 0;
+    char *tmp = 0;
+    long value = strtol(src, &tmp, 0);

 
 

-    if (dst == 0) {
+    if ((dst = tmp) == 0) {

        dst = src;
     } else if (value >= 0) {
        *result = value;
        dst = src;
     } else if (value >= 0) {
        *result = value;


@@ -272,8 +271,8 @@ extract_fgbg(char *src, int *result)
 }
 #endif
 
 }
 #endif
 

-#define ReturnScreenError() _nc_set_screen(0); \
-                            returnCode(ERR)
+#define ReturnScreenError() do { _nc_set_screen(0); \
+                            returnCode(ERR); } while (0)

 
 /* OS-independent screen initializations */
 NCURSES_EXPORT(int)
 
 /* OS-independent screen initializations */
 NCURSES_EXPORT(int)


@@ -284,12 +283,11 @@ NCURSES_SP_NAME(_nc_setupscreen) (
                                     int slines,
                                     int scolumns,
                                     FILE *output,
                                     int slines,
                                     int scolumns,
                                     FILE *output,

-                                    bool filtered,
+                                    int filtered,

                                     int slk_format)
 {
     char *env;
     int bottom_stolen = 0;
                                     int slk_format)
 {
     char *env;
     int bottom_stolen = 0;

-    ripoff_t *rop;

     SCREEN *sp;
 #ifndef USE_TERM_DRIVER
     bool support_cookies = USE_XMC_SUPPORT;
     SCREEN *sp;
 #ifndef USE_TERM_DRIVER
     bool support_cookies = USE_XMC_SUPPORT;


@@ -314,7 +312,7 @@ NCURSES_SP_NAME(_nc_setupscreen) (
        ReturnScreenError();
     }
 
        ReturnScreenError();
     }
 

-    T(("created SP %p", sp));
+    T(("created SP %p", (void *) sp));

     sp->_next_screen = _nc_screen_chain;
     _nc_screen_chain = sp;
 
     sp->_next_screen = _nc_screen_chain;
     _nc_screen_chain = sp;
 


@@ -362,7 +360,7 @@ NCURSES_SP_NAME(_nc_setupscreen) (
        slines = 1;
        SET_LINES(slines);
 #ifdef USE_TERM_DRIVER
        slines = 1;
        SET_LINES(slines);
 #ifdef USE_TERM_DRIVER

-       CallDriver(sp, setfilter);
+       CallDriver(sp, td_setfilter);

 #else
        clear_screen = 0;
        cursor_down = parm_down_cursor = 0;
 #else
        clear_screen = 0;
        cursor_down = parm_down_cursor = 0;


@@ -380,10 +378,18 @@ NCURSES_SP_NAME(_nc_setupscreen) (
     setmode(output, O_BINARY);
 #endif
     NCURSES_SP_NAME(_nc_set_buffer) (NCURSES_SP_ARGx output, TRUE);
     setmode(output, O_BINARY);
 #endif
     NCURSES_SP_NAME(_nc_set_buffer) (NCURSES_SP_ARGx output, TRUE);

-    sp->_lines = slines;
-    sp->_lines_avail = slines;
-    sp->_columns = scolumns;
+    sp->_lines = (NCURSES_SIZE_T) slines;
+    sp->_lines_avail = (NCURSES_SIZE_T) slines;
+    sp->_columns = (NCURSES_SIZE_T) scolumns;
+
+    fflush(output);
+    sp->_ofd = output ? fileno(output) : -1;

     sp->_ofp = output;
     sp->_ofp = output;

+    sp->out_limit = (size_t) ((2 + slines) * (6 + scolumns));
+    if ((sp->out_buffer = malloc(sp->out_limit)) == 0)
+       sp->out_limit = 0;
+    sp->out_inuse = 0;
+

     SP_PRE_INIT(sp);
     SetNoPadding(sp);
 
     SP_PRE_INIT(sp);
     SetNoPadding(sp);
 


@@ -414,8 +420,8 @@ NCURSES_SP_NAME(_nc_setupscreen) (
     sp->_default_fg = COLOR_WHITE;
     sp->_default_bg = COLOR_BLACK;
 #else
     sp->_default_fg = COLOR_WHITE;
     sp->_default_bg = COLOR_BLACK;
 #else

-    sp->_default_fg = C_MASK;
-    sp->_default_bg = C_MASK;
+    sp->_default_fg = COLOR_DEFAULT;
+    sp->_default_bg = COLOR_DEFAULT;

 #endif
 
     /*
 #endif
 
     /*


@@ -427,9 +433,9 @@ NCURSES_SP_NAME(_nc_setupscreen) (
        char sep1, sep2;
        int count = sscanf(env, "%d%c%d%c", &fg, &sep1, &bg, &sep2);
        if (count >= 1) {
        char sep1, sep2;
        int count = sscanf(env, "%d%c%d%c", &fg, &sep1, &bg, &sep2);
        if (count >= 1) {

-           sp->_default_fg = ((fg >= 0 && fg < MaxColors) ? fg : C_MASK);
+           sp->_default_fg = ((fg >= 0 && fg < MaxColors) ? fg : COLOR_DEFAULT);

            if (count >= 3) {
            if (count >= 3) {

-               sp->_default_bg = ((bg >= 0 && bg < MaxColors) ? bg : C_MASK);
+               sp->_default_bg = ((bg >= 0 && bg < MaxColors) ? bg : COLOR_DEFAULT);

            }
            TR(TRACE_CHARPUT | TRACE_MOVE,
               ("from environment assumed fg=%d, bg=%d",
            }
            TR(TRACE_CHARPUT | TRACE_MOVE,
               ("from environment assumed fg=%d, bg=%d",


@@ -445,7 +451,7 @@ NCURSES_SP_NAME(_nc_setupscreen) (
      * decide later if it is worth having default attributes as well.
      */
     if (getenv("COLORFGBG") != 0) {
      * decide later if it is worth having default attributes as well.
      */
     if (getenv("COLORFGBG") != 0) {

-       char *p = getenv("COLORFGBG");
+       const char *p = getenv("COLORFGBG");

        TR(TRACE_CHARPUT | TRACE_MOVE, ("decoding COLORFGBG %s", p));
        p = extract_fgbg(p, &(sp->_default_fg));
        p = extract_fgbg(p, &(sp->_default_bg));
        TR(TRACE_CHARPUT | TRACE_MOVE, ("decoding COLORFGBG %s", p));
        p = extract_fgbg(p, &(sp->_default_fg));
        p = extract_fgbg(p, &(sp->_default_bg));


@@ -456,7 +462,7 @@ NCURSES_SP_NAME(_nc_setupscreen) (
        if (sp->_default_fg >= MaxColors) {
            if (set_a_foreground != ABSENT_STRING
                && !strcmp(set_a_foreground, "\033[3%p1%dm")) {
        if (sp->_default_fg >= MaxColors) {
            if (set_a_foreground != ABSENT_STRING
                && !strcmp(set_a_foreground, "\033[3%p1%dm")) {

-               set_a_foreground = "\033[3%?%p1%{8}%>%t9%e%p1%d%;m";
+               set_a_foreground = strdup("\033[3%?%p1%{8}%>%t9%e%p1%d%;m");

            } else {
                sp->_default_fg %= MaxColors;
            }
            } else {
                sp->_default_fg %= MaxColors;
            }


@@ -464,7 +470,7 @@ NCURSES_SP_NAME(_nc_setupscreen) (
        if (sp->_default_bg >= MaxColors) {
            if (set_a_background != ABSENT_STRING
                && !strcmp(set_a_background, "\033[4%p1%dm")) {
        if (sp->_default_bg >= MaxColors) {
            if (set_a_background != ABSENT_STRING
                && !strcmp(set_a_background, "\033[4%p1%dm")) {

-               set_a_background = "\033[4%?%p1%{8}%>%t9%e%p1%d%;m";
+               set_a_background = strdup("\033[4%?%p1%{8}%>%t9%e%p1%d%;m");

            } else {
                sp->_default_bg %= MaxColors;
            }
            } else {
                sp->_default_bg %= MaxColors;
            }


@@ -510,16 +516,7 @@ NCURSES_SP_NAME(_nc_setupscreen) (
 
     if (magic_cookie_glitch > 0) {     /* tvi, wyse */
 
 
     if (magic_cookie_glitch > 0) {     /* tvi, wyse */
 

-       sp->_xmc_triggers = sp->_ok_attributes & (
-                                                    A_STANDOUT |
-                                                    A_UNDERLINE |
-                                                    A_REVERSE |
-                                                    A_BLINK |
-                                                    A_DIM |
-                                                    A_BOLD |
-                                                    A_INVIS |
-                                                    A_PROTECT
-           );
+       sp->_xmc_triggers = sp->_ok_attributes & XMC_CONFLICT;

 #if 0
        /*
         * We "should" treat colors as an attribute.  The wyse350 (and its
 #if 0
        /*
         * We "should" treat colors as an attribute.  The wyse350 (and its


@@ -584,9 +581,15 @@ NCURSES_SP_NAME(_nc_setupscreen) (
 
     NCURSES_SP_NAME(_nc_init_acs) (NCURSES_SP_ARG);
 #if USE_WIDEC_SUPPORT
 
     NCURSES_SP_NAME(_nc_init_acs) (NCURSES_SP_ARG);
 #if USE_WIDEC_SUPPORT

-    _nc_init_wacs();
+    sp->_screen_unicode = _nc_unicode_locale();
+    if (_nc_wacs == 0) {
+       _nc_init_wacs();
+    }
+    if (_nc_wacs == 0) {
+       ReturnScreenError();
+    }

 
 

-    sp->_screen_acs_fix = (_nc_unicode_locale()
+    sp->_screen_acs_fix = (sp->_screen_unicode

                           && _nc_locale_breaks_acs(sp->_term));
 #endif
     env = _nc_get_locale();
                           && _nc_locale_breaks_acs(sp->_term));
 #endif
     env = _nc_get_locale();


@@ -619,6 +622,7 @@ NCURSES_SP_NAME(_nc_setupscreen) (
 #endif
 #if USE_SIZECHANGE
     sp->_resize = NCURSES_SP_NAME(resizeterm);
 #endif
 #if USE_SIZECHANGE
     sp->_resize = NCURSES_SP_NAME(resizeterm);

+    sp->_ungetch = safe_ungetch;

 #endif
 
     NewScreen(sp)->_clear = TRUE;
 #endif
 
     NewScreen(sp)->_clear = TRUE;


@@ -628,6 +632,8 @@ NCURSES_SP_NAME(_nc_setupscreen) (
     NCURSES_SP_NAME(def_prog_mode) (NCURSES_SP_ARG);
 
     if (safe_ripoff_sp && safe_ripoff_sp != safe_ripoff_stack) {
     NCURSES_SP_NAME(def_prog_mode) (NCURSES_SP_ARG);
 
     if (safe_ripoff_sp && safe_ripoff_sp != safe_ripoff_stack) {

+       ripoff_t *rop;
+

        for (rop = safe_ripoff_stack;
             rop != safe_ripoff_sp && (rop - safe_ripoff_stack) < N_RIPS;
             rop++) {
        for (rop = safe_ripoff_stack;
             rop != safe_ripoff_sp && (rop - safe_ripoff_stack) < N_RIPS;
             rop++) {


@@ -663,11 +669,12 @@ NCURSES_SP_NAME(_nc_setupscreen) (
                } else {
                    ReturnScreenError();
                }
                } else {
                    ReturnScreenError();
                }

-               if (rop->line < 0)
+               if (rop->line < 0) {

                    bottom_stolen += count;
                    bottom_stolen += count;

-               else
-                   sp->_topstolen += count;
-               sp->_lines_avail -= count;
+               } else {
+                   sp->_topstolen = (NCURSES_SIZE_T) (sp->_topstolen + count);
+               }
+               sp->_lines_avail = (NCURSES_SIZE_T) (sp->_lines_avail - count);

            }
        }
        /* reset the stack */
            }
        }
        /* reset the stack */


@@ -694,7 +701,7 @@ NCURSES_EXPORT(int)
 _nc_setupscreen(int slines GCC_UNUSED,
                int scolumns GCC_UNUSED,
                FILE *output,
 _nc_setupscreen(int slines GCC_UNUSED,
                int scolumns GCC_UNUSED,
                FILE *output,

-               bool filtered,
+               int filtered,

                int slk_format)
 {
     SCREEN *sp = 0;
                int slk_format)
 {
     SCREEN *sp = 0;


@@ -722,7 +729,7 @@ NCURSES_SP_NAME(_nc_ripoffline) (NCURSES_SP_DCLx
     int code = ERR;
 
     START_TRACE();
     int code = ERR;
 
     START_TRACE();

-    T((T_CALLED("ripoffline(%p,%d,%p)"), (void *) SP_PARM, line, (void *) init));
+    T((T_CALLED("ripoffline(%p,%d,%p)"), (void *) SP_PARM, line, TR_FUNC(init)));

 
 #if NCURSES_SP_FUNCS
     if (SP_PARM != 0 && SP_PARM->_prescreen)
 
 #if NCURSES_SP_FUNCS
     if (SP_PARM != 0 && SP_PARM->_prescreen)


@@ -758,6 +765,7 @@ NCURSES_SP_NAME(ripoffline) (NCURSES_SP_DCLx
                             int line,
                             int (*init) (WINDOW *, int))
 {
                             int line,
                             int (*init) (WINDOW *, int))
 {

+    START_TRACE();

     return NCURSES_SP_NAME(_nc_ripoffline) (NCURSES_SP_ARGx
                                            (line < 0) ? -1 : 1,
                                            init);
     return NCURSES_SP_NAME(_nc_ripoffline) (NCURSES_SP_ARGx
                                            (line < 0) ? -1 : 1,
                                            init);