gratuitous stylistic change

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

diff --git a/usr/src/usr.bin/window/mloop.c b/usr/src/usr.bin/window/mloop.c
index 1e2886e..d64962a 100644 (file)
--- a/usr/src/usr.bin/window/mloop.c
+++ b/usr/src/usr.bin/window/mloop.c
@@ -1,37 +1,59 @@
+/*
+ * 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[] = "@(#)mloop.c    3.5 %G%";
-#endif
+static char sccsid[] = "@(#)mloop.c    3.13 (Berkeley) %G%";
+#endif /* not lint */

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

+#include <sys/signal.h>

 
 mloop()
 {
 
 mloop()
 {

+       kill(getpid(), SIGIO);  /* catch typeahead before ASYNC was set */

        while (!quit) {
                if (incmd) {
                        docmd();
                } else if (wwcurwin->ww_state != WWS_HASPROC) {
        while (!quit) {
                if (incmd) {
                        docmd();
                } else if (wwcurwin->ww_state != WWS_HASPROC) {

+                       if (!wwcurwin->ww_keepopen)
+                               closewin(wwcurwin);

                        setcmd(1);
                        if (wwpeekc() == escapec)
                                (void) wwgetc();
                        error("Process died.");
                } else {
                        setcmd(1);
                        if (wwpeekc() == escapec)
                                (void) wwgetc();
                        error("Process died.");
                } else {

+                       register struct ww *w = wwcurwin;

                        register char *p;
                        register n;
 
                        register char *p;
                        register n;
 

-                       wwiomux();
-                       if (wwibp < wwibq) {
-                               for (p = wwibp; p < wwibq && *p != escapec;
-                                    p++)
-                                       ;
-                               if ((n = p - wwibp) > 0) {
-                                       (void) write(wwcurwin->ww_pty,
-                                               wwibp, n);
-                                       wwibp = p;
-                               }
-                               if (wwpeekc() == escapec) {
-                                       (void) wwgetc();
-                                       setcmd(1);
-                               }
+                       if (wwibp >= wwibq)
+                               wwiomux();
+                       for (p = wwibp; p < wwibq && *p != escapec;
+                            p++)
+                               ;
+                       if ((n = p - wwibp) > 0) {
+                               if (!w->ww_ispty && w->ww_stopped)
+                                       startwin(w);
+                               (void) write(w->ww_pty, wwibp, n);
+                               wwibp = p;
+                       }
+                       if (wwpeekc() == escapec) {
+                               (void) wwgetc();
+                               setcmd(1);

                        }
                }
        }
                        }
                }
        }