diff options
| author | Nicholas Marriott <nicm@cvs.openbsd.org> | 2013-03-21 16:49:38 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicm@cvs.openbsd.org> | 2013-03-21 16:49:38 +0000 |
| commit | c50c4cf9fa9a15be5f774c5a8fce032bfe331dd1 (patch) | |
| tree | 2db2d025933fbb59f4bf2f8de1eef69efee1ed54 /usr.bin | |
| parent | 3cf5b6db9aff0846bd0af5f26be0e971b4487115 (diff) | |
Add -c to refresh-client to set client size in control mode, based on
code from George Nachman.
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/tmux/cmd-refresh-client.c | 30 |
1 files changed, 26 insertions, 4 deletions
diff --git a/usr.bin/tmux/cmd-refresh-client.c b/usr.bin/tmux/cmd-refresh-client.c index 25ed92628b2..57f985e3086 100644 --- a/usr.bin/tmux/cmd-refresh-client.c +++ b/usr.bin/tmux/cmd-refresh-client.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd-refresh-client.c,v 1.7 2012/07/11 07:10:15 nicm Exp $ */ +/* $OpenBSD: cmd-refresh-client.c,v 1.8 2013/03/21 16:49:37 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -28,8 +28,8 @@ enum cmd_retval cmd_refresh_client_exec(struct cmd *, struct cmd_ctx *); 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, @@ -41,11 +41,33 @@ cmd_refresh_client_exec(struct cmd *self, struct cmd_ctx *ctx) { 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) return (CMD_RETURN_ERROR); - if (args_has(args, 'S')) { + if (args_has(args, 'C')) { + if ((size = args_get(args, 'C')) == NULL) { + ctx->error(ctx, "missing size"); + return (CMD_RETURN_ERROR); + } + if (sscanf(size, "%u,%u", &w, &h) != 2) { + ctx->error(ctx, "bad size argument"); + return (CMD_RETURN_ERROR); + } + if (w < PANE_MINIMUM || w > 5000 || + h < PANE_MINIMUM || h > 5000) { + ctx->error(ctx, "size too small or too big"); + return (CMD_RETURN_ERROR); + } + if (!(c->flags & CLIENT_CONTROL)) { + ctx->error(ctx, "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 |