Changes in zephyr.c [f203cad:cd28517]

File:

• zephyr.c (modified) (9 diffs)

zephyr.c

@@ -7 +7 @@
 #include "owl.h"
 
+static GSource *owl_zephyr_event_source_new(int fd);
+
+static gboolean owl_zephyr_event_prepare(GSource *source, int *timeout);
+static gboolean owl_zephyr_event_check(GSource *source);
+static gboolean owl_zephyr_event_dispatch(GSource *source, GSourceFunc callback, gpointer user_data);
+
 #ifdef HAVE_LIBZEPHYR
 static GList *deferred_subs = NULL;
@@ -16 +22 @@
 
 Code_t ZResetAuthentication(void);
+
+static GSourceFuncs zephyr_event_funcs = {
+  owl_zephyr_event_prepare,
+  owl_zephyr_event_check,
+  owl_zephyr_event_dispatch,
+  NULL
+};
 #endif
 
@@ -84 +97 @@
   Code_t code;
   char *perl;
+  GSource *event_source;
 
   owl_select_remove_io_dispatch(d);
@@ -99 +113 @@
   }
 
-  owl_select_add_io_dispatch(ZGetFD(), OWL_IO_READ|OWL_IO_EXCEPT, &owl_zephyr_process_events, NULL, NULL);
+  event_source = owl_zephyr_event_source_new(ZGetFD());
+  g_source_attach(event_source, NULL);
+  g_source_unref(event_source);
 
   owl_global_set_havezephyr(&g);
@@ -127 +143 @@
   perl = owl_perlconfig_execute("BarnOwl::Zephyr::_zephyr_startup()");
   g_free(perl);
-
-  owl_select_add_pre_select_action(owl_zephyr_pre_select_action, NULL, NULL);
 }
 
@@ -180 +194 @@
     if((code = ZPending()) < 0) {
       owl_function_debugmsg("Error (%s) in ZPending()\n",
+                            error_message(code));
+      return 0;
+    }
+    return code;
+  }
+#endif
+  return 0;
+}
+
+int owl_zephyr_zqlength(void)
+{
+#ifdef HAVE_LIBZEPHYR
+  Code_t code;
+  if(owl_global_is_havezephyr(&g)) {
+    if((code = ZQLength()) < 0) {
+      owl_function_debugmsg("Error (%s) in ZQLength()\n",
                             error_message(code));
       return 0;
@@ -1019 +1049 @@
 {
 #ifdef HAVE_LIBZEPHYR
+  char *exposure, *eset;
+  Code_t ret;
+
   ZResetAuthentication();
 
-  /* ZSetLocation, and store the default value as the current value */
-  owl_global_set_exposure(&g, owl_global_get_default_exposure(&g));
+  eset = EXPOSE_REALMVIS;
+  exposure = ZGetVariable(zstr("exposure"));
+  if (exposure)
+    exposure = ZParseExposureLevel(exposure);
+  if (exposure)
+    eset = exposure;
+   
+  ret = ZSetLocation(eset);
+  if (ret != ZERR_NONE)
+    owl_function_error("Error setting location: %s", error_message(ret));
 #endif
 }
@@ -1143 +1184 @@
   ZInitLocationInfo(zstr(host), zstr(val));
 #endif
-}
-
-const char *owl_zephyr_normalize_exposure(const char *exposure)
-{
-  if (exposure == NULL)
-    return NULL;
-#ifdef HAVE_LIBZEPHYR
-  return ZParseExposureLevel(zstr(exposure));
-#else
-  return exposure;
-#endif
-}
-
-int owl_zephyr_set_default_exposure(const char *exposure)
-{
-#ifdef HAVE_LIBZEPHYR
-  Code_t ret;
-  if (exposure == NULL)
-    return -1;
-  exposure = ZParseExposureLevel(zstr(exposure));
-  if (exposure == NULL)
-    return -1;
-  ret = ZSetVariable(zstr("exposure"), zstr(exposure)); /* ZSetVariable does file I/O */
-  if (ret != ZERR_NONE) {
-    owl_function_error("Unable to set default exposure location: %s", error_message(ret));
-    return -1;
-  }
-#endif
-  return 0;
-}
-
-const char *owl_zephyr_get_default_exposure(void)
-{
-#ifdef HAVE_LIBZEPHYR
-  const char *exposure = ZGetVariable(zstr("exposure")); /* ZGetVariable does file I/O */
-  if (exposure == NULL)
-    return EXPOSE_REALMVIS;
-  exposure = ZParseExposureLevel(zstr(exposure));
-  if (exposure == NULL) /* The user manually entered an invalid value in ~/.zephyr.vars, or something weird happened. */
-    return EXPOSE_REALMVIS;
-  return exposure;
-#else
-  return "";
-#endif
-}
-
-int owl_zephyr_set_exposure(const char *exposure)
-{
-#ifdef HAVE_LIBZEPHYR
-  Code_t ret;
-  if (exposure == NULL)
-    return -1;
-  exposure = ZParseExposureLevel(zstr(exposure));
-  if (exposure == NULL)
-    return -1;
-  ret = ZSetLocation(zstr(exposure));
-  if (ret != ZERR_NONE) {
-    owl_function_error("Unable to set exposure level: %s.", error_message(ret));
-    return -1;
-  }
-#endif
-  return 0;
 }
   
@@ -1470 +1449 @@
 }
 
-void owl_zephyr_process_events(const owl_io_dispatch *d, void *data)
-{
+typedef struct { /*noproto*/
+  GSource source;
+  GPollFD poll_fd;
+} owl_zephyr_event_source;
+
+static GSource *owl_zephyr_event_source_new(int fd) {
+  GSource *source;
+  owl_zephyr_event_source *event_source;
+
+  source = g_source_new(&zephyr_event_funcs, sizeof(owl_zephyr_event_source));
+  event_source = (owl_zephyr_event_source*) source;
+  event_source->poll_fd.fd = fd;
+  event_source->poll_fd.events = G_IO_IN | G_IO_HUP | G_IO_PRI | G_IO_ERR;
+  g_source_add_poll(source, &event_source->poll_fd);
+
+  return source;
+}
+
+static gboolean owl_zephyr_event_prepare(GSource *source, int *timeout) {
+  *timeout = -1;
+  return owl_zephyr_zqlength() > 0;
+}
+
+static gboolean owl_zephyr_event_check(GSource *source) {
+  owl_zephyr_event_source *event_source = (owl_zephyr_event_source*)source;
+  if (event_source->poll_fd.revents & event_source->poll_fd.events)
+    return owl_zephyr_zpending() > 0;
+  return FALSE;
+}
+
+static gboolean owl_zephyr_event_dispatch(GSource *source, GSourceFunc callback, gpointer user_data) {
   _owl_zephyr_process_events();
-}
-
-int owl_zephyr_pre_select_action(owl_ps_action *a, void *p)
-{
-  return _owl_zephyr_process_events();
-}
+  return TRUE;
+}