diff options
| author | Tiago Cunha <tcunha@gmx.com> | 2009-10-11 23:30:28 +0000 |
|---|---|---|
| committer | Tiago Cunha <tcunha@gmx.com> | 2009-10-11 23:30:28 +0000 |
| commit | 91e4dc83fcfa8c2d4a318d5f23dcebbaeeea2096 (patch) | |
| tree | b5fe84fa223ed89dd3c17d43a56c7c0bb4ef93eb /tmux.c | |
| parent | a4ea6a9d19ef9dc4290a9cd15e352a414198d268 (diff) | |
| download | rtmux-91e4dc83fcfa8c2d4a318d5f23dcebbaeeea2096.tar.gz rtmux-91e4dc83fcfa8c2d4a318d5f23dcebbaeeea2096.tar.bz2 rtmux-91e4dc83fcfa8c2d4a318d5f23dcebbaeeea2096.zip | |
Sync OpenBSD patchset 370:
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.c | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -1,4 +1,4 @@ -/* $Id: tmux.c,v 1.176 2009-10-09 13:07:04 tcunha Exp $ */ +/* $Id: tmux.c,v 1.177 2009-10-11 23:30:28 tcunha Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -51,8 +51,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; @@ -388,6 +386,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); |