/* -*- 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>
gboolean signal_fired;
guint signals_fired[NUM_SIGNALS];
GSList *signal_handlers[NUM_SIGNALS];
-
- GSList *action_queue;
};
struct _ObMainLoopTimer
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;
};
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;
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);
}
ObMainLoopXHandlerType *h = it->data;
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);
- }
+ } while (XPending(loop->display) && loop->run);
} 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;
}
}
- 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);
/* 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;
-
+
}
static void insert_timer(ObMainLoop *loop, ObMainLoopTimer *ins)
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;
+ }
}
}
for (it = loop->timers; it; it = next) {
ObMainLoopTimer *curr;
-
+
next = g_slist_next(it);
curr = it->data;
*/
if (curr->del_me) {
/* delete the top */
- loop->timers = g_slist_delete_link(loop->timers, it);
+ 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
+
+ /* the queue is sorted, so if this timer shouldn't fire, none are
ready */
if (timecompare(&NEAREST_TIMEOUT(loop), &loop->now) < 0)
break;
projects / chaz / openbox / blobdiff