Changeset 26255f0

Timestamp:

Oct 19, 2009, 10:21:10 PM (15 years ago)

Author:

Alejandro R. Sedeño <asedeno@mit.edu>

Branches:

master, release-1.10, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

ba88ae7

Parents:

0697f09

git-author:

Alejandro R. Sedeño <asedeno@mit.edu> (10/13/09 03:19:34)

git-committer:

Alejandro R. Sedeño <asedeno@mit.edu> (10/19/09 22:21:10)

Message:

Add a message processing pre-select action.

File:

• owl.c (modified) (4 diffs)

owl.c

@@ -297 +297 @@
 }
 
+/*
+ * Process any new messages we have waiting in the message queue.
+ * Returns 1 if any messages were added to the message list, and 0 otherwise.
+ */
+int owl_process_messages(owl_ps_action *d, void *p)
+{
+  int newmsgs=0;
+  owl_message *m;
+
+  /* Grab incoming messages. */
+  while (owl_global_messagequeue_pending(&g)) {
+    m = owl_global_messagequeue_popmsg(&g);
+    if (owl_process_message(m))
+      newmsgs = 1;
+  }
+
+  if (newmsgs) {
+    /* follow the last message if we're supposed to */
+    if (owl_global_should_followlast(&g))
+      owl_function_lastmsg_noredisplay();
+
+    /* do the newmsgproc thing */
+    owl_function_do_newmsgproc();
+
+    /* redisplay if necessary */
+    /* this should be optimized to not run if the new messages won't be displayed */
+    owl_mainwin_redisplay(owl_global_get_mainwin(&g));
+    sepbar(NULL);
+    if (owl_popwin_is_active(owl_global_get_popwin(&g))) {
+      owl_popwin_refresh(owl_global_get_popwin(&g));
+      /* TODO: this is a broken kludge */
+      if (owl_global_get_viewwin(&g)) {
+        owl_viewwin_redisplay(owl_global_get_viewwin(&g), 0);
+      }
+    }
+    owl_global_set_needrefresh(&g);
+  }
+  return newmsgs;
+}
+
 void owl_process_input(owl_dispatch *d)
 {
@@ -469 +509 @@
   owl_editwin *tw;
   owl_popwin *pw;
-  int argcsave, followlast;
-  int newmsgs;
+  int argcsave;
   const char *const *argvsave;
   char *perlout, *perlerr;
   const owl_style *s;
   const char *dir;
-  owl_message *m;
   owl_options opts;
 
@@ -624 +662 @@
   owl_select_add_timer(0, 1, owl_perlconfig_mainloop, NULL, NULL);
 
+  owl_select_add_pre_select_action(owl_process_messages, NULL, NULL);
+
   owl_function_debugmsg("startup: entering main loop");
   /* main loop */
@@ -636 +676 @@
     sepwin=owl_global_get_curs_sepwin(&g);
     typwin=owl_global_get_curs_typwin(&g);
-
-    followlast=owl_global_should_followlast(&g);
-
-    /* Grab incoming messages. */
-    newmsgs=0;
-    while(owl_global_messagequeue_pending(&g)) {
-
-      m = owl_global_messagequeue_popmsg(&g);
-
-      if(owl_process_message(m))
-        newmsgs = 1;
-    }
-
-    /* follow the last message if we're supposed to */
-    if (newmsgs && followlast) {
-      owl_function_lastmsg_noredisplay();
-    }
-
-    /* do the newmsgproc thing */
-    if (newmsgs) {
-      owl_function_do_newmsgproc();
-    }
-    
-    /* redisplay if necessary */
-    /* this should be optimized to not run if the new messages won't be displayed */
-    if (newmsgs) {
-      owl_mainwin_redisplay(owl_global_get_mainwin(&g));
-      sepbar(NULL);
-      if (owl_popwin_is_active(owl_global_get_popwin(&g))) {
-        owl_popwin_refresh(owl_global_get_popwin(&g));
-        /* TODO: this is a broken kludge */
-        if (owl_global_get_viewwin(&g)) {
-          owl_viewwin_redisplay(owl_global_get_viewwin(&g), 0);
-        }
-      }
-      owl_global_set_needrefresh(&g);
-    }
 
     /* if a popwin just came up, refresh it */