*/
#include "mainloop.h"
+#include "action.h"
+#include "client.h"
#include <stdio.h>
#include <stdlib.h>
gboolean signal_fired;
guint signals_fired[NUM_SIGNALS];
GSList *signal_handlers[NUM_SIGNALS];
+
+ GSList *action_queue;
};
struct _ObMainLoopTimer
ObMainLoop *loop;
gpointer data;
ObMainLoopXHandler func;
+ ObMainLoopXDoneHandler done_func;
GDestroyNotify destroy;
};
all_loops = g_slist_prepend(all_loops, loop);
+ loop->action_queue = NULL;
+
return 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);
}
}
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;
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 */
+ 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;
/* there is a small race condition here. if a signal occurs
between this if() and the select() then we will not process
}
}
+ client_remove_destructor(ob_main_loop_client_destroy);
+
loop->running = FALSE;
}
void ob_main_loop_x_add(ObMainLoop *loop,
ObMainLoopXHandler handler,
+ ObMainLoopXDoneHandler done_handler,
gpointer data,
GDestroyNotify notify)
{
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);
{
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,
g_get_current_time(&loop->now);
for (it = loop->timers; it; it = next) {
- ObMainLoopTimer *curr;
+ ObMainLoopTimer *curr;
next = g_slist_next(it);
- curr = it->data;
+ 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) {
+ /* 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, it);
- g_free(curr);
- continue;
- }
+ loop->timers = g_slist_delete_link(loop->timers, it);
+ 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)
- break;
-
- /* we set the last fired time to delay msec after the previous firing,
- 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, it);
- g_time_val_add(&curr->last, curr->delay);
- if (curr->func(curr->data)) {
+ /* the queue is sorted, so if this timer shouldn't fire, none are
+ ready */
+ if (timecompare(&NEAREST_TIMEOUT(loop), &loop->now) < 0)
+ break;
+
+ /* we set the last fired time to delay msec after the previous firing,
+ 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, it);
+ g_time_val_add(&curr->last, curr->delay);
+ if (curr->func(curr->data)) {
g_time_val_add(&curr->timeout, curr->delay);
insert_timer(loop, curr);
} else {
}
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;
+ /* 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;
} else if (nearest_timeout_wait(loop, &loop->ret_wait))
- *wait = &loop->ret_wait;
+ *wait = &loop->ret_wait;
else
- *wait = NULL;
+ *wait = NULL;
}
projects / chaz / openbox / blobdiff