X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmainloop.c;h=26ba4f9be633333e32c7d1424cd2ed0865c01f5e;hb=9d1949f0b168650e38dcb9adf1ad93e8b90a9b44;hp=dea9e8c16ac293f9b6a62756e6311332309be1b8;hpb=87430acf3461a071a1ac48738290513f2fe44951;p=chaz%2Fopenbox diff --git a/openbox/mainloop.c b/openbox/mainloop.c index dea9e8c1..26ba4f9b 100644 --- a/openbox/mainloop.c +++ b/openbox/mainloop.c @@ -1,6 +1,7 @@ /* -*- 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 @@ -18,6 +19,7 @@ #include "mainloop.h" #include "action.h" +#include "client.h" #include #include @@ -88,7 +90,7 @@ struct _ObMainLoop guint signals_fired[NUM_SIGNALS]; GSList *signal_handlers[NUM_SIGNALS]; - GQueue *action_queue; + GSList *action_queue; }; struct _ObMainLoopTimer @@ -178,7 +180,7 @@ ObMainLoop *ob_main_loop_new(Display *display) all_loops = g_slist_prepend(all_loops, loop); - loop->action_queue = g_queue_new(); + loop->action_queue = NULL; return loop; } @@ -230,7 +232,9 @@ void ob_main_loop_destroy(ObMainLoop *loop) } } - g_queue_free(loop->action_queue); + for (it = loop->action_queue; it; it = g_slist_next(it)) + action_unref(it->data); + g_slist_free(loop->action_queue); g_free(loop); } @@ -249,7 +253,20 @@ static void fd_handle_foreach(gpointer key, void ob_main_loop_queue_action(ObMainLoop *loop, ObAction *act) { - g_queue_push_tail(loop->action_queue, action_copy(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) @@ -263,6 +280,8 @@ void ob_main_loop_run(ObMainLoop *loop) loop->run = TRUE; loop->running = TRUE; + client_add_destructor(ob_main_loop_client_destroy, loop); + while (loop->run) { if (loop->signal_fired) { guint i; @@ -275,7 +294,7 @@ void ob_main_loop_run(ObMainLoop *loop) 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); } @@ -294,12 +313,31 @@ void ob_main_loop_run(ObMainLoop *loop) h->func(&e, h->data); } } while (XPending(loop->display)); - } else if ((act = g_queue_pop_head(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 :) */ - act->func(&act->data); - action_unref(act); + } 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); + } } else { /* this only runs if there were no x events received */ @@ -323,6 +361,8 @@ void ob_main_loop_run(ObMainLoop *loop) } } + client_remove_destructor(ob_main_loop_client_destroy); + loop->running = FALSE; } @@ -378,7 +418,8 @@ static void sighandler(gint sig) /* 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. (Signal=%d)\n", sig); /* die with a core dump */ abort(); @@ -514,9 +555,9 @@ void ob_main_loop_fd_remove(ObMainLoop *loop, #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; @@ -568,16 +609,18 @@ void ob_main_loop_timeout_remove(ObMainLoop *loop, } } -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; + } } } @@ -623,10 +666,12 @@ static void timer_dispatch(ObMainLoop *loop, GTimeVal **wait) 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)