queue up ObActions and run them when idle
Dana Jansens danakj@orodu.net
2 files changed,
26 insertions(+),
0 deletions(-)
M
openbox/mainloop.c
→
openbox/mainloop.c
@@ -17,6 +17,7 @@ See the COPYING file for a copy of the GNU General Public License.
*/ #include "mainloop.h" +#include "action.h" #include <stdio.h> #include <stdlib.h>@@ -86,6 +87,8 @@
gboolean signal_fired; guint signals_fired[NUM_SIGNALS]; GSList *signal_handlers[NUM_SIGNALS]; + + GQueue *action_queue; }; struct _ObMainLoopTimer@@ -174,6 +177,8 @@ }
} all_loops = g_slist_prepend(all_loops, loop); + + loop->action_queue = g_queue_new(); return loop; }@@ -225,6 +230,8 @@ }
} } + g_queue_free(loop->action_queue); + g_free(loop); } }@@ -240,12 +247,18 @@ if (FD_ISSET(h->fd, set))
h->func(h->fd, h->data); } +void ob_main_loop_queue_action(ObMainLoop *loop, ObAction *act) +{ + g_queue_push_tail(loop->action_queue, action_copy(act)); +} + 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;@@ -281,10 +294,17 @@ ObMainLoopXHandlerType *h = it->data;
h->func(&e, h->data); } } while (XPending(loop->display)); + } else if ((act = g_queue_pop_head(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 :) */ + act->func(&act->data); + 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
M
openbox/mainloop.h
→
openbox/mainloop.h
@@ -67,6 +67,12 @@ void ob_main_loop_timeout_remove_data(ObMainLoop *loop,
GSourceFunc handler, gpointer data); +struct _ObAction; + +/*! Queues an action, which will be run when there are no more X events + to process */ +void ob_main_loop_queue_action(ObMainLoop *loop, struct _ObAction *act); + void ob_main_loop_run(ObMainLoop *loop); void ob_main_loop_exit(ObMainLoop *loop);