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-select-layout.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-select-layout.c')
| -rw-r--r-- | cmd-select-layout.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/cmd-select-layout.c b/cmd-select-layout.c index b2423e9c..ae1be4c4 100644 --- a/cmd-select-layout.c +++ b/cmd-select-layout.c @@ -25,7 +25,7 @@ */ void cmd_select_layout_key_binding(struct cmd *, int); -enum cmd_retval cmd_select_layout_exec(struct cmd *, struct cmd_ctx *); +enum cmd_retval cmd_select_layout_exec(struct cmd *, struct cmd_q *); const struct cmd_entry cmd_select_layout_entry = { "select-layout", "selectl", @@ -83,15 +83,16 @@ cmd_select_layout_key_binding(struct cmd *self, int key) } enum cmd_retval -cmd_select_layout_exec(struct cmd *self, struct cmd_ctx *ctx) +cmd_select_layout_exec(struct cmd *self, struct cmd_q *cmdq) { struct args *args = self->args; struct winlink *wl; const char *layoutname; int next, previous, layout; - if ((wl = cmd_find_window(ctx, args_get(args, 't'), NULL)) == NULL) + if ((wl = cmd_find_window(cmdq, args_get(args, 't'), NULL)) == NULL) return (CMD_RETURN_ERROR); + server_unzoom_window(wl->window); next = self->entry == &cmd_next_layout_entry; if (args_has(self->args, 'n')) @@ -106,7 +107,7 @@ cmd_select_layout_exec(struct cmd *self, struct cmd_ctx *ctx) else layout = layout_set_previous(wl->window); server_redraw_window(wl->window); - ctx->info(ctx, "arranging in: %s", layout_set_name(layout)); + cmdq_info(cmdq, "arranging in: %s", layout_set_name(layout)); return (CMD_RETURN_NORMAL); } @@ -117,18 +118,18 @@ cmd_select_layout_exec(struct cmd *self, struct cmd_ctx *ctx) if (layout != -1) { layout = layout_set_select(wl->window, layout); server_redraw_window(wl->window); - ctx->info(ctx, "arranging in: %s", layout_set_name(layout)); + cmdq_info(cmdq, "arranging in: %s", layout_set_name(layout)); return (CMD_RETURN_NORMAL); } if (args->argc != 0) { layoutname = args->argv[0]; if (layout_parse(wl->window, layoutname) == -1) { - ctx->error(ctx, "can't set layout: %s", layoutname); + cmdq_error(cmdq, "can't set layout: %s", layoutname); return (CMD_RETURN_ERROR); } server_redraw_window(wl->window); - ctx->info(ctx, "arranging in: %s", layoutname); + cmdq_info(cmdq, "arranging in: %s", layoutname); } return (CMD_RETURN_NORMAL); } |