gratuitous stylistic change

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

diff --git a/usr/src/usr.bin/window/wwdump.c b/usr/src/usr.bin/window/wwdump.c
index 8e871bc..f1364da 100644 (file)
--- a/usr/src/usr.bin/window/wwdump.c
+++ b/usr/src/usr.bin/window/wwdump.c
@@ -1,37 +1,40 @@
+/*
+ * Copyright (c) 1983 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley.  The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ */
+

 #ifndef lint
 #ifndef lint

-static char *sccsid = "@(#)wwdump.c    3.4 83/08/19";
-#endif
+static char sccsid[] = "@(#)wwdump.c   3.13 (Berkeley) %G%";
+#endif /* not lint */

 
 #include "ww.h"
 #include "tt.h"
 
 static char cmap[] = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
 
 
 #include "ww.h"
 #include "tt.h"
 
 static char cmap[] = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
 

-wwdumpcov(w)
-register struct ww *w;
-{
-       register i, j;
-
-       (*tt.tt_setmodes)(0);
-       (*tt.tt_clear)();
-       for (i = 0; i < w->ww_w.nr; i++) {
-               (*tt.tt_move)(w->ww_w.t + i, w->ww_w.l);
-               for (j = 0; j < w->ww_w.nc; j++)
-                       (*tt.tt_putc)(cmap[w->ww_cov[i][j]]);
-       }
-}
-

 wwdumpwin(w)
 register struct ww *w;
 {
        register i, j;
 
 wwdumpwin(w)
 register struct ww *w;
 {
        register i, j;
 

-       (*tt.tt_setmodes)(0);
+       tt.tt_nmodes = 0;

        (*tt.tt_clear)();
        (*tt.tt_clear)();

-       for (i = 0; i < w->ww_w.nr; i++) {
-               (*tt.tt_move)(w->ww_w.t + i, w->ww_w.l);
-               for (j = 0; j < w->ww_w.nc; j++)
-                       (*tt.tt_putc)(w->ww_win[i][j] & WWM_COV ? 'C' : ' ');
+       for (i = w->ww_i.t; i < w->ww_i.b; i++) {
+               (*tt.tt_move)(i, w->ww_i.l);
+               for (j = w->ww_i.l; j < w->ww_i.r; j++)
+                       (*tt.tt_putc)(w->ww_win[i][j] & WWM_GLS ? 'G' : ' ');

        }
 }
 
        }
 }
 


@@ -39,14 +42,14 @@ wwdumpnvis(w)
 register struct ww *w;
 {
        register i;
 register struct ww *w;
 {
        register i;

+       char buf[20];

 
 

-       (*tt.tt_setmodes)(0);
+       tt.tt_nmodes = 0;

        (*tt.tt_clear)();
        (*tt.tt_clear)();

-       for (i = 0; i < w->ww_w.nr; i++) {
-               (*tt.tt_move)(w->ww_w.t + i, w->ww_w.l);
-               (*tt.tt_putc)(w->ww_nvis[i] / 100 % 10 + '0');
-               (*tt.tt_putc)(w->ww_nvis[i] / 10 % 10 + '0');
-               (*tt.tt_putc)(w->ww_nvis[i] % 10 + '0');
+       for (i = w->ww_i.t; i < w->ww_i.b; i++) {
+               (*tt.tt_move)(i, w->ww_i.l);
+               (void) sprintf(buf, "%d", w->ww_nvis[i]);
+               (*tt.tt_write)(buf, strlen(buf));

        }
 }
 
        }
 }
 


@@ -54,7 +57,7 @@ wwdumpsmap()
 {
        register i, j;
 
 {
        register i, j;
 

-       (*tt.tt_setmodes)(0);
+       tt.tt_nmodes = 0;

        (*tt.tt_clear)();
        for (i = 0; i < wwnrow; i++) {
                (*tt.tt_move)(i, 0);
        (*tt.tt_clear)();
        for (i = 0; i < wwnrow; i++) {
                (*tt.tt_move)(i, 0);


@@ -63,7 +66,6 @@ wwdumpsmap()
        }
 }
 
        }
 }
 

-/*

 wwdumpns()
 {
        register i, j;
 wwdumpns()
 {
        register i, j;


@@ -72,7 +74,7 @@ wwdumpns()
        for (i = 0; i < wwnrow; i++) {
                (*tt.tt_move)(i, 0);
                for (j = 0; j < wwncol; j++) {
        for (i = 0; i < wwnrow; i++) {
                (*tt.tt_move)(i, 0);
                for (j = 0; j < wwncol; j++) {

-                       (*tt.tt_setmodes)(wwns[i][j].c_m);
+                       tt.tt_nmodes = wwns[i][j].c_m & tt.tt_availmodes;

                        (*tt.tt_putc)(wwns[i][j].c_c);
                }
        }
                        (*tt.tt_putc)(wwns[i][j].c_c);
                }
        }


@@ -86,9 +88,8 @@ wwdumpos()
        for (i = 0; i < wwnrow; i++) {
                (*tt.tt_move)(i, 0);
                for (j = 0; j < wwncol; j++) {
        for (i = 0; i < wwnrow; i++) {
                (*tt.tt_move)(i, 0);
                for (j = 0; j < wwncol; j++) {

-                       (*tt.tt_setmodes)(wwns[i][j].c_m);
+                       tt.tt_nmodes = wwos[i][j].c_m & tt.tt_availmodes;

                        (*tt.tt_putc)(wwns[i][j].c_c);
                }
        }
 }
                        (*tt.tt_putc)(wwns[i][j].c_c);
                }
        }
 }

-*/