da and db flags now needed with scrolling

and new WWT_TERMCAP scheme

SCCS-vsn: usr.bin/window/ww.h 3.7
SCCS-vsn: usr.bin/window/wwenviron.c 3.2

diff --git a/usr/src/usr.bin/window/ww.h b/usr/src/usr.bin/window/ww.h
index e26ba5f..87498d9 100644 (file)
--- a/usr/src/usr.bin/window/ww.h
+++ b/usr/src/usr.bin/window/ww.h
@@ -1,5 +1,5 @@
 /*
 /*

- *     @(#)ww.h        3.6 83/08/17    
+ *     @(#)ww.h        3.7 83/08/18    

  */
 
 #include <stdio.h>
  */
 
 #include <stdio.h>


@@ -140,10 +140,10 @@ int wwnupdate, wwntouched, wwnmiss;
 
        /* the window virtual terminal */
 #define WWT_TERM       "TERM=window"
 
        /* the window virtual terminal */
 #define WWT_TERM       "TERM=window"

-#define WWT_TERMCAP    "TERMCAP=WW|window|window package:\
+#define WWT_TERMCAP    "WW|window|window package:\

        :cr=^M:nl=^J:bl=^G:\
        :cr=^M:nl=^J:bl=^G:\

-       :al=\\EL:am:le=^H:bs:cd=\\EJ:ce=\\EK:cl=\\EE:cm=\\EY%%+ %%+ :\
-       :co#%d:dc=\\EN:dl=\\EM:do=\\EB:ei=\\EO:ho=\\EH:li#%d:im=\\E@:mi:\
+       :al=\\EL:am:le=^H:bs:cd=\\EJ:ce=\\EK:cl=\\EE:cm=\\EY%+ %+ :\
+       :da:db:dc=\\EN:dl=\\EM:do=\\EB:ei=\\EO:ho=\\EH:im=\\E@:mi:\

        :nd=\\EC:ta=^I:pt:up=\\EA:"
 #define WWT_REV                "se=\\Eq:so=\\Ep:"
 #define WWT_UL         "ue=\\Es:us=\\Er:"
        :nd=\\EC:ta=^I:pt:up=\\EA:"
 #define WWT_REV                "se=\\Eq:so=\\Ep:"
 #define WWT_UL         "ue=\\Es:us=\\Er:"

diff --git a/usr/src/usr.bin/window/wwenviron.c b/usr/src/usr.bin/window/wwenviron.c
index d0482ef..227d696 100644 (file)
--- a/usr/src/usr.bin/window/wwenviron.c
+++ b/usr/src/usr.bin/window/wwenviron.c
@@ -1,5 +1,5 @@
 #ifndef lint
 #ifndef lint

-static char *sccsid = "@(#)wwenviron.c 3.1 83/08/17";
+static char *sccsid = "@(#)wwenviron.c 3.2 83/08/18";

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


@@ -43,7 +43,8 @@ register struct ww *wp;
        if (termcap == 0)
                termcap = q++;
        *q = 0;
        if (termcap == 0)
                termcap = q++;
        *q = 0;

-       *termcap = sprintf(tbuf, WWT_TERMCAP, wp->ww_w.nc, wp->ww_w.nr);
+       *termcap = sprintf(tbuf, "TERMCAP=%sco#%d:li#%d:",
+               WWT_TERMCAP, wp->ww_w.nc, wp->ww_w.nr);

        if (wwavailmodes & WWM_REV)
                (void) strcat(tbuf, WWT_REV);
        if (wwavailmodes & WWM_UL)
        if (wwavailmodes & WWM_REV)
                (void) strcat(tbuf, WWT_REV);
        if (wwavailmodes & WWM_UL)