X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmainloop.c;h=dea9e8c16ac293f9b6a62756e6311332309be1b8;hb=224927a7ae0a72615a015731a06db2e3a14e18a3;hp=4dce047ee9dd79cc48aa9f56e687067988591ffb;hpb=861cfbdabee7b97e4eb87f117e5683394d550260;p=chaz%2Fopenbox diff --git a/openbox/mainloop.c b/openbox/mainloop.c index 4dce047e..dea9e8c1 100644 --- a/openbox/mainloop.c +++ b/openbox/mainloop.c @@ -1,4 +1,23 @@ +/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- + + mainloop.c for the Openbox window manager + Copyright (c) 2003 Ben 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 + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + See the COPYING file for a copy of the GNU General Public License. +*/ + #include "mainloop.h" +#include "action.h" #include #include @@ -68,6 +87,8 @@ struct _ObMainLoop gboolean signal_fired; guint signals_fired[NUM_SIGNALS]; GSList *signal_handlers[NUM_SIGNALS]; + + GQueue *action_queue; }; struct _ObMainLoopTimer @@ -157,6 +178,8 @@ ObMainLoop *ob_main_loop_new(Display *display) all_loops = g_slist_prepend(all_loops, loop); + loop->action_queue = g_queue_new(); + return loop; } @@ -207,6 +230,8 @@ void ob_main_loop_destroy(ObMainLoop *loop) } } + g_queue_free(loop->action_queue); + g_free(loop); } } @@ -222,12 +247,18 @@ static void fd_handle_foreach(gpointer key, h->func(h->fd, h->data); } +void ob_main_loop_queue_action(ObMainLoop *loop, ObAction *act) +{ + g_queue_push_tail(loop->action_queue, action_copy(act)); +} + 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; @@ -263,10 +294,17 @@ 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 { /* 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 @@ -489,14 +527,14 @@ static void insert_timer(ObMainLoop *loop, ObMainLoopTimer *ins) { GSList *it; for (it = loop->timers; it; it = g_slist_next(it)) { - ObMainLoopTimer *t = it->data; - if (timecompare(&ins->timeout, &t->timeout) <= 0) { - loop->timers = g_slist_insert_before(loop->timers, it, ins); - break; - } + ObMainLoopTimer *t = it->data; + if (timecompare(&ins->timeout, &t->timeout) >= 0) { + loop->timers = g_slist_insert_before(loop->timers, it, ins); + break; + } } if (it == NULL) /* didnt fit anywhere in the list */ - loop->timers = g_slist_append(loop->timers, ins); + loop->timers = g_slist_append(loop->timers, ins); } void ob_main_loop_timeout_add(ObMainLoop *loop, @@ -566,32 +604,41 @@ static gboolean nearest_timeout_wait(ObMainLoop *loop, GTimeVal *tm) static void timer_dispatch(ObMainLoop *loop, GTimeVal **wait) { + GSList *it, *next; + + gboolean fired = FALSE; + g_get_current_time(&loop->now); - while (loop->timers != NULL) { - ObMainLoopTimer *curr = loop->timers->data; /* get the top element */ - /* since timer_stop doesn't actually free the timer, we have to do our - real freeing in here. - */ - if (curr->del_me) { + for (it = loop->timers; it; it = next) { + ObMainLoopTimer *curr; + + next = g_slist_next(it); + + curr = it->data; + + /* since timer_stop doesn't actually free the timer, we have to do our + real freeing in here. + */ + if (curr->del_me) { /* delete the top */ - loop->timers = g_slist_delete_link(loop->timers, loop->timers); - g_free(curr); - continue; - } + loop->timers = g_slist_delete_link(loop->timers, it); + 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) - break; - - /* we set the last fired time to delay msec after the previous firing, - then re-insert. timers maintain their order and may trigger more - than once if they've waited more than one delay's worth of time. - */ - loop->timers = g_slist_delete_link(loop->timers, loop->timers); - g_time_val_add(&curr->last, curr->delay); - if (curr->func(curr->data)) { + /* the queue is sorted, so if this timer shouldn't fire, none are + ready */ + if (timecompare(&NEAREST_TIMEOUT(loop), &loop->now) < 0) + break; + + /* we set the last fired time to delay msec after the previous firing, + then re-insert. timers maintain their order and may trigger more + than once if they've waited more than one delay's worth of time. + */ + loop->timers = g_slist_delete_link(loop->timers, it); + g_time_val_add(&curr->last, curr->delay); + if (curr->func(curr->data)) { g_time_val_add(&curr->timeout, curr->delay); insert_timer(loop, curr); } else { @@ -600,16 +647,17 @@ static void timer_dispatch(ObMainLoop *loop, GTimeVal **wait) g_free(curr); } - /* if at least one timer fires, then don't wait on X events, as there - may already be some in the queue from the timer callbacks. - */ - loop->ret_wait.tv_sec = loop->ret_wait.tv_usec = 0; - *wait = &loop->ret_wait; - return; + fired = TRUE; } - if (nearest_timeout_wait(loop, &loop->ret_wait)) - *wait = &loop->ret_wait; + if (fired) { + /* if at least one timer fires, then don't wait on X events, as there + may already be some in the queue from the timer callbacks. + */ + loop->ret_wait.tv_sec = loop->ret_wait.tv_usec = 0; + *wait = &loop->ret_wait; + } else if (nearest_timeout_wait(loop, &loop->ret_wait)) + *wait = &loop->ret_wait; else - *wait = NULL; + *wait = NULL; }