scrolling has come

[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 3425d1d..cd7fe60 100644 (file)
--- a/usr/src/usr.bin/window/wwwrite.c
+++ b/usr/src/usr.bin/window/wwwrite.c
@@ -1,5 +1,5 @@
 #ifndef lint
 #ifndef lint

-static char *sccsid = "@(#)wwwrite.c   3.2 83/08/16";
+static char *sccsid = "@(#)wwwrite.c   3.5 83/08/18";

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


@@ -7,9 +7,9 @@ static  char *sccsid = "@(#)wwwrite.c   3.2 83/08/16";
 wwwrite(w, p, n)
 register struct ww *w;
 register char *p;
 wwwrite(w, p, n)
 register struct ww *w;
 register char *p;

-register n;
+int n;

 {
 {

-       register char c;
+       char c;

        int oldn = n;
 
        if (w == 0)
        int oldn = n;
 
        if (w == 0)


@@ -20,35 +20,54 @@ register n;
                c = *p++ & 0x7f;
                switch (w->ww_wstate) {
                case 0:
                c = *p++ & 0x7f;
                switch (w->ww_wstate) {
                case 0:

-                       asm("_wwwrite1:");
-                       if (c >= ' ' && c < 0x7f) {
-                               register i, j, cc;
+                       if (!ISCTRL(c)) {
+                               int i, j;
+                               register union ww_char *bp;
+                               union ww_char *bq;
+                               register union ww_char *ns;
+                               register char *smap;
+                               register char *win;
+                               char *touched;

 
 

-                               if (w->ww_insert)
+                               if (w->ww_insert) {

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

-                               else {
-                                       cc = w->ww_buf[w->ww_scroll
-                                               + w->ww_cur.r]
-                                               [w->ww_cur.c].c_w = c;
-                                       i = wwcurrow(w);
-                                       j = wwcurcol(w);
-                                       if (wwsmap[i][j] == w->ww_index) {
-                                               wwtouched[i] = 1;
-                                               cc = wwns[i][j].c_w = cc
-                                                       ^ w->ww_win[w->ww_cur.r]
-                                                       [w->ww_cur.c]
-                                                       << WWC_MSHIFT;
+                                       goto right;
+                               }
+                               i = w->ww_w.nc - w->ww_cur.c - 1;
+                               bp = bq = &w->ww_buf[w->ww_scroll+w->ww_cur.r]
+                                       [w->ww_cur.c];
+                               bp++->c_w = c | w->ww_modes << WWC_MSHIFT;
+                               while (n > 0 && --i >= 0 && !ISCTRL(*p)) {
+                                       n--;
+                                       bp++->c_w = *p++ & 0x7f
+                                               | w->ww_modes << WWC_MSHIFT;
+                               }
+                               win = &w->ww_win[w->ww_cur.r][w->ww_cur.c];
+                               i = wwcurrow(w);
+                               j = wwcurcol(w);
+                               smap = &wwsmap[i][j];
+                               ns = &wwns[i][j];
+                               touched = &wwtouched[i];
+                               j = i = bp - bq;
+                               bp = bq;
+                               while (--i >= 0) {
+                                       if (*smap++ == w->ww_index) {
+                                               *touched = 1;
+                                               ns++->c_w = bp++->c_w
+                                                       ^ *win++ << WWC_MSHIFT;
+                                       } else {
+                                               ns++;
+                                               bp++;
+                                               win++;

                                        }
                                }
                                        }
                                }

-               right:
-                               if (++w->ww_cur.c >= w->ww_w.nc) {
+                               if ((w->ww_cur.c += j) >= w->ww_w.nc) {

                                        w->ww_cur.c = 0;
                                        goto lf;
                                }
                                break;
                        }
                                        w->ww_cur.c = 0;
                                        goto lf;
                                }
                                break;
                        }

-                       asm("_wwwrite2:");

                        switch (c) {
                        case '\n':
                                if (w->ww_mapnl)
                        switch (c) {
                        case '\n':
                                if (w->ww_mapnl)


@@ -56,16 +75,26 @@ register n;
                lf:
                                if (++w->ww_cur.r >= w->ww_w.nr) {
                                        w->ww_cur.r = w->ww_w.nr - 1;
                lf:
                                if (++w->ww_cur.r >= w->ww_w.nr) {
                                        w->ww_cur.r = w->ww_w.nr - 1;

-                                       wwdelline(w, 0);
+                                       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;
                                }
                                break;
                        case '\t':
                                w->ww_cur.c |= 7;

-                               goto right;
+               right:
+                               if (++w->ww_cur.c >= w->ww_w.nc) {
+                                       w->ww_cur.c = 0;
+                                       goto lf;
+                               }

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

-                               if (--w->ww_cur.c < 0)
-                                       w->ww_cur.c = 0;
+                               if (--w->ww_cur.c < 0) {
+                                       w->ww_cur.c = w->ww_w.nc - 1;
+                                       goto up;
+                               }

                                break;
                        case '\r':
                                w->ww_cur.c = 0;
                                break;
                        case '\r':
                                w->ww_cur.c = 0;


@@ -85,8 +114,14 @@ register n;
                                w->ww_insert = 1;
                                break;
                        case 'A':
                                w->ww_insert = 1;
                                break;
                        case 'A':

-                               if (--w->ww_cur.r < 0)
+               up:
+                               if (--w->ww_cur.r < 0) {

                                        w->ww_cur.r = 0;
                                        w->ww_cur.r = 0;

+                                       if (w->ww_scroll > 0)
+                                               wwscroll(w, -1);
+                                       else
+                                               wwinsline(w, 0);
+                               }

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


@@ -124,6 +159,18 @@ register n;
                        case 'Y':
                                w->ww_wstate = 2;
                                break;
                        case 'Y':
                                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;
+                               break;
+                       case 's':
+                               w->ww_modes &= ~WWM_UL;
+                               break;

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