ncurses 5.7 - patch 20090516

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

diff --git a/ncurses/base/lib_newwin.c b/ncurses/base/lib_newwin.c
index 086dd1023d3e21ab7b20b848680933cfb7f36ecd..7d3b02bead4a8123041c1788728c3c4b07f151ba 100644 (file)
--- a/ncurses/base/lib_newwin.c
+++ b/ncurses/base/lib_newwin.c
@@ -43,7 +43,7 @@
 #include <curses.priv.h>
 #include <stddef.h>
 
-MODULE_ID("$Id: lib_newwin.c,v 1.53 2009/02/15 00:38:00 tom Exp $")
+MODULE_ID("$Id: lib_newwin.c,v 1.57 2009/05/09 23:40:03 tom Exp $")
 
 #define window_is(name) ((sp)->_##name == win)
 
@@ -88,11 +88,11 @@ _nc_freewin(WINDOW *win)
     if (win != 0) {
        if (_nc_try_global(curses) == 0) {
            q = 0;
-           for (each_window(p)) {
+           for (each_window(SP, p)) {
                if (&(p->win) == win) {
                    remove_window_from_screen(win);
                    if (q == 0)
-                       _nc_windows = p->next;
+                       WindowList(SP) = p->next;
                    else
                        q->next = p->next;
 
@@ -131,9 +131,11 @@ NCURSES_SP_NAME(newwin) (NCURSES_SP_DCLx
     if (num_lines == 0)
        num_lines = SP_PARM->_lines_avail - begy;
     if (num_columns == 0)
-       num_columns = screen_columns - begx;
+       num_columns = screen_columns(SP_PARM) - begx;
 
-    if ((win = _nc_makenew(num_lines, num_columns, begy, begx, 0)) == 0)
+    win = NCURSES_SP_NAME(_nc_makenew) (NCURSES_SP_ARGx
+                                       num_lines, num_columns, begy, begx, 0);
+    if (win == 0)
        returnWin(0);
 
     for (i = 0; i < num_lines; i++) {
@@ -155,7 +157,8 @@ NCURSES_SP_NAME(newwin) (NCURSES_SP_DCLx
 NCURSES_EXPORT(WINDOW *)
 newwin(int num_lines, int num_columns, int begy, int begx)
 {
-    return NCURSES_SP_NAME(newwin) (CURRENT_SCREEN, num_lines, num_columns,
+    return NCURSES_SP_NAME(newwin) (CURRENT_SCREEN,
+                                   num_lines, num_columns,
                                    begy, begx);
 }
 #endif
@@ -163,6 +166,9 @@ newwin(int num_lines, int num_columns, int begy, int begx)
 NCURSES_EXPORT(WINDOW *)
 derwin(WINDOW *orig, int num_lines, int num_columns, int begy, int begx)
 {
+#if NCURSES_SP_FUNCS
+    SCREEN *sp = CURRENT_SCREEN;
+#endif
     WINDOW *win;
     int i;
     int flags = _SUBWIN;
@@ -188,8 +194,10 @@ derwin(WINDOW *orig, int num_lines, int num_columns, int begy, int begx)
     if (orig->_flags & _ISPAD)
        flags |= _ISPAD;
 
-    if ((win = _nc_makenew(num_lines, num_columns, orig->_begy + begy,
-                          orig->_begx + begx, flags)) == 0)
+    win = NCURSES_SP_NAME(_nc_makenew) (NCURSES_SP_ARGx num_lines, num_columns,
+                                       orig->_begy + begy,
+                                       orig->_begx + begx, flags);
+    if (win == 0)
        returnWin(0);
 
     win->_pary = begy;
@@ -222,16 +230,22 @@ dimension_limit(int value)
 }
 
 NCURSES_EXPORT(WINDOW *)
-_nc_makenew(int num_lines, int num_columns, int begy, int begx, int flags)
+NCURSES_SP_NAME(_nc_makenew) (NCURSES_SP_DCLx
+                             int num_lines,
+                             int num_columns,
+                             int begy,
+                             int begx,
+                             int flags)
 {
     int i;
     WINDOWLIST *wp;
     WINDOW *win;
     bool is_pad = (flags & _ISPAD);
 
-    T((T_CALLED("_nc_makenew(%d,%d,%d,%d)"), num_lines, num_columns, begy, begx));
+    T((T_CALLED("_nc_makenew(%p,%d,%d,%d,%d)"),
+       SP_PARM, num_lines, num_columns, begy, begx));
 
-    if (SP == 0)
+    if (SP_PARM == 0)
        returnWin(0);
 
     if (!dimension_limit(num_lines) || !dimension_limit(num_columns))
@@ -255,14 +269,16 @@ _nc_makenew(int num_lines, int num_columns, int begy, int begx, int flags)
     win->_maxx = num_columns - 1;
     win->_begy = begy;
     win->_begx = begx;
-    win->_yoffset = SP->_topstolen;
+    win->_yoffset = SP_PARM->_topstolen;
 
     win->_flags = flags;
     WINDOW_ATTRS(win) = A_NORMAL;
     SetChar(win->_nc_bkgd, BLANK_TEXT, BLANK_ATTR);
 
-    win->_clear = is_pad ? FALSE : (num_lines == screen_lines
-                                   && num_columns == screen_columns);
+    win->_clear = (is_pad
+                  ? FALSE
+                  : (num_lines == screen_lines(SP_PARM)
+                     && num_columns == screen_columns(SP_PARM)));
     win->_idlok = FALSE;
     win->_idcok = TRUE;
     win->_scroll = FALSE;
@@ -311,19 +327,19 @@ _nc_makenew(int num_lines, int num_columns, int begy, int begx, int flags)
        if_USE_SCROLL_HINTS(win->_line[i].oldindex = i);
     }
 
-    if (!is_pad && (begx + num_columns == screen_columns)) {
+    if (!is_pad && (begx + num_columns == screen_columns(SP_PARM))) {
        win->_flags |= _ENDLINE;
 
-       if (begx == 0 && num_lines == screen_lines && begy == 0)
+       if (begx == 0 && num_lines == screen_lines(SP_PARM) && begy == 0)
            win->_flags |= _FULLWIN;
 
-       if (begy + num_lines == screen_lines)
+       if (begy + num_lines == screen_lines(SP_PARM))
            win->_flags |= _SCROLLWIN;
     }
 
-    wp->next = _nc_windows;
-    wp->screen = SP;
-    _nc_windows = wp;
+    wp->next = WindowList(SP_PARM);
+    wp->screen = SP_PARM;
+    WindowList(SP_PARM) = wp;
 
     T((T_CREATE("window %p"), win));
 
@@ -331,6 +347,16 @@ _nc_makenew(int num_lines, int num_columns, int begy, int begx, int flags)
     returnWin(win);
 }
 
+#if NCURSES_SP_FUNCS
+NCURSES_EXPORT(WINDOW *)
+_nc_makenew(int num_lines, int num_columns, int begy, int begx, int flags)
+{
+    return NCURSES_SP_NAME(_nc_makenew) (CURRENT_SCREEN,
+                                        num_lines, num_columns,
+                                        begy, begx, flags);
+}
+#endif
+
 /*
  * wgetch() and other functions with a WINDOW* parameter may use a SCREEN*
  * internally, and it is useful to allow those to be invoked without switching
@@ -347,3 +373,23 @@ _nc_screen_of(WINDOW *win)
     }
     return (sp);
 }
+
+#if NCURSES_SP_FUNCS
+NCURSES_EXPORT(WINDOW *)
+_nc_curscr_of(SCREEN *sp)
+{
+    return sp == 0 ? 0 : sp->_curscr;
+}
+
+NCURSES_EXPORT(WINDOW *)
+_nc_newscr_of(SCREEN *sp)
+{
+    return sp == 0 ? 0 : sp->_newscr;
+}
+
+NCURSES_EXPORT(WINDOW *)
+_nc_stdscr_of(SCREEN *sp)
+{
+    return sp == 0 ? 0 : sp->_stdscr;
+}
+#endif