diff options
| author | Thomas Adam <thomas.adam@smoothwall.net> | 2013-03-25 14:59:29 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas.adam@smoothwall.net> | 2013-03-25 14:59:29 +0000 |
| commit | f90eb43fcb12720711ea01b110c5b474111e6600 (patch) | |
| tree | 43b2e85bcf1626e3810ade10578ac18399931772 /cmd-refresh-client.c | |
| parent | 418ba99078a2712ece398e17a5a9bc1f6600126b (diff) | |
| parent | 58bb6f8c5650d496fb3b872766c0278aa024631d (diff) | |
| download | rtmux-f90eb43fcb12720711ea01b110c5b474111e6600.tar.gz rtmux-f90eb43fcb12720711ea01b110c5b474111e6600.tar.bz2 rtmux-f90eb43fcb12720711ea01b110c5b474111e6600.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-refresh-client.c')
| -rw-r--r-- | cmd-refresh-client.c | 34 |
1 files changed, 28 insertions, 6 deletions
diff --git a/cmd-refresh-client.c b/cmd-refresh-client.c index 52518122..7d9d539f 100644 --- a/cmd-refresh-client.c +++ b/cmd-refresh-client.c @@ -24,12 +24,12 @@ * Refresh client. */ -enum cmd_retval cmd_refresh_client_exec(struct cmd *, struct cmd_ctx *); +enum cmd_retval cmd_refresh_client_exec(struct cmd *, struct cmd_q *); const struct cmd_entry cmd_refresh_client_entry = { "refresh-client", "refresh", - "St:", 0, 0, - "[-S] " CMD_TARGET_CLIENT_USAGE, + "C:St:", 0, 0, + "[-S] [-C size]" CMD_TARGET_CLIENT_USAGE, 0, NULL, NULL, @@ -37,15 +37,37 @@ const struct cmd_entry cmd_refresh_client_entry = { }; enum cmd_retval -cmd_refresh_client_exec(struct cmd *self, struct cmd_ctx *ctx) +cmd_refresh_client_exec(struct cmd *self, struct cmd_q *cmdq) { struct args *args = self->args; struct client *c; + const char *size; + u_int w, h; - if ((c = cmd_find_client(ctx, args_get(args, 't'))) == NULL) + if ((c = cmd_find_client(cmdq, args_get(args, 't'), 0)) == NULL) return (CMD_RETURN_ERROR); - if (args_has(args, 'S')) { + if (args_has(args, 'C')) { + if ((size = args_get(args, 'C')) == NULL) { + cmdq_error(cmdq, "missing size"); + return (CMD_RETURN_ERROR); + } + if (sscanf(size, "%u,%u", &w, &h) != 2) { + cmdq_error(cmdq, "bad size argument"); + return (CMD_RETURN_ERROR); + } + if (w < PANE_MINIMUM || w > 5000 || + h < PANE_MINIMUM || h > 5000) { + cmdq_error(cmdq, "size too small or too big"); + return (CMD_RETURN_ERROR); + } + if (!(c->flags & CLIENT_CONTROL)) { + cmdq_error(cmdq, "not a control client"); + return (CMD_RETURN_ERROR); + } + if (tty_set_size(&c->tty, w, h)) + recalculate_sizes(); + } else if (args_has(args, 'S')) { status_update_jobs(c); server_status_client(c); } else |