Add define for Kirk Smith's USR Courier driver. Change default baud

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

diff --git a/usr/src/usr.bin/window/wwdelchar.c b/usr/src/usr.bin/window/wwdelchar.c
index e59ec46..a222c9c 100644 (file)
--- a/usr/src/usr.bin/window/wwdelchar.c
+++ b/usr/src/usr.bin/window/wwdelchar.c
@@ -1,66 +1,86 @@
 #ifndef lint
 #ifndef lint

-static char *sccsid = "@(#)wwdelchar.c 3.3 83/08/15";
+static char sccsid[] = "@(#)wwdelchar.c        3.11 %G%";

 #endif
 
 #endif
 

+/*
+ * Copyright (c) 1983 Regents of the University of California,
+ * All rights reserved.  Redistribution permitted subject to
+ * the terms of the Berkeley Software License Agreement.
+ */
+

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

-wwdelchar(w, line, col)
+wwdelchar(w, row, col)

 register struct ww *w;
 {
        register i;
 register struct ww *w;
 {
        register i;

-       int row = line - w->ww_scroll;

        int nvis;
 
        int nvis;
 

+       /*
+        * First, shift the line.
+        */

        {
                register union ww_char *p, *q;
 
        {
                register union ww_char *p, *q;
 

-               p = &w->ww_buf[line][col];
+               p = &w->ww_buf[row][col];

                q = p + 1;
                q = p + 1;

-               for (i = w->ww_w.nc - col - 1; --i >= 0;)
+               for (i = w->ww_b.r - col; --i > 0;)

                        *p++ = *q++;
                p->c_w = ' ';
        }
                        *p++ = *q++;
                p->c_w = ' ';
        }

-       if (row < 0 || row >= w->ww_w.nr)
+
+       /*
+        * If can't see it, just return.
+        */
+       if (row < w->ww_i.t || row >= w->ww_i.b
+           || w->ww_i.r <= 0 || w->ww_i.r <= col)

                return;
                return;

+
+       if (col < w->ww_i.l)
+               col = w->ww_i.l;
+
+       /*
+        * Now find out how much is actually changed, and fix wwns.
+        */

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

+               char touched;

 
                nvis = 0;
 
                nvis = 0;

-               smap = &wwsmap[row + w->ww_w.t][col + w->ww_w.l];
-               for (i = w->ww_w.nc - col; i > 0; i--)
-                       if (*smap == w->ww_index)
-                               break;
-                       else {
-                               smap++;
-                               col++;
-                       }
-               if (i <= 0)
+               smap = &wwsmap[row][col];
+               for (i = col; i < w->ww_i.r && *smap++ != w->ww_index; i++)
+                       ;
+               if (i >= w->ww_i.r)

                        return;
                        return;

-               buf = &w->ww_buf[line][col];
-               win = &w->ww_win[row][col];
-               ns = &wwns[row + w->ww_w.t][col + w->ww_w.l];
-               for (; --i >= 0;) {
-                       if (*win) {
-                               if ((*win & (WWM_COV|WWM_GLS)) != 0) {
-                                       ns++;
-                                       buf++;
-                               } else
-                                       ns++->c_w = buf++->c_w
-                                               ^ *win++ << WWC_MSHIFT;
-                       } else {
-                               *ns++ = *buf++;
-                               win++;
+               col = i;
+               buf = w->ww_buf[row];
+               win = w->ww_win[row];
+               ns = wwns[row];
+               smap = &wwsmap[row][i];
+               touched = wwtouched[row];
+               for (; i < w->ww_i.r; i++) {
+                       if (*smap++ != w->ww_index)
+                               continue;
+                       touched |= WWU_TOUCHED;
+                       if (win[i])
+                               ns[i].c_w =
+                                       buf[i].c_w ^ win[i] << WWC_MSHIFT;
+                       else {

                                nvis++;
                                nvis++;

+                               ns[i] = buf[i];

                        }
                }
                        }
                }

+               wwtouched[row] = touched;

        }
        }

-       col += w->ww_w.l;
-       row += w->ww_w.t;
-       if (nvis > (wwncol - col) / 2) {
+
+       /*
+        * Can/Should we use delete character?
+        */
+       if (tt.tt_delchar != 0 && nvis > (wwncol - col) / 2) {

                register union ww_char *p, *q;
 
                (*tt.tt_move)(row, col);
                register union ww_char *p, *q;
 
                (*tt.tt_move)(row, col);


@@ -68,7 +88,7 @@ register struct ww *w;
 
                p = &wwos[row][col];
                q = p + 1;
 
                p = &wwos[row][col];
                q = p + 1;

-               for (i = wwncol - col - 1; --i >= 0;)
+               for (i = wwncol - col; --i > 0;)

                        *p++ = *q++;
                p->c_w = ' ';
        }
                        *p++ = *q++;
                p->c_w = ' ';
        }