Changes in owl.c [f7cf6c2:3aa0522]

File:

• owl.c (modified) (7 diffs)

owl.c

@@ -311 +311 @@
 {
   owl_input j;
-  WINDOW *typwin;
-
-  typwin = owl_global_get_curs_typwin(&g);
 
   while (1) {
-    j.ch = wgetch(typwin);
+    j.ch = wgetch(g.input_pad);
     if (j.ch == ERR) return;
 
@@ -339 +336 @@
       
       for (i = 1; i < bytes; i++) {
-        int tmp =  wgetch(typwin);
+        int tmp = wgetch(g.input_pad);
         /* If what we got was not a byte, or not a continuation byte */
         if (tmp > 0xff || !(tmp & 0x80 && ~tmp & 0x40)) {
@@ -458 +455 @@
 #endif /* OWL_STDERR_REDIR */
 
-void owl_zephyr_buddycheck_timer(owl_timer *t, void *data)
-{
-  if (owl_global_is_pseudologins(&g)) {
-    owl_function_debugmsg("Doing zephyr buddy check");
-    owl_function_zephyr_buddy_check(1);
-  }
+static int owl_refresh_pre_select_action(owl_ps_action *a, void *data)
+{
+  /* if a resize has been scheduled, deal with it */
+  owl_global_resize(&g, 0, 0);
+  /* also handle relayouts */
+  owl_global_relayout(&g);
+
+  /* update the terminal if we need to */
+  if (owl_global_is_needrefresh(&g)) {
+    /* these are here in case a relayout changes the windows */
+    WINDOW *sepwin = owl_global_get_curs_sepwin(&g);
+    WINDOW *typwin = owl_global_get_curs_typwin(&g);
+
+    /* push all changed windows to screen */
+    update_panels();
+    /* leave the cursor in the appropriate window */
+    if (!owl_popwin_is_active(owl_global_get_popwin(&g))
+        && owl_global_get_typwin(&g)) {
+      owl_function_set_cursor(typwin);
+    } else {
+      owl_function_set_cursor(sepwin);
+    }
+    doupdate();
+    owl_global_set_noneedrefresh(&g);
+  }
+  return 0;
 }
 
@@ -469 +486 @@
 int main(int argc, char **argv, char **env)
 {
-  WINDOW *sepwin, *typwin;
   int argcsave;
   const char *const *argvsave;
@@ -583 +599 @@
   owl_function_source(NULL);
 
-  update_panels();
-
   /* Set the default style */
   owl_function_debugmsg("startup: setting startup and default style");
@@ -605 +619 @@
   owl_global_push_context(&g, OWL_CTX_READCONFIG|OWL_CTX_RECV, NULL, "recv");
 
-  owl_select_add_timer(180, 180, owl_zephyr_buddycheck_timer, NULL, NULL);
-
-  /* If we ever deprecate the mainloop hook, remove this. */
-  owl_select_add_timer(0, 1, owl_perlconfig_mainloop, NULL, NULL);
-
+  owl_select_add_pre_select_action(owl_refresh_pre_select_action, NULL, NULL);
   owl_select_add_pre_select_action(owl_process_messages, NULL, NULL);
 
@@ -615 +625 @@
   /* main loop */
   while (1) {
-
-    /* if a resize has been scheduled, deal with it */
-    owl_global_resize(&g, 0, 0);
-    /* also handle relayouts */
-    owl_global_relayout(&g);
-
-    /* these are here in case a relayout changes the windows */
-    sepwin=owl_global_get_curs_sepwin(&g);
-    typwin=owl_global_get_curs_typwin(&g);
-
-    /* update the terminal if we need to */
-    if (owl_global_is_needrefresh(&g)) {
-      /* push all changed windows to screen */
-      update_panels();
-      /* leave the cursor in the appropriate window */
-      if (!owl_popwin_is_active(owl_global_get_popwin(&g))
-          && owl_global_get_typwin(&g)) {
-        owl_function_set_cursor(typwin);
-      } else {
-        owl_function_set_cursor(sepwin);
-      }
-      doupdate();
-      owl_global_set_noneedrefresh(&g);
-    }
-
     /* select on FDs we know about. */
     owl_select();