ncurses 5.6 - patch 20070812

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

diff --git a/ncurses/base/lib_newwin.c b/ncurses/base/lib_newwin.c
index c0980ad589934fbb5fa311ab7f784dabc59a6c04..bb6bc0578633748c6dd6c56996b129df66dd5109 100644 (file)
--- a/ncurses/base/lib_newwin.c
+++ b/ncurses/base/lib_newwin.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2006,2007 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            *


@@ -41,7 +41,7 @@
 
 #include <curses.priv.h>
 
 
 #include <curses.priv.h>
 

-MODULE_ID("$Id: lib_newwin.c,v 1.36 2005/04/09 15:23:04 tom Exp $")
+MODULE_ID("$Id: lib_newwin.c,v 1.40 2007/03/10 18:18:59 tom Exp $")

 
 static WINDOW *
 remove_window_from_screen(WINDOW *win)
 
 static WINDOW *
 remove_window_from_screen(WINDOW *win)


@@ -52,16 +52,22 @@ remove_window_from_screen(WINDOW *win)
        SCREEN *sp = *scan;
        if (sp->_curscr == win) {
            sp->_curscr = 0;
        SCREEN *sp = *scan;
        if (sp->_curscr == win) {
            sp->_curscr = 0;

+#if !USE_REENTRANT

            if (win == curscr)
                curscr = 0;
            if (win == curscr)
                curscr = 0;

+#endif

        } else if (sp->_stdscr == win) {
            sp->_stdscr = 0;
        } else if (sp->_stdscr == win) {
            sp->_stdscr = 0;

+#if !USE_REENTRANT

            if (win == stdscr)
                stdscr = 0;
            if (win == stdscr)
                stdscr = 0;

+#endif

        } else if (sp->_newscr == win) {
            sp->_newscr = 0;
        } else if (sp->_newscr == win) {
            sp->_newscr = 0;

+#if !USE_REENTRANT

            if (win == newscr)
                newscr = 0;
            if (win == newscr)
                newscr = 0;

+#endif

        } else {
            scan = &(*scan)->_next_screen;
            continue;
        } else {
            scan = &(*scan)->_next_screen;
            continue;


@@ -173,7 +179,7 @@ derwin(WINDOW *orig, int num_lines, int num_columns, int begy, int begx)
 
     win->_pary = begy;
     win->_parx = begx;
 
     win->_pary = begy;
     win->_parx = begx;

-    win->_attrs = orig->_attrs;
+    WINDOW_ATTRS(win) = WINDOW_ATTRS(orig);

     win->_nc_bkgd = orig->_nc_bkgd;
 
     for (i = 0; i < num_lines; i++)
     win->_nc_bkgd = orig->_nc_bkgd;
 
     for (i = 0; i < num_lines; i++)


@@ -188,7 +194,7 @@ NCURSES_EXPORT(WINDOW *)
 subwin(WINDOW *w, int l, int c, int y, int x)
 {
     T((T_CALLED("subwin(%p, %d, %d, %d, %d)"), w, l, c, y, x));
 subwin(WINDOW *w, int l, int c, int y, int x)
 {
     T((T_CALLED("subwin(%p, %d, %d, %d, %d)"), w, l, c, y, x));

-    T(("parent has begy = %d, begx = %d", w->_begy, w->_begx));
+    T(("parent has begy = %ld, begx = %ld", (long) w->_begy, (long) w->_begx));

 
     returnWin(derwin(w, l, c, y - w->_begy, x - w->_begx));
 }
 
     returnWin(derwin(w, l, c, y - w->_begy, x - w->_begx));
 }


@@ -208,22 +214,22 @@ _nc_makenew(int num_lines, int num_columns, int begy, int begx, int flags)
     WINDOW *win;
     bool is_pad = (flags & _ISPAD);
 
     WINDOW *win;
     bool is_pad = (flags & _ISPAD);
 

-    T(("_nc_makenew(%d,%d,%d,%d)", num_lines, num_columns, begy, begx));
+    T((T_CALLED("_nc_makenew(%d,%d,%d,%d)"), num_lines, num_columns, begy, begx));

 
     if (SP == 0)
 
     if (SP == 0)

-       return 0;
+       returnWin(0);

 
     if (!dimension_limit(num_lines) || !dimension_limit(num_columns))
 
     if (!dimension_limit(num_lines) || !dimension_limit(num_columns))

-       return 0;
+       returnWin(0);

 
     if ((wp = typeCalloc(WINDOWLIST, 1)) == 0)
 
     if ((wp = typeCalloc(WINDOWLIST, 1)) == 0)

-       return 0;
+       returnWin(0);

 
     win = &(wp->win);
 
     if ((win->_line = typeCalloc(struct ldat, ((unsigned) num_lines))) == 0) {
        free(win);
 
     win = &(wp->win);
 
     if ((win->_line = typeCalloc(struct ldat, ((unsigned) num_lines))) == 0) {
        free(win);

-       return 0;
+       returnWin(0);

     }
 
     win->_curx = 0;
     }
 
     win->_curx = 0;


@@ -235,7 +241,7 @@ _nc_makenew(int num_lines, int num_columns, int begy, int begx, int flags)
     win->_yoffset = SP->_topstolen;
 
     win->_flags = flags;
     win->_yoffset = SP->_topstolen;
 
     win->_flags = flags;

-    win->_attrs = A_NORMAL;
+    WINDOW_ATTRS(win) = A_NORMAL;

     SetChar(win->_nc_bkgd, BLANK_TEXT, BLANK_ATTR);
 
     win->_clear = is_pad ? FALSE : (num_lines == screen_lines
     SetChar(win->_nc_bkgd, BLANK_TEXT, BLANK_ATTR);
 
     win->_clear = is_pad ? FALSE : (num_lines == screen_lines


@@ -303,5 +309,5 @@ _nc_makenew(int num_lines, int num_columns, int begy, int begx, int flags)
 
     T((T_CREATE("window %p"), win));
 
 
     T((T_CREATE("window %p"), win));
 

-    return (win);
+    returnWin(win);

 }
 }