consistant glib type usage

[chaz/openbox] / openbox / mainloop.c

diff --git a/openbox/mainloop.c b/openbox/mainloop.c
index 2e7c190be27de20405c2dc5b993d501e7f445c87..0dd3b6b8b4e881497ff3ecc92b755774b5347bfc 100644 (file)
--- a/openbox/mainloop.c
+++ b/openbox/mainloop.c
@@ -121,6 +121,7 @@ struct _ObMainLoopXHandlerType
     ObMainLoop *loop;
     gpointer data;
     ObMainLoopXHandler func;
+    ObMainLoopXDoneHandler done_func;
     GDestroyNotify destroy;
 };
 
@@ -312,51 +313,60 @@ void ob_main_loop_run(ObMainLoop *loop)
                     h->func(&e, h->data);
                 }
             } while (XPending(loop->display));
-        } else if (loop->action_queue) {
-             /* only fire off one action at a time, then go back for more
-                X events, since the action might cause some X events (like
-                FocusIn :) */
+        } else {
+            for (it = loop->x_handlers; it; it = g_slist_next(it)) {
+                ObMainLoopXHandlerType *h = it->data;
+                if (h->done_func)
+                    h->done_func(h->data);
+            }
 
-            do {
-                act = loop->action_queue->data;
-                if (act->data.any.client_action == OB_CLIENT_ACTION_ALWAYS &&
-                    !act->data.any.c)
-                {
+            if (loop->action_queue) {
+                /* only fire off one action at a time, then go back for more
+                   X events, since the action might cause some X events (like
+                   FocusIn :) */
+
+                do {
+                    act = loop->action_queue->data;
+                    if (act->data.any.client_action ==
+                        OB_CLIENT_ACTION_ALWAYS &&
+                        !act->data.any.c)
+                    {
+                        loop->action_queue =
+                            g_slist_delete_link(loop->action_queue,
+                                                loop->action_queue);
+                        action_unref(act);
+                        act = NULL;
+                    }
+                } while (!act && loop->action_queue);
+
+                if  (act) {
+                    act->func(&act->data);
                     loop->action_queue =
                         g_slist_delete_link(loop->action_queue,
                                             loop->action_queue);
                     action_unref(act);
-                    act = NULL;
                 }
-            } while (!act && loop->action_queue);
-
-            if  (act) {
-                act->func(&act->data);
-                loop->action_queue =
-                    g_slist_delete_link(loop->action_queue,
-                                        loop->action_queue);
-                action_unref(act);
+            } else {
+                /* this only runs if there were no x events received */
+
+                timer_dispatch(loop, (GTimeVal**)&wait);
+
+                selset = loop->fd_set;
+                /* there is a small race condition here. if a signal occurs
+                   between this if() and the select() then we will not process
+                   the signal until 'wait' expires. possible solutions include
+                   using GStaticMutex, and having the signal handler set 'wait'
+                   to 0 */
+                if (!loop->signal_fired)
+                    select(loop->fd_max + 1, &selset, NULL, NULL, wait);
+
+                /* handle the X events with highest prioirity */
+                if (FD_ISSET(loop->fd_x, &selset))
+                    continue;
+
+                g_hash_table_foreach(loop->fd_handlers,
+                                     fd_handle_foreach, &selset);
             }
-        } else {
-            /* this only runs if there were no x events received */
-
-            timer_dispatch(loop, (GTimeVal**)&wait);
-
-            selset = loop->fd_set;
-            /* there is a small race condition here. if a signal occurs
-               between this if() and the select() then we will not process
-               the signal until 'wait' expires. possible solutions include
-               using GStaticMutex, and having the signal handler set 'wait'
-               to 0 */
-            if (!loop->signal_fired)
-                select(loop->fd_max + 1, &selset, NULL, NULL, wait);
-
-            /* handle the X events with highest prioirity */
-            if (FD_ISSET(loop->fd_x, &selset))
-                continue;
-
-            g_hash_table_foreach(loop->fd_handlers,
-                                 fd_handle_foreach, &selset);
         }
     }
 
@@ -374,6 +384,7 @@ void ob_main_loop_exit(ObMainLoop *loop)
 
 void ob_main_loop_x_add(ObMainLoop *loop,
                         ObMainLoopXHandler handler,
+                        ObMainLoopXDoneHandler done_handler,
                         gpointer data,
                         GDestroyNotify notify)
 {
@@ -382,6 +393,7 @@ void ob_main_loop_x_add(ObMainLoop *loop,
     h = g_new(ObMainLoopXHandlerType, 1);
     h->loop = loop;
     h->func = handler;
+    h->done_func = done_handler;
     h->data = data;
     h->destroy = notify;
     loop->x_handlers = g_slist_prepend(loop->x_handlers, h);
@@ -553,9 +565,9 @@ void ob_main_loop_fd_remove(ObMainLoop *loop,
 #define NEAREST_TIMEOUT(loop) \
     (((ObMainLoopTimer*)(loop)->timers->data)->timeout)
 
-static long timecompare(GTimeVal *a, GTimeVal *b)
+static glong timecompare(GTimeVal *a, GTimeVal *b)
 {
-    long r;
+    glong r;
 
     if ((r = b->tv_sec - a->tv_sec)) return r;
     return b->tv_usec - a->tv_usec;
@@ -662,6 +674,8 @@ static void timer_dispatch(ObMainLoop *loop, GTimeVal **wait)
         if (curr->del_me) {
             /* delete the top */
             loop->timers = g_slist_delete_link(loop->timers, it); 
+            if (curr->destroy)
+                curr->destroy(curr->data);
             g_free(curr);
             continue;
         }