break focus. or maybe make it better.

[chaz/openbox] / openbox / mainloop.c

diff --git a/openbox/mainloop.c b/openbox/mainloop.c
index 4dce047ee9dd79cc48aa9f56e687067988591ffb..a50a48fb97cf755913831078c3fbf4cfdc196270 100644 (file)
--- a/openbox/mainloop.c
+++ b/openbox/mainloop.c
@@ -1,4 +1,5 @@
 #include "mainloop.h"
+#include "focus.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -99,6 +100,7 @@ struct _ObMainLoopXHandlerType
     ObMainLoop *loop;
     gpointer data;
     ObMainLoopXHandler func;
+    ObMainLoopXDoneHandler done_func;
     GDestroyNotify destroy;
 };
 
@@ -263,6 +265,12 @@ void ob_main_loop_run(ObMainLoop *loop)
                     h->func(&e, h->data);
                 }
             } while (XPending(loop->display));
+
+            for (it = loop->x_handlers; it; it = g_slist_next(it)) {
+                ObMainLoopXHandlerType *h = it->data;
+                if (h->done_func)
+                    h->done_func(h->data);
+            }
         } else {
             /* this only runs if there were no x events received */
 
@@ -297,6 +305,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)
 {
@@ -305,6 +314,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);
@@ -566,16 +576,25 @@ static gboolean nearest_timeout_wait(ObMainLoop *loop, GTimeVal *tm)
 
 static void timer_dispatch(ObMainLoop *loop, GTimeVal **wait)
 {
+    GSList *it, *next;
+
+    gboolean fired = FALSE;
+
     g_get_current_time(&loop->now);
 
-    while (loop->timers != NULL) {
-       ObMainLoopTimer *curr = loop->timers->data; /* get the top element */
+    for (it = loop->timers; it; it = next) {
+       ObMainLoopTimer *curr;
+        
+        next = g_slist_next(it);
+
+       curr = it->data;
+
        /* since timer_stop doesn't actually free the timer, we have to do our
           real freeing in here.
        */
        if (curr->del_me) {
             /* delete the top */
-           loop->timers = g_slist_delete_link(loop->timers, loop->timers); 
+           loop->timers = g_slist_delete_link(loop->timers, it); 
            g_free(curr);
            continue;
        }
@@ -589,7 +608,7 @@ static void timer_dispatch(ObMainLoop *loop, GTimeVal **wait)
           then re-insert.  timers maintain their order and may trigger more
           than once if they've waited more than one delay's worth of time.
        */
-       loop->timers = g_slist_delete_link(loop->timers, loop->timers);
+       loop->timers = g_slist_delete_link(loop->timers, it);
        g_time_val_add(&curr->last, curr->delay);
        if (curr->func(curr->data)) {
             g_time_val_add(&curr->timeout, curr->delay);
@@ -600,15 +619,16 @@ static void timer_dispatch(ObMainLoop *loop, GTimeVal **wait)
             g_free(curr);
         }
 
+        fired = TRUE;
+    }
+
+    if (fired) {
        /* if at least one timer fires, then don't wait on X events, as there
           may already be some in the queue from the timer callbacks.
        */
        loop->ret_wait.tv_sec = loop->ret_wait.tv_usec = 0;
        *wait = &loop->ret_wait;
-       return;
-    }
-
-    if (nearest_timeout_wait(loop, &loop->ret_wait))
+    } else if (nearest_timeout_wait(loop, &loop->ret_wait))
        *wait = &loop->ret_wait;
     else
        *wait = NULL;