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.1 | |
| 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.1')
| -rw-r--r-- | tmux.1 | 29 |
1 files changed, 21 insertions, 8 deletions
@@ -1,4 +1,4 @@ -.\" $Id: tmux.1,v 1.181 2009-10-09 13:07:04 tcunha Exp $ +.\" $Id: tmux.1,v 1.182 2009-10-11 23:30:28 tcunha Exp $ .\" .\" Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> .\" @@ -14,7 +14,7 @@ .\" IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: October 9 2009 $ +.Dd $Mdocdate: October 10 2009 $ .Dt TMUX 1 .Os .Sh NAME @@ -1253,20 +1253,33 @@ Set the maximum number of lines held in window history. This setting applies only to new windows - existing window histories are not resized and retain the limit at the point they were created. .It Ic lock-after-time Ar number -Lock the server (like the -.Ic lock-server +Lock the session (like the +.Ic lock-session command) after .Ar number -seconds of inactivity. -The default is off (set to 0). -This has no effect as a session option; it must be set as a global option using -.Fl g . +seconds of inactivity, or the entire server (all sessions) if the +.Ic lock-server +option is set. +The default is not to lock (set to 0). .It Ic lock-command Ar command Command to run when locking each client. The default is to run .Xr lock 1 with .Fl np . +.It Xo Ic lock-server +.Op Ic on | off +.Xc +If this option is +.Ic on +(the default), +instead of each session locking individually as each has been +idle for +.Ic lock-after-time +, the entire server will lock after +.Em all +sessions would have locked. +This has no effect as a session option; it must be set as a global option. .It Ic message-attr Ar attributes Set status line message attributes, where .Ar attributes |