ncurses 5.6 - patch 20080412

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

diff --git a/ncurses/base/lib_scroll.c b/ncurses/base/lib_scroll.c
index 39c62d0850e58b3964071e8556c9b88e50a40400..ac85bd55ea1d50f773e4c1b57350fa1d3b50277d 100644 (file)
--- a/ncurses/base/lib_scroll.c
+++ b/ncurses/base/lib_scroll.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998,2000,2001 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2004,2006 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            *
@@ -27,7 +27,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- *  Author: Thomas E. Dickey 1996-2001                                      *
+ *  Author: Thomas E. Dickey 1996-2003                                      *
  *     and: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
  ****************************************************************************/
@@ -43,18 +43,22 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_scroll.c,v 1.23 2001/12/19 01:06:55 tom Exp $")
+MODULE_ID("$Id: lib_scroll.c,v 1.26 2006/10/14 20:46:08 tom Exp $")
 
 NCURSES_EXPORT(void)
-_nc_scroll_window(WINDOW *win, int const n, NCURSES_SIZE_T const top,
-                 NCURSES_SIZE_T const bottom, NCURSES_CH_T blank)
+_nc_scroll_window(WINDOW *win,
+                 int const n,
+                 NCURSES_SIZE_T const top,
+                 NCURSES_SIZE_T const bottom,
+                 NCURSES_CH_T blank)
 {
     int limit;
     int line;
     int j;
     size_t to_copy = (size_t) (sizeof(NCURSES_CH_T) * (win->_maxx + 1));
 
-    TR(TRACE_MOVE, ("_nc_scroll_window(%p, %d, %d, %d)", win, n, top, bottom));
+    TR(TRACE_MOVE, ("_nc_scroll_window(%p, %d, %ld, %ld)",
+                   win, n, (long) top, (long) bottom));
 
     if (top < 0
        || bottom < top
@@ -77,24 +81,15 @@ _nc_scroll_window(WINDOW *win, int const n, NCURSES_SIZE_T const top,
     /* shift n lines downwards */
     if (n < 0) {
        limit = top - n;
-       if (limit > win->_maxy)
-           limit = win->_maxy;
-       for (line = bottom; line >= limit; line--) {
-           if (line + n >= 0) {
-               TR(TRACE_MOVE, ("...copying %d to %d", line + n, line));
-               memcpy(win->_line[line].text,
-                      win->_line[line + n].text,
-                      to_copy);
-               if_USE_SCROLL_HINTS(win->_line[line].oldindex =
-                                   win->_line[line + n].oldindex);
-           } else {
-               TR(TRACE_MOVE, ("...filling %d", line));
-               for (j = 0; j <= win->_maxx; j++)
-                   win->_line[line].text[j] = blank;
-               if_USE_SCROLL_HINTS(win->_line[line].oldindex = _NEWINDEX);
-           }
+       for (line = bottom; line >= limit && line >= 0; line--) {
+           TR(TRACE_MOVE, ("...copying %d to %d", line + n, line));
+           memcpy(win->_line[line].text,
+                  win->_line[line + n].text,
+                  to_copy);
+           if_USE_SCROLL_HINTS(win->_line[line].oldindex =
+                               win->_line[line + n].oldindex);
        }
-       for (line = top; line < limit; line++) {
+       for (line = top; line < limit && line <= win->_maxy; line++) {
            TR(TRACE_MOVE, ("...filling %d", line));
            for (j = 0; j <= win->_maxx; j++)
                win->_line[line].text[j] = blank;
@@ -105,31 +100,36 @@ _nc_scroll_window(WINDOW *win, int const n, NCURSES_SIZE_T const top,
     /* shift n lines upwards */
     if (n > 0) {
        limit = bottom - n;
-       if (limit < 0)
-           limit = 0;
-       for (line = top; line <= limit; line++) {
-           if (line + n <= win->_maxy) {
-               TR(TRACE_MOVE, ("...copying %d to %d", line + n, line));
-               memcpy(win->_line[line].text,
-                      win->_line[line + n].text,
-                      to_copy);
-               if_USE_SCROLL_HINTS(win->_line[line].oldindex =
-                                   win->_line[line + n].oldindex);
-           } else {
-               TR(TRACE_MOVE, ("...filling %d", line));
-               for (j = 0; j <= win->_maxx; j++)
-                   win->_line[line].text[j] = blank;
-               if_USE_SCROLL_HINTS(win->_line[line].oldindex = _NEWINDEX);
-           }
+       for (line = top; line <= limit && line <= win->_maxy; line++) {
+           memcpy(win->_line[line].text,
+                  win->_line[line + n].text,
+                  to_copy);
+           if_USE_SCROLL_HINTS(win->_line[line].oldindex =
+                               win->_line[line + n].oldindex);
        }
-       for (line = bottom; line > limit; line--) {
-           TR(TRACE_MOVE, ("...filling %d", line));
+       for (line = bottom; line > limit && line >= 0; line--) {
            for (j = 0; j <= win->_maxx; j++)
                win->_line[line].text[j] = blank;
            if_USE_SCROLL_HINTS(win->_line[line].oldindex = _NEWINDEX);
        }
     }
     touchline(win, top, bottom - top + 1);
+
+    if_WIDEC({
+       if (WINDOW_EXT(win, addch_used) != 0) {
+           int next = WINDOW_EXT(win, addch_y) + n;
+           if (next < 0 || next > win->_maxy) {
+               TR(TRACE_VIRTPUT,
+                  ("Alert discarded multibyte on scroll"));
+               WINDOW_EXT(win, addch_y) = 0;
+           } else {
+               TR(TRACE_VIRTPUT, ("scrolled working position to %d,%d",
+                                  WINDOW_EXT(win, addch_y),
+                                  WINDOW_EXT(win, addch_x)));
+               WINDOW_EXT(win, addch_y) = next;
+           }
+       }
+    })
 }
 
 NCURSES_EXPORT(int)
@@ -142,11 +142,9 @@ wscrl(WINDOW *win, int n)
        returnCode(ERR);
     }
 
-    if (n == 0)
-       returnCode(OK);
-
-    _nc_scroll_window(win, n, win->_regtop, win->_regbottom, win->_nc_bkgd);
-
-    _nc_synchook(win);
+    if (n != 0) {
+       _nc_scroll_window(win, n, win->_regtop, win->_regbottom, win->_nc_bkgd);
+       _nc_synchook(win);
+    }
     returnCode(OK);
 }