Changeset afbf668

Timestamp:

Mar 1, 2004, 12:42:56 PM (21 years ago)

Author:

Erik Nygren <nygren@mit.edu>

Branches:

master, barnowl_perlaim, debian, owl, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

948b942

Parents:

c61918e

Message:

	pexec will now incrimentally display data as it is output
	  by the child process.  Additionally, commands running under
	  pexec may now be killed by quitting out of the popless window.
	Added muxevents select loop dispatcher.  File descriptors may
	  be registered with muxevents and handlers will be dispatched
	  to when data is available for non-blocking read/write/except.
	Switched the stderr_redir stuff to use muxevents.

Files:

• ChangeLog (modified) (1 diff)
• Makefile.in (modified) (1 diff)
• functions.c (modified) (1 diff)
• global.c (modified) (2 diffs)
• muxevents.c (added)
• owl.c (modified) (7 diffs)
• owl.h (modified) (6 diffs)
• popexec.c (added)
• viewwin.c (modified) (4 diffs)

ChangeLog

@@ -1 +1 @@
 $Id$
 
+2.1.6pre1
+        pexec will now incrimentally display data as it is output
+          by the child process.  Additionally, commands running under
+          pexec may now be killed by quitting out of the popless window.
+        Added muxevents select loop dispatcher.  File descriptors may
+          be registered with muxevents and handlers will be dispatched
+          to when data is available for non-blocking read/write/except.
+        Switched the stderr_redir stuff to use muxevents.
+        
 2.1.5
         Added a licence

Makefile.in

@@ -24 +24 @@
      keypress.c keymap.c keybinding.c cmd.c context.c zcrypt.c \
      aim.c buddy.c buddylist.c timer.c style.c stylefunc.c errqueue.c \
-     zbuddylist.c
+     zbuddylist.c muxevents.c popexec.c
 OWL_SRC = owl.c
 TESTER_SRC = tester.c

functions.c

@@ -2241 +2241 @@
   strcat(newbuff, redirect);
 
-  p=popen(newbuff, "r");
-  out=owl_malloc(1024);
-  size=1024;
-  strcpy(out, "");
-  while (fgets(buff2, 1024, p)!=NULL) {
-    size+=1024;
-    out=owl_realloc(out, size);
-    strcat(out, buff2);
-  }
-  pclose(p);
-
-  if (type==1) {
-    owl_function_popless_text(out);
-  } else if (type==0) {
-    return out;
-  } else if (type==2) {
-    owl_function_adminmsg(buff, out);
+  if (type == 1) {
+    owl_popexec_new(newbuff);
   } else {
-    owl_function_popless_text(out);
-  }
-  owl_free(out);
+    p=popen(newbuff, "r");
+    out=owl_malloc(1024);
+    size=1024;
+    strcpy(out, "");
+    while (fgets(buff2, 1024, p)!=NULL) {
+      size+=1024;
+      out=owl_realloc(out, size);
+      strcat(out, buff2);
+    }
+    pclose(p);
+    
+    if (type==1) {
+      owl_function_popless_text(out);
+    } else if (type==0) {
+      return out;
+    } else if (type==2) {
+      owl_function_adminmsg(buff, out);
+    } else {
+      owl_function_popless_text(out);
+    }
+    owl_free(out);
+  }
   return NULL;
 }

global.c

@@ -50 +50 @@
   owl_keys_setup_keymaps(&g->kh);
 
+  owl_list_create(&(g->muxevents));
   owl_list_create(&(g->filterlist));
   owl_list_create(&(g->puntlist));
@@ -523 +524 @@
 }
 
+/* muxevents */
+
+owl_muxevents *owl_global_get_muxevents(owl_global *g) {
+  return(&(g->muxevents));
+}
+
 /* filterlist */
 

owl.c

@@ -57 +57 @@
 #endif
 int stderr_replace(void);
-void stderr_redirect(int rfd);
 #endif
 
@@ -196 +195 @@
   owl_function_debugmsg("startup: doing stderr redirection");
   newstderr = stderr_replace();
+  owl_muxevents_add(owl_global_get_muxevents(&g), newstderr, OWL_MUX_READ,
+                    stderr_redirect_handler, NULL);
 #endif   
 
@@ -579 +580 @@
       }
     }
+
+    /* dispatch any muxevents */
+    owl_muxevents_dispatch(owl_global_get_muxevents(&g), 0);
 
     /* follow the last message if we're supposed to */
@@ -665 +669 @@
     }
 
-#if OWL_STDERR_REDIR
-    stderr_redirect(newstderr);
-#endif   
-
     /* Log any error signals */
     {
@@ -675 +675 @@
       if ((signum = owl_global_get_errsignal_and_clear(&g, &si)) > 0) {
         owl_function_error("Got unexpected signal: %d %s  (code: %d band: %d  errno: %d)", 
-                           signum, signum==SIGPIPE?"SIGPIPE":"",
+                           signum, signum==SIGPIPE?"SIGPIPE":"SIG????",
                            si.si_code, si.si_band, si.si_errno);
       }
@@ -690 +690 @@
      */
     owl_function_resize();
-  } else if (sig==SIGPIPE) {
+  } else if (sig==SIGPIPE || sig==SIGCHLD) {
     /* Set a flag and some info that we got the sigpipe
      * so we can record that we got it and why... */
@@ -732 +732 @@
 }
 
-/* Sends stderr (read from rfd) messages to a file */
-void stderr_redirect(int rfd)
+/* Sends stderr (read from rfd) messages to the error console */
+void stderr_redirect_handler(int handle, int rfd, int eventmask, void *data) 
 {
   int navail, bread;

owl.h

@@ -59 +59 @@
 static const char owl_h_fileIdent[] = "$Id$";
 
-#define OWL_VERSION         2.1.5
-#define OWL_VERSION_STRING "2.1.5"
+#define OWL_VERSION         2.1.6pre1
+#define OWL_VERSION_STRING "2.1.6pre1"
 
 /* Feature that is being tested to redirect stderr through a pipe. 
@@ -110 +110 @@
 #define OWL_MESSAGE_DIRECTION_IN    1
 #define OWL_MESSAGE_DIRECTION_OUT   2
+
+#define OWL_MUX_READ   1
+#define OWL_MUX_WRITE  2
+#define OWL_MUX_EXCEPT 4
 
 #define OWL_DIRECTION_NONE      0
@@ -352 +356 @@
   int winlines, wincols;
   WINDOW *curswin;
+  void (*onclose_hook) (struct _owl_viewwin *vwin, void *data);
+  void *onclose_hook_data;
 } owl_viewwin;
   
@@ -363 +369 @@
   void (*handler) (int ch);
 } owl_popwin;
+
+typedef struct _owl_popexec {
+  int refcount;
+  owl_viewwin *vwin;
+  int winactive;
+  int pid;                      /* or 0 if it has terminated */
+  int rfd;  
+} owl_popexec;
 
 typedef struct _owl_messagelist {
@@ -419 +433 @@
 } owl_editwin;
 
+typedef struct _owl_mux {
+  int handle;                   /* for referencing this */
+  int active;                   /* has this been deleted? */
+  int fd;                      
+  int eventmask;                /* bitmask of OWL_MUX_* */
+  void (*handler_fn)(int handle, int fd, int eventmask, void *data);
+  void *data;                   /* data reference to pass to callback */
+} owl_mux;
+typedef owl_list owl_muxevents;
+
 typedef struct _owl_keybinding {
   int  *j;                      /* keypress stack (0-terminated) */  
@@ -478 +502 @@
   owl_list filterlist;
   owl_list puntlist;
+  owl_muxevents muxevents;      /* fds to dispatch on */
   owl_vardict vars;
   owl_cmddict cmds;

viewwin.c

@@ -14 +14 @@
   if (text) {
     owl_fmtext_append_normal(&(v->fmtext), text);
-    if (text[strlen(text)-1]!='\n') {
+    if (text[strlen(text)-1]!='\n' && text[0]!='\0') {
       owl_fmtext_append_normal(&(v->fmtext), "\n");
     }
@@ -24 +24 @@
   v->wincols=wincols;
   v->curswin=win;
+  v->onclose_hook = NULL;
+}
+
+void owl_viewwin_append_text(owl_viewwin *v, char *text) {
+    owl_fmtext_append_normal(&(v->fmtext), text);
+    v->textlines=owl_fmtext_num_lines(&(v->fmtext));  
 }
 
@@ -45 +51 @@
   v->winlines=winlines;
   v->wincols=wincols;
+}
+
+void owl_viewwin_set_onclose_hook(owl_viewwin *v, void (*onclose_hook) (owl_viewwin *vwin, void *data), void *onclose_hook_data) {
+  v->onclose_hook = onclose_hook;
+  v->onclose_hook_data = onclose_hook_data;
 }
 
@@ -135 +146 @@
 void owl_viewwin_free(owl_viewwin *v)
 {
+  if (v->onclose_hook) {
+    v->onclose_hook(v, v->onclose_hook_data);
+  }
   owl_fmtext_free(&(v->fmtext));
 }