circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-02 13:37:12 +00:00
Code Issues Projects Releases Wiki Activity

Remove the lock-server option which is a bit redundant, it isn't that

Browse Source 
different without it.
This commit is contained in:
nicm
2015-08-28 12:31:55 +00:00
parent 6419f66523
commit 675def0396
3 changed files with 2 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
server.c
View File

@ -64,7 +64,6 @@ void server_child_signal(void);
void server_child_exited(pid_t, int);
void server_child_stopped(pid_t, int);
void server_second_callback(int, short, void *);
void server_lock_server(void);
void server_lock_sessions(void);
/* Set marked pane. */
@ -506,10 +505,7 @@ server_second_callback(unused int fd, unused short events, unused void *arg)
{
struct timeval tv;
if (options_get_number(&global_s_options, "lock-server"))
server_lock_server();
else
server_lock_sessions();
server_lock_sessions();
evtimer_del(&server_ev_second);
memset(&tv, 0, sizeof tv);
@ -517,27 +513,6 @@ server_second_callback(unused int fd, unused short events, unused void *arg)
evtimer_add(&server_ev_second, &tv);
}
/* Lock the server if ALL sessions have hit the time limit. */
void
server_lock_server(void)
{
struct session *s;
int timeout;
time_t t;
t = time(NULL);
RB_FOREACH(s, sessions, &sessions) {
if (s->flags & SESSION_UNATTACHED)
continue;
timeout = options_get_number(&s->options, "lock-after-time");
if (timeout <= 0 || t <= s->activity_time.tv_sec + timeout)
return; /* not timed out */
}
server_lock();
recalculate_sizes();
}
/* Lock any sessions which have timed out. */
void
server_lock_sessions(void)