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

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

diff --git a/usr/src/usr.bin/window/cmd5.c b/usr/src/usr.bin/window/cmd5.c
index 938e4fb..23fb50e 100644 (file)
--- a/usr/src/usr.bin/window/cmd5.c
+++ b/usr/src/usr.bin/window/cmd5.c
@@ -1,37 +1,51 @@
 #ifndef lint
 #ifndef lint

-static char *sccsid = "@(#)cmd5.c      3.3 83/08/31";
+static char sccsid[] = "@(#)cmd5.c     3.14 %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 "defs.h"
 
 /*
  * Window movement.
  */
 #include "defs.h"
 
 /*
  * Window movement.
  */

+

 c_move(w)
 register struct ww *w;
 {
        int col, row;
 c_move(w)
 register struct ww *w;
 {
        int col, row;

-       int tmp;
-       struct ww *back = w->ww_back;
+       int mincol, minrow;
+       int maxcol, maxrow;
+       int curcol, currow;

 
 

+       if (!terse)
+               wwputs("New window position: ", cmdwin);

        col = w->ww_w.l;
        row = w->ww_w.t;
        wwadd(boxwin, framewin->ww_back);
        for (;;) {
                wwbox(boxwin, row - 1, col - 1, w->ww_w.nr + 2, w->ww_w.nc + 2);
        col = w->ww_w.l;
        row = w->ww_w.t;
        wwadd(boxwin, framewin->ww_back);
        for (;;) {
                wwbox(boxwin, row - 1, col - 1, w->ww_w.nr + 2, w->ww_w.nc + 2);

-               wwsetcursor(row, col);
-               while (bpeekc() < 0)
-                       bread();
-               wwunbox(boxwin);
-               switch (getpos(&row, &col, 1, 0,
-                       wwnrow - w->ww_w.nr, wwncol - w->ww_w.nc)) {
-               case -1:
+               getminmax(row, w->ww_w.nr, 1, wwnrow,
+                       &currow, &minrow, &maxrow);
+               getminmax(col, w->ww_w.nc, 0, wwncol,
+                       &curcol, &mincol, &maxcol);
+               wwsetcursor(currow, curcol);
+               while (wwpeekc() < 0)
+                       wwiomux();
+               switch (getpos(&row, &col, minrow, mincol, maxrow, maxcol)) {
+               case 3:
+                       wwunbox(boxwin);

                        wwdelete(boxwin);
                        wwdelete(boxwin);

-                       if (!terse)
-                               (void) wwputs("\r\nCancelled.  ", cmdwin);

                        return;
                        return;

-               case 1:
+               case 2:
+                       wwunbox(boxwin);

                        break;
                        break;

+               case 1:
+                       wwunbox(boxwin);

                case 0:
                        continue;
                }
                case 0:
                        continue;
                }


@@ -39,13 +53,47 @@ register struct ww *w;
        }
        wwdelete(boxwin);
        if (!terse)
        }
        wwdelete(boxwin);
        if (!terse)

-               (void) wwputs("\r\n", cmdwin);
+               wwputc('\n', cmdwin);

        wwcurtowin(cmdwin);
        wwcurtowin(cmdwin);

+       movewin(w, row, col);
+}
+
+movewin(w, row, col)
+register struct ww *w;
+{
+       struct ww *back = w->ww_back;
+
+       w->ww_alt.t = w->ww_w.t;
+       w->ww_alt.l = w->ww_w.l;

        wwdelete(w);
        wwdelete(w);

-       w->ww_w.t = row;
-       w->ww_w.l = col;
-       w->ww_w.b = row + w->ww_w.nr;
-       w->ww_w.r = col + w->ww_w.nc;
+       wwmove(w, row, col);

        wwadd(w, back);
        reframe();
 }
        wwadd(w, back);
        reframe();
 }

+
+/*
+ * Weird stufff, don't ask.
+ */
+getminmax(x, n, a, b, curx, minx, maxx)
+register x, n, a, b;
+int *curx, *minx, *maxx;
+{
+       if (x < 0)
+               *curx = x + n - 1;
+       else
+               *curx = x;
+
+       if (x <= a)
+               *minx = 1 - n;
+       else if (x <= b - n)
+               *minx = a;
+       else
+               *minx = b - n;
+
+       if (x >= b - n)
+               *maxx = b - 1;
+       else if (x >= a)
+               *maxx = b - n;
+       else
+               *maxx = a;
+}