X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmainloop.c;h=62261dde0af6e52dd2b215aea6a12f8c659e8cd2;hb=4c672be2e1f39e72eb7d7e99f129e61338f481b2;hp=7db4291061985ce5ed15314cd51b9e022907b95b;hpb=092ef0e6dd1e911e0b95c77d644aac51d31c9aaa;p=chaz%2Fopenbox diff --git a/openbox/mainloop.c b/openbox/mainloop.c index 7db42910..62261dde 100644 --- a/openbox/mainloop.c +++ b/openbox/mainloop.c @@ -20,6 +20,7 @@ #include "mainloop.h" #include "action.h" #include "client.h" +#include "event.h" #include #include @@ -98,6 +99,7 @@ struct _ObMainLoopTimer gulong delay; GSourceFunc func; gpointer data; + GEqualFunc equal; GDestroyNotify destroy; /* The timer needs to be freed */ @@ -325,14 +327,16 @@ void ob_main_loop_run(ObMainLoop *loop) { 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); 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); @@ -582,12 +586,14 @@ void ob_main_loop_timeout_add(ObMainLoop *loop, 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); @@ -616,7 +622,7 @@ void ob_main_loop_timeout_remove_data(ObMainLoop *loop, GSourceFunc handler, 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;