fix ctrl macro for ANSI C

[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 a6e8bae..cde45fd 100644 (file)
--- a/usr/src/usr.bin/window/wwwrite.c
+++ b/usr/src/usr.bin/window/wwwrite.c
@@ -1,119 +1,158 @@
 #ifndef lint
 #ifndef lint

-static char *sccsid = "@(#)wwwrite.c   3.10 83/09/14";
+static char sccsid[] = "@(#)wwwrite.c  3.26 %G%";

 #endif
 
 #endif
 

+/*
+ * Copyright (c) 1983 Regents of the University of California,
+ * All rights reserved.  Redistribution permitted subject to
+ * the terms of the Berkeley Software License Agreement.
+ */
+

 #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 i;

-                       int crow, ccol;

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

-                       union ww_char *bq;
+                       int col, col1;

 
 

-                       if (w->ww_insert) {
-                               n--;
-                               wwinschar(w, w->ww_scroll + w->ww_cur.r,
-                                       w->ww_cur.c,
+                       if (w->ww_insert) {     /* this is very slow */
+                               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,

                                        *p++ | w->ww_modes << WWC_MSHIFT);
                                goto right;
                        }
 
                                        *p++ | w->ww_modes << WWC_MSHIFT);
                                goto right;
                        }
 

-                       bp = bq = &w->ww_buf[w->ww_scroll+w->ww_cur.r]
-                               [w->ww_cur.c];
-                       if ((i = w->ww_w.nc - 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 = bq;
+                       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);
+                       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];
+                               int nchanged = 0;

 
 

-                       crow = wwcurrow(w);
-                       ccol = wwcurcol(w);
-                       if (ccol < w->ww_i.l) {
-                               bp += w->ww_i.l - ccol;
-                               ccol = w->ww_i.l;
-                       }
-                       w->ww_cur.c += i;
-                       if (crow >= w->ww_i.t && crow < w->ww_i.b) {
-                               register union ww_char *ns;
-                               register char *smap;
-                               register char *win;
-                               char *touched;
-
-                               win = &w->ww_win[w->ww_cur.r][ccol - w->ww_w.l];
-                               smap = &wwsmap[crow][ccol];
-                               ns = &wwns[crow][ccol];
-                               touched = &wwtouched[crow];
-                               if (i > w->ww_i.r - ccol)
-                                       i = w->ww_i.r - ccol;
-                               while (--i >= 0)
+                               bp = w->ww_buf[w->ww_cur.r];
+                               for (i = col; i < col1; i++)

                                        if (*smap++ == w->ww_index) {
                                        if (*smap++ == w->ww_index) {

-                                               *touched = 1;
-                                               ns++->c_w = bp++->c_w
-                                                       ^ *win++ << WWC_MSHIFT;
-                                       } else {
-                                               ns++;
-                                               bp++;
-                                               win++;
+                                               nchanged++;
+                                               ns[i].c_w = bp[i].c_w
+                                                       ^ win[i] << WWC_MSHIFT;

                                        }
                                        }

+                               if (nchanged > 0)
+                                       wwtouched[w->ww_cur.r] |= WWU_TOUCHED;

                        }
                        }

-                       if (w->ww_cur.c >= w->ww_w.nc) {
-                               w->ww_cur.c = 0;
-                               goto lf;
-                       }
-                       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)

-                                       w->ww_cur.c = 0;
+               crlf:
+                                       w->ww_cur.c = w->ww_w.l;

                lf:
                lf:

-                               if (++w->ww_cur.r >= w->ww_w.nr) {
-                                       w->ww_cur.r = w->ww_w.nr - 1;
-                                       if (w->ww_scroll + w->ww_w.nr
-                                           < w->ww_nline)
-                                               wwscroll(w, 1);
-                                       else
-                                               wwdelline(w, 0);
-                               }
-                               break;
-                       case '\t':
-                               w->ww_cur.c |= 7;
-               right:
-                               if (++w->ww_cur.c >= w->ww_w.nc) {
-                                       w->ww_cur.c = 0;
-                                       goto 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) {
+                                               (void) wwscroll1(w, w->ww_i.t,
+                                                       w->ww_i.b, 1, 0);
+                                               w->ww_buf++;
+                                               w->ww_b.t--;
+                                               w->ww_b.b--;
+                                       } else
+                                               wwdelline(w, w->ww_b.t);

                                }
                                break;
                        case '\b':
                                }
                                break;
                        case '\b':

-                               if (--w->ww_cur.c < 0) {
-                                       w->ww_cur.c = w->ww_w.nc - 1;
+                               if (--w->ww_cur.c < w->ww_w.l) {
+                                       w->ww_cur.c = w->ww_w.r - 1;

                                        goto up;
                                }
                                break;
                        case '\r':
                                        goto up;
                                }
                                break;
                        case '\r':

-                               w->ww_cur.c = 0;
+                               w->ww_cur.c = w->ww_w.l;

                                break;
                                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;
                        }


@@ -126,75 +165,94 @@ int n;
                                break;
                        case 'A':
                up:
                                break;
                        case 'A':
                up:

-                               if (--w->ww_cur.r < 0) {
-                                       w->ww_cur.r = 0;
-                                       if (w->ww_scroll > 0)
-                                               wwscroll(w, -1);
-                                       else
-                                               wwinsline(w, 0);
+                               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) {
+                                               (void) wwscroll1(w, w->ww_i.t,
+                                                       w->ww_i.b, -1, 0);
+                                               w->ww_buf--;
+                                               w->ww_b.t++;
+                                               w->ww_b.b++;
+                                       } else
+                                               wwinsline(w, w->ww_b.t);

                                }
                                break;
                        case 'B':
                                goto lf;
                        case 'C':
                                }
                                break;
                        case 'B':
                                goto lf;
                        case 'C':

-                               goto right;
+               right:
+                               w->ww_cur.c++;
+                               goto chklf;

                        case 'E':
                        case 'E':

-                               w->ww_scroll = 0;
-                               w->ww_cur.c = w->ww_cur.r = 0;
-                               wwclreos(w, 0, 0);
+                               w->ww_buf -= w->ww_w.t - w->ww_b.t;
+                               w->ww_b.t = w->ww_w.t;
+                               w->ww_b.b = w->ww_b.t + w->ww_b.nr;
+                               w->ww_cur.r = w->ww_w.t;
+                               w->ww_cur.c = w->ww_w.l;
+                               wwclreos(w, w->ww_w.t, w->ww_w.l);

                                break;
                        case 'H':
                                break;
                        case 'H':

-                               w->ww_cur.c = w->ww_cur.r = 0;
+                               UPDATE();
+                               w->ww_cur.r = w->ww_w.t;
+                               w->ww_cur.c = w->ww_w.l;

                                break;
                        case 'J':
                                break;
                        case 'J':

-                               wwclreos(w, w->ww_scroll + w->ww_cur.r,
-                                       w->ww_cur.c);
+                               wwclreos(w, w->ww_cur.r, w->ww_cur.c);

                                break;
                        case 'K':
                                break;
                        case 'K':

-                               wwclreol(w, w->ww_scroll + w->ww_cur.r,
-                                       w->ww_cur.c);
+                               wwclreol(w, w->ww_cur.r, w->ww_cur.c);

                                break;
                        case 'L':
                                break;
                        case 'L':

-                               wwinsline(w, w->ww_scroll + w->ww_cur.r);
+                               UPDATE();
+                               wwinsline(w, w->ww_cur.r);

                                break;
                        case 'M':
                                break;
                        case 'M':

-                               wwdelline(w, w->ww_scroll + w->ww_cur.r);
+                               wwdelline(w, w->ww_cur.r);

                                break;
                        case 'N':
                                break;
                        case 'N':

-                               wwdelchar(w, w->ww_scroll + w->ww_cur.r,
-                                       w->ww_cur.c);
+                               wwdelchar(w, w->ww_cur.r, w->ww_cur.c);

                                break;
                        case 'O':
                                w->ww_insert = 0;
                                break;
                        case 'Y':
                                break;
                        case 'O':
                                w->ww_insert = 0;
                                break;
                        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;
+                       case 's':
+                               w->ww_wstate = 4;

                                break;
                        case 'r':
                                break;
                        case 'r':

-                               w->ww_modes |= WWM_UL;
-                               break;
-                       case 's':
-                               w->ww_modes &= ~WWM_UL;
+                               w->ww_wstate = 5;

                                break;
                        }
                        break;
                case 2:
                                break;
                        }
                        break;
                case 2:

-                       w->ww_cur.r = (*p++ - ' ') % w->ww_w.nr;
-                       w->ww_wstate++;
+                       w->ww_cur.r = w->ww_w.t +
+                               (unsigned)(*p++ - ' ') % w->ww_w.nr;
+                       w->ww_wstate = 3;

                        break;
                case 3:
                        break;
                case 3:

-                       w->ww_cur.c = (*p++ - ' ') % w->ww_w.nc;
+                       w->ww_cur.c = w->ww_w.l +
+                               (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);
                        w->ww_wstate = 0;
                        break;
                }
        }
        if (hascursor)
                wwcursor(w, 1);

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

 }
 }