Changes in global.c [dc1edbd:6383920]

File:

• global.c (modified) (21 diffs)

global.c

@@ +1 @@
+#include "owl.h"
 #include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-#include <netdb.h>
-#include <termios.h>
 #include <sys/ioctl.h>
-#include <time.h>
-#include "owl.h"
 
 static void _owl_global_init_windows(owl_global *g);
@@ -15 +9 @@
   const char *homedir;
 
+#if !GLIB_CHECK_VERSION(2, 35, 0)
   g_type_init();
+#endif
+#if !GLIB_CHECK_VERSION(2, 31, 0)
   g_thread_init(NULL);
+#endif
 
   owl_select_init();
@@ -47 +45 @@
   owl_dict_create(&(g->filters));
   g->filterlist = NULL;
-  owl_list_create(&(g->puntlist));
+  g->puntlist = g_ptr_array_new();
   g->messagequeue = g_queue_new();
   owl_dict_create(&(g->styledict));
@@ -53 +51 @@
   g->resizepending=0;
   g->direction=OWL_DIRECTION_DOWNWARDS;
-  g->zaway=0;
-  if (has_colors()) {
-    g->hascolors=1;
-  }
-  g->colorpairs=COLOR_PAIRS;
   owl_fmtext_init_colorpair_mgr(&(g->cpmgr));
   g->debug=OWL_DEBUG;
@@ -69 +62 @@
   owl_history_init(&(g->msghist));
   owl_history_init(&(g->cmdhist));
-  owl_history_set_norepeats(&(g->cmdhist));
   g->nextmsgid=0;
 
@@ -83 +75 @@
   g->confdir = NULL;
   g->startupfile = NULL;
-  cd = g_strdup_printf("%s/%s", g->homedir, OWL_CONFIG_DIR);
+  cd = g_build_filename(g->homedir, OWL_CONFIG_DIR, NULL);
   owl_global_set_confdir(g, cd);
   g_free(cd);
 
-  owl_messagelist_create(&(g->msglist));
+  g->msglist = owl_messagelist_new();
 
   _owl_global_init_windows(g);
@@ -109 +101 @@
 
   owl_message_init_fmtext_cache();
-  owl_list_create(&(g->io_dispatch_list));
-  g->timerlist = NULL;
   g->kill_buffer = NULL;
 
   g->interrupt_count = 0;
+#if GLIB_CHECK_VERSION(2, 31, 0)
+  g_mutex_init(&g->interrupt_lock);
+#else
   g->interrupt_lock = g_mutex_new();
+#endif
 }
 
@@ -123 +117 @@
 
   /* Create the widgets */
-  owl_mainwin_init(&(g->mw), g->mainpanel.recwin);
+  g->mw = owl_mainwin_new(g->mainpanel.recwin);
   owl_msgwin_init(&(g->msgwin), g->mainpanel.msgwin);
   owl_sepbar_init(g->mainpanel.sepwin);
@@ -179 +173 @@
 /* Pops the current context from the context stack and returns it. Caller is
  * responsible for freeing. */
-owl_context *owl_global_pop_context_no_delete(owl_global *g) {
+CALLER_OWN owl_context *owl_global_pop_context_no_delete(owl_global *g)
+{
   owl_context *c;
   if (!g->context_stack)
@@ -254 +249 @@
 /* windows */
 
-owl_mainwin *owl_global_get_mainwin(owl_global *g) {
-  return(&(g->mw));
+owl_mainwin *owl_global_get_mainwin(owl_global *g)
+{
+  return g->mw;
 }
 
@@ -269 +265 @@
 
 owl_messagelist *owl_global_get_msglist(owl_global *g) {
-  return(&(g->msglist));
+  return g->msglist;
 }
 
@@ -371 +367 @@
   g->confdir = g_strdup(cd);
   g_free(g->startupfile);
-  g->startupfile = g_strdup_printf("%s/startup", cd);
+  g->startupfile = g_build_filename(cd, "startup", NULL);
 }
 
@@ -512 +508 @@
 
 void owl_global_set_startupargs(owl_global *g, int argc, char **argv) {
-  if (g->startupargs) g_free(g->startupargs);
+  g_free(g->startupargs);
   g->startupargs = g_strjoinv(" ", argv);
 }
@@ -579 +575 @@
 }
 
-/* has colors */
-
-int owl_global_get_hascolors(const owl_global *g) {
-  if (g->hascolors) return(1);
-  return(0);
-}
-
-/* color pairs */
-
-int owl_global_get_colorpairs(const owl_global *g) {
-  return(g->colorpairs);
-}
-
 owl_colorpair_mgr *owl_global_get_colorpair_mgr(owl_global *g) {
   return(&(g->cpmgr));
@@ -598 +581 @@
 /* puntlist */
 
-owl_list *owl_global_get_puntlist(owl_global *g) {
-  return(&(g->puntlist));
+GPtrArray *owl_global_get_puntlist(owl_global *g) {
+  return g->puntlist;
 }
 
 int owl_global_message_is_puntable(owl_global *g, const owl_message *m) {
-  const owl_list *pl;
-  int i, j;
-
-  pl=owl_global_get_puntlist(g);
-  j=owl_list_get_size(pl);
-  for (i=0; i<j; i++) {
-    if (owl_filter_message_match(owl_list_get_element(pl, i), m)) return(1);
-  }
-  return(0);
+  const GPtrArray *pl;
+  int i;
+
+  pl = owl_global_get_puntlist(g);
+  for (i = 0; i < pl->len; i++) {
+    if (owl_filter_message_match(pl->pdata[i], m)) return 1;
+  }
+  return 0;
 }
 
@@ -744 +726 @@
  * necessary.
  */
-owl_message *owl_global_messagequeue_popmsg(owl_global *g)
+CALLER_OWN owl_message *owl_global_messagequeue_popmsg(owl_global *g)
 {
   owl_message *out;
@@ -773 +755 @@
 }
 
-int owl_global_get_style_names(const owl_global *g, owl_list *l) {
-  return owl_dict_get_keys(&(g->styledict), l);
+CALLER_OWN GPtrArray *owl_global_get_style_names(const owl_global *g)
+{
+  return owl_dict_get_keys(&g->styledict);
 }
 
@@ -858 +841 @@
 }
 
-owl_list *owl_global_get_io_dispatch_list(owl_global *g)
-{
-  return &(g->io_dispatch_list);
-}
-
-GList **owl_global_get_timerlist(owl_global *g)
-{
-  return &(g->timerlist);
-}
-
 void owl_global_setup_default_filters(owl_global *g)
 {
@@ -876 +849 @@
   } filters[] = {
     { "personal",
-      "isprivate ^true$ and ( not type ^zephyr$ or ( class ^message  ) )" },
+      "isprivate ^true$ and ( not type ^zephyr$ or ( class ^message$ ) )" },
     { "trash",
       "class ^mail$ or opcode ^ping$ or type ^admin$ or ( not login ^none$ )" },
@@ -883 +856 @@
     { "auto", "opcode ^auto$" },
     { "login", "not login ^none$" },
-    { "reply-lockout", "class ^noc or class ^mail$" },
+    { "reply-lockout", "class ^mail$ or class ^filsrv$" },
     { "out", "direction ^out$" },
     { "aim", "type ^aim$" },
@@ -934 +907 @@
 }
 
+static GMutex *owl_global_get_interrupt_lock(owl_global *g)
+{
+#if GLIB_CHECK_VERSION(2, 31, 0)
+  return &g->interrupt_lock;
+#else
+  return g->interrupt_lock;
+#endif
+}
+
 void owl_global_add_interrupt(owl_global *g) {
   /* TODO: This can almost certainly be done with atomic
    * operations. Whatever. */
-  g_mutex_lock(g->interrupt_lock);
+  g_mutex_lock(owl_global_get_interrupt_lock(g));
   g->interrupt_count++;
-  g_mutex_unlock(g->interrupt_lock);
+  g_mutex_unlock(owl_global_get_interrupt_lock(g));
 }
 
 bool owl_global_take_interrupt(owl_global *g) {
   bool ans = false;
-  g_mutex_lock(g->interrupt_lock);
+  g_mutex_lock(owl_global_get_interrupt_lock(g));
   if (g->interrupt_count > 0) {
     ans = true;
     g->interrupt_count--;
   }
-  g_mutex_unlock(g->interrupt_lock);
+  g_mutex_unlock(owl_global_get_interrupt_lock(g));
   return ans;
 }