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

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

diff --git a/usr/src/usr.bin/window/startup.c b/usr/src/usr.bin/window/startup.c
index 08706b0..63e5ec5 100644 (file)
--- a/usr/src/usr.bin/window/startup.c
+++ b/usr/src/usr.bin/window/startup.c
@@ -1,52 +1,59 @@
 #ifndef lint
 #ifndef lint

-static char *sccsid = "@(#)startup.c   3.9 84/03/03";
+static char sccsid[] = "@(#)startup.c  3.17 %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"
 #include "value.h"
 #include "var.h"
 #include "defs.h"
 #include "value.h"
 #include "var.h"

+#include "char.h"
+#include "local.h"

 
 doconfig()
 {
        char buf[100];
        char *home;
 
 doconfig()
 {
        char buf[100];
        char *home;

+       static char runcom[] = RUNCOM;

 
        if ((home = getenv("HOME")) == 0)
 
        if ((home = getenv("HOME")) == 0)

-               home = "";
-       (void) sprintf(buf, "%s/.windrc", home);
-       return dosource(buf);
+               home = ".";
+       return dosource(sprintf(buf, "%.*s/%s",
+               (sizeof buf - sizeof runcom) / sizeof (char) - 1,
+               home, runcom));

 }
 
 /*
 }
 
 /*

- * The default is two windows of equal sizes.
+ * The default is two windows of equal size.

  */
 dodefault()
 {
        struct ww *w;
        register r = wwnrow / 2 - 1;
 
  */
 dodefault()
 {
        struct ww *w;
        register r = wwnrow / 2 - 1;
 

-       if ((w = openwin(-1, 1, 0, r, wwncol, nbufline, (char *) 0)) == 0)
-               goto bad;
-       if (openwin(-1, r + 2, 0, wwnrow - r - 2, wwncol, nbufline, (char *) 0)
-           == 0)
-               goto bad;
+       if (openwin(1, r + 2, 0, wwnrow - r - 2, wwncol, nbufline,
+                               (char *) 0, 1, 1, shellfile, shell) == 0)
+               return;
+       if ((w = openwin(0, 1, 0, r, wwncol, nbufline,
+                               (char *) 0, 1, 1, shellfile, shell)) == 0)
+               return;

        wwprintf(w, "Escape character is %s.\r\n", unctrl(escapec));
        wwprintf(w, "Escape character is %s.\r\n", unctrl(escapec));

-       setselwin(w);
-       return;
-bad:
-       wwputs("Can't open default windows.  ", cmdwin);

 }
 
 setvars()
 {
 }
 
 setvars()
 {

-       /* try to use a good ordering to balance the tree */
+       /* try to use a random ordering to balance the tree */

        (void) var_setnum("nrow", wwnrow);
        (void) var_setnum("ncol", wwncol);
        (void) var_setnum("nrow", wwnrow);
        (void) var_setnum("ncol", wwncol);

-       (void) var_setnum("availmodes", wwavailmodes);

        (void) var_setnum("baud", wwbaud);
        (void) var_setnum("m_rev", WWM_REV);
        (void) var_setnum("m_blk", WWM_BLK);
        (void) var_setnum("m_ul", WWM_UL);
        (void) var_setnum("m_grp", WWM_GRP);
        (void) var_setstr("term", wwterm);
        (void) var_setnum("baud", wwbaud);
        (void) var_setnum("m_rev", WWM_REV);
        (void) var_setnum("m_blk", WWM_BLK);
        (void) var_setnum("m_ul", WWM_UL);
        (void) var_setnum("m_grp", WWM_GRP);
        (void) var_setstr("term", wwterm);

+       (void) var_setnum("modes", wwavailmodes);

 }
 }