date and time created 84/05/06 18:00:10 by edward

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

diff --git a/usr/src/usr.bin/window/wwdelete.c b/usr/src/usr.bin/window/wwdelete.c
index b7089e0..28b8a90 100644 (file)
--- a/usr/src/usr.bin/window/wwdelete.c
+++ b/usr/src/usr.bin/window/wwdelete.c
@@ -1,5 +1,5 @@
 #ifndef lint
 #ifndef lint

-static char *sccsid = "@(#)wwdelete.c  3.3 83/08/16";
+static char *sccsid = "@(#)wwdelete.c  3.11 83/12/02";

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


@@ -10,53 +10,98 @@ static      char *sccsid = "@(#)wwdelete.c  3.3 83/08/16";
 wwdelete(w)
 register struct ww *w;
 {
 wwdelete(w)
 register struct ww *w;
 {

-       {
-               register i = w->ww_w.t;
-               register char *touched = &wwtouched[i];
-
-               for (; i < w->ww_w.b; i++, touched++) {
-                       register int j = w->ww_w.l;
-                       register char *smap = &wwsmap[i][j];
-                       register union ww_char *ns = &wwns[i][j];
-
-                       for (j = w->ww_w.nc; --j >= 0;) {
-                               if (*smap == w->ww_index) {
-                                       *touched = 1;
-                                       *smap++ = WWX_NOBODY;
-                                       ns++->c_w = ' ';
-                               } else {
-                                       smap++;
-                                       ns++;
-                               }
+       register i;
+
+       for (i = w->ww_i.t; i < w->ww_i.b; i++) {
+               register j;
+               register char *smap = wwsmap[i];
+               register struct ww_char *ns = wwns[i];
+               register int nchanged = 0;
+
+               for (j = w->ww_i.l; j < w->ww_i.r; j++)
+                       if (smap[j] == w->ww_index) {
+                               smap[j] = WWX_NOBODY;
+                               ns[j].c_w = ' ';
+                               nchanged++;

                        }
                        }

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

        }
        }

+

        {
                register struct ww *wp;
 
        {
                register struct ww *wp;
 

-               for (wp = w->ww_forw; wp != &wwhead; wp = wp->ww_forw) {
+               for (wp = w->ww_forw; wp != &wwhead; wp = wp->ww_forw)

                        wp->ww_order--;
                        wp->ww_order--;

-                       wwuncover(w, wp);
-               }
-       }
-       {
-               register i;
-
-               for (i = 0; i < w->ww_w.nr; i++) {
-                       register j;
-                       register char *win = w->ww_win[i];
-                       register char *cov = w->ww_cov[i];
-                       for (j = w->ww_w.nc; --j >= 0;) {
-                               if (*win != 0) {
-                                       if ((*win++ &= ~WWM_COV) == 0)
-                                               w->ww_nvis[i]++;
-                               } else
-                                       win++;
-                               *cov++ = WWX_NOBODY;
-                       }
-               }

        }
        }

+
+       if (w->ww_forw != &wwhead)
+               wwdelete1(w->ww_forw,
+                       w->ww_i.t, w->ww_i.b, w->ww_i.l, w->ww_i.r);
+

        w->ww_back->ww_forw = w->ww_forw;
        w->ww_forw->ww_back = w->ww_back;
        w->ww_forw = w->ww_back = 0;
 }
        w->ww_back->ww_forw = w->ww_forw;
        w->ww_forw->ww_back = w->ww_back;
        w->ww_forw = w->ww_back = 0;
 }

+
+wwdelete1(w, t, b, l, r)
+register struct ww *w;
+{
+       int i;
+       int tt, bb, ll, rr;
+       char hasglass;
+
+again:
+       hasglass = 0;
+       tt = MAX(t, w->ww_i.t);
+       bb = MIN(b, w->ww_i.b);
+       ll = MAX(l, w->ww_i.l);
+       rr = MIN(r, w->ww_i.r);
+       if (tt >= bb || ll >= rr) {
+               if ((w = w->ww_forw) == &wwhead)
+                       return;
+               goto again;
+       }
+       for (i = tt; i < bb; i++) {
+               register j;
+               register char *smap = wwsmap[i];
+               register union ww_char *ns = wwns[i];
+               register char *win = w->ww_win[i];
+               register union ww_char *buf = w->ww_buf[i];
+               int nvis = w->ww_nvis[i];
+               int nchanged = 0;
+
+               for (j = ll; j < rr; j++) {
+                       if (smap[j] != WWX_NOBODY)
+                               continue;
+                       if (win[j] & WWM_GLS) {
+                               hasglass = 1;
+                               continue;
+                       }
+                       smap[j] = w->ww_index;
+                       ns[j].c_w = buf[j].c_w ^ win[j] << WWC_MSHIFT;
+                       nchanged++;
+                       if (win[j] == 0)
+                               nvis++;
+               }
+               if (nchanged > 4)
+                       wwtouched[i] |= WWU_MAJOR|WWU_TOUCHED;
+               else if (nchanged > 0)
+                       wwtouched[i] |= WWU_TOUCHED;
+               w->ww_nvis[i] = nvis;
+       }
+       if ((w = w->ww_forw) == &wwhead)
+               return;
+       if (hasglass)
+               goto again;
+       if (tt > t)
+               wwdelete1(w, t, tt, l, r);
+       if (bb < b)
+               wwdelete1(w, bb, b, l, r);
+       if (ll > l)
+               wwdelete1(w, tt, bb, l, ll);
+       if (rr < r)
+               wwdelete1(w, tt, bb, rr, r);
+}