Sync OpenBSD patchset 504:
Use timeout events for the identify and message timers.
diff --git a/server-client.c b/server-client.c
index 67af570..7007916 100644
--- a/server-client.c
+++ b/server-client.c
@@ -1,4 +1,4 @@
-/* $Id: server-client.c,v 1.15 2009-11-08 23:09:36 tcunha Exp $ */
+/* $Id: server-client.c,v 1.16 2009-11-08 23:11:23 tcunha Exp $ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -119,8 +119,11 @@
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);
@@ -446,12 +449,6 @@
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) {
/*
diff --git a/server-fn.c b/server-fn.c
index 6dc810a..4684ac8 100644
--- a/server-fn.c
+++ b/server-fn.c
@@ -1,4 +1,4 @@
-/* $Id: server-fn.c,v 1.95 2009-11-08 23:09:36 tcunha Exp $ */
+/* $Id: server-fn.c,v 1.96 2009-11-08 23:11:23 tcunha Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -23,6 +23,8 @@
#include <unistd.h>
#include "tmux.h"
+
+void server_callback_identify(int, short, void *);
void
server_fill_environ(struct session *s, struct environ *env)
@@ -353,10 +355,10 @@
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 @@
}
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/status.c b/status.c
index 05c7658..1e5701b 100644
--- a/status.c
+++ b/status.c
@@ -1,4 +1,4 @@
-/* $Id: status.c,v 1.126 2009-11-08 22:56:04 tcunha Exp $ */
+/* $Id: status.c,v 1.127 2009-11-08 23:11:23 tcunha Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -33,6 +33,7 @@
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 @@
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 @@
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/tmux.h b/tmux.h
index c445b30..f34aba7 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1,4 +1,4 @@
-/* $Id: tmux.h,v 1.503 2009-11-08 23:09:36 tcunha Exp $ */
+/* $Id: tmux.h,v 1.504 2009-11-08 23:11:23 tcunha Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -1073,10 +1073,10 @@
#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;