ncurses 6.1 - patch 20191102

[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 864968c120a8133e3b2595f1919d621b244344c3..fb0465a940a6baa05571514475193d56d8f600ce 100644 (file)
--- a/ncurses/base/lib_set_term.c
+++ b/ncurses/base/lib_set_term.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2016,2017 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2017,2018 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            *


@@ -43,11 +43,10 @@
 #include <curses.priv.h>
 #include <tic.h>
 
 #include <curses.priv.h>
 #include <tic.h>
 

-#ifndef CUR
+#undef CUR

 #define CUR SP_TERMTYPE
 #define CUR SP_TERMTYPE

-#endif

 
 

-MODULE_ID("$Id: lib_set_term.c,v 1.156 2017/03/01 00:10:41 tom Exp $")
+MODULE_ID("$Id: lib_set_term.c,v 1.168 2018/12/15 23:49:43 tom Exp $")

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


@@ -183,6 +182,7 @@ delscreen(SCREEN *sp)
        FreeIfNeeded(sp->_color_table);
        FreeIfNeeded(sp->_color_pairs);
 
        FreeIfNeeded(sp->_color_table);
        FreeIfNeeded(sp->_color_pairs);
 

+       FreeIfNeeded(sp->_oldnum_list);

        FreeIfNeeded(sp->oldhash);
        FreeIfNeeded(sp->newhash);
        FreeIfNeeded(sp->hashtab);
        FreeIfNeeded(sp->oldhash);
        FreeIfNeeded(sp->newhash);
        FreeIfNeeded(sp->hashtab);


@@ -193,6 +193,9 @@ delscreen(SCREEN *sp)
        NCURSES_SP_NAME(_nc_flush) (NCURSES_SP_ARG);
        NCURSES_SP_NAME(del_curterm) (NCURSES_SP_ARGx sp->_term);
        FreeIfNeeded(sp->out_buffer);
        NCURSES_SP_NAME(_nc_flush) (NCURSES_SP_ARG);
        NCURSES_SP_NAME(del_curterm) (NCURSES_SP_ARGx sp->_term);
        FreeIfNeeded(sp->out_buffer);

+       if (_nc_find_prescr() == sp) {
+           _nc_forget_prescr();
+       }

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


@@ -261,7 +264,7 @@ extract_fgbg(const char *src, int *result)
     if ((dst = tmp) == 0) {
        dst = src;
     } else if (value >= 0) {
     if ((dst = tmp) == 0) {
        dst = src;
     } else if (value >= 0) {

-       *result = value;
+       *result = (int) value;

     }
     while (*dst != 0 && *dst != ';')
        dst++;
     }
     while (*dst != 0 && *dst != ';')
        dst++;


@@ -286,6 +289,9 @@ NCURSES_SP_NAME(_nc_setupscreen) (
                                     int filtered,
                                     int slk_format)
 {
                                     int filtered,
                                     int slk_format)
 {

+#ifndef USE_TERM_DRIVER
+    static const TTY null_TTY; /* all zeros iff uninitialized */
+#endif

     char *env;
     int bottom_stolen = 0;
     SCREEN *sp;
     char *env;
     int bottom_stolen = 0;
     SCREEN *sp;


@@ -304,6 +310,7 @@ NCURSES_SP_NAME(_nc_setupscreen) (
 
     if (!sp) {
        sp = _nc_alloc_screen_sp();
 
     if (!sp) {
        sp = _nc_alloc_screen_sp();

+       T(("_nc_alloc_screen_sp %p", (void *) sp));

        *spp = sp;
     }
     if (!sp
        *spp = sp;
     }
     if (!sp


@@ -362,13 +369,19 @@ NCURSES_SP_NAME(_nc_setupscreen) (
 #ifdef USE_TERM_DRIVER
        CallDriver(sp, td_setfilter);
 #else
 #ifdef USE_TERM_DRIVER
        CallDriver(sp, td_setfilter);
 #else

-       clear_screen = 0;
-       cursor_down = parm_down_cursor = 0;
-       cursor_address = 0;
-       cursor_up = parm_up_cursor = 0;
-       row_address = 0;
+       /* *INDENT-EQLS* */
+       clear_screen     = ABSENT_STRING;
+       cursor_address   = ABSENT_STRING;
+       cursor_down      = ABSENT_STRING;
+       cursor_up        = ABSENT_STRING;
+       parm_down_cursor = ABSENT_STRING;
+       parm_up_cursor   = ABSENT_STRING;
+       row_address      = ABSENT_STRING;
+       cursor_home      = carriage_return;
+
+       if (back_color_erase)
+           clr_eos = ABSENT_STRING;

 
 

-       cursor_home = carriage_return;

 #endif
        T(("filter screensize %dx%d", slines, scolumns));
     }
 #endif
        T(("filter screensize %dx%d", slines, scolumns));
     }


@@ -628,8 +641,18 @@ NCURSES_SP_NAME(_nc_setupscreen) (
     NewScreen(sp)->_clear = TRUE;
     CurScreen(sp)->_clear = FALSE;
 
     NewScreen(sp)->_clear = TRUE;
     CurScreen(sp)->_clear = FALSE;
 

-    NCURSES_SP_NAME(def_shell_mode) (NCURSES_SP_ARG);
-    NCURSES_SP_NAME(def_prog_mode) (NCURSES_SP_ARG);
+    /*
+     * Get the current tty-modes. setupterm() may already have done this,
+     * unless we use the term-driver.
+     */
+#ifndef USE_TERM_DRIVER
+    if (cur_term != 0 &&
+       !memcmp(&cur_term->Ottyb, &null_TTY, sizeof(TTY)))
+#endif
+    {
+       NCURSES_SP_NAME(def_shell_mode) (NCURSES_SP_ARG);
+       NCURSES_SP_NAME(def_prog_mode) (NCURSES_SP_ARG);
+    }

 
     if (safe_ripoff_sp && safe_ripoff_sp != safe_ripoff_stack) {
        ripoff_t *rop;
 
     if (safe_ripoff_sp && safe_ripoff_sp != safe_ripoff_stack) {
        ripoff_t *rop;


@@ -727,9 +750,12 @@ NCURSES_SP_NAME(_nc_ripoffline) (NCURSES_SP_DCLx
                                 int (*init) (WINDOW *, int))
 {
     int code = ERR;
                                 int (*init) (WINDOW *, int))
 {
     int code = ERR;

+    TR_FUNC_BFR(1);

 
     START_TRACE();
 
     START_TRACE();

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

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


@@ -738,12 +764,15 @@ NCURSES_SP_NAME(_nc_ripoffline) (NCURSES_SP_DCLx
        if (line == 0) {
            code = OK;
        } else {
        if (line == 0) {
            code = OK;
        } else {

-           if (safe_ripoff_sp == 0)
+           if (safe_ripoff_sp == 0) {

                safe_ripoff_sp = safe_ripoff_stack;
                safe_ripoff_sp = safe_ripoff_stack;

+           }

            if (safe_ripoff_sp < safe_ripoff_stack + N_RIPS) {
                safe_ripoff_sp->line = line;
                safe_ripoff_sp->hook = init;
                (safe_ripoff_sp)++;
            if (safe_ripoff_sp < safe_ripoff_stack + N_RIPS) {
                safe_ripoff_sp->line = line;
                safe_ripoff_sp->hook = init;
                (safe_ripoff_sp)++;

+               T(("ripped-off %d:%d chunks",
+                  (int) (safe_ripoff_sp - safe_ripoff_stack), N_RIPS));

                code = OK;
            }
        }
                code = OK;
            }
        }


@@ -756,7 +785,12 @@ NCURSES_SP_NAME(_nc_ripoffline) (NCURSES_SP_DCLx
 NCURSES_EXPORT(int)
 _nc_ripoffline(int line, int (*init) (WINDOW *, int))
 {
 NCURSES_EXPORT(int)
 _nc_ripoffline(int line, int (*init) (WINDOW *, int))
 {

-    return NCURSES_SP_NAME(_nc_ripoffline) (CURRENT_SCREEN_PRE, line, init);
+    int rc;
+    _nc_lock_global(prescreen);
+    START_TRACE();
+    rc = NCURSES_SP_NAME(_nc_ripoffline) (CURRENT_SCREEN_PRE, line, init);
+    _nc_unlock_global(prescreen);
+    return rc;

 }
 #endif
 
 }
 #endif
 


@@ -775,6 +809,11 @@ NCURSES_SP_NAME(ripoffline) (NCURSES_SP_DCLx
 NCURSES_EXPORT(int)
 ripoffline(int line, int (*init) (WINDOW *, int))
 {
 NCURSES_EXPORT(int)
 ripoffline(int line, int (*init) (WINDOW *, int))
 {

-    return NCURSES_SP_NAME(ripoffline) (CURRENT_SCREEN_PRE, line, init);
+    int rc;
+    _nc_lock_global(prescreen);
+    START_TRACE();
+    rc = NCURSES_SP_NAME(ripoffline) (CURRENT_SCREEN_PRE, line, init);
+    _nc_unlock_global(prescreen);
+    return rc;

 }
 #endif
 }
 #endif