gratuitous stylistic change

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

diff --git a/usr/src/usr.bin/window/wwinsline.c b/usr/src/usr.bin/window/wwinsline.c
index e5a1051..88df98f 100644 (file)
--- a/usr/src/usr.bin/window/wwinsline.c
+++ b/usr/src/usr.bin/window/wwinsline.c
@@ -1,40 +1,58 @@
+/*
+ * 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 = "@(#)wwinsline.c 3.3 83/08/18";
-#endif
+static char sccsid[] = "@(#)wwinsline.c        3.10 (Berkeley) %G%";
+#endif /* not lint */

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

-wwinsline(w, line)
+wwinsline(w, row)

 register struct ww *w;
 register struct ww *w;

-int line;
+int row;

 {
        register i;
        register union ww_char **cpp, **cqq;
        register union ww_char *cp;
 {
        register i;
        register union ww_char **cpp, **cqq;
        register union ww_char *cp;

-       int srow, erow;
+       int row1, row2;

        char deleted;
        int visible;
 
        /*
         * Scroll first.
         */
        char deleted;
        int visible;
 
        /*
         * Scroll first.
         */

-       if ((srow = line - w->ww_scroll) < 0) {
-               srow = 0;
+       if ((row1 = row) < w->ww_i.t) {
+               row1 = w->ww_i.t;

                visible = 0;
        } else
                visible = 1;
                visible = 0;
        } else
                visible = 1;

-       if ((erow = w->ww_nline - w->ww_scroll - 1) >= w->ww_w.nr)
-               erow = w->ww_w.nr - 1;
-       deleted = wwscroll1(w, srow, erow, -1, visible);
+       if ((row2 = w->ww_b.b) > w->ww_i.b) {
+               row2 = w->ww_i.b;
+       }
+       deleted = wwscroll1(w, row1, row2, -1, visible);

 
        /*
         * Fix the buffer.
         * But leave clearing the last line for wwclreol().
         */
 
        /*
         * Fix the buffer.
         * But leave clearing the last line for wwclreol().
         */

-       cpp = &w->ww_buf[w->ww_nline];
+       cpp = &w->ww_buf[w->ww_b.b];

        cqq = cpp - 1;
        cp = *cqq;
        cqq = cpp - 1;
        cp = *cqq;

-       for (i = w->ww_nline - line - 1; --i >= 0;)
+       for (i = w->ww_b.b - row; --i > 0;)

                *--cpp = *--cqq;
        *cqq = cp;
 
                *--cpp = *--cqq;
        *cqq = cp;
 


@@ -42,8 +60,10 @@ int line;
         * Now clear the last line.
         */
        if (visible)
         * Now clear the last line.
         */
        if (visible)

-               wwclreol1(w, line, 0, deleted);
-       else
-               for (i = w->ww_w.nc; --i >= 0;)
+               wwclreol1(w, row, w->ww_b.l, deleted);
+       else {
+               cp += w->ww_b.l;
+               for (i = w->ww_b.nc; --i >= 0;)

                        cp++->c_w = ' ';
                        cp++->c_w = ' ';

+       }

 }
 }