ncurses 5.9 - patch 20120825

[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 5128dc183052bfeffa06ae412dd9173967b54662..3ed5e72431394834013eaf2e844680748c7eb8d1 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-2011,2012 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.134 2009/11/07 16:27:25 tom Exp $")
+MODULE_ID("$Id: lib_set_term.c,v 1.143 2012/08/25 20:10:40 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;


@@ -188,18 +188,7 @@ 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);
        free(sp);
 
        NCURSES_SP_NAME(del_curterm) (NCURSES_SP_ARGx sp->_term);
        free(sp);
 


@@ -272,44 +261,6 @@ extract_fgbg(char *src, int *result)
 }
 #endif
 
 }
 #endif
 

-#if NCURSES_SP_FUNCS
-/*
- * In case of handling multiple screens, we need to have a screen before
- * initialization in setupscreen takes place.  This is to extend the substitute
- * for some of the stuff in _nc_prescreen, especially for slk and ripoff
- * handling which should be done per screen.
- */
-NCURSES_EXPORT(SCREEN *)
-new_prescr(void)
-{
-    static SCREEN *sp;
-
-    START_TRACE();
-    T((T_CALLED("new_prescr()")));
-
-    if (sp == 0) {
-       sp = _nc_alloc_screen_sp();
-       if (sp != 0) {
-           sp->rsp = sp->rippedoff;
-           sp->_filtered = _nc_prescreen.filter_mode;
-           sp->_use_env = _nc_prescreen.use_env;
-#if NCURSES_NO_PADDING
-           sp->_no_padding = _nc_prescreen._no_padding;
-#endif
-           sp->slk_format = 0;
-           sp->_slk = 0;
-           sp->_prescreen = TRUE;
-           SP_PRE_INIT(sp);
-#if USE_REENTRANT
-           sp->_TABSIZE = _nc_prescreen._TABSIZE;
-           sp->_ESCDELAY = _nc_prescreen._ESCDELAY;
-#endif
-       }
-    }
-    returnSP(sp);
-}
-#endif
-

 #define ReturnScreenError() _nc_set_screen(0); \
                             returnCode(ERR)
 
 #define ReturnScreenError() _nc_set_screen(0); \
                             returnCode(ERR)
 


@@ -322,7 +273,7 @@ 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 slk_format)
 {
     char *env;


@@ -352,7 +303,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;
 


@@ -418,10 +369,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) (slines * 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);
 


@@ -657,6 +616,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;


@@ -701,11 +661,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 */


@@ -732,7 +693,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;


@@ -760,7 +721,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, init));

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


@@ -796,6 +757,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);