X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmainloop.c;h=284de04bcd41a21f6d7685a1528d984c27f1d162;hb=adb9bb700f3235728dacc1d3e3daad81abd93e9a;hp=397f8ae21a4aced2ad6b1949abb9b9bcc59f08fa;hpb=1df4e327607f7dcf56826928efdddb809d8f1fc3;p=chaz%2Fopenbox

diff --git a/openbox/mainloop.c b/openbox/mainloop.c
index 397f8ae2..284de04b 100644
--- a/openbox/mainloop.c
+++ b/openbox/mainloop.c
@@ -1,3 +1,21 @@
+/* -*- 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>
@@ -489,14 +507,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,48 +584,60 @@ 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 if (curr->destroy) {
-            curr->destroy(curr->data);
+        } else {
+            if (curr->destroy)
+                curr->destroy(curr->data);
+            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;
 }