summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@cvs.openbsd.org>2009-11-04 23:29:43 +0000
committerNicholas Marriott <nicm@cvs.openbsd.org>2009-11-04 23:29:43 +0000
commit19daa3940ff1a5efcad8306ad6ecda6d708dbd4e (patch)
tree9a6aa5ae028ea2e97a59d1d0ed0aa954c218dcda
parent948d8365576ad37dbb34cd3630c5d60eeb7e270f (diff)
Use timeout events for the identify and message timers.
-rw-r--r--usr.bin/tmux/server-client.c11
-rw-r--r--usr.bin/tmux/server-fn.c20
-rw-r--r--usr.bin/tmux/status.c19
-rw-r--r--usr.bin/tmux/tmux.h6
4 files changed, 36 insertions, 20 deletions
diff --git a/usr.bin/tmux/server-client.c b/usr.bin/tmux/server-client.c
index 87c723ad915..6db511bf4e7 100644
--- a/usr.bin/tmux/server-client.c
+++ b/usr.bin/tmux/server-client.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: server-client.c,v 1.14 2009/11/04 23:12:43 nicm Exp $ */
+/* $OpenBSD: server-client.c,v 1.15 2009/11/04 23:29:42 nicm Exp $ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -120,8 +120,11 @@ server_client_lost(struct client *c)
if (c->title != NULL)
xfree(c->title);
+ evtimer_del(&c->identify_timer);
+
if (c->message_string != NULL)
xfree(c->message_string);
+ evtimer_del(&c->message_timer);
if (c->prompt_string != NULL)
xfree(c->prompt_string);
@@ -448,12 +451,6 @@ server_client_check_timers(struct client *c)
if (gettimeofday(&tv, NULL) != 0)
fatal("gettimeofday failed");
- if (c->flags & CLIENT_IDENTIFY && timercmp(&tv, &c->identify_timer, >))
- server_clear_identify(c);
-
- if (c->message_string != NULL && timercmp(&tv, &c->message_timer, >))
- status_message_clear(c);
-
if (c->message_string != NULL || c->prompt_string != NULL) {
/*
* Don't need timed redraw for messages/prompts so bail now.
diff --git a/usr.bin/tmux/server-fn.c b/usr.bin/tmux/server-fn.c
index 4c026b6df0b..d57f069b6fe 100644
--- a/usr.bin/tmux/server-fn.c
+++ b/usr.bin/tmux/server-fn.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: server-fn.c,v 1.27 2009/11/04 23:12:43 nicm Exp $ */
+/* $OpenBSD: server-fn.c,v 1.28 2009/11/04 23:29:42 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -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;
diff --git a/usr.bin/tmux/status.c b/usr.bin/tmux/status.c
index 94e27f7e764..d27c5c31a83 100644
--- a/usr.bin/tmux/status.c
+++ b/usr.bin/tmux/status.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: status.c,v 1.41 2009/11/04 21:04:43 nicm Exp $ */
+/* $OpenBSD: status.c,v 1.42 2009/11/04 23:29:42 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -33,6 +33,7 @@ char *status_job(struct client *, char **);
void status_job_callback(struct job *);
size_t status_width(struct winlink *);
char *status_print(struct session *, struct winlink *, struct grid_cell *);
+void status_message_callback(int, short, void *);
void status_prompt_add_history(struct client *);
char *status_prompt_complete(const char *);
@@ -579,10 +580,10 @@ status_message_set(struct client *c, const char *fmt, ...)
delay = options_get_number(&c->session->options, "display-time");
tv.tv_sec = delay / 1000;
tv.tv_usec = (delay % 1000) * 1000L;
-
- if (gettimeofday(&c->message_timer, NULL) != 0)
- fatal("gettimeofday failed");
- timeradd(&c->message_timer, &tv, &c->message_timer);
+
+ evtimer_del(&c->message_timer);
+ evtimer_set(&c->message_timer, status_message_callback, c);
+ evtimer_add(&c->message_timer, &tv);
c->tty.flags |= (TTY_NOCURSOR|TTY_FREEZE);
c->flags |= CLIENT_STATUS;
@@ -603,6 +604,14 @@ status_message_clear(struct client *c)
screen_reinit(&c->status);
}
+void
+status_message_callback(unused int fd, unused short event, void *data)
+{
+ struct client *c = data;
+
+ status_message_clear(c);
+}
+
/* Draw client message on status line of present else on last line. */
int
status_message_redraw(struct client *c)
diff --git a/usr.bin/tmux/tmux.h b/usr.bin/tmux/tmux.h
index 5899be357d1..3484032022d 100644
--- a/usr.bin/tmux/tmux.h
+++ b/usr.bin/tmux/tmux.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: tmux.h,v 1.165 2009/11/04 23:12:43 nicm Exp $ */
+/* $OpenBSD: tmux.h,v 1.166 2009/11/04 23:29:42 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -1074,10 +1074,10 @@ struct client {
#define CLIENT_DEAD 0x200
int flags;
- struct timeval identify_timer;
+ struct event identify_timer;
char *message_string;
- struct timeval message_timer;
+ struct event message_timer;
char *prompt_string;
char *prompt_buffer;