add pathnames.h

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

diff --git a/usr/src/usr.bin/window/lcmd1.c b/usr/src/usr.bin/window/lcmd1.c
index 38addc6..e67368a 100644 (file)
--- a/usr/src/usr.bin/window/lcmd1.c
+++ b/usr/src/usr.bin/window/lcmd1.c
@@ -1,6 +1,23 @@
+/*
+ * 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[] = "@(#)lcmd1.c    3.27 %G%";
-#endif
+static char sccsid[] = "@(#)lcmd1.c    3.34 (Berkeley) %G%";
+#endif /* not lint */

 
 #include "defs.h"
 #include "string.h"
 
 #include "defs.h"
 #include "string.h"


@@ -18,7 +35,9 @@ struct lcmd_arg arg_window[] = {
        { "pty",        1,      ARG_ANY },
        { "frame",      1,      ARG_ANY },
        { "mapnl",      1,      ARG_ANY },
        { "pty",        1,      ARG_ANY },
        { "frame",      1,      ARG_ANY },
        { "mapnl",      1,      ARG_ANY },

-       { "shell",      1,      ARG_ANY|ARG_LIST },
+       { "keepopen",   1,      ARG_ANY },
+       { "smooth",     1,      ARG_ANY },
+       { "shell",      1,      ARG_STR|ARG_LIST },

        0
 };
 
        0
 };
 


@@ -29,9 +48,9 @@ register struct value *a;
        struct ww *w;
        int col, row, ncol, nrow, id, nline;
        char *label;
        struct ww *w;
        int col, row, ncol, nrow, id, nline;
        char *label;

-       char haspty, hasframe, mapnl;
+       char haspty, hasframe, mapnl, keepopen, smooth;

        char *shf, **sh;
        char *shf, **sh;

-       char *argv[sizeof shell / sizeof *shell];
+       char *argv[sizeof default_shell / sizeof *default_shell];

        register char **pp;
 
        if ((id = findid()) < 0)
        register char **pp;
 
        if ((id = findid()) < 0)


@@ -44,7 +63,7 @@ register struct value *a;
        a++;
        ncol = a->v_type == V_ERR ? wwncol - col : a->v_num;
        a++;
        a++;
        ncol = a->v_type == V_ERR ? wwncol - col : a->v_num;
        a++;

-       nline = a->v_type == V_ERR ? nbufline : a->v_num;
+       nline = a->v_type == V_ERR ? default_nline : a->v_num;

        a++;
        label = a->v_type == V_ERR ? 0 : a->v_str;
        if ((haspty = vtobool(++a, 1, -1)) < 0)
        a++;
        label = a->v_type == V_ERR ? 0 : a->v_str;
        if ((haspty = vtobool(++a, 1, -1)) < 0)


@@ -53,15 +72,14 @@ register struct value *a;
                return;
        if ((mapnl = vtobool(++a, !haspty, -1)) < 0)
                return;
                return;
        if ((mapnl = vtobool(++a, !haspty, -1)) < 0)
                return;

+       if ((keepopen = vtobool(++a, 0, -1)) < 0)
+               return;
+       if ((smooth = vtobool(++a, default_smooth, -1)) < 0)
+               return;

        if ((++a)->v_type != V_ERR) {
                for (pp = argv; a->v_type != V_ERR &&
        if ((++a)->v_type != V_ERR) {
                for (pp = argv; a->v_type != V_ERR &&

-                    pp < &argv[sizeof argv/sizeof *argv-1]; pp++, a++) {
-                       if (a->v_type == V_NUM && p_convstr(a->v_num) < 0) {
-                               p_memerror();
-                               return;
-                       }
+                    pp < &argv[sizeof argv/sizeof *argv-1]; pp++, a++)

                        *pp = a->v_str;
                        *pp = a->v_str;

-               }

                *pp = 0;
                shf = *(sh = argv);
                if (*sh = rindex(shf, '/'))
                *pp = 0;
                shf = *(sh = argv);
                if (*sh = rindex(shf, '/'))


@@ -69,29 +87,63 @@ register struct value *a;
                else
                        *sh = shf;
        } else {
                else
                        *sh = shf;
        } else {

-               sh = shell;
-               shf = shellfile;
+               sh = default_shell;
+               shf = default_shellfile;

        }
        if ((w = openwin(id, row, col, nrow, ncol, nline, label, haspty,
            hasframe, shf, sh)) == 0)
                return;
        w->ww_mapnl = mapnl;
        }
        if ((w = openwin(id, row, col, nrow, ncol, nline, label, haspty,
            hasframe, shf, sh)) == 0)
                return;
        w->ww_mapnl = mapnl;

+       w->ww_keepopen = keepopen;
+       w->ww_noupdate = !smooth;

        v->v_type = V_NUM;
        v->v_num = id + 1;
 }
 
        v->v_type = V_NUM;
        v->v_num = id + 1;
 }
 

-struct lcmd_arg arg_nline[] = {
+struct lcmd_arg arg_def_nline[] = {

        { "nlines",     1,      ARG_NUM },
        0
 };
 
        { "nlines",     1,      ARG_NUM },
        0
 };
 

-l_nline(v, a)
+l_def_nline(v, a)

 register struct value *v, *a;
 {
 register struct value *v, *a;
 {

-       v->v_num = nbufline;
+       v->v_num = default_nline;

        v->v_type = V_NUM;
        if (a->v_type != V_ERR)
        v->v_type = V_NUM;
        if (a->v_type != V_ERR)

-               nbufline = a->v_num;
+               default_nline = a->v_num;
+}
+
+struct lcmd_arg arg_smooth[] = {
+       { "window",     1,      ARG_NUM },
+       { "flag",       1,      ARG_ANY },
+       0
+};
+
+l_smooth(v, a)
+register struct value *v, *a;
+{
+       struct ww *w;
+
+       v->v_type = V_NUM;
+       v->v_num = 0;
+       if ((w = vtowin(a++, selwin)) == 0)
+               return;
+       v->v_num = !w->ww_noupdate;
+       w->ww_noupdate = !vtobool(a, v->v_num, v->v_num);
+}
+
+struct lcmd_arg arg_def_smooth[] = {
+       { "flag",       1,      ARG_ANY },
+       0
+};
+
+l_def_smooth(v, a)
+register struct value *v, *a;
+{
+       v->v_type = V_NUM;
+       v->v_num = default_smooth;
+       default_smooth = vtobool(a, v->v_num, v->v_num);

 }
 
 struct lcmd_arg arg_select[] = {
 }
 
 struct lcmd_arg arg_select[] = {


@@ -108,7 +160,7 @@ register struct value *v, *a;
        v->v_num = selwin ? selwin->ww_id + 1 : -1;
        if (a->v_type == V_ERR)
                return;
        v->v_num = selwin ? selwin->ww_id + 1 : -1;
        if (a->v_type == V_ERR)
                return;

-       if ((w = vtowin(a)) == 0)
+       if ((w = vtowin(a, (struct ww *)0)) == 0)

                return;
        setselwin(w);
 }
                return;
        setselwin(w);
 }


@@ -123,7 +175,7 @@ register struct value *v, *a;
 {
        v->v_type = V_NUM;
        v->v_num = debug;
 {
        v->v_type = V_NUM;
        v->v_num = debug;

-       debug = vtobool(a, 1, debug);
+       debug = vtobool(a, debug, debug);

 }
 
 struct lcmd_arg arg_escape[] = {
 }
 
 struct lcmd_arg arg_escape[] = {


@@ -160,7 +212,7 @@ register struct value *a;
 {
        struct ww *w;
 
 {
        struct ww *w;
 

-       if ((w = vtowin(a)) == 0)
+       if ((w = vtowin(a, selwin)) == 0)

                return;
        if ((++a)->v_type != V_ERR && setlabel(w, a->v_str) < 0)
                error("Out of memory.");
                return;
        if ((++a)->v_type != V_ERR && setlabel(w, a->v_str) < 0)
                error("Out of memory.");


@@ -179,11 +231,11 @@ register struct value *v, *a;
        struct ww *w;
        char flag;
 
        struct ww *w;
        char flag;
 

-       if ((w = vtowin(a)) == 0)
+       if ((w = vtowin(a, selwin)) == 0)

                return;
        v->v_type = V_NUM;
        v->v_num = isfg(w);
                return;
        v->v_type = V_NUM;
        v->v_num = isfg(w);

-       flag = vtobool(++a, 1, v->v_num);
+       flag = vtobool(++a, v->v_num, v->v_num);

        if (flag == v->v_num)
                return;
        deletewin(w);
        if (flag == v->v_num)
                return;
        deletewin(w);


@@ -201,7 +253,7 @@ register struct value *v, *a;
 {
        v->v_type = V_NUM;
        v->v_num = terse;
 {
        v->v_type = V_NUM;
        v->v_num = terse;

-       setterse(vtobool(a, 1, terse));
+       setterse(vtobool(a, terse, terse));

 }
 
 struct lcmd_arg arg_source[] = {
 }
 
 struct lcmd_arg arg_source[] = {


@@ -234,7 +286,7 @@ register struct value *a;
        char buf[20];
        struct ww *w;
 
        char buf[20];
        struct ww *w;
 

-       if ((w = vtowin(a++)) == 0)
+       if ((w = vtowin(a++, selwin)) == 0)

                return;
        while (a->v_type != V_ERR) {
                if (a->v_type == V_NUM) {
                return;
        while (a->v_type != V_ERR) {
                if (a->v_type == V_NUM) {


@@ -259,12 +311,12 @@ register struct value *a;
 {
        struct ww *w;
 
 {
        struct ww *w;
 

-       if (a->v_type == V_STR && str_match(a->v_str, "all", 1))
-               c_close((struct ww *)0);
+       if (a->v_type == V_STR && str_match(a->v_str, "all", 3))
+               closewin((struct ww *)0);

        else
                for (; a->v_type != V_ERR; a++)
        else
                for (; a->v_type != V_ERR; a++)

-                       if ((w = vtowin(a)) != 0)
-                               c_close(w);
+                       if ((w = vtowin(a, (struct ww *)0)) != 0)
+                               closewin(w);

 }
 
 struct lcmd_arg arg_cursormodes[] = {
 }
 
 struct lcmd_arg arg_cursormodes[] = {


@@ -308,13 +360,14 @@ register struct value *v, *a;
 }
 
 struct ww *
 }
 
 struct ww *

-vtowin(v)
+vtowin(v, w)

 register struct value *v;
 register struct value *v;

+struct ww *w;

 {
 {

-       struct ww *w;
-

        switch (v->v_type) {
        case V_ERR:
        switch (v->v_type) {
        case V_ERR:

+               if (w != 0)
+                       return w;

                error("No window specified.");
                return 0;
        case V_STR:
                error("No window specified.");
                return 0;
        case V_STR:


@@ -355,27 +408,3 @@ char def, err;
        }
        /*NOTREACHED*/
 }
        }
        /*NOTREACHED*/
 }

-
-mkargv(p, argv, n)
-register char *p;
-register char **argv;
-register n;
-{
-       while (--n > 0) {
-               for (; *p && (*p == ' ' || *p == '\t'); p++)
-                       ;
-               if (!*p)
-                       break;
-               *argv++ = p;
-               for (; *p && *p != ' ' && *p != '\t'; p++)
-                       ;
-               if (*p)
-                       *p++ = 0;
-       }
-       if (n == 0) {
-               error("Too many shell arguments.");
-               return -1;
-       }
-       *argv = 0;
-       return 0;
-}