ncurses 6.2 - patch 20200816

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

diff --git a/ncurses/base/lib_overlay.c b/ncurses/base/lib_overlay.c
index 26314de5e5fba0d604cfbf5c7b7b1bb2c14c03a9..6d451d046a852047ea17996944d13efc7ff978d7 100644 (file)
--- a/ncurses/base/lib_overlay.c
+++ b/ncurses/base/lib_overlay.c
@@ -1,5 +1,6 @@
 /****************************************************************************
- * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
+ * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 1998-2013,2016 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            *
@@ -40,23 +41,20 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_overlay.c,v 1.25 2008/04/12 17:21:59 tom Exp $")
+MODULE_ID("$Id: lib_overlay.c,v 1.33 2020/02/02 23:34:34 tom Exp $")
 
 static int
 overlap(const WINDOW *const src, WINDOW *const dst, int const flag)
 {
     int rc = ERR;
-    int sx1, sy1, sx2, sy2;
-    int dx1, dy1, dx2, dy2;
-    int sminrow, smincol;
-    int dminrow, dmincol;
-    int dmaxrow, dmaxcol;
 
-    T((T_CALLED("overlap(%p,%p,%d)"), src, dst, flag));
+    T((T_CALLED("overlap(%p,%p,%d)"), (const void *) src, (void *) dst, flag));
 
     if (src != 0 && dst != 0) {
-       _nc_lock_window(src);
-       _nc_lock_window(dst);
+       int sx1, sy1, sx2, sy2;
+       int dx1, dy1, dx2, dy2;
+
+       _nc_lock_global(curses);
 
        T(("src : begy %ld, begx %ld, maxy %ld, maxx %ld",
           (long) src->_begy,
@@ -80,12 +78,12 @@ overlap(const WINDOW *const src, WINDOW *const dst, int const flag)
        dy2 = dy1 + dst->_maxy;
 
        if (dx2 >= sx1 && dx1 <= sx2 && dy2 >= sy1 && dy1 <= sy2) {
-           sminrow = max(sy1, dy1) - sy1;
-           smincol = max(sx1, dx1) - sx1;
-           dminrow = max(sy1, dy1) - dy1;
-           dmincol = max(sx1, dx1) - dx1;
-           dmaxrow = min(sy2, dy2) - dy1;
-           dmaxcol = min(sx2, dx2) - dx1;
+           int sminrow = max(sy1, dy1) - sy1;
+           int smincol = max(sx1, dx1) - sx1;
+           int dminrow = max(sy1, dy1) - dy1;
+           int dmincol = max(sx1, dx1) - dx1;
+           int dmaxrow = min(sy2, dy2) - dy1;
+           int dmaxcol = min(sx2, dx2) - dx1;
 
            rc = copywin(src, dst,
                         sminrow, smincol,
@@ -93,8 +91,7 @@ overlap(const WINDOW *const src, WINDOW *const dst, int const flag)
                         dmaxrow, dmaxcol,
                         flag);
        }
-       _nc_unlock_window(dst);
-       _nc_unlock_window(src);
+       _nc_unlock_global(curses);
     }
     returnCode(rc);
 }
@@ -112,7 +109,7 @@ overlap(const WINDOW *const src, WINDOW *const dst, int const flag)
 NCURSES_EXPORT(int)
 overlay(const WINDOW *win1, WINDOW *win2)
 {
-    T((T_CALLED("overlay(%p,%p)"), win1, win2));
+    T((T_CALLED("overlay(%p,%p)"), (const void *) win1, (void *) win2));
     returnCode(overlap(win1, win2, TRUE));
 }
 
@@ -129,7 +126,7 @@ overlay(const WINDOW *win1, WINDOW *win2)
 NCURSES_EXPORT(int)
 overwrite(const WINDOW *win1, WINDOW *win2)
 {
-    T((T_CALLED("overwrite(%p,%p)"), win1, win2));
+    T((T_CALLED("overwrite(%p,%p)"), (const void *) win1, (void *) win2));
     returnCode(overlap(win1, win2, FALSE));
 }
 
@@ -141,18 +138,22 @@ copywin(const WINDOW *src, WINDOW *dst,
        int over)
 {
     int rc = ERR;
-    int sx, sy, dx, dy;
-    bool touched;
-    attr_t bk;
-    attr_t mask;
 
     T((T_CALLED("copywin(%p, %p, %d, %d, %d, %d, %d, %d, %d)"),
-       src, dst, sminrow, smincol, dminrow, dmincol, dmaxrow, dmaxcol, over));
+       (const void *) src,
+       (void *) dst,
+       sminrow, smincol,
+       dminrow, dmincol,
+       dmaxrow, dmaxcol, over));
 
-    if (src && dst) {
+    if (src != 0
+       && dst != 0
+       && dmaxrow >= dminrow
+       && dmaxcol >= dmincol) {
+       attr_t bk;
+       attr_t mask;
 
-       _nc_lock_window(src);
-       _nc_lock_window(dst);
+       _nc_lock_global(curses);
 
        bk = AttrOf(dst->_nc_bkgd);
        mask = ~(attr_t) ((bk & A_COLOR) ? A_COLOR : 0);
@@ -165,17 +166,28 @@ copywin(const WINDOW *src, WINDOW *dst,
 
            /* make sure rectangle fits in destination */
            if (dmaxrow <= dst->_maxy && dmaxcol <= dst->_maxx) {
+               int sx, sy, dx, dy;
+               bool copied = FALSE;
 
                T(("rectangle fits in destination"));
 
                for (dy = dminrow, sy = sminrow;
                     dy <= dmaxrow;
                     sy++, dy++) {
+                   bool touched;
+
+                   if (dy < 0 || sy < 0)
+                       continue;
 
                    touched = FALSE;
                    for (dx = dmincol, sx = smincol;
                         dx <= dmaxcol;
                         sx++, dx++) {
+
+                       if (dx < 0 || sx < 0)
+                           continue;
+                       copied = TRUE;
+
                        if (over) {
                            if ((CharOf(src->_line[sy].text[sx]) != L(' ')) &&
                                (!CharEq(dst->_line[dy].text[dx],
@@ -201,11 +213,11 @@ copywin(const WINDOW *src, WINDOW *dst,
                    }
                }
                T(("finished copywin"));
-               rc = OK;
+               if (copied)
+                   rc = OK;
            }
        }
-       _nc_unlock_window(dst);
-       _nc_unlock_window(src);
+       _nc_unlock_global(curses);
     }
     returnCode(rc);
 }