ncurses 5.6 - patch 20080823

[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 24f90d1b19a55e19c7a1539d71313213ad3a3c6f..aff432bb9fd1a3dc8fde612794d5fd9afae79dc1 100644 (file)
--- a/ncurses/base/lib_set_term.c
+++ b/ncurses/base/lib_set_term.c
@@ -44,7 +44,7 @@
 #include <term.h>              /* cur_term */
 #include <tic.h>
 
-MODULE_ID("$Id: lib_set_term.c,v 1.112 2008/06/07 22:29:07 tom Exp $")
+MODULE_ID("$Id: lib_set_term.c,v 1.117 2008/08/04 18:11:12 tom Exp $")
 
 NCURSES_EXPORT(SCREEN *)
 set_term(SCREEN *screenp)
@@ -164,11 +164,6 @@ delscreen(SCREEN *sp)
        FreeIfNeeded(sp->_acs_map);
        FreeIfNeeded(sp->_screen_acs_map);
 
-#if 0
-       /* FIXME - this should be a copy of the struct, not a pointer */
-       del_curterm(sp->_term);
-#endif
-
        /*
         * If the associated output stream has been closed, we can discard the
         * set-buffer.  Limit the error check to EBADF, since fflush may fail
@@ -181,6 +176,7 @@ delscreen(SCREEN *sp)
            free(sp->_setbuf);
        }
 
+       del_curterm(sp->_term);
        free(sp);
 
        /*
@@ -326,11 +322,7 @@ _nc_setupscreen(int slines GCC_UNUSED,
     SP->_ofp = output;
     SP->_cursor = -1;          /* cannot know real cursor shape */
 
-#if NCURSES_NO_PADDING
-    SP->_no_padding = getenv("NCURSES_NO_PADDING") != 0;
-    TR(TRACE_CHARPUT | TRACE_MOVE, ("padding will%s be used",
-                                   SP->_no_padding ? " not" : ""));
-#endif
+    SetNoPadding(SP);
 
 #if NCURSES_EXT_FUNCS
     SP->_default_color = FALSE;
@@ -367,11 +359,10 @@ _nc_setupscreen(int slines GCC_UNUSED,
      * Allow those assumed/default color assumptions to be overridden at
      * runtime:
      */
-    if (getenv("NCURSES_ASSUMED_COLORS") != 0) {
-       char *p = getenv("NCURSES_ASSUMED_COLORS");
+    if ((env = getenv("NCURSES_ASSUMED_COLORS")) != 0) {
        int fg, bg;
        char sep1, sep2;
-       int count = sscanf(p, "%d%c%d%c", &fg, &sep1, &bg, &sep2);
+       int count = sscanf(env, "%d%c%d%c", &fg, &sep1, &bg, &sep2);
        if (count >= 1) {
            SP->_default_fg = (fg >= 0 && fg < max_colors) ? fg : C_MASK;
            if (count >= 3) {
@@ -427,11 +418,6 @@ _nc_setupscreen(int slines GCC_UNUSED,
     SP->_mouse_wrap = no_mouse_wrap;
     SP->_mouse_fd = -1;
 
-    /* initialize the panel hooks */
-    SP->_panelHook.top_panel = (struct panel *) 0;
-    SP->_panelHook.bottom_panel = (struct panel *) 0;
-    SP->_panelHook.stdscr_pseudo_panel = (struct panel *) 0;
-
     /*
      * If we've no magic cookie support, we suppress attributes that xmc would
      * affect, i.e., the attributes that affect the rendition of a space.
@@ -520,7 +506,7 @@ _nc_setupscreen(int slines GCC_UNUSED,
 
     /* initialize normal acs before wide, since we use mapping in the latter */
 #if !USE_WIDEC_SUPPORT
-    if (_nc_unicode_locale() && _nc_locale_breaks_acs()) {
+    if (_nc_unicode_locale() && _nc_locale_breaks_acs(cur_term)) {
        acs_chars = NULL;
        ena_acs = NULL;
        enter_alt_charset_mode = NULL;
@@ -532,7 +518,8 @@ _nc_setupscreen(int slines GCC_UNUSED,
 #if USE_WIDEC_SUPPORT
     _nc_init_wacs();
 
-    SP->_screen_acs_fix = (_nc_unicode_locale() && _nc_locale_breaks_acs());
+    SP->_screen_acs_fix = (_nc_unicode_locale()
+                          && _nc_locale_breaks_acs(cur_term));
 #endif
     env = _nc_get_locale();
     SP->_legacy_coding = ((env == 0)