aboutsummaryrefslogtreecommitdiff
path: root/cmd-select-layout.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2016-10-16 22:01:14 +0100
committerThomas Adam <thomas@xteddy.org>2016-10-16 22:01:14 +0100
commit1a6e696b08113ca17ee8e881844167cf94276846 (patch)
tree60ecdd8c9e51bff46624e48d9373686b858d2fb1 /cmd-select-layout.c
parentd401340c516131ae8e07bfb978b670347486d077 (diff)
parentd15d54c2c8e6b95695169442eb2a27d814efc078 (diff)
downloadrtmux-1a6e696b08113ca17ee8e881844167cf94276846.tar.gz
rtmux-1a6e696b08113ca17ee8e881844167cf94276846.tar.bz2
rtmux-1a6e696b08113ca17ee8e881844167cf94276846.zip
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-select-layout.c')
-rw-r--r--cmd-select-layout.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/cmd-select-layout.c b/cmd-select-layout.c
index 4ecafc5c..10a7413c 100644
--- a/cmd-select-layout.c
+++ b/cmd-select-layout.c
@@ -26,7 +26,8 @@
* Switch window to selected layout.
*/
-static enum cmd_retval cmd_select_layout_exec(struct cmd *, struct cmd_q *);
+static enum cmd_retval cmd_select_layout_exec(struct cmd *,
+ struct cmdq_item *);
const struct cmd_entry cmd_select_layout_entry = {
.name = "select-layout",
@@ -68,10 +69,10 @@ const struct cmd_entry cmd_previous_layout_entry = {
};
static enum cmd_retval
-cmd_select_layout_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_select_layout_exec(struct cmd *self, struct cmdq_item *item)
{
struct args *args = self->args;
- struct winlink *wl = cmdq->state.tflag.wl;
+ struct winlink *wl = item->state.tflag.wl;
struct window *w;
const char *layoutname;
char *oldlayout;
@@ -118,7 +119,7 @@ cmd_select_layout_exec(struct cmd *self, struct cmd_q *cmdq)
if (layoutname != NULL) {
if (layout_parse(w, layoutname) == -1) {
- cmdq_error(cmdq, "can't set layout: %s", layoutname);
+ cmdq_error(item, "can't set layout: %s", layoutname);
goto error;
}
goto changed;