BSD 4_3_Net_2 release

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

diff --git a/usr/src/usr.bin/window/wwdelchar.c b/usr/src/usr.bin/window/wwdelchar.c
index 0782bb3..0be6f3f 100644 (file)
--- a/usr/src/usr.bin/window/wwdelchar.c
+++ b/usr/src/usr.bin/window/wwdelchar.c
@@ -1,6 +1,42 @@
+/*
+ * Copyright (c) 1983 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 = "@(#)wwdelchar.c 3.7 83/11/23";
-#endif
+static char sccsid[] = "@(#)wwdelchar.c        3.16 (Berkeley) 6/6/90";
+#endif /* not lint */

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


@@ -42,33 +78,33 @@ register struct ww *w;
                register char *win;
                register union ww_char *ns;
                register char *smap;
                register char *win;
                register union ww_char *ns;
                register char *smap;

-               char *touched;
+               char touched;

 
                nvis = 0;
                smap = &wwsmap[row][col];
 
                nvis = 0;
                smap = &wwsmap[row][col];

-               for (i = w->ww_i.r - col; i > 0 && *smap++ != w->ww_index; i--)
-                       col++;
-               if (i <= 0)
+               for (i = col; i < w->ww_i.r && *smap++ != w->ww_index; i++)
+                       ;
+               if (i >= w->ww_i.r)

                        return;
                        return;

-               buf = &w->ww_buf[row][col];
-               win = &w->ww_win[row][col];
-               ns = &wwns[row][col];
-               smap = &wwsmap[row][col];
-               touched = &wwtouched[row];
-               for (; --i >= 0;)
-                       if (*smap++ != w->ww_index) {
-                               ns++;
-                               buf++;
-                               win++;
-                       } else if (*win) {
-                               ns++->c_w = buf++->c_w ^ *win++ << WWC_MSHIFT;
-                               *touched = 1;
-                       } else {
-                               *ns++ = *buf++;
-                               win++;
+               col = i;
+               buf = w->ww_buf[row];
+               win = w->ww_win[row];
+               ns = wwns[row];
+               smap = &wwsmap[row][i];
+               touched = wwtouched[row];
+               for (; i < w->ww_i.r; i++) {
+                       if (*smap++ != w->ww_index)
+                               continue;
+                       touched |= WWU_TOUCHED;
+                       if (win[i])
+                               ns[i].c_w =
+                                       buf[i].c_w ^ win[i] << WWC_MSHIFT;
+                       else {

                                nvis++;
                                nvis++;

-                               *touched = 1;
+                               ns[i] = buf[i];

                        }
                        }

+               }
+               wwtouched[row] = touched;

        }
 
        /*
        }
 
        /*


@@ -77,9 +113,7 @@ register struct ww *w;
        if (tt.tt_delchar != 0 && nvis > (wwncol - col) / 2) {
                register union ww_char *p, *q;
 
        if (tt.tt_delchar != 0 && nvis > (wwncol - col) / 2) {
                register union ww_char *p, *q;
 

-               (*tt.tt_move)(row, col);
-               (*tt.tt_delchar)();
-
+               xxdelchar(row, col);

                p = &wwos[row][col];
                q = p + 1;
                for (i = wwncol - col; --i > 0;)
                p = &wwos[row][col];
                q = p + 1;
                for (i = wwncol - col; --i > 0;)