summaryrefslogtreecommitdiffstats
path: root/usr.bin/tmux/tmux.c
diff options
context:
space:
mode:
authornicm <nicm@openbsd.org>2009-10-10 09:46:11 +0000
committernicm <nicm@openbsd.org>2009-10-10 09:46:11 +0000
commitbe5c3bab5b05c6bc5de3ff980df60dcbabfe96f5 (patch)
treeacb172671d6b09d76963b6c8af06c6a8dd44b0f2 /usr.bin/tmux/tmux.c
parentInstead of passing a struct pollfd ** around through various functions, build (diff)
downloadwireguard-openbsd-be5c3bab5b05c6bc5de3ff980df60dcbabfe96f5.tar.xz
wireguard-openbsd-be5c3bab5b05c6bc5de3ff980df60dcbabfe96f5.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 'usr.bin/tmux/tmux.c')
-rw-r--r--usr.bin/tmux/tmux.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/usr.bin/tmux/tmux.c b/usr.bin/tmux/tmux.c
index dcb62ec01d9..8172b00291d 100644
--- a/usr.bin/tmux/tmux.c
+++ b/usr.bin/tmux/tmux.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tmux.c,v 1.47 2009/10/09 07:27:00 nicm Exp $ */
+/* $OpenBSD: tmux.c,v 1.48 2009/10/10 09:46:11 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -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);