insert mode bug fix and cleanup

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

diff --git a/usr/src/usr.bin/window/ttzapple.c b/usr/src/usr.bin/window/ttzapple.c
index e14feba..79ea82d 100644 (file)
--- a/usr/src/usr.bin/window/ttzapple.c
+++ b/usr/src/usr.bin/window/ttzapple.c
@@ -16,7 +16,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)ttzapple.c 3.3 (Berkeley) %G%";
+static char sccsid[] = "@(#)ttzapple.c 3.5 (Berkeley) %G%";

 #endif /* not lint */
 
 #include "ww.h"
 #endif /* not lint */
 
 #include "ww.h"


@@ -229,7 +229,7 @@ zz_clear()
        tt.tt_col = tt.tt_row = 0;
 }
 
        tt.tt_col = tt.tt_row = 0;
 }
 

-zz_inschar(n)
+zz_insspace(n)

 {
        if (n != 1) {
                esc1();
 {
        if (n != 1) {
                esc1();


@@ -303,8 +303,8 @@ zz_set_token(t, s, n)
                ttputs(buf);
                tt.tt_col += 3;
        }
                ttputs(buf);
                tt.tt_col += 3;
        }

-       pc(ctrl('^'));
-       pc(t);
+       pc(0x80);
+       pc(t + 1);

        s[n - 1] |= 0x80;
        ttwrite(s, n);
        s[n - 1] &= ~0x80;
        s[n - 1] |= 0x80;
        ttwrite(s, n);
        s[n - 1] &= ~0x80;


@@ -326,7 +326,7 @@ zz_put_token(t, s, n)
                ttputs(buf);
                tt.tt_col += 3;
        }
                ttputs(buf);
                tt.tt_col += 3;
        }

-       pc(t | 0x80);
+       pc(t + 0x81);

        tt.tt_col += n;
        if (tt.tt_col == NCOL)
                tt.tt_col = 0, tt.tt_row++;
        tt.tt_col += n;
        if (tt.tt_col == NCOL)
                tt.tt_col = 0, tt.tt_row++;


@@ -334,7 +334,7 @@ zz_put_token(t, s, n)
 
 tt_zapple()
 {
 
 tt_zapple()
 {

-       tt.tt_inschar = zz_inschar;
+       tt.tt_insspace = zz_insspace;

        tt.tt_delchar = zz_delchar;
        tt.tt_insline = zz_insline;
        tt.tt_delline = zz_delline;
        tt.tt_delchar = zz_delchar;
        tt.tt_insline = zz_insline;
        tt.tt_delline = zz_delline;


@@ -356,7 +356,7 @@ tt_zapple()
        tt.tt_clear = zz_clear;
        tt.tt_setmodes = zz_setmodes;
        tt.tt_frame = gen_frame;
        tt.tt_clear = zz_clear;
        tt.tt_setmodes = zz_setmodes;
        tt.tt_frame = gen_frame;

-       tt.tt_ntoken = 128;
+       tt.tt_ntoken = 127;

        tt.tt_set_token = zz_set_token;
        tt.tt_put_token = zz_put_token;
        tt.tt_token_min = 1;
        tt.tt_set_token = zz_set_token;
        tt.tt_put_token = zz_put_token;
        tt.tt_token_min = 1;