X-Git-Url: https://git.subgeniuskitty.com/unix-history/.git/blobdiff_plain/1c15e88899094343f75aeba04122cd96a96b428e..ad7871609881e73855d0b04da49b486cd93efca7:/usr/src/lib/libcurses/touchwin.c

diff --git a/usr/src/lib/libcurses/touchwin.c b/usr/src/lib/libcurses/touchwin.c
index 101db81bf4..68fa785889 100644
--- a/usr/src/lib/libcurses/touchwin.c
+++ b/usr/src/lib/libcurses/touchwin.c
@@ -1,69 +1,121 @@
 /*
- * Copyright (c) 1981 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1981, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
- * Redistribution and use in source and binary forms are permitted
- * provided that: (1) source distributions retain this entire copyright
- * notice and comment, and (2) distributions including binaries display
- * the following acknowledgement:  ``This product includes software
- * developed by the University of California, Berkeley and its contributors''
- * in the documentation or other materials provided with the distribution
- * and in all advertising materials mentioning features or use of this
- * software. Neither the name of the University nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)touchwin.c	5.4 (Berkeley) 6/1/90";
+static char sccsid[] = "@(#)touchwin.c	8.1 (Berkeley) 6/4/93";
 #endif /* not lint */
 
-# include	"curses.ext"
+#include <curses.h>
+
 
 /*
- * make it look like the whole window has been changed.
- *
+ * touchline --
+ *	Touch a given line.
  */
+int
+touchline(win, y, sx, ex)
+	WINDOW *win;
+	register int y, sx, ex;
+{
+	return (__touchline(win, y, sx, ex, 1));
+}
+
+
+/*
+ * touchwin --
+ *	Make it look like the whole window has been changed.
+ */
+int
 touchwin(win)
-register WINDOW	*win;
+	register WINDOW *win;
 {
-	register int	y, maxy;
+	register int y, maxy;
 
-# ifdef	DEBUG
-	fprintf(outf, "TOUCHWIN(%0.2o)\n", win);
-# endif
-	maxy = win->_maxy;
+#ifdef DEBUG
+	__CTRACE("touchwin: (%0.2o)\n", win);
+#endif
+	maxy = win->maxy;
 	for (y = 0; y < maxy; y++)
-		touchline(win, y, 0, win->_maxx - 1);
+		__touchline(win, y, 0, win->maxx - 1, 1);
+	return (OK);
 }
 
-/*
- * touch a given line
- */
-touchline(win, y, sx, ex)
-register WINDOW	*win;
-register int	y, sx, ex;
+
+int
+__touchwin(win)
+	register WINDOW *win;
 {
-# ifdef DEBUG
-	fprintf(outf, "TOUCHLINE(%0.2o, %d, %d, %d)\n", win, y, sx, ex);
-	fprintf(outf, "TOUCHLINE:first = %d, last = %d\n", win->_firstch[y], win->_lastch[y]);
-# endif
-	sx += win->_ch_off;
-	ex += win->_ch_off;
-	if (win->_firstch[y] == _NOCHANGE) {
-		win->_firstch[y] = sx;
-		win->_lastch[y] = ex;
-	}
-	else {
-		if (win->_firstch[y] > sx)
-			win->_firstch[y] = sx;
-		if (win->_lastch[y] < ex)
-			win->_lastch[y] = ex;
+	register int y, maxy;
+
+#ifdef DEBUG
+	__CTRACE("touchwin: (%0.2o)\n", win);
+#endif
+	maxy = win->maxy;
+	for (y = 0; y < maxy; y++)
+		__touchline(win, y, 0, win->maxx - 1, 0);
+	return (OK);
+}
+
+int
+__touchline(win, y, sx, ex, force)
+	register WINDOW *win;
+	register int y, sx, ex;
+	int force;
+{
+#ifdef DEBUG
+	__CTRACE("touchline: (%0.2o, %d, %d, %d, %d)\n", win, y, sx, ex, force);
+	__CTRACE("touchline: first = %d, last = %d\n",
+	    *win->lines[y]->firstchp, *win->lines[y]->lastchp);
+#endif
+	if (force)
+		win->lines[y]->flags |= __FORCEPAINT;
+	sx += win->ch_off;
+	ex += win->ch_off;
+	if (!(win->lines[y]->flags & __ISDIRTY)) {
+		win->lines[y]->flags |= __ISDIRTY;
+		*win->lines[y]->firstchp = sx;
+		*win->lines[y]->lastchp = ex;
+	} else {
+		if (*win->lines[y]->firstchp > sx)
+			*win->lines[y]->firstchp = sx;
+		if (*win->lines[y]->lastchp < ex)
+			*win->lines[y]->lastchp = ex;
 	}
-# ifdef	DEBUG
-	fprintf(outf, "TOUCHLINE:first = %d, last = %d\n", win->_firstch[y], win->_lastch[y]);
-# endif
+#ifdef DEBUG
+	__CTRACE("touchline: first = %d, last = %d\n",
+	    *win->lines[y]->firstchp, *win->lines[y]->lastchp);
+#endif
+	return (OK);
 }
+
+