ncurses 5.7 - patch 20101225

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

diff --git a/ncurses/base/lib_window.c b/ncurses/base/lib_window.c
index 25101673044e90235ae81d823af12ab0ba6c1a5b..4baa36943c44a5156cd8348e2ceb4bb172cd8c1d 100644 (file)
--- a/ncurses/base/lib_window.c
+++ b/ncurses/base/lib_window.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2001,2002 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2009,2010 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            *
@@ -39,7 +39,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_window.c,v 1.21 2002/09/14 23:28:02 tom Exp $")
+MODULE_ID("$Id: lib_window.c,v 1.29 2010/12/19 01:47:22 tom Exp $")
 
 NCURSES_EXPORT(void)
 _nc_synchook(WINDOW *win)
@@ -57,32 +57,30 @@ mvderwin(WINDOW *win, int y, int x)
 {
     WINDOW *orig;
     int i;
+    int rc = ERR;
 
-    T((T_CALLED("mvderwin(%p,%d,%d)"), win, y, x));
+    T((T_CALLED("mvderwin(%p,%d,%d)"), (void *) win, y, x));
 
-    if (win && (orig = win->_parent)) {
-       if (win->_parx == x && win->_pary == y)
-           returnCode(OK);
-       if (x < 0 || y < 0)
-           returnCode(ERR);
-       if ((x + getmaxx(win) > getmaxx(orig)) ||
-           (y + getmaxy(win) > getmaxy(orig)))
-           returnCode(ERR);
-    } else
-       returnCode(ERR);
-    wsyncup(win);
-    win->_parx = x;
-    win->_pary = y;
-    for (i = 0; i < getmaxy(win); i++)
-       win->_line[i].text = &(orig->_line[y++].text[x]);
-    returnCode(OK);
+    if (win != 0
+       && (orig = win->_parent) != 0
+       && (x >= 0 && y >= 0)
+       && (x + getmaxx(win) <= getmaxx(orig))
+       && (y + getmaxy(win) <= getmaxy(orig))) {
+       wsyncup(win);
+       win->_parx = x;
+       win->_pary = y;
+       for (i = 0; i < getmaxy(win); i++)
+           win->_line[i].text = &(orig->_line[y++].text[x]);
+       rc = OK;
+    }
+    returnCode(rc);
 }
 
 NCURSES_EXPORT(int)
 syncok(WINDOW *win, bool bf)
 /* enable/disable automatic wsyncup() on each change to window */
 {
-    T((T_CALLED("syncok(%p,%d)"), win, bf));
+    T((T_CALLED("syncok(%p,%d)"), (void *) win, bf));
 
     if (win) {
        win->_sync = bf;
@@ -98,7 +96,7 @@ wsyncup(WINDOW *win)
 {
     WINDOW *wp;
 
-    T((T_CALLED("wsyncup(%p)"), win));
+    T((T_CALLED("wsyncup(%p)"), (void *) win));
     if (win && win->_parent) {
        for (wp = win; wp->_parent; wp = wp->_parent) {
            int y;
@@ -128,7 +126,7 @@ wsyncdown(WINDOW *win)
 /* mark changed every cell in win that is changed in any of its ancestors */
 /* Rewritten by J. Pfeifer, 1-Apr-96 (don't even think that...)           */
 {
-    T((T_CALLED("wsyncdown(%p)"), win));
+    T((T_CALLED("wsyncdown(%p)"), (void *) win));
 
     if (win && win->_parent) {
        WINDOW *pp = win->_parent;
@@ -149,7 +147,7 @@ wsyncdown(WINDOW *win)
                /* left and right character in child coordinates */
                int left = pp->_line[win->_pary + y].firstchar - win->_parx;
                int right = pp->_line[win->_pary + y].lastchar - win->_parx;
-               /* The change maybe outside the childs range */
+               /* The change may be outside the child's range */
                if (left < 0)
                    left = 0;
                if (right > win->_maxx)
@@ -167,7 +165,7 @@ wcursyncup(WINDOW *win)
 {
     WINDOW *wp;
 
-    T((T_CALLED("wcursyncup(%p)"), win));
+    T((T_CALLED("wcursyncup(%p)"), (void *) win));
     for (wp = win; wp && wp->_parent; wp = wp->_parent) {
        wmove(wp->_parent, wp->_pary + wp->_cury, wp->_parx + wp->_curx);
     }
@@ -182,18 +180,23 @@ dupwin(WINDOW *win)
     size_t linesize;
     int i;
 
-    T((T_CALLED("dupwin(%p)"), win));
+    T((T_CALLED("dupwin(%p)"), (void *) win));
 
     if (win != 0) {
-
+#if NCURSES_SP_FUNCS
+       SCREEN *sp = _nc_screen_of(win);
+#endif
+       _nc_lock_global(curses);
        if (win->_flags & _ISPAD) {
-           nwin = newpad(win->_maxy + 1,
-                         win->_maxx + 1);
+           nwin = NCURSES_SP_NAME(newpad) (NCURSES_SP_ARGx
+                                           win->_maxy + 1,
+                                           win->_maxx + 1);
        } else {
-           nwin = newwin(win->_maxy + 1,
-                         win->_maxx + 1,
-                         win->_begy,
-                         win->_begx);
+           nwin = NCURSES_SP_NAME(newwin) (NCURSES_SP_ARGx
+                                           win->_maxy + 1,
+                                           win->_maxx + 1,
+                                           win->_begy,
+                                           win->_begx);
        }
 
        if (nwin != 0) {
@@ -211,7 +214,7 @@ dupwin(WINDOW *win)
             * The text is really copied into the clone.
             */
 
-           nwin->_attrs = win->_attrs;
+           WINDOW_ATTRS(nwin) = WINDOW_ATTRS(win);
            nwin->_nc_bkgd = win->_nc_bkgd;
 
            nwin->_notimeout = win->_notimeout;
@@ -236,13 +239,14 @@ dupwin(WINDOW *win)
            if (win->_flags & _ISPAD)
                nwin->_pad = win->_pad;
 
-           linesize = (win->_maxx + 1) * sizeof(NCURSES_CH_T);
+           linesize = (unsigned) (win->_maxx + 1) * sizeof(NCURSES_CH_T);
            for (i = 0; i <= nwin->_maxy; i++) {
                memcpy(nwin->_line[i].text, win->_line[i].text, linesize);
                nwin->_line[i].firstchar = win->_line[i].firstchar;
                nwin->_line[i].lastchar = win->_line[i].lastchar;
            }
        }
+       _nc_unlock_global(curses);
     }
     returnWin(nwin);
 }