new copyright notice

[unix-history] / usr / src / usr.bin / window / wwredrawwin.c

diff --git a/usr/src/usr.bin/window/wwredrawwin.c b/usr/src/usr.bin/window/wwredrawwin.c
index a7f89b7..460813c 100644 (file)
--- a/usr/src/usr.bin/window/wwredrawwin.c
+++ b/usr/src/usr.bin/window/wwredrawwin.c
@@ -1,42 +1,44 @@
+/*
+ * Copyright (c) 1983 Regents of the University of California.
+ * All rights reserved.
+ *
+ * %sccs.include.redist.c%
+ */
+

 #ifndef lint
 #ifndef lint

-static char *sccsid = "@(#)wwredrawwin.c       3.2 83/08/16";
-#endif
+static char sccsid[] = "@(#)wwredrawwin.c      3.15 (Berkeley) %G%";
+#endif /* not lint */

 
 #include "ww.h"
 
 
 #include "ww.h"
 

-/*                     nobody calls it
-wwredrawwin(w)
-register struct ww *w;
-{
-       wwredrawwin1(w, 0, w->ww_w.nr - 1, w->ww_scroll);
-}
-*/
-
-wwredrawwin1(w, srow, erow, offset)
+wwredrawwin1(w, row1, row2, offset)

 register struct ww *w;
 register struct ww *w;

-int srow, erow, offset;
+int row1, row2, offset;

 {
 {

-       int i;
-       register j;
+       int row;
+       register col;

        register char *smap;
        register union ww_char *buf;
        register char *win;
        register union ww_char *ns;
        register char *smap;
        register union ww_char *buf;
        register char *win;
        register union ww_char *ns;

-       char *touched;
+       int x;
+       int nchanged;

 
 

-       touched = &wwtouched[srow + w->ww_w.t];
-       for (i = srow; i <= erow; i++, touched++) {
-               ns = &wwns[i + w->ww_w.t][w->ww_w.l];
-               smap = &wwsmap[i + w->ww_w.t][w->ww_w.l];
-               buf = w->ww_buf[offset + i];
-               win = w->ww_win[i];
-               for (j = w->ww_w.nc; --j >= 0;)
-                       if (*smap++ != w->ww_index)
-                               win++, ns++, buf++;
-                       else {
-                               *touched = 1;
-                               ns++->c_w = buf++->c_w
-                                       ^ *win++ << WWC_MSHIFT;
+       for (row = row1; row < row2; row++) {
+               col = w->ww_i.l;
+               ns = wwns[row];
+               smap = &wwsmap[row][col];
+               buf = w->ww_buf[row + offset];
+               win = w->ww_win[row];
+               nchanged = 0;
+               for (; col < w->ww_i.r; col++)
+                       if (*smap++ == w->ww_index &&
+                           ns[col].c_w !=
+                           (x = buf[col].c_w ^ win[col] << WWC_MSHIFT)) {
+                               nchanged++;
+                               ns[col].c_w = x;

                        }
                        }

+               if (nchanged > 0)
+                       wwtouched[row] |= WWU_TOUCHED;

        }
 }
        }
 }