From 85112c4d0831067251de1295fbb6974db94af2ba Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Thu, 10 Jul 2003 17:06:30 +0000 Subject: [PATCH] prefix the Timer->ObTimer and TimeoutHandler->ObTimeoutHandler shitz --- openbox/dock.c | 2 +- openbox/dock.h | 2 +- openbox/screen.c | 2 +- openbox/timer.c | 14 +++++++------- openbox/timer.h | 15 +++++++++------ plugins/keyboard/keyboard.c | 2 +- plugins/menu/timed_menu.c | 2 +- 7 files changed, 21 insertions(+), 18 deletions(-) diff --git a/openbox/dock.c b/openbox/dock.c index da9bdd2a..ccea0ad0 100644 --- a/openbox/dock.c +++ b/openbox/dock.c @@ -518,7 +518,7 @@ void dock_hide(gboolean hide) } else { g_assert(!dock->hide_timer); dock->hide_timer = timer_start(config_dock_hide_timeout * 1000, - (TimeoutHandler)hide_timeout, + (ObTimeoutHandler)hide_timeout, NULL); } } diff --git a/openbox/dock.h b/openbox/dock.h index aa18da84..99cc01f3 100644 --- a/openbox/dock.h +++ b/openbox/dock.h @@ -28,7 +28,7 @@ struct _ObDock gint h; gboolean hidden; - Timer *hide_timer; + ObTimer *hide_timer; GList *dock_apps; }; diff --git a/openbox/screen.c b/openbox/screen.c index e2e141dd..a83c5710 100644 --- a/openbox/screen.c +++ b/openbox/screen.c @@ -46,7 +46,7 @@ static Window support_window = None; #ifdef USE_LIBSN static SnMonitorContext *sn_context; static int sn_busy_cnt; -static Timer *sn_timer = NULL; +static ObTimer *sn_timer = NULL; static void sn_event_func(SnMonitorEvent *event, void *data); #endif diff --git a/openbox/timer.c b/openbox/timer.c index e4591544..b49f4dea 100644 --- a/openbox/timer.c +++ b/openbox/timer.c @@ -8,7 +8,7 @@ static GTimeVal now; static GTimeVal ret_wait; static GSList *timers; /* nearest timer is at the top */ -#define NEAREST_TIMEOUT (((Timer*)timers->data)->timeout) +#define NEAREST_TIMEOUT (((ObTimer*)timers->data)->timeout) static long timecompare(GTimeVal *a, GTimeVal *b) { @@ -19,11 +19,11 @@ static long timecompare(GTimeVal *a, GTimeVal *b) } -static void insert_timer(Timer *self) +static void insert_timer(ObTimer *self) { GSList *it; for (it = timers; it != NULL; it = it->next) { - Timer *t = it->data; + ObTimer *t = it->data; if (timecompare(&self->timeout, &t->timeout) <= 0) { timers = g_slist_insert_before(timers, it, self); break; @@ -49,9 +49,9 @@ void timer_shutdown() timers = NULL; } -Timer *timer_start(long delay, TimeoutHandler cb, void *data) +ObTimer *timer_start(long delay, ObTimeoutHandler cb, void *data) { - Timer *self = g_new(Timer, 1); + ObTimer *self = g_new(ObTimer, 1); self->delay = delay; self->action = cb; self->data = data; @@ -64,7 +64,7 @@ Timer *timer_start(long delay, TimeoutHandler cb, void *data) return self; } -void timer_stop(Timer *self) +void timer_stop(ObTimer *self) { self->del_me = TRUE; } @@ -96,7 +96,7 @@ void timer_dispatch(GTimeVal **wait) g_get_current_time(&now); while (timers != NULL) { - Timer *curr = timers->data; /* get the top element */ + ObTimer *curr = timers->data; /* get the top element */ /* since timer_stop doesn't actually free the timer, we have to do our real freeing in here. */ diff --git a/openbox/timer.h b/openbox/timer.h index e50ffa8c..549490c5 100644 --- a/openbox/timer.h +++ b/openbox/timer.h @@ -3,14 +3,17 @@ #include +typedef struct _ObTimer ObTimer; + /*! Data type of Timer callback */ -typedef void (*TimeoutHandler)(void *data); +typedef void (*ObTimeoutHandler)(void *data); -typedef struct Timer { +struct _ObTimer +{ /*! Microseconds between timer firings */ long delay; /*! Callback for timer expiry */ - TimeoutHandler action; + ObTimeoutHandler action; /*! Data sent to callback */ void *data; /*! We overload the delete operator to just set this to true */ @@ -19,7 +22,7 @@ typedef struct Timer { GTimeVal last; /*! When this timer will next trigger */ GTimeVal timeout; -} Timer; +}; /*! Initializes the timer subsection */ void timer_startup(); @@ -27,9 +30,9 @@ void timer_startup(); void timer_shutdown(); /* Creates a new timer with a given delay */ -Timer *timer_start(long delay, TimeoutHandler cb, void *data); +ObTimer *timer_start(long delay, ObTimeoutHandler cb, void *data); /* Stops and frees a timer */ -void timer_stop(Timer *self); +void timer_stop(ObTimer *self); /*! Dispatch all pending timers. Sets wait to the amount of time to wait for the next timer, or NULL if there are no timers to wait for */ diff --git a/plugins/keyboard/keyboard.c b/plugins/keyboard/keyboard.c index b1923af3..0fc43e83 100644 --- a/plugins/keyboard/keyboard.c +++ b/plugins/keyboard/keyboard.c @@ -80,7 +80,7 @@ KeyBindingTree *firstnode = NULL; static KeyBindingTree *curpos; static guint reset_key, reset_state; -static Timer *chain_timer; +static ObTimer *chain_timer; static void grab_for_window(Window win, gboolean grab) { diff --git a/plugins/menu/timed_menu.c b/plugins/menu/timed_menu.c index 19a24f14..e7665b56 100644 --- a/plugins/menu/timed_menu.c +++ b/plugins/menu/timed_menu.c @@ -26,7 +26,7 @@ typedef enum { typedef struct { Timed_Menu_Type type; - Timer *timer; + ObTimer *timer; char *command; /* for the PIPE */ char *buf; /* buffer to hold partially read menu */ unsigned long buflen; /* how many bytes are in the buffer */ -- 2.45.2