/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
mainloop.c for the Openbox window manager
- Copyright (c) 2003 Ben Jansens
+ Copyright (c) 2006 Mikael Magnusson
+ 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 */
ObMainLoop *loop;
gpointer data;
ObMainLoopXHandler func;
- ObMainLoopXDoneHandler done_func;
GDestroyNotify destroy;
};
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) {
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);
}
h->func(&e, h->data);
}
} while (XPending(loop->display));
- } else {
- for (it = loop->x_handlers; it; it = g_slist_next(it)) {
- ObMainLoopXHandlerType *h = it->data;
- if (h->done_func)
- h->done_func(h->data);
- }
-
- 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);
+ } 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 :) */
- if (act) {
- act->func(&act->data);
+ 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;
}
- } 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
- the signal until 'wait' expires. possible solutions include
- using GStaticMutex, and having the signal handler set 'wait'
- to 0 */
- if (!loop->signal_fired)
- select(loop->fd_max + 1, &selset, NULL, NULL, wait);
-
- /* handle the X events with highest prioirity */
- if (FD_ISSET(loop->fd_x, &selset))
- continue;
-
- g_hash_table_foreach(loop->fd_handlers,
- fd_handle_foreach, &selset);
+ } 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);
+ 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
+ the signal until 'wait' expires. possible solutions include
+ using GStaticMutex, and having the signal handler set 'wait'
+ to 0 */
+ if (!loop->signal_fired)
+ select(loop->fd_max + 1, &selset, NULL, NULL, wait);
+
+ /* handle the X events with highest prioirity */
+ if (FD_ISSET(loop->fd_x, &selset))
+ continue;
+
+ g_hash_table_foreach(loop->fd_handlers,
+ fd_handle_foreach, &selset);
}
}
- client_remove_destructor(ob_main_loop_client_destroy);
+ client_remove_destroy_notify(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);
/* 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();
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);
}
}
-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->equal(t->data, data)) {
t->del_me = TRUE;
+ if (cancel_dest)
+ t->destroy = NULL;
+ }
}
}
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)
projects / chaz / openbox / blobdiff