ncurses-4.2-980718

1 files changed, 53 insertions, 45 deletions

diff --git a/lib/libcurses/lib_clrbot.c b/lib/libcurses/lib_clrbot.c
index ad2469c264f..624a8c7967c 100644
--- a/lib/libcurses/lib_clrbot.c
+++ b/lib/libcurses/lib_clrbot.c
@@ -1,25 +1,37 @@
-/*	$OpenBSD: lib_clrbot.c,v 1.3 1997/12/03 05:21:13 millert Exp $	*/
+/*	$OpenBSD: lib_clrbot.c,v 1.4 1998/07/23 21:18:33 millert Exp $	*/
 
+/****************************************************************************
+ * Copyright (c) 1998 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            *
+ * "Software"), to deal in the Software without restriction, including      *
+ * without limitation the rights to use, copy, modify, merge, publish,      *
+ * distribute, distribute with modifications, sublicense, and/or sell       *
+ * copies of the Software, and to permit persons to whom the Software is    *
+ * furnished to do so, subject to the following conditions:                 *
+ *                                                                          *
+ * The above copyright notice and this permission notice shall be included  *
+ * in all copies or substantial portions of the Software.                   *
+ *                                                                          *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
+ *                                                                          *
+ * Except as contained in this notice, the name(s) of the above copyright   *
+ * holders shall not be used in advertising or otherwise to promote the     *
+ * sale, use or other dealings in this Software without prior written       *
+ * authorization.                                                           *
+ ****************************************************************************/
 
-/***************************************************************************
-*                            COPYRIGHT NOTICE                              *
-****************************************************************************
-*                ncurses is copyright (C) 1992-1995                        *
-*                          Zeyd M. Ben-Halim                               *
-*                          zmbenhal@netcom.com                             *
-*                          Eric S. Raymond                                 *
-*                          esr@snark.thyrsus.com                           *
-*                                                                          *
-*        Permission is hereby granted to reproduce and distribute ncurses  *
-*        by any means and for any fee, whether alone or as part of a       *
-*        larger distribution, in source or in binary form, PROVIDED        *
-*        this notice is included with any such distribution, and is not    *
-*        removed from any of its header files. Mention of ncurses in any   *
-*        applications linked with it is highly appreciated.                *
-*                                                                          *
-*        ncurses comes AS IS with no warranty, implied or expressed.       *
-*                                                                          *
-***************************************************************************/
+/****************************************************************************
+ *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
+ *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
+ ****************************************************************************/
 
 /*
 **	lib_clrbot.c
@@ -30,39 +42,35 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("Id: lib_clrbot.c,v 1.12 1997/09/20 15:02:34 juergen Exp $")
+MODULE_ID("$From: lib_clrbot.c,v 1.14 1998/06/28 00:36:26 tom Exp $")
 
 int wclrtobot(WINDOW *win)
 {
 int     code = ERR;
-chtype	blank;
-chtype	*ptr, *end;
-short	y, startx;
 
 	T((T_CALLED("wclrtobot(%p)"), win));
 
 	if (win) {
-	  startx = win->_curx;
-	  
-	  T(("clearing from y = %d to y = %d with maxx =  %d", win->_cury, win->_maxy, win->_maxx));
-	  
-	  for (y = win->_cury; y <= win->_maxy; y++) {
-	    end = &win->_line[y].text[win->_maxx];
-	    
-	    blank = _nc_background(win);
-	    for (ptr = &win->_line[y].text[startx]; ptr <= end; ptr++)
-	      *ptr = blank;
-	    
-	    if (win->_line[y].firstchar > startx
-		||  win->_line[y].firstchar == _NOCHANGE)
-	      win->_line[y].firstchar = startx;
-	    
-	    win->_line[y].lastchar = win->_maxx;
-	    
-	    startx = 0;
-	  }
-	  _nc_synchook(win);
-	  code = OK;
+		short y;
+		short startx = win->_curx;
+		chtype blank = _nc_background(win);
+
+		T(("clearing from y = %d to y = %d with maxx =  %d", win->_cury, win->_maxy, win->_maxx));
+
+		for (y = win->_cury; y <= win->_maxy; y++) {
+			struct ldat *line = &(win->_line[y]);
+			chtype *ptr = &(line->text[startx]);
+			chtype *end = &(line->text[win->_maxx]);
+
+			CHANGED_TO_EOL(line, startx, win->_maxx);
+
+			while (ptr <= end)
+				*ptr++ = blank;
+
+			startx = 0;
+		}
+		_nc_synchook(win);
+		code = OK;
 	}
 	returnCode(code);
 }