copyright messages

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

diff --git a/usr/src/usr.bin/window/wwadd.c b/usr/src/usr.bin/window/wwadd.c
index 9ea336b..2b33397 100644 (file)
--- a/usr/src/usr.bin/window/wwadd.c
+++ b/usr/src/usr.bin/window/wwadd.c
@@ -1,7 +1,13 @@
 #ifndef lint
 #ifndef lint

-static char *sccsid = "@(#)wwadd.c     3.6 83/11/23";
+static char sccsid[] = "@(#)wwadd.c    3.9 %G%";

 #endif
 
 #endif
 

+/*
+ * Copyright (c) 1983 Regents of the University of California,
+ * All rights reserved.  Redistribution permitted subject to
+ * the terms of the Berkeley Software License Agreement.
+ */
+

 #include "ww.h"
 
 /*
 #include "ww.h"
 
 /*


@@ -11,8 +17,8 @@ wwadd(w1, w2)
 register struct ww *w1;
 struct ww *w2;
 {
 register struct ww *w1;
 struct ww *w2;
 {

-       register struct ww *w;

        register i;
        register i;

+       register struct ww *w;

 
        w1->ww_order = w2->ww_order + 1;
        w1->ww_back = w2;
 
        w1->ww_order = w2->ww_order + 1;
        w1->ww_back = w2;


@@ -23,32 +29,32 @@ struct ww *w2;
        for (w = w1->ww_forw; w != &wwhead; w = w->ww_forw)
                w->ww_order++;
        for (i = w1->ww_i.t; i < w1->ww_i.b; i++) {
        for (w = w1->ww_forw; w != &wwhead; w = w->ww_forw)
                w->ww_order++;
        for (i = w1->ww_i.t; i < w1->ww_i.b; i++) {

-               register j = w1->ww_i.l;
-               register char *smap = &wwsmap[i][j];
-               register char *win = &w1->ww_win[i][j];
+               register j;
+               register char *smap = wwsmap[i];
+               register char *win = w1->ww_win[i];
+               union ww_char *ns = wwns[i];
+               union ww_char *buf = w1->ww_buf[i];

                int nvis = 0;
                int nvis = 0;

+               int nchanged = 0;

 
                for (j = w1->ww_i.l; j < w1->ww_i.r; j++) {
 
                for (j = w1->ww_i.l; j < w1->ww_i.r; j++) {

-                       w = wwindex[*smap];
-                       if (w1->ww_order > w->ww_order) {
-                               win++;
-                               smap++;
+                       w = wwindex[smap[j]];
+                       if (w1->ww_order > w->ww_order)

                                continue;
                                continue;

-                       }
-                       if (*win & WWM_GLS) {
-                               win++;
-                               smap++;
+                       if (win[j] & WWM_GLS)

                                continue;
                                continue;

-                       }

                        if (w != &wwnobody && w->ww_win[i][j] == 0)
                                w->ww_nvis[i]--;
                        if (w != &wwnobody && w->ww_win[i][j] == 0)
                                w->ww_nvis[i]--;

-                       *smap++ = w1->ww_index;
-                       if (*win == 0)
+                       smap[j] = w1->ww_index;
+                       if (win[j] == 0)

                                nvis++;
                                nvis++;

-                       wwns[i][j].c_w = w1->ww_buf[i][j].c_w ^
-                               *win++ << WWC_MSHIFT;
-                       wwtouched[i] = 1;
+                       ns[j].c_w = buf[j].c_w ^ win[j] << WWC_MSHIFT;
+                       nchanged++;

                }
                }

+               if (nchanged > 4)
+                       wwtouched[i] |= WWU_MAJOR|WWU_TOUCHED;
+               else if (nchanged > 0)
+                       wwtouched[i] |= WWU_TOUCHED;

                w1->ww_nvis[i] = nvis;
        }
 }
                w1->ww_nvis[i] = nvis;
        }
 }