mainloop.c for the Openbox window manager
Copyright (c) 2006 Mikael Magnusson
- Copyright (c) 2003 Ben Jansens
+ Copyright (c) 2003-2007 Dana Jansens
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#include "mainloop.h"
#include "action.h"
#include "client.h"
+#include "event.h"
#include <stdio.h>
#include <stdlib.h>
gulong delay;
GSourceFunc func;
gpointer data;
+ GEqualFunc equal;
GDestroyNotify destroy;
/* The timer needs to be freed */
loop->run = TRUE;
loop->running = TRUE;
- client_add_destructor(ob_main_loop_client_destroy, loop);
+ client_add_destroy_notify(ob_main_loop_client_destroy, loop);
while (loop->run) {
if (loop->signal_fired) {
ObMainLoopXHandlerType *h = it->data;
h->func(&e, h->data);
}
- } while (XPending(loop->display));
+ } while (XPending(loop->display) && loop->run);
} 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
{
loop->action_queue =
g_slist_delete_link(loop->action_queue,
- loop->action_queue);
+ loop->action_queue);
action_unref(act);
act = NULL;
}
- } while (!act && loop->action_queue);
+ } while (!act && loop->action_queue && loop->run);
if (act) {
+ event_curtime = act->data.any.time;
act->func(&act->data);
+ event_curtime = CurrentTime;
loop->action_queue =
g_slist_delete_link(loop->action_queue,
loop->action_queue);
}
}
- client_remove_destructor(ob_main_loop_client_destroy);
+ client_remove_destroy_notify(ob_main_loop_client_destroy);
loop->running = FALSE;
}
gulong microseconds,
GSourceFunc handler,
gpointer data,
+ GEqualFunc cmp,
GDestroyNotify notify)
{
ObMainLoopTimer *t = g_new(ObMainLoopTimer, 1);
t->delay = microseconds;
t->func = handler;
t->data = data;
+ t->equal = cmp;
t->destroy = notify;
t->del_me = FALSE;
g_get_current_time(&loop->now);
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->equal(t->data, data)) {
t->del_me = TRUE;
if (cancel_dest)
t->destroy = NULL;