less verbose...

[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 a9357e0..503dc71 100644 (file)
--- a/usr/src/usr.bin/window/wwdelete.c
+++ b/usr/src/usr.bin/window/wwdelete.c
@@ -1,6 +1,23 @@
+/*
+ * Copyright (c) 1983 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley.  The name of the
+ * University may not 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 MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ */
+

 #ifndef lint
 #ifndef lint

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

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


@@ -12,41 +29,92 @@ register struct ww *w;
 {
        register i;
 
 {
        register i;
 

-       for (i = w->ww_w.t; i < w->ww_w.b; i++) {
-               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) {
-                               *smap++ = WWX_NOBODY;
-                               ns++->c_w = ' ';
-                       } else {
-                               smap++;
-                               ns++;
+       for (i = w->ww_i.t; i < w->ww_i.b; i++) {
+               register j;
+               register char *smap = wwsmap[i];
+               register union 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 > 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);
-               }

        }
        }

-       for (i = 0; i < w->ww_w.nr; i++) {
+
+       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;
+}
+
+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 j;

+               register char *smap = wwsmap[i];
+               register union ww_char *ns = wwns[i];

                register char *win = w->ww_win[i];
                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;
+               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 > 0)
+                       wwtouched[i] |= WWU_TOUCHED;
+               w->ww_nvis[i] = nvis;

        }
        }

-       w->ww_back->ww_forw = w->ww_forw;
-       w->ww_forw->ww_back = w->ww_back;
-       w->ww_forw = w->ww_back = 0;
+       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);

 }
 }