Changes in owl.c [1d21d9f:3b8a563]

File:

• owl.c (modified) (15 diffs)

owl.c

@@ -41 +41 @@
   char *confdir;
   bool debug;
-  bool rm_debug;
 } owl_options;
 
@@ -50 +49 @@
   fprintf(stderr, "  -n,--no-subs        don't load zephyr subscriptions\n");
   fprintf(stderr, "  -d,--debug          enable debugging\n");
-  fprintf(stderr, "  -D,--remove-debug   enable debugging and delete previous debug file\n");
   fprintf(stderr, "  -v,--version        print the Barnowl version number and exit\n");
   fprintf(stderr, "  -h,--help           print this help message\n");
@@ -66 +64 @@
     { "tty",             1, 0, 't' },
     { "debug",           0, 0, 'd' },
-    { "remove-debug",    0, 0, 'D' },
     { "version",         0, 0, 'v' },
     { "help",            0, 0, 'h' },
@@ -88 +85 @@
       opts->tty = g_strdup(optarg);
       break;
-    case 'D':
-      opts->rm_debug = 1;
-      /* fallthrough */
     case 'd':
       opts->debug = 1;
@@ -166 +160 @@
  * was ignored due to user settings or otherwise.
  */
-static int owl_process_message(owl_message *m) {
+int owl_process_message(owl_message *m) {
   const owl_filter *f;
   /* if this message it on the puntlist, nuke it and continue */
@@ -251 +245 @@
 }
 
-static gboolean owl_process_messages_prepare(GSource *source, int *timeout) {
-  *timeout = -1;
-  return owl_global_messagequeue_pending(&g);
-}
-
-static gboolean owl_process_messages_check(GSource *source) {
-  return owl_global_messagequeue_pending(&g);
-}
-
 /*
  * 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.
  */
-static gboolean owl_process_messages_dispatch(GSource *source, GSourceFunc callback, gpointer user_data) {
+int owl_process_messages(owl_ps_action *d, void *p)
+{
   int newmsgs=0;
   int followlast = owl_global_should_followlast(&g);
@@ -287 +274 @@
     owl_mainwin_redisplay(owl_global_get_mainwin(&g));
   }
-  return TRUE;
-}
-
-static GSourceFuncs owl_process_messages_funcs = {
-  owl_process_messages_prepare,
-  owl_process_messages_check,
-  owl_process_messages_dispatch,
-  NULL
-};
-
-void owl_process_input_char(owl_input j)
-{
-  int ret;
-
-  owl_global_set_lastinputtime(&g, time(NULL));
-  ret = owl_keyhandler_process(owl_global_get_keyhandler(&g), j);
-  if (ret!=0 && ret!=1) {
-    owl_function_makemsg("Unable to handle keypress");
-  }
+  return newmsgs;
 }
 
@@ -365 +334 @@
 }
 
-static void sig_handler_main_thread(void *data) {
-  int sig = GPOINTER_TO_INT(data);
-
-  owl_function_debugmsg("Got signal %d", sig);
-  if (sig == SIGWINCH) {
+void sig_handler(int sig, siginfo_t *si, void *data)
+{
+  if (sig==SIGWINCH) {
+    /* we can't inturrupt a malloc here, so it just sets a flag
+     * schedulding a resize for later
+     */
     owl_function_resize();
-  } else if (sig == SIGTERM || sig == SIGHUP) {
+  } 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... */
+    owl_global_set_errsignal(&g, sig, si);
+  } else if (sig==SIGTERM || sig==SIGHUP) {
     owl_function_quit();
-  } else if (sig == SIGINT && owl_global_take_interrupt(&g)) {
-    owl_input in;
-    in.ch = in.uch = owl_global_get_startup_tio(&g)->c_cc[VINTR];
-    owl_process_input_char(in);
-  }
-}
-
-static void sig_handler(const siginfo_t *siginfo, void *data) {
-  /* If it was an interrupt, set a flag so we can handle it earlier if
-   * needbe. sig_handler_main_thread will check the flag to make sure
-   * no one else took it. */
-  if (siginfo->si_signo == SIGINT) {
-    owl_global_add_interrupt(&g);
-  }
-  /* Send a message to the main thread. */
-  owl_select_post_task(sig_handler_main_thread,
-                       GINT_TO_POINTER(siginfo->si_signo), NULL);
-}
-
-#define CHECK_RESULT(s, syscall) \
-  G_STMT_START {                 \
-    if ((syscall) != 0) {        \
-      perror((s));               \
-      exit(1);                   \
-    }                            \
-  } G_STMT_END
+  }
+}
+
+void sigint_handler(int sig, siginfo_t *si, void *data)
+{
+  owl_global_set_interrupted(&g);
+}
+
+static int owl_errsignal_pre_select_action(owl_ps_action *a, void *data)
+{
+  siginfo_t si;
+  int signum;
+  if ((signum = owl_global_get_errsignal_and_clear(&g, &si)) > 0) {
+    owl_function_error("Got unexpected signal: %d %s  (code: %d band: %ld  errno: %d)",
+        signum, signum==SIGPIPE?"SIGPIPE":"SIG????",
+        si.si_code, si.si_band, si.si_errno);
+  }
+  return 0;
+}
 
 void owl_register_signal_handlers(void) {
-  struct sigaction sig_ignore = { .sa_handler = SIG_IGN };
-  struct sigaction sig_default = { .sa_handler = SIG_DFL };
-  sigset_t sigset;
-  int ret, i;
-  const int signals[] = { SIGABRT, SIGBUS, SIGCHLD, SIGFPE, SIGHUP, SIGILL,
-                          SIGINT, SIGQUIT, SIGSEGV, SIGTERM, SIGWINCH };
-
-  /* Sanitize our signals; the mask and dispositions from our parent
-   * aren't really useful. Signal list taken from equivalent code in
-   * Chromium. */
-  CHECK_RESULT("sigemptyset", sigemptyset(&sigset));
-  if ((ret = pthread_sigmask(SIG_SETMASK, &sigset, NULL)) != 0) {
-    errno = ret;
-    perror("pthread_sigmask");
-  }
-  for (i = 0; i < G_N_ELEMENTS(signals); i++) {
-    CHECK_RESULT("sigaction", sigaction(signals[i], &sig_default, NULL));
-  }
-
-  /* Turn off SIGPIPE; we check the return value of write. */
-  CHECK_RESULT("sigaction", sigaction(SIGPIPE, &sig_ignore, NULL));
-
-  /* Register some signals with the signal thread. */
-  CHECK_RESULT("sigaddset", sigaddset(&sigset, SIGWINCH));
-  CHECK_RESULT("sigaddset", sigaddset(&sigset, SIGTERM));
-  CHECK_RESULT("sigaddset", sigaddset(&sigset, SIGHUP));
-  CHECK_RESULT("sigaddset", sigaddset(&sigset, SIGINT));
-  owl_signal_init(&sigset, sig_handler, NULL);
+  struct sigaction sigact;
+
+  /* signal handler */
+  /*sigact.sa_handler=sig_handler;*/
+  sigact.sa_sigaction=sig_handler;
+  sigemptyset(&sigact.sa_mask);
+  sigact.sa_flags=SA_SIGINFO;
+  sigaction(SIGWINCH, &sigact, NULL);
+  sigaction(SIGALRM, &sigact, NULL);
+  sigaction(SIGPIPE, &sigact, NULL);
+  sigaction(SIGTERM, &sigact, NULL);
+  sigaction(SIGHUP, &sigact, NULL);
+
+  sigact.sa_sigaction=sigint_handler;
+  sigaction(SIGINT, &sigact, NULL);
 }
 
@@ -481 +435 @@
 
 #endif /* OWL_STDERR_REDIR */
+
+static int owl_refresh_pre_select_action(owl_ps_action *a, void *data)
+{
+  owl_colorpair_mgr *cpmgr;
+
+  /* if a resize has been scheduled, deal with it */
+  owl_global_check_resize(&g);
+  /* update the terminal if we need to */
+  owl_window_redraw_scheduled();
+  /* On colorpair shortage, reset and redraw /everything/. NOTE: if we
+   * still overflow, this be useless work. With 8-colors, we get 64
+   * pairs. With 256-colors, we get 32768 pairs with ext-colors
+   * support and 256 otherwise. */
+  cpmgr = owl_global_get_colorpair_mgr(&g);
+  if (cpmgr->overflow) {
+    owl_function_debugmsg("colorpairs: used all %d pairs; reset pairs and redraw.",
+                          owl_util_get_colorpairs());
+    owl_fmtext_reset_colorpairs(cpmgr);
+    owl_function_full_redisplay();
+    owl_window_redraw_scheduled();
+  }
+  return 0;
+}
+
 
 int main(int argc, char **argv, char **env)
@@ -490 +468 @@
   const char *dir;
   owl_options opts;
-  GSource *source;
 
   if (!GLIB_CHECK_VERSION (2, 12, 0))
@@ -505 +482 @@
   g.load_initial_subs = opts.load_initial_subs;
 
+  owl_register_signal_handlers();
   owl_start_curses();
 
   /* owl global init */
   owl_global_init(&g);
-  if (opts.rm_debug) unlink(OWL_DEBUG_FILE);
   if (opts.debug) owl_global_set_debug_on(&g);
   if (opts.confdir) owl_global_set_confdir(&g, opts.confdir);
@@ -516 +493 @@
   g_strfreev(argv_copy);
   owl_global_set_haveaim(&g);
-
-  owl_register_signal_handlers();
 
   /* register STDIN dispatch; throw away return, we won't need it */
@@ -577 +552 @@
   owl_function_debugmsg("startup: executing perl startup, if applicable");
   perlout = owl_perlconfig_execute("BarnOwl::Hooks::_startup();");
-  if (perlout) g_free(perlout);
+  g_free(perlout);
 
   /* welcome message */
@@ -610 +585 @@
   owl_global_push_context(&g, OWL_CTX_INTERACTIVE|OWL_CTX_RECV, NULL, "recv", NULL);
 
-  source = owl_window_redraw_source_new();
-  g_source_attach(source, NULL);
-  g_source_unref(source);
-
-  source = g_source_new(&owl_process_messages_funcs, sizeof(GSource));
-  g_source_attach(source, NULL);
-  g_source_unref(source);
+  owl_select_add_pre_select_action(owl_refresh_pre_select_action, NULL, NULL);
+  owl_select_add_pre_select_action(owl_process_messages, NULL, NULL);
+  owl_select_add_pre_select_action(owl_errsignal_pre_select_action, NULL, NULL);
 
   owl_function_debugmsg("startup: entering main loop");
@@ -623 +594 @@
   /* Shut down everything. */
   owl_zephyr_shutdown();
-  owl_signal_shutdown();
   owl_shutdown_curses();
   return 0;