ncurses 5.7 - patch 20090419

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

diff --git a/ncurses/base/lib_screen.c b/ncurses/base/lib_screen.c
index 43f848d8a64df6e9683f0a962c1abd705754a1d8..745a366731eb60143857fa8a24f214b3b67e09c8 100644 (file)
--- a/ncurses/base/lib_screen.c
+++ b/ncurses/base/lib_screen.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2001,2002 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2008,2009 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            *


@@ -29,15 +29,18 @@
 /****************************************************************************
  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
 /****************************************************************************
  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *

- *     and: Thomas E. Dickey 1996 on                                        *
+ *     and: Thomas E. Dickey                        1996 on                 *
+ *     and: Juergen Pfeifer                         2009                    *

  ****************************************************************************/
 
 #include <curses.priv.h>
 
  ****************************************************************************/
 
 #include <curses.priv.h>
 

-MODULE_ID("$Id: lib_screen.c,v 1.28 2002/09/14 23:30:41 tom Exp $")
+MODULE_ID("$Id: lib_screen.c,v 1.32 2009/02/15 00:39:13 tom Exp $")
+
+#define MAX_SIZE 0x3fff                /* 16k is big enough for a window or pad */

 
 NCURSES_EXPORT(WINDOW *)
 
 NCURSES_EXPORT(WINDOW *)

-getwin(FILE * filep)
+getwin(FILE *filep)

 {
     WINDOW tmp, *nwin;
     int n;
 {
     WINDOW tmp, *nwin;
     int n;


@@ -46,7 +49,11 @@ getwin(FILE * filep)
 
     clearerr(filep);
     (void) fread(&tmp, sizeof(WINDOW), 1, filep);
 
     clearerr(filep);
     (void) fread(&tmp, sizeof(WINDOW), 1, filep);

-    if (ferror(filep))
+    if (ferror(filep)
+       || tmp._maxy == 0
+       || tmp._maxy > MAX_SIZE
+       || tmp._maxx == 0
+       || tmp._maxx > MAX_SIZE)

        returnWin(0);
 
     if (tmp._flags & _ISPAD) {
        returnWin(0);
 
     if (tmp._flags & _ISPAD) {


@@ -70,7 +77,7 @@ getwin(FILE * filep)
        nwin->_yoffset = tmp._yoffset;
        nwin->_flags = tmp._flags & ~(_SUBWIN);
 
        nwin->_yoffset = tmp._yoffset;
        nwin->_flags = tmp._flags & ~(_SUBWIN);
 

-       nwin->_attrs = tmp._attrs;
+       WINDOW_ATTRS(nwin) = WINDOW_ATTRS(&tmp);

        nwin->_nc_bkgd = tmp._nc_bkgd;
 
        nwin->_notimeout = tmp._notimeout;
        nwin->_nc_bkgd = tmp._nc_bkgd;
 
        nwin->_notimeout = tmp._notimeout;


@@ -107,7 +114,7 @@ getwin(FILE * filep)
 }
 
 NCURSES_EXPORT(int)
 }
 
 NCURSES_EXPORT(int)

-putwin(WINDOW *win, FILE * filep)
+putwin(WINDOW *win, FILE *filep)

 {
     int code = ERR;
     int n;
 {
     int code = ERR;
     int n;


@@ -115,7 +122,7 @@ putwin(WINDOW *win, FILE * filep)
     T((T_CALLED("putwin(%p,%p)"), win, filep));
 
     if (win != 0) {
     T((T_CALLED("putwin(%p,%p)"), win, filep));
 
     if (win != 0) {

-       size_t len = (win->_maxx + 1);
+       size_t len = (size_t) (win->_maxx + 1);

 
        clearerr(filep);
        if (fwrite(win, sizeof(WINDOW), 1, filep) != 1
 
        clearerr(filep);
        if (fwrite(win, sizeof(WINDOW), 1, filep) != 1


@@ -135,7 +142,7 @@ putwin(WINDOW *win, FILE * filep)
 }
 
 NCURSES_EXPORT(int)
 }
 
 NCURSES_EXPORT(int)

-scr_restore(const char *file)
+NCURSES_SP_NAME(scr_restore) (NCURSES_SP_DCLx const char *file)

 {
     FILE *fp = 0;
 
 {
     FILE *fp = 0;
 


@@ -146,12 +153,23 @@ scr_restore(const char *file)
        returnCode(ERR);
     } else {
        delwin(newscr);
        returnCode(ERR);
     } else {
        delwin(newscr);

-       SP->_newscr = newscr = getwin(fp);
+       SP_PARM->_newscr = getwin(fp);
+#if !USE_REENTRANT
+       newscr = SP_PARM->_newscr;
+#endif

        (void) fclose(fp);
        returnCode(OK);
     }
 }
 
        (void) fclose(fp);
        returnCode(OK);
     }
 }
 

+#if NCURSES_SP_FUNCS
+NCURSES_EXPORT(int)
+scr_restore(const char *file)
+{
+    return NCURSES_SP_NAME(scr_restore) (CURRENT_SCREEN, file);
+}
+#endif
+

 NCURSES_EXPORT(int)
 scr_dump(const char *file)
 {
 NCURSES_EXPORT(int)
 scr_dump(const char *file)
 {


@@ -170,7 +188,7 @@ scr_dump(const char *file)
 }
 
 NCURSES_EXPORT(int)
 }
 
 NCURSES_EXPORT(int)

-scr_init(const char *file)
+NCURSES_SP_NAME(scr_init) (NCURSES_SP_DCLx const char *file)

 {
     FILE *fp = 0;
 
 {
     FILE *fp = 0;
 


@@ -184,14 +202,25 @@ scr_init(const char *file)
        returnCode(ERR);
     } else {
        delwin(curscr);
        returnCode(ERR);
     } else {
        delwin(curscr);

-       SP->_curscr = curscr = getwin(fp);
+       SP_PARM->_curscr = getwin(fp);
+#if !USE_REENTRANT
+       curscr = SP_PARM->_curscr;
+#endif

        (void) fclose(fp);
        returnCode(OK);
     }
 }
 
        (void) fclose(fp);
        returnCode(OK);
     }
 }
 

+#if NCURSES_SP_FUNCS

 NCURSES_EXPORT(int)
 NCURSES_EXPORT(int)

-scr_set(const char *file)
+scr_init(const char *file)
+{
+    return NCURSES_SP_NAME(scr_init) (CURRENT_SCREEN, file);
+}
+#endif
+
+NCURSES_EXPORT(int)
+NCURSES_SP_NAME(scr_set) (NCURSES_SP_DCLx const char *file)

 {
     T((T_CALLED("scr_set(%s)"), _nc_visbuf(file)));
 
 {
     T((T_CALLED("scr_set(%s)"), _nc_visbuf(file)));
 


@@ -199,7 +228,18 @@ scr_set(const char *file)
        returnCode(ERR);
     } else {
        delwin(newscr);
        returnCode(ERR);
     } else {
        delwin(newscr);

-       SP->_newscr = newscr = dupwin(curscr);
+       SP_PARM->_newscr = dupwin(curscr);
+#if !USE_REENTRANT
+       newscr = SP_PARM->_newscr;
+#endif

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

+
+#if NCURSES_SP_FUNCS
+NCURSES_EXPORT(int)
+scr_set(const char *file)
+{
+    return NCURSES_SP_NAME(scr_set) (CURRENT_SCREEN, file);
+}
+#endif