diff options
| author | Nicholas Marriott <nicm@openbsd.org> | 2009-11-04 23:29:42 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicm@openbsd.org> | 2009-11-04 23:29:42 +0000 |
| commit | b1264a7416789dad8fad1b4b00a63f99b1ca25e5 (patch) | |
| tree | df5e1caa4db6713325be59dc06ff33da4008a6a2 /server-fn.c | |
| parent | b3c4956efeb62bae3c9ac64eab2371bb6384623a (diff) | |
| download | rtmux-b1264a7416789dad8fad1b4b00a63f99b1ca25e5.tar.gz rtmux-b1264a7416789dad8fad1b4b00a63f99b1ca25e5.tar.bz2 rtmux-b1264a7416789dad8fad1b4b00a63f99b1ca25e5.zip | |
Use timeout events for the identify and message timers.
Diffstat (limited to 'server-fn.c')
| -rw-r--r-- | server-fn.c | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/server-fn.c b/server-fn.c index 66845b91..f31e1337 100644 --- a/server-fn.c +++ b/server-fn.c @@ -24,6 +24,8 @@ #include "tmux.h" +void server_callback_identify(int, short, void *); + void server_fill_environ(struct session *s, struct environ *env) { @@ -353,10 +355,10 @@ server_set_identify(struct client *c) delay = options_get_number(&c->session->options, "display-panes-time"); tv.tv_sec = delay / 1000; tv.tv_usec = (delay % 1000) * 1000L; - - if (gettimeofday(&c->identify_timer, NULL) != 0) - fatal("gettimeofday failed"); - timeradd(&c->identify_timer, &tv, &c->identify_timer); + + evtimer_del(&c->identify_timer); + evtimer_set(&c->identify_timer, server_callback_identify, c); + evtimer_add(&c->identify_timer, &tv); c->flags |= CLIENT_IDENTIFY; c->tty.flags |= (TTY_FREEZE|TTY_NOCURSOR); @@ -374,6 +376,14 @@ server_clear_identify(struct client *c) } void +server_callback_identify(unused int fd, unused short events, void *data) +{ + struct client *c = data; + + server_clear_identify(c); +} + +void server_update_event(struct client *c) { short events; |