Don't allow locked or suspended clients to limit the size of active clients.

pull/1/head
Nicholas Marriott 2009-09-24 07:02:56 +00:00
parent fecf8dc44e
commit 1764ef81ef
4 changed files with 6 additions and 2 deletions

View File

@ -45,6 +45,7 @@ int
cmd_lock_server_exec(unused struct cmd *self, unused struct cmd_ctx *ctx)
{
server_lock();
recalculate_sizes();
return (0);
}

View File

@ -60,7 +60,7 @@ recalculate_sizes(void)
ssx = ssy = UINT_MAX;
for (j = 0; j < ARRAY_LENGTH(&clients); j++) {
c = ARRAY_ITEM(&clients, j);
if (c == NULL)
if (c == NULL || c->flags & CLIENT_SUSPENDED)
continue;
if (c->session == s) {
if (c->tty.sx < ssx)

View File

@ -104,6 +104,7 @@ server_msg_dispatch(struct client *c)
c->flags &= ~CLIENT_SUSPENDED;
tty_start_tty(&c->tty);
server_redraw_client(c);
recalculate_sizes();
server_activity = time(NULL);
break;
case MSG_ENVIRON:

View File

@ -1194,8 +1194,10 @@ server_second_timers(void)
t = time(NULL);
xtimeout = options_get_number(&global_s_options, "lock-after-time");
if (xtimeout > 0 && t > server_activity + xtimeout)
if (xtimeout > 0 && t > server_activity + xtimeout) {
server_lock();
recalculate_sizes();
}
for (i = 0; i < ARRAY_LENGTH(&windows); i++) {
w = ARRAY_ITEM(&windows, i);