diff options
| author | Tiago Cunha <tcunha@gmx.com> | 2009-09-25 17:47:42 +0000 |
|---|---|---|
| committer | Tiago Cunha <tcunha@gmx.com> | 2009-09-25 17:47:42 +0000 |
| commit | 804b8696a47b37076f8ae0e0b04dcba3e2d1fb7c (patch) | |
| tree | 4afaebf2044cd1bb48e6d392c9ac313374ebd16c | |
| parent | b5d23ef38b6fb3483caeead4baf1f0c34aa1292c (diff) | |
| download | rtmux-804b8696a47b37076f8ae0e0b04dcba3e2d1fb7c.tar.gz rtmux-804b8696a47b37076f8ae0e0b04dcba3e2d1fb7c.tar.bz2 rtmux-804b8696a47b37076f8ae0e0b04dcba3e2d1fb7c.zip | |
Sync OpenBSD patchset 352:
Don't allow locked or suspended clients to limit the size of active clients.
| -rw-r--r-- | cmd-lock-server.c | 3 | ||||
| -rw-r--r-- | resize.c | 4 | ||||
| -rw-r--r-- | server-msg.c | 3 | ||||
| -rw-r--r-- | server.c | 6 |
4 files changed, 10 insertions, 6 deletions
diff --git a/cmd-lock-server.c b/cmd-lock-server.c index ec6f93ab..6da55687 100644 --- a/cmd-lock-server.c +++ b/cmd-lock-server.c @@ -1,4 +1,4 @@ -/* $Id: cmd-lock-server.c,v 1.6 2009-07-28 22:12:16 tcunha Exp $ */ +/* $Id: cmd-lock-server.c,v 1.7 2009-09-25 17:47:42 tcunha Exp $ */ /* * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net> @@ -45,6 +45,7 @@ int cmd_lock_server_exec(unused struct cmd *self, unused struct cmd_ctx *ctx) { server_lock(); + recalculate_sizes(); return (0); } @@ -1,4 +1,4 @@ -/* $Id: resize.c,v 1.23 2009-07-20 15:42:05 tcunha Exp $ */ +/* $Id: resize.c,v 1.24 2009-09-25 17:47:42 tcunha Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -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) diff --git a/server-msg.c b/server-msg.c index e258cc1f..35446723 100644 --- a/server-msg.c +++ b/server-msg.c @@ -1,4 +1,4 @@ -/* $Id: server-msg.c,v 1.89 2009-09-23 15:20:16 tcunha Exp $ */ +/* $Id: server-msg.c,v 1.90 2009-09-25 17:47:42 tcunha Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -103,6 +103,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: @@ -1,4 +1,4 @@ -/* $Id: server.c,v 1.193 2009-09-23 15:10:37 tcunha Exp $ */ +/* $Id: server.c,v 1.194 2009-09-25 17:47:42 tcunha Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -1197,8 +1197,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); |