X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmainloop.c;h=9676f07e1d3512b375013c813dffe3ac77001ac7;hb=b2b8ad92bfbc60392737fe9945e719b238d34933;hp=6b931957b073b85ca2b8781b95c704a7f29d29c0;hpb=2612dbf0504c9e35171248b44a2b58b63a80b624;p=chaz%2Fopenbox

diff --git a/openbox/mainloop.c b/openbox/mainloop.c
index 6b931957..9676f07e 100644
--- 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
@@ -17,6 +18,8 @@
 */
 
 #include "mainloop.h"
+#include "action.h"
+#include "client.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -86,6 +89,8 @@ struct _ObMainLoop
     gboolean signal_fired;
     guint signals_fired[NUM_SIGNALS];
     GSList *signal_handlers[NUM_SIGNALS];
+
+    GSList *action_queue;
 };
 
 struct _ObMainLoopTimer
@@ -175,6 +180,8 @@ ObMainLoop *ob_main_loop_new(Display *display)
 
     all_loops = g_slist_prepend(all_loops, loop);
 
+    loop->action_queue = NULL;
+
     return loop;
 }
 
@@ -225,6 +232,10 @@ void ob_main_loop_destroy(ObMainLoop *loop)
             }
         }
 
+        for (it = loop->action_queue; it; it = g_slist_next(it))
+            action_unref(it->data);
+        g_slist_free(loop->action_queue);
+
         g_free(loop);
     }
 }
@@ -240,16 +251,37 @@ static void fd_handle_foreach(gpointer key,
         h->func(h->fd, h->data);
 }
 
+void ob_main_loop_queue_action(ObMainLoop *loop, ObAction *act)
+{
+    loop->action_queue = g_slist_append(loop->action_queue, action_copy(act));
+}
+
+static void ob_main_loop_client_destroy(ObClient *client, gpointer data)
+{
+    ObMainLoop *loop = data;
+    GSList *it;
+
+    for (it = loop->action_queue; it; it = g_slist_next(it)) {
+        ObAction *act = it->data;
+
+        if (act->data.any.c == client)
+            act->data.any.c = NULL;
+    }
+}
+
 void ob_main_loop_run(ObMainLoop *loop)
 {
     XEvent e;
     struct timeval *wait;
     fd_set selset;
     GSList *it;
+    ObAction *act;
 
     loop->run = TRUE;
     loop->running = TRUE;
 
+    client_add_destructor(ob_main_loop_client_destroy, loop);
+
     while (loop->run) {
         if (loop->signal_fired) {
             guint i;
@@ -262,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);
                     }
@@ -281,10 +313,36 @@ 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 :) */
+
+            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);
+            }
         } 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
@@ -303,6 +361,8 @@ void ob_main_loop_run(ObMainLoop *loop)
         }
     }
 
+    client_remove_destructor(ob_main_loop_client_destroy);
+
     loop->running = FALSE;
 }
 
@@ -494,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;
@@ -507,14 +567,14 @@ static void insert_timer(ObMainLoop *loop, ObMainLoopTimer *ins)
 {
     GSList *it;
     for (it = loop->timers; it; it = g_slist_next(it)) {
-	ObMainLoopTimer *t = it->data;
-        if (timecompare(&ins->timeout, &t->timeout) <= 0) {
-	    loop->timers = g_slist_insert_before(loop->timers, it, ins);
-	    break;
-	}
+        ObMainLoopTimer *t = it->data;
+        if (timecompare(&ins->timeout, &t->timeout) >= 0) {
+            loop->timers = g_slist_insert_before(loop->timers, it, ins);
+            break;
+        }
     }
     if (it == NULL) /* didnt fit anywhere in the list */
-	loop->timers = g_slist_append(loop->timers, ins);
+        loop->timers = g_slist_append(loop->timers, ins);
 }
 
 void ob_main_loop_timeout_add(ObMainLoop *loop,
@@ -603,13 +663,15 @@ 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)
+        if (timecompare(&NEAREST_TIMEOUT(loop), &loop->now) < 0)
             break;
 
         /* we set the last fired time to delay msec after the previous firing,