BSD 4_4 release

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

diff --git a/usr/src/usr.bin/window/wwunframe.c b/usr/src/usr.bin/window/wwunframe.c
index 4603822..6945ffa 100644 (file)
--- a/usr/src/usr.bin/window/wwunframe.c
+++ b/usr/src/usr.bin/window/wwunframe.c
@@ -1,43 +1,76 @@
+/*
+ * Copyright (c) 1983, 1993
+ *     The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Edward Wang at The University of California, Berkeley.
+ *
+ * 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
 #ifndef lint

-static char *sccsid = "@(#)wwunframe.c 3.10 83/11/23";
-#endif
+static char sccsid[] = "@(#)wwunframe.c        8.1 (Berkeley) 6/6/93";
+#endif /* not lint */

 
 #include "ww.h"
 
 wwunframe(w)
 register struct ww *w;
 {
 
 #include "ww.h"
 
 wwunframe(w)
 register struct ww *w;
 {

-       register i;
+       int i;

 
        for (i = w->ww_i.t; i < w->ww_i.b; i++) {
 
        for (i = w->ww_i.t; i < w->ww_i.b; i++) {

-               register j = w->ww_i.l;
-               register char *win = &w->ww_win[i][j];
-               register char *fmap = w->ww_fmap ? &w->ww_fmap[i][j] : 0;
-               register char *smap = &wwsmap[i][j];
+               register j;
+               register char *win = w->ww_win[i];
+               register char *fmap = w->ww_fmap ? w->ww_fmap[i] : 0;
+               register char *smap = wwsmap[i];
+               register union ww_char *ns = wwns[i];
+               int nchanged = 0;

 
 

-               for (; j < w->ww_i.r; j++) {
-                       if (*win & WWM_GLS) {
-                               win++;
-                               fmap++;
-                               smap++;
+               for (j = w->ww_i.l; j < w->ww_i.r; j++) {
+                       if (win[j] & WWM_GLS)

                                continue;
                                continue;

+                       win[j] |= WWM_GLS;
+                       if (fmap != 0)
+                               fmap[j] = 0;
+                       if (smap[j] == w->ww_index) {
+                               smap[j] = WWX_NOBODY;
+                               ns[j].c_w = ' ';
+                               nchanged++;

                        }
                        }

-                       *win++ |= WWM_GLS;
-                       if (w->ww_fmap != 0)
-                               *fmap++ = 0;
-                       if (*smap == w->ww_index) {
-                               *smap = WWX_NOBODY;
-                               wwns[i][j].c_w = ' ';
-                               wwtouched[i] = 1;
-                       }
-                       smap++;

                }
                }

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

                w->ww_nvis[i] = 0;
        }
                w->ww_nvis[i] = 0;
        }

-       {
-               register struct ww *wp;

 
 

-               for (wp = w->ww_forw; wp != &wwhead; wp = wp->ww_forw)
-                       wwuncover(w, wp);
-       }
+       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);

 }
 }