only executable by group dialer

[unix-history] / usr / src / usr.bin / window / ww.h

diff --git a/usr/src/usr.bin/window/ww.h b/usr/src/usr.bin/window/ww.h
index 7be1128..11825ab 100644 (file)
--- a/usr/src/usr.bin/window/ww.h
+++ b/usr/src/usr.bin/window/ww.h
@@ -14,11 +14,12 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *

- *     @(#)ww.h        3.49 (Berkeley) %G%
+ *     @(#)ww.h        3.52 (Berkeley) %G%

  */
 
 #include <sgtty.h>
 #include <setjmp.h>
  */
 
 #include <sgtty.h>
 #include <setjmp.h>

+#include <machine/endian.h>

 
 #define NWW    30              /* maximum number of windows */
 
 
 #define NWW    30              /* maximum number of windows */
 


@@ -104,10 +105,11 @@ struct ww_tty {
 union ww_char {
        short c_w;              /* as a word */
        struct {
 union ww_char {
        short c_w;              /* as a word */
        struct {

-#if defined(vax) || defined(MIPSEL)
+#if BYTE_ORDER == LITTLE_ENDIAN || BYTE_ORDER == PDP_ENDIAN

                char C_c;       /* the character part */
                char C_m;       /* the mode part */
                char C_c;       /* the character part */
                char C_m;       /* the mode part */

-#else
+#endif
+#if BYTE_ORDER == BIG_ENDIAN

                char C_m;       /* the mode part */
                char C_c;       /* the character part */
 #endif
                char C_m;       /* the mode part */
                char C_c;       /* the character part */
 #endif


@@ -116,6 +118,13 @@ union ww_char {
 #define c_c c_un.C_c
 #define c_m c_un.C_m
 
 #define c_c c_un.C_c
 #define c_m c_un.C_m
 

+       /* for display update */
+struct ww_update {
+       int best_gain;
+       int best_col;
+       int gain;
+};
+

        /* parts of ww_char */
 #define WWC_CMASK      0x00ff
 #define WWC_MMASK      0xff00
        /* parts of ww_char */
 #define WWC_CMASK      0x00ff
 #define WWC_MMASK      0xff00


@@ -164,9 +173,8 @@ union ww_char {
 #define WWE_BADTERM    6               /* bad terminal type */
 #define WWE_CANTDO     7               /* dumb terminal */
 
 #define WWE_BADTERM    6               /* bad terminal type */
 #define WWE_CANTDO     7               /* dumb terminal */
 

-       /* wwtouched[] bits */
+       /* wwtouched[] bits, there used to be more than one */

 #define WWU_TOUCHED    0x01            /* touched */
 #define WWU_TOUCHED    0x01            /* touched */

-#define WWU_MAJOR      0x02            /* major change */

 
        /* the window structures */
 struct ww wwhead;
 
        /* the window structures */
 struct ww wwhead;


@@ -190,6 +198,7 @@ char **wwsmap;                      /* the screen map */
 union ww_char **wwos;          /* the old (current) screen */
 union ww_char **wwns;          /* the new (desired) screen */
 char *wwtouched;               /* wwns changed flags */
 union ww_char **wwos;          /* the old (current) screen */
 union ww_char **wwns;          /* the new (desired) screen */
 char *wwtouched;               /* wwns changed flags */

+struct ww_update *wwupd;       /* for display update */

 extern int wwbaudmap[];                /* maps stty() baud rate code into number */
 int wwbaud;                    /* wwbaudmap[wwoldtty.ww_sgttyb.sg_ospeed] */
 int wwcursorrow, wwcursorcol;  /* where we want the cursor to be */
 extern int wwbaudmap[];                /* maps stty() baud rate code into number */
 int wwbaud;                    /* wwbaudmap[wwoldtty.ww_sgttyb.sg_ospeed] */
 int wwcursorrow, wwcursorcol;  /* where we want the cursor to be */


@@ -198,7 +207,8 @@ int wwerrno;                        /* error number */
        /* statistics */
 int wwnflush, wwnwr, wwnwre, wwnwrz, wwnwrc;
 int wwnwwr, wwnwwra, wwnwwrc;
        /* statistics */
 int wwnflush, wwnwr, wwnwre, wwnwrz, wwnwrc;
 int wwnwwr, wwnwwra, wwnwwrc;

-int wwnupdate, wwnupdline, wwnupdmiss, wwnmajline, wwnmajmiss;
+int wwnupdate, wwnupdline, wwnupdmiss;
+int wwnupdscan, wwnupdclreol, wwnupdclreos, wwnupdclreosmiss, wwnupdclreosline;

 int wwnread, wwnreade, wwnreadz, wwnreadc;
 int wwnwread, wwnwreade, wwnwreadz, wwnwreadd, wwnwreadc, wwnwreadp;
 int wwnselect, wwnselecte, wwnselectz;
 int wwnread, wwnreade, wwnreadz, wwnreadc;
 int wwnwread, wwnwreade, wwnwreadz, wwnwreadd, wwnwreadc, wwnwreadp;
 int wwnselect, wwnselecte, wwnselectz;


@@ -227,7 +237,8 @@ char wwintr;                /* interrupting */
 char wwsetjmp;         /* want a longjmp() from wwrint() and wwchild() */
 jmp_buf wwjmpbuf;      /* jmpbuf for above */
 #define wwinterrupt()  wwintr
 char wwsetjmp;         /* want a longjmp() from wwrint() and wwchild() */
 jmp_buf wwjmpbuf;      /* jmpbuf for above */
 #define wwinterrupt()  wwintr

-#define wwsetintr()    (wwintr = 1, wwsetjmp ? longjmp(wwjmpbuf, 1) : 0)
+#define wwsetintr()    do { wwintr = 1; if (wwsetjmp) longjmp(wwjmpbuf, 1); } \
+                       while (0)

 #define wwclrintr()    (wwintr = 0)
 
        /* the window virtual terminal */
 #define wwclrintr()    (wwintr = 0)
 
        /* the window virtual terminal */