aboutsummaryrefslogtreecommitdiff
path: root/server.c
diff options
context:
space:
mode:
authorTiago Cunha <tcunha@gmx.com>2009-08-31 22:30:15 +0000
committerTiago Cunha <tcunha@gmx.com>2009-08-31 22:30:15 +0000
commited3535db8a5dac03cab96f7fc220b99095423fd0 (patch)
treeedbf02a4b364a56d0d58b1665fdca029acb1bd61 /server.c
parent2fe369831ce005827ff10dafe80532ff18c57641 (diff)
downloadrtmux-ed3535db8a5dac03cab96f7fc220b99095423fd0.tar.gz
rtmux-ed3535db8a5dac03cab96f7fc220b99095423fd0.tar.bz2
rtmux-ed3535db8a5dac03cab96f7fc220b99095423fd0.zip
Sync OpenBSD patchset 302:
Add a new display-panes command, with two options (display-panes-colour and display-panes-time), which displays a visual indication of the number of each pane.
Diffstat (limited to 'server.c')
-rw-r--r--server.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/server.c b/server.c
index 8dc946e0..da22af2a 100644
--- a/server.c
+++ b/server.c
@@ -1,4 +1,4 @@
-/* $Id: server.c,v 1.176 2009-08-31 22:24:18 tcunha Exp $ */
+/* $Id: server.c,v 1.177 2009-08-31 22:30:15 tcunha Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -635,6 +635,9 @@ server_check_timers(struct client *c)
if (gettimeofday(&tv, NULL) != 0)
fatal("gettimeofday");
+ 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);
@@ -812,6 +815,7 @@ server_handle_client(struct client *c)
wp = c->session->curw->window->active; /* could die */
status_message_clear(c);
+ server_clear_identify(c);
if (c->prompt_string != NULL) {
status_prompt_key(c, key);
continue;