insert mode bug fix and cleanup

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

diff --git a/usr/src/usr.bin/window/wwinschar.c b/usr/src/usr.bin/window/wwinschar.c
index 9dea614..715a2da 100644 (file)
--- a/usr/src/usr.bin/window/wwinschar.c
+++ b/usr/src/usr.bin/window/wwinschar.c
@@ -1,41 +1,105 @@
+/*
+ * 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 = "@(#)wwinschar.c 3.1 83/08/09";
-#endif
+static char sccsid[] = "@(#)wwinschar.c        3.18 (Berkeley) %G%";
+#endif /* not lint */

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

+#include "tt.h"

 
 

-wwinschar(w, n)
+wwinschar(w, row, col, c)

 register struct ww *w;
 register struct ww *w;

-register n;
+short c;

 {
 {

-       register i, j;
-       int col, row;
+       register i;
+       int nvis;
+
+       /*
+        * First, shift the line.
+        */
+       {
+               register union ww_char *p, *q;
+
+               p = &w->ww_buf[row][w->ww_b.r];
+               q = p - 1;
+               for (i = w->ww_b.r - col; --i > 0;)
+                       *--p = *--q;
+               q->c_w = c;
+       }
+
+       /*
+        * If can't see it, just return.
+        */
+       if (row < w->ww_i.t || row >= w->ww_i.b
+           || w->ww_i.r <= 0 || w->ww_i.r <= col)
+               return;
+
+       if (col < w->ww_i.l)
+               col = w->ww_i.l;

 
 

-       col = w->ww_cur.c + w->ww_w.l;
-       row = w->ww_cur.r + w->ww_w.t;
-       for (i = col; i < wwncol;) {
-               for (j = i; j < wwncol && wwsmap[row][j] == w->ww_index; j++)
+       /*
+        * Now find out how much is actually changed, and fix wwns.
+        */
+       {
+               register union ww_char *buf;
+               register char *win;
+               register union ww_char *ns;
+               register char *smap;
+               char touched;
+
+               nvis = 0;
+               smap = &wwsmap[row][col];
+               for (i = col; i < w->ww_i.r && *smap++ != w->ww_index; i++)

                        ;
                        ;

-               if (j > i) {
-                       if (j <= i + n) {
-                               if (j == wwncol) {
-                                       (*tt.tt_clreol)(w);
-                               } else {
-                                       (*tt.tt_blank)(j);
-                                       (*tt.tt_move)(row, col);
-                               }
-                       } else {
-                               if (j < wwncol) {
-                                       (*tt.tt_move)(row, j - n);
-                                       (*tt.tt_delchar)(n);
-                                       (*tt.tt_move)(row, col);
-                               }
-                               (*tt.tt_setinsert)(1);
-                               (*tt.tt_blank)(n);
+               if (i >= w->ww_i.r)
+                       return;
+               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++;
+                               ns[i] = buf[i];

                        }
                }
                        }
                }

-               for (i = j; i < wwncol && wwsmap[row][i] != w->ww_index; i++)
-                       ;
+               wwtouched[row] = touched;
+       }
+
+       /*
+        * Can/Should we use delete character?
+        */
+       if ((tt.tt_inschar || tt.tt_setinsert) && nvis > (wwncol - col) / 2) {
+               register union ww_char *p, *q;
+
+               xxinschar(row, col, c & wwavailmodes << WWC_MSHIFT);
+               p = &wwos[row][wwncol];
+               q = p - 1;
+               for (i = wwncol - col; --i > 0;)
+                       *--p = *--q;
+               q->c_w = tt.tt_setinsert ? c : ' ';

        }
        }

-       (*tt.tt_setinsert)(0);

 }
 }