add a means to tell the timer destroy function not to fire when for example freeing...

[chaz/openbox] / openbox / mainloop.c

diff --git a/openbox/mainloop.c b/openbox/mainloop.c
index eef794034b3b266cb846b93e39cab00f76b1152f..b59564a2075f192eb05e4e0bc05a8d05e7de892d 100644 (file)
--- a/openbox/mainloop.c
+++ b/openbox/mainloop.c
@@ -1,6 +1,7 @@
 /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    mainloop.c for the Openbox window manager
+   Copyright (c) 2004        Mikael Magnusson
    Copyright (c) 2003        Ben Jansens
 
    This program is free software; you can redistribute it and/or modify
@@ -121,7 +122,6 @@ struct _ObMainLoopXHandlerType
     ObMainLoop *loop;
     gpointer data;
     ObMainLoopXHandler func;
-    ObMainLoopXDoneHandler done_func;
     GDestroyNotify destroy;
 };
 
@@ -294,7 +294,7 @@ void ob_main_loop_run(ObMainLoop *loop)
             for (i = 0; i < NUM_SIGNALS; ++i) {
                 while (loop->signals_fired[i]) {
                     for (it = loop->signal_handlers[i];
-                         it; it = g_slist_next(it)) {
+                            it; it = g_slist_next(it)) {
                         ObMainLoopSignalHandlerType *h = it->data;
                         h->func(i, h->data);
                     }
@@ -314,9 +314,9 @@ void ob_main_loop_run(ObMainLoop *loop)
                 }
             } 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 :) */
+            /* 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;
@@ -325,7 +325,7 @@ void ob_main_loop_run(ObMainLoop *loop)
                 {
                     loop->action_queue =
                         g_slist_delete_link(loop->action_queue,
-                                            loop->action_queue);
+                                loop->action_queue);
                     action_unref(act);
                     act = NULL;
                 }
@@ -341,12 +341,6 @@ void ob_main_loop_run(ObMainLoop *loop)
         } else {
             /* this only runs if there were no x events received */
 
-            for (it = loop->x_handlers; it; it = g_slist_next(it)) {
-                ObMainLoopXHandlerType *h = it->data;
-                if (h->done_func)
-                    h->done_func(h->data);
-            }            
-
             timer_dispatch(loop, (GTimeVal**)&wait);
 
             selset = loop->fd_set;
@@ -381,7 +375,6 @@ void ob_main_loop_exit(ObMainLoop *loop)
 
 void ob_main_loop_x_add(ObMainLoop *loop,
                         ObMainLoopXHandler handler,
-                        ObMainLoopXDoneHandler done_handler,
                         gpointer data,
                         GDestroyNotify notify)
 {
@@ -390,7 +383,6 @@ 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);
@@ -562,9 +554,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;
@@ -616,16 +608,18 @@ void ob_main_loop_timeout_remove(ObMainLoop *loop,
     }
 }
 
-void ob_main_loop_timeout_remove_data(ObMainLoop *loop,
-                                      GSourceFunc handler,
-                                      gpointer data)
+void ob_main_loop_timeout_remove_data(ObMainLoop *loop, GSourceFunc handler,
+                                      gpointer data, gboolean cancel_dest)
 {
     GSList *it;
 
     for (it = loop->timers; it; it = g_slist_next(it)) {
         ObMainLoopTimer *t = it->data;
-        if (t->func == handler && t->data == data)
+        if (t->func == handler && t->data == data) {
             t->del_me = TRUE;
+            if (cancel_dest)
+                t->destroy = NULL;
+        }
     }
 }
 
@@ -671,10 +665,12 @@ 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;
         }
-       
+
         /* the queue is sorted, so if this timer shouldn't fire, none are 
            ready */
         if (timecompare(&NEAREST_TIMEOUT(loop), &loop->now) < 0)