aboutsummaryrefslogtreecommitdiff
path: root/input.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2015-06-20 08:45:19 +0100
committerNicholas Marriott <nicholas.marriott@gmail.com>2015-06-20 08:45:19 +0100
commit8b8a007e8e1faa6af20acdeac728c4fddfeb2f6b (patch)
tree10612c9842dbdb0749e0840cf057ca4a08a84948 /input.c
parent8abcea18a24dea24d6049fefa31c877133489092 (diff)
parent0ef3e28609ba89f53bedf40f5facc990cc57e60d (diff)
downloadrtmux-8b8a007e8e1faa6af20acdeac728c4fddfeb2f6b.tar.gz
rtmux-8b8a007e8e1faa6af20acdeac728c4fddfeb2f6b.tar.bz2
rtmux-8b8a007e8e1faa6af20acdeac728c4fddfeb2f6b.zip
Merge branch 'master' of github.com:tmux/tmux
Diffstat (limited to 'input.c')
-rw-r--r--input.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/input.c b/input.c
index 7a371c62..d1ff17fe 100644
--- a/input.c
+++ b/input.c
@@ -20,6 +20,7 @@
#include <stdlib.h>
#include <string.h>
+#include <time.h>
#include "tmux.h"
@@ -849,6 +850,9 @@ input_parse(struct window_pane *wp)
wp->window->flags |= WINDOW_ACTIVITY;
wp->window->flags &= ~WINDOW_SILENCE;
+ if (gettimeofday(&wp->window->activity_time, NULL) != 0)
+ fatal("gettimeofday failed");
+
/*
* Open the screen. Use NULL wp if there is a mode set as don't want to
* update the tty.