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.
This commit is contained in:
Tiago Cunha
2009-10-11 23:30:28 +00:00
parent a4ea6a9d19
commit 91e4dc83fc
7 changed files with 89 additions and 32 deletions

4
tmux.h
View File

@ -1,4 +1,4 @@
/* $Id: tmux.h,v 1.460 2009-10-09 13:11:42 tcunha Exp $ */
/* $Id: tmux.h,v 1.461 2009-10-11 23:30:28 tcunha Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -798,6 +798,7 @@ struct session_alert {
struct session {
char *name;
struct timeval tv;
time_t activity;
u_int sx;
u_int sy;
@ -1115,7 +1116,6 @@ extern struct options global_s_options;
extern struct options global_w_options;
extern struct environ global_environ;
extern char *cfg_file;
extern time_t server_activity;
extern int debug_level;
extern int be_quiet;
extern time_t start_time;