ncurses 6.1 - patch 20180210

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

diff --git a/ncurses/base/lib_redrawln.c b/ncurses/base/lib_redrawln.c
index 10fda917984e38c520c101a55c82194953a5130b..72905f84d656c6580c431641df2858a76eb568ce 100644 (file)
--- a/ncurses/base/lib_redrawln.c
+++ b/ncurses/base/lib_redrawln.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998 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,31 +39,49 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_redrawln.c,v 1.7 1998/09/19 20:09:50 Alexander.V.Lukyanov Exp $")
+MODULE_ID("$Id: lib_redrawln.c,v 1.17 2010/12/19 00:03:23 tom Exp $")
 
-int wredrawln(WINDOW *win, int beg, int num)
+NCURSES_EXPORT(int)
+wredrawln(WINDOW *win, int beg, int num)
 {
-       int i;
-       int end;
-       size_t len = (win->_maxx + 1) * sizeof(chtype);
+    int i;
+    int end;
+    size_t len;
+    SCREEN *sp;
 
-       T((T_CALLED("wredrawln(%p,%d,%d)"), win, beg, num));
+    T((T_CALLED("wredrawln(%p,%d,%d)"), (void *) win, beg, num));
 
-       if (beg < 0)
-               beg = 0;
+    if (win == 0)
+       returnCode(ERR);
 
-       if (touchline (win, beg, num) == ERR)
-               returnCode(ERR);
+    sp = _nc_screen_of(win);
 
-       end = beg + num;
-       if (end > win->_maxy + 1)
-               end = win->_maxy + 1;
+    if (beg < 0)
+       beg = 0;
 
-       for (i = beg; i < end; i++)
-       {
-               memset (curscr->_line[i+win->_begy].text+win->_begx, 0, len);
-               _nc_make_oldhash(i+win->_begy);
-       }
+    if (touchline(win, beg, num) == ERR)
+       returnCode(ERR);
 
-       returnCode(OK);
+    if (touchline(CurScreen(sp), beg + win->_begy, num) == ERR)
+       returnCode(ERR);
+
+    end = beg + num;
+    if (end > CurScreen(sp)->_maxy + 1 - win->_begy)
+       end = CurScreen(sp)->_maxy + 1 - win->_begy;
+    if (end > win->_maxy + 1)
+       end = win->_maxy + 1;
+
+    len = (size_t) (win->_maxx + 1);
+    if (len > (size_t) (CurScreen(sp)->_maxx + 1 - win->_begx))
+       len = (size_t) (CurScreen(sp)->_maxx + 1 - win->_begx);
+    len *= sizeof(CurScreen(sp)->_line[0].text[0]);
+
+    for (i = beg; i < end; i++) {
+       int crow = i + win->_begy;
+
+       memset(CurScreen(sp)->_line[crow].text + win->_begx, 0, len);
+       NCURSES_SP_NAME(_nc_make_oldhash) (NCURSES_SP_ARGx crow);
+    }
+
+    returnCode(OK);
 }