should free token_str if not used

[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 d7e4c97..ebbc00b 100644 (file)
--- a/usr/src/usr.bin/window/wwlabel.c
+++ b/usr/src/usr.bin/window/wwlabel.c
@@ -1,61 +1,59 @@
 #ifndef lint
 #ifndef lint

-static char *sccsid = "@(#)wwlabel.c   2.1.1.1 83/08/09";
+static char *sccsid = "@(#)wwlabel.c   3.10 83/12/02";

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

-char **wwfmap;
-#define U 1
-#define R 2
-#define D 4
-#define L 8
-

 /*
  * Label window w on f,
  * at 1 line above w and 'where' columns from it's left edge.
  * Gross, but it works.
  */
 wwlabel(w, f, where, l, mode)
 /*
  * Label window w on f,
  * at 1 line above w and 'where' columns from it's left edge.
  * Gross, but it works.
  */
 wwlabel(w, f, where, l, mode)

-register struct ww *w;
+struct ww *w;

 struct ww *f;
 char *l;
 {
 struct ww *f;
 char *l;
 {

-       int i;
+       int row;

        register j;
        register j;

-       register char *p;
+       int jj;

        register char *win;
        register union ww_char *buf;
        register union ww_char *ns;
        register char *win;
        register union ww_char *buf;
        register union ww_char *ns;

-       char *fmap;
+       register char *fmap;
+       register char *smap;
+       char touched;
+       char *p;
+
+       if (f->ww_fmap == 0)
+               return;

 
 

-       if ((i = w->ww_w.t - 1 - f->ww_w.t) < 0)
-               return -1;
-       j = w->ww_w.l + where;
-       j = MAX(j, f->ww_w.l);
-       win = &f->ww_win[i][j - f->ww_w.l];
-       buf = &f->ww_buf[w->ww_scroll + i][j - f->ww_w.l];
-       i += f->ww_w.t;
-       ns = &wwns[i][j];
-       fmap = &wwfmap[i][j];
-       j = MIN(w->ww_w.r, f->ww_w.r) - j;
+       row = w->ww_w.t - 1;
+       if (row < f->ww_i.t || row >= f->ww_i.b)
+               return;
+       win = f->ww_win[row];
+       buf = f->ww_buf[row];
+       fmap = f->ww_fmap[row];
+       ns = wwns[row];
+       smap = wwsmap[row];
+       touched = wwtouched[row];
+       mode <<= WWC_MSHIFT;

 
 

-       for (; j > 0 && *l;)
-               for (p = unctrl(*l++); j > 0 && *p; j--, fmap++) {
+       jj = MIN(w->ww_i.r, f->ww_i.r);
+       j = w->ww_i.l + where;
+       while (j < jj && *l)
+               for (p = unctrl(*l++); j < jj && *p; j++, p++) {

                        /* can't label if not already framed */
                        /* can't label if not already framed */

-                       if (*win & WWM_GLS || (*fmap & (U|D)) == (U|D)) {
-                               p++;
-                               buf++;
-                               ns++;
-                               win++;
-                       } else if (*win & WWM_COV) {
-                               buf++->c_w = mode << WWC_MSHIFT | *p++;
-                               ns++;
-                               win++;
-                       } else
-                               ns++->c_w = (buf++->c_w
-                                       = mode << WWC_MSHIFT | *p++)
-                                               ^ *win++ << WWC_MSHIFT;
+                       if (win[j] & WWM_GLS)
+                               continue;
+                       if (smap[j] != f->ww_index)
+                               buf[j].c_w = mode | *p;
+                       else {
+                               ns[j].c_w = (buf[j].c_w = mode | *p)
+                                               ^ win[j] << WWC_MSHIFT;
+                               touched |= WWU_TOUCHED;
+                       }
+                       fmap[j] |= WWF_LABEL;

                }
                }

-
-       return 0;
+       wwtouched[row] = touched;

 }
 }