ww_availmodes and stuff

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

diff --git a/usr/src/usr.bin/window/ttgeneric.c b/usr/src/usr.bin/window/ttgeneric.c
index 394fc70..2beed49 100644 (file)
--- a/usr/src/usr.bin/window/ttgeneric.c
+++ b/usr/src/usr.bin/window/ttgeneric.c
@@ -1,10 +1,13 @@
 #ifndef lint
 #ifndef lint

-static char *sccsid = "@(#)ttgeneric.c 3.5 83/08/15";
+static char *sccsid = "@(#)ttgeneric.c 3.7 83/08/17";

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

+char *tgetstr();
+char *tgoto();
+

 char gen_frame[16] = {
        ' ', '|', '-', '+',
        '|', '|', '+', '+',
 char gen_frame[16] = {
        ' ', '|', '-', '+',
        '|', '|', '+', '+',


@@ -14,11 +17,8 @@ char gen_frame[16] = {
 
 int gen_row, gen_col;
 char gen_modes;
 
 int gen_row, gen_col;
 char gen_modes;

-char gen_availmodes;

 char gen_insert;
 
 char gen_insert;
 

-char *tgetstr();
-

 char *gen_CM;
 char *gen_IM;
 char *gen_IC;
 char *gen_CM;
 char *gen_IM;
 char *gen_IC;


@@ -84,7 +84,7 @@ register new;
 {
        register diff;
 
 {
        register diff;
 

-       new &= gen_availmodes;
+       new &= tt.tt_availmodes;

        if ((diff = new ^ gen_modes) == 0)
                return;
        if (diff & WWM_REV) {
        if ((diff = new ^ gen_modes) == 0)
                return;
        if (diff & WWM_REV) {


@@ -338,9 +338,9 @@ tt_generic()
        }
 
        if (gen_SO)
        }
 
        if (gen_SO)

-               gen_availmodes |= WWM_REV;
+               tt.tt_availmodes |= WWM_REV;

        if (gen_US)
        if (gen_US)

-               gen_availmodes |= WWM_UL;
+               tt.tt_availmodes |= WWM_UL;

        if (gen_IM)
                tt.tt_setinsert = gen_setinsert;
        if (gen_DC)
        if (gen_IM)
                tt.tt_setinsert = gen_setinsert;
        if (gen_DC)