rip out SHELL_ESCAPE define

[unix-history] / usr / src / usr.bin / window / defs.h

diff --git a/usr/src/usr.bin/window/defs.h b/usr/src/usr.bin/window/defs.h
index b849ce8..5fad1c6 100644 (file)
--- a/usr/src/usr.bin/window/defs.h
+++ b/usr/src/usr.bin/window/defs.h
@@ -1,18 +1,28 @@
 /*
 /*

- *     @(#)defs.h      3.9 84/03/03    
+ * 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.
+ *
+ *     @(#)defs.h      3.18 (Berkeley) %G%

  */
 
 #include "ww.h"
  */
 
 #include "ww.h"

-#ifndef O_4_1A

 #include <sys/time.h>
 #include <sys/time.h>

-#include <sys/resource.h>
-#endif

 
 #define NWINDOW 9
 
 
 #define NWINDOW 9
 

-#ifndef O_4_1A

 struct timeval starttime;
 struct timeval starttime;

-#endif

 
 struct ww *window[NWINDOW];    /* the windows */
 struct ww *selwin;             /* the selected window */
 
 struct ww *window[NWINDOW];    /* the windows */
 struct ww *selwin;             /* the selected window */


@@ -20,9 +30,12 @@ struct ww *lastselwin;               /* the last selected window */
 struct ww *cmdwin;             /* the command window */
 struct ww *framewin;           /* the window for framing */
 struct ww *boxwin;             /* the window for the box */
 struct ww *cmdwin;             /* the command window */
 struct ww *framewin;           /* the window for framing */
 struct ww *boxwin;             /* the window for the box */

+struct ww *fgwin;              /* the last foreground window */

 
 

-char *shell;                   /* the shell program */
-char *shellname;               /* the shell program name (for argv[0]) */
+#define isfg(w)                ((w)->ww_order <= fgwin->ww_order)
+
+char *shell[128];              /* the shell argv */
+char *shellfile;               /* the shell program */

 int nbufline;                  /* default buffer size for new windows */
 char escapec;                  /* the escape character */
 
 int nbufline;                  /* default buffer size for new windows */
 char escapec;                  /* the escape character */
 


@@ -30,6 +43,7 @@ char escapec;                 /* the escape character */
 char quit;                     /* quit command issued */
 char terse;                    /* terse mode */
 char debug;                    /* debug mode */
 char quit;                     /* quit command issued */
 char terse;                    /* terse mode */
 char debug;                    /* debug mode */

+char incmd;                    /* in command mode */

 
 struct ww *getwin();
 struct ww *openwin();
 
 struct ww *getwin();
 struct ww *openwin();