insert mode bug fix and cleanup

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

diff --git a/usr/src/usr.bin/window/wwwrite.c b/usr/src/usr.bin/window/wwwrite.c
index 1e8a985..90cf59b 100644 (file)
--- a/usr/src/usr.bin/window/wwwrite.c
+++ b/usr/src/usr.bin/window/wwwrite.c
@@ -1,76 +1,144 @@
+/*
+ * 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 = "@(#)wwwrite.c   3.16 84/01/11";
-#endif
+static char sccsid[] = "@(#)wwwrite.c  3.30 (Berkeley) %G%";
+#endif /* not lint */

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

+#include "tt.h"
+#include "char.h"

 
 

+#define UPDATE() \
+       if (!w->ww_noupdate && w->ww_cur.r >= 0 && w->ww_cur.r < wwnrow && \
+           wwtouched[w->ww_cur.r]) \
+               wwupdate1(w->ww_cur.r, w->ww_cur.r + 1)
+
+/*
+ * To support control character expansion, we save the old
+ * p and q values in r and s, and point p at the beginning
+ * of the expanded string, and q at some safe place beyond it
+ * (p + 10).  At strategic points in the loops, we check
+ * for (r && !*p) and restore the saved values back into
+ * p and q.  Essentially, we implement a stack of depth 2,
+ * to avoid recursion, which might be a better idea.
+ */

 wwwrite(w, p, n)
 register struct ww *w;
 register char *p;
 int n;
 {
        char hascursor;
 wwwrite(w, p, n)
 register struct ww *w;
 register char *p;
 int n;
 {
        char hascursor;

+       char *savep = p;
+       char *q = p + n;
+       char *r = 0;
+       char *s;

 
 

-       wwnwrite++;
-       wwnwritec += n;
+#ifdef lint
+       s = 0;                  /* define it before possible use */
+#endif

        if (hascursor = w->ww_hascursor)
                wwcursor(w, 0);
        if (hascursor = w->ww_hascursor)
                wwcursor(w, 0);

-       while (n > 0) {
-               if (w->ww_wstate == 0 && !ISCTRL(*p)) {
+       while (p < q && !w->ww_stopped && (!wwinterrupt() || w->ww_nointr)) {
+               if (r && !*p) {
+                       p = r;
+                       q = s;
+                       r = 0;
+                       continue;
+               }
+               if (w->ww_wstate == 0 &&
+                   (isprt(*p) || w->ww_unctrl && isunctrl(*p))) {

                        register i;
                        register union ww_char *bp;
                        register i;
                        register union ww_char *bp;

-                       union ww_char *bq;

                        int col, col1;
 
                        if (w->ww_insert) {     /* this is very slow */
                        int col, col1;
 
                        if (w->ww_insert) {     /* this is very slow */

-                               n--;
+                               if (*p == '\t') {
+                                       p++;
+                                       w->ww_cur.c += 8 -
+                                               (w->ww_cur.c - w->ww_w.l & 7);
+                                       goto chklf;
+                               }
+                               if (!isprt(*p)) {
+                                       r = p + 1;
+                                       s = q;
+                                       p = unctrl(*p);
+                                       q = p + 10;
+                               }

                                wwinschar(w, w->ww_cur.r, w->ww_cur.c,
                                wwinschar(w, w->ww_cur.r, w->ww_cur.c,

-                                       *p++ | w->ww_modes << WWC_MSHIFT);
+                                       *p++, w->ww_modes);

                                goto right;
                        }
 
                                goto right;
                        }
 

-                       bp = bq = &w->ww_buf[w->ww_cur.r][w->ww_cur.c];
-                       if ((i = w->ww_b.r - w->ww_cur.c) > n)
-                               i = n;
-                       while (--i >= 0 && !ISCTRL(*p))
-                               bp++->c_w = *p++ | w->ww_modes << WWC_MSHIFT;
-
-                       i = bp - bq;
-                       n -= i;
+                       bp = &w->ww_buf[w->ww_cur.r][w->ww_cur.c];
+                       i = w->ww_cur.c;
+                       while (i < w->ww_w.r && p < q)
+                               if (!*p && r) {
+                                       p = r;
+                                       q = s;
+                                       r = 0;
+                               } else if (*p == '\t') {
+                                       register tmp = 8 - (i - w->ww_w.l & 7);
+                                       p++;
+                                       i += tmp;
+                                       bp += tmp;
+                               } else if (isprt(*p)) {
+                                       bp++->c_w = *p++
+                                               | w->ww_modes << WWC_MSHIFT;
+                                       i++;
+                               } else if (w->ww_unctrl && isunctrl(*p)) {
+                                       r = p + 1;
+                                       s = q;
+                                       p = unctrl(*p);
+                                       q = p + 10;
+                               } else
+                                       break;

                        col = MAX(w->ww_cur.c, w->ww_i.l);
                        col = MAX(w->ww_cur.c, w->ww_i.l);

-                       w->ww_cur.c += i;
-                       col1 = MIN(w->ww_cur.c, w->ww_i.r);
-
-                       if (w->ww_cur.r >= w->ww_i.t && w->ww_cur.r < w->ww_i.b)
-                       {
+                       col1 = MIN(i, w->ww_i.r);
+                       w->ww_cur.c = i;
+                       if (w->ww_cur.r >= w->ww_i.t
+                           && w->ww_cur.r < w->ww_i.b) {

                                register union ww_char *ns = wwns[w->ww_cur.r];
                                register char *smap = &wwsmap[w->ww_cur.r][col];
                                register char *win = w->ww_win[w->ww_cur.r];
                                register union ww_char *ns = wwns[w->ww_cur.r];
                                register char *smap = &wwsmap[w->ww_cur.r][col];
                                register char *win = w->ww_win[w->ww_cur.r];

-                               char touched = wwtouched[w->ww_cur.r];
+                               int nchanged = 0;

 
                                bp = w->ww_buf[w->ww_cur.r];
                                for (i = col; i < col1; i++)
                                        if (*smap++ == w->ww_index) {
 
                                bp = w->ww_buf[w->ww_cur.r];
                                for (i = col; i < col1; i++)
                                        if (*smap++ == w->ww_index) {

-                                               touched |= WWU_TOUCHED;
+                                               nchanged++;

                                                ns[i].c_w = bp[i].c_w
                                                        ^ win[i] << WWC_MSHIFT;
                                        }
                                                ns[i].c_w = bp[i].c_w
                                                        ^ win[i] << WWC_MSHIFT;
                                        }

-                               wwtouched[w->ww_cur.r] = touched;
-                       }
-                       if (w->ww_cur.c >= w->ww_w.r) {
-                               w->ww_cur.c = w->ww_w.l;
-                               goto lf;
+                               if (nchanged > 0)
+                                       wwtouched[w->ww_cur.r] |= WWU_TOUCHED;

                        }
                        }

-                       continue;
-               }
-               n--;
-               switch (w->ww_wstate) {
+               chklf:
+                       if (w->ww_cur.c >= w->ww_w.r)
+                               goto crlf;
+               } else switch (w->ww_wstate) {

                case 0:
                        switch (*p++) {
                        case '\n':
                                if (w->ww_mapnl)
                case 0:
                        switch (*p++) {
                        case '\n':
                                if (w->ww_mapnl)

+               crlf:

                                        w->ww_cur.c = w->ww_w.l;
                lf:
                                        w->ww_cur.c = w->ww_w.l;
                lf:

+                               UPDATE();

                                if (++w->ww_cur.r >= w->ww_w.b) {
                                        w->ww_cur.r = w->ww_w.b - 1;
                                        if (w->ww_w.b < w->ww_b.b) {
                                if (++w->ww_cur.r >= w->ww_w.b) {
                                        w->ww_cur.r = w->ww_w.b - 1;
                                        if (w->ww_w.b < w->ww_b.b) {


@@ -83,14 +151,6 @@ int n;
                                                wwdelline(w, w->ww_b.t);
                                }
                                break;
                                                wwdelline(w, w->ww_b.t);
                                }
                                break;

-                       case '\t':
-                               w->ww_cur.c +=
-                                       8 - (w->ww_cur.c - w->ww_w.l & 7);
-                               if (w->ww_cur.c >= w->ww_w.r) {
-                                       w->ww_cur.c = w->ww_w.l;
-                                       goto lf;
-                               }
-                               break;

                        case '\b':
                                if (--w->ww_cur.c < w->ww_w.l) {
                                        w->ww_cur.c = w->ww_w.r - 1;
                        case '\b':
                                if (--w->ww_cur.c < w->ww_w.l) {
                                        w->ww_cur.c = w->ww_w.r - 1;


@@ -100,10 +160,10 @@ int n;
                        case '\r':
                                w->ww_cur.c = w->ww_w.l;
                                break;
                        case '\r':
                                w->ww_cur.c = w->ww_w.l;
                                break;

-                       case CTRL(g):
-                               wwbell();
+                       case ctrl('g'):
+                               ttputc(ctrl('g'));

                                break;
                                break;

-                       case CTRL([):
+                       case ctrl('['):

                                w->ww_wstate = 1;
                                break;
                        }
                                w->ww_wstate = 1;
                                break;
                        }


@@ -116,6 +176,7 @@ int n;
                                break;
                        case 'A':
                up:
                                break;
                        case 'A':
                up:

+                               UPDATE();

                                if (--w->ww_cur.r < w->ww_w.t) {
                                        w->ww_cur.r = w->ww_w.t;
                                        if (w->ww_w.t > w->ww_b.t) {
                                if (--w->ww_cur.r < w->ww_w.t) {
                                        w->ww_cur.r = w->ww_w.t;
                                        if (w->ww_w.t > w->ww_b.t) {


@@ -132,11 +193,8 @@ int n;
                                goto lf;
                        case 'C':
                right:
                                goto lf;
                        case 'C':
                right:

-                               if (++w->ww_cur.c >= w->ww_w.r) {
-                                       w->ww_cur.c = w->ww_w.l;
-                                       goto lf;
-                               }
-                               break;
+                               w->ww_cur.c++;
+                               goto chklf;

                        case 'E':
                                w->ww_buf -= w->ww_w.t - w->ww_b.t;
                                w->ww_b.t = w->ww_w.t;
                        case 'E':
                                w->ww_buf -= w->ww_w.t - w->ww_b.t;
                                w->ww_b.t = w->ww_w.t;


@@ -146,6 +204,7 @@ int n;
                                wwclreos(w, w->ww_w.t, w->ww_w.l);
                                break;
                        case 'H':
                                wwclreos(w, w->ww_w.t, w->ww_w.l);
                                break;
                        case 'H':

+                               UPDATE();

                                w->ww_cur.r = w->ww_w.t;
                                w->ww_cur.c = w->ww_w.l;
                                break;
                                w->ww_cur.r = w->ww_w.t;
                                w->ww_cur.c = w->ww_w.l;
                                break;


@@ -156,6 +215,7 @@ int n;
                                wwclreol(w, w->ww_cur.r, w->ww_cur.c);
                                break;
                        case 'L':
                                wwclreol(w, w->ww_cur.r, w->ww_cur.c);
                                break;
                        case 'L':

+                               UPDATE();

                                wwinsline(w, w->ww_cur.r);
                                break;
                        case 'M':
                                wwinsline(w, w->ww_cur.r);
                                break;
                        case 'M':


@@ -167,26 +227,22 @@ int n;
                        case 'O':
                                w->ww_insert = 0;
                                break;
                        case 'O':
                                w->ww_insert = 0;
                                break;

+                       case 'X':
+                               wwupdate();
+                               break;

                        case 'Y':
                        case 'Y':

+                               UPDATE();

                                w->ww_wstate = 2;
                                break;
                                w->ww_wstate = 2;
                                break;

-                       case 'p':
-                               w->ww_modes |= WWM_REV;
-                               break;
-                       case 'q':
-                               w->ww_modes &= ~WWM_REV;
-                               break;
-                       case 'r':
-                               w->ww_modes |= WWM_UL;
+                       case 'Z':
+                               wwupdate();
+                               xxflush(0);

                                break;
                        case 's':
                                break;
                        case 's':

-                               w->ww_modes &= ~WWM_UL;
-                               break;
-                       case 'F':
-                               w->ww_modes |= WWM_GRP;
+                               w->ww_wstate = 4;

                                break;
                                break;

-                       case 'G':
-                               w->ww_modes &= ~WWM_GRP;
+                       case 'r':
+                               w->ww_wstate = 5;

                                break;
                        }
                        break;
                                break;
                        }
                        break;


@@ -200,9 +256,21 @@ int n;
                                (unsigned)(*p++ - ' ') % w->ww_w.nc;
                        w->ww_wstate = 0;
                        break;
                                (unsigned)(*p++ - ' ') % w->ww_w.nc;
                        w->ww_wstate = 0;
                        break;

+               case 4:
+                       w->ww_modes |= *p++ & wwavailmodes;
+                       w->ww_wstate = 0;
+                       break;
+               case 5:
+                       w->ww_modes &= ~*p++;
+                       w->ww_wstate = 0;
+                       break;

                }
        }
        if (hascursor)
                wwcursor(w, 1);
                }
        }
        if (hascursor)
                wwcursor(w, 1);

-       return 0;
+       wwnwwr++;
+       wwnwwra += n;
+       n = p - savep;
+       wwnwwrc += n;
+       return n;

 }
 }