aboutsummaryrefslogtreecommitdiff
path: root/tmux.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@openbsd.org>2009-10-10 09:46:11 +0000
committerNicholas Marriott <nicm@openbsd.org>2009-10-10 09:46:11 +0000
commitb7d031cc92a1d9ac3ca8c2a71b76b0a78ea77465 (patch)
tree394d17a68e2b92bf82be36b23206037d25adf7b9 /tmux.c
parent93b353d3532cc12e7e8ca05f59a2199398252df5 (diff)
downloadrtmux-b7d031cc92a1d9ac3ca8c2a71b76b0a78ea77465.tar.gz
rtmux-b7d031cc92a1d9ac3ca8c2a71b76b0a78ea77465.tar.bz2
rtmux-b7d031cc92a1d9ac3ca8c2a71b76b0a78ea77465.zip
Support for individual session idle time locking. May be enabled by turning off
the lock-server option (it is on by default). When this is off, each session locks when it has been idle for the lock-after-time setting. When on, the entire server locks when ALL sessions have been idle for their individual lock-after-time settings. This replaces one global-only option (lock-after-time) with another (lock-server), but the default behaviour is usually preferable so there don't seem to be many alternatives. Diff/idea largely from Thomas Adam, tweaked by me.
Diffstat (limited to 'tmux.c')
-rw-r--r--tmux.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/tmux.c b/tmux.c
index eed7e9e1..cfbf8aac 100644
--- a/tmux.c
+++ b/tmux.c
@@ -46,8 +46,6 @@ struct options global_s_options; /* session options */
struct options global_w_options; /* window options */
struct environ global_environ;
-time_t server_activity;
-
int debug_level;
int be_quiet;
time_t start_time;
@@ -379,6 +377,7 @@ main(int argc, char **argv)
options_set_number(so, "history-limit", 2000);
options_set_number(so, "lock-after-time", 0);
options_set_string(so, "lock-command", "lock -np");
+ options_set_number(so, "lock-server", 1);
options_set_number(so, "message-attr", 0);
options_set_number(so, "message-bg", 3);
options_set_number(so, "message-fg", 0);