summaryrefslogtreecommitdiff
path: root/openbox
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2003-09-22 03:37:22 +0000
committerDana Jansens <danakj@orodu.net>2003-09-22 03:37:22 +0000
commit2612dbf0504c9e35171248b44a2b58b63a80b624 (patch)
tree65fe799a595380f2bc87eb4ea71d72ee8ee552e8 /openbox
parentd9e08487dffd010f4434d24b98a3a571b2e5a600 (diff)
indenting
Diffstat (limited to 'openbox')
-rw-r--r--openbox/mainloop.c56
1 files changed, 28 insertions, 28 deletions
diff --git a/openbox/mainloop.c b/openbox/mainloop.c
index b8b7e698..6b931957 100644
--- a/openbox/mainloop.c
+++ b/openbox/mainloop.c
@@ -591,34 +591,34 @@ static void timer_dispatch(ObMainLoop *loop, GTimeVal **wait)
g_get_current_time(&loop->now);
for (it = loop->timers; it; it = next) {
- ObMainLoopTimer *curr;
+ ObMainLoopTimer *curr;
next = g_slist_next(it);
- curr = it->data;
+ 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) {
+ /* 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, it);
- 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 */
+ /* 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)) {
+ 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 {
@@ -631,13 +631,13 @@ static void timer_dispatch(ObMainLoop *loop, GTimeVal **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;
+ /* 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;
+ *wait = &loop->ret_wait;
else
- *wait = NULL;
+ *wait = NULL;
}