+/* -*- 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 <stdio.h>
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 */
+ 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);
+ loop->timers = g_slist_delete_link(loop->timers, it);
g_free(curr);
continue;
}
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);
+ 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 {
- curr->del_me = TRUE;
+ if (curr->destroy)
+ curr->destroy(curr->data);
+ g_free(curr);
}
+ fired = TRUE;
+ }
+
+ 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;
- return;
- }
-
- if (nearest_timeout_wait(loop, &loop->ret_wait))
+ } else if (nearest_timeout_wait(loop, &loop->ret_wait))
*wait = &loop->ret_wait;
else
*wait = NULL;