From 0d5d92426f9a58eaa5be8b0694c742a53a5577de Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Mon, 15 Sep 2003 03:02:26 +0000 Subject: [PATCH] allow more than one timer to work at a time --- openbox/mainloop.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/openbox/mainloop.c b/openbox/mainloop.c index 041c67f4..9ee20757 100644 --- a/openbox/mainloop.c +++ b/openbox/mainloop.c @@ -566,18 +566,25 @@ 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 */ + 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; } @@ -591,7 +598,7 @@ static void timer_dispatch(ObMainLoop *loop, GTimeVal **wait) 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); -- 2.45.2