/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
mainloop.c for the Openbox window manager
+ Copyright (c) 2006 Mikael Magnusson
Copyright (c) 2003 Ben Jansens
This program is free software; you can redistribute it and/or modify
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);
}
}
} 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 :) */
+ /* 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;
{
loop->action_queue =
g_slist_delete_link(loop->action_queue,
- loop->action_queue);
+ loop->action_queue);
action_unref(act);
act = NULL;
}
/* XXX special case for signals that default to core dump.
but throw some helpful output here... */
- fprintf(stderr, "Fuck yah. Core dump. (Signal=%d)\n", sig);
+ fprintf(stderr, "How are you gentlemen? All your base are"
+ " belong to us. (Openbox received signal %d)\n", sig);
/* die with a core dump */
abort();
#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;
}
}
-void ob_main_loop_timeout_remove_data(ObMainLoop *loop,
- GSourceFunc handler,
- gpointer data)
+void ob_main_loop_timeout_remove_data(ObMainLoop *loop, GSourceFunc handler,
+ gpointer data, gboolean cancel_dest)
{
GSList *it;
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->data == data) {
t->del_me = TRUE;
+ if (cancel_dest)
+ t->destroy = NULL;
+ }
}
}
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)