X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmainloop.c;h=2af81629e429cc6abeb880c8e59dc0d883f09435;hb=cdb108c76d20e8272bfbd15919e32e609d685322;hp=61c927052ed3b0edc100d255a32b87ba82d8a0d7;hpb=4d50b21835d7dd00ecc40efd64c5573d7e048500;p=chaz%2Fopenbox

diff --git a/openbox/mainloop.c b/openbox/mainloop.c
index 61c92705..2af81629 100644
--- a/openbox/mainloop.c
+++ b/openbox/mainloop.c
@@ -2,7 +2,7 @@
 
    mainloop.c for the Openbox window manager
    Copyright (c) 2006        Mikael Magnusson
-   Copyright (c) 2003        Ben Jansens
+   Copyright (c) 2003-2007   Dana 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
@@ -20,6 +20,7 @@
 #include "mainloop.h"
 #include "action.h"
 #include "client.h"
+#include "event.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -98,6 +99,7 @@ struct _ObMainLoopTimer
     gulong delay;
     GSourceFunc func;
     gpointer data;
+    GEqualFunc equal;
     GDestroyNotify destroy;
 
     /* The timer needs to be freed */
@@ -325,14 +327,16 @@ void ob_main_loop_run(ObMainLoop *loop)
                 {
                     loop->action_queue =
                         g_slist_delete_link(loop->action_queue,
-                                loop->action_queue);
+                                            loop->action_queue);
                     action_unref(act);
                     act = NULL;
                 }
             } while (!act && loop->action_queue);
 
             if  (act) {
+                event_curtime = act->data.any.time;
                 act->func(&act->data);
+                event_curtime = CurrentTime;
                 loop->action_queue =
                     g_slist_delete_link(loop->action_queue,
                                         loop->action_queue);
@@ -418,7 +422,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. (Openbox received signal %d)\n", sig);
 
             /* die with a core dump */
             abort();
@@ -581,12 +586,14 @@ void ob_main_loop_timeout_add(ObMainLoop *loop,
                               gulong microseconds,
                               GSourceFunc handler,
                               gpointer data,
+                              GEqualFunc cmp,
                               GDestroyNotify notify)
 {
     ObMainLoopTimer *t = g_new(ObMainLoopTimer, 1);
     t->delay = microseconds;
     t->func = handler;
     t->data = data;
+    t->equal = cmp;
     t->destroy = notify;
     t->del_me = FALSE;
     g_get_current_time(&loop->now);
@@ -615,7 +622,7 @@ void ob_main_loop_timeout_remove_data(ObMainLoop *loop, GSourceFunc handler,
 
     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->equal(t->data, data)) {
             t->del_me = TRUE;
             if (cancel_dest)
                 t->destroy = NULL;