ww_availmodes and stuff

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

diff --git a/usr/src/usr.bin/window/wwlabel.c b/usr/src/usr.bin/window/wwlabel.c
index 4f042ac..b4fe0af 100644 (file)
--- a/usr/src/usr.bin/window/wwlabel.c
+++ b/usr/src/usr.bin/window/wwlabel.c
@@ -1,5 +1,5 @@
 #ifndef lint
 #ifndef lint

-static char *sccsid = "@(#)wwlabel.c   3.2 83/08/12";
+static char *sccsid = "@(#)wwlabel.c   3.3 83/08/16";

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


@@ -21,6 +21,7 @@ char *l;
        register union ww_char *buf;
        register union ww_char *ns;
        register char *fmap;
        register union ww_char *buf;
        register union ww_char *ns;
        register char *fmap;

+       char *touched;

 
        if ((i = w->ww_w.t - 1 - f->ww_w.t) < 0)
                return -1;
 
        if ((i = w->ww_w.t - 1 - f->ww_w.t) < 0)
                return -1;


@@ -31,6 +32,7 @@ char *l;
        i += f->ww_w.t;
        ns = &wwns[i][j];
        fmap = &wwfmap[i][j];
        i += f->ww_w.t;
        ns = &wwns[i][j];
        fmap = &wwfmap[i][j];

+       touched = &wwtouched[i];

        j = MIN(w->ww_w.r, f->ww_w.r) - j;
 
        for (; j > 0 && *l;)
        j = MIN(w->ww_w.r, f->ww_w.r) - j;
 
        for (; j > 0 && *l;)


@@ -48,6 +50,7 @@ char *l;
                                ns++;
                                win++;
                        } else {
                                ns++;
                                win++;
                        } else {

+                               *touched = 1;

                                ns++->c_w = (buf++->c_w
                                        = mode << WWC_MSHIFT | *p++)
                                                ^ *win++ << WWC_MSHIFT;
                                ns++->c_w = (buf++->c_w
                                        = mode << WWC_MSHIFT | *p++)
                                                ^ *win++ << WWC_MSHIFT;