summaryrefslogtreecommitdiffstats
path: root/usr.bin/tmux/cmd-select-layout.c
diff options
context:
space:
mode:
authornicm <nicm@openbsd.org>2017-04-22 10:22:39 +0000
committernicm <nicm@openbsd.org>2017-04-22 10:22:39 +0000
commitbf0d297eb5fd1d4558a97868432053598642156e (patch)
tree78d4342b9a8453beaed8105e1356f8593332810b /usr.bin/tmux/cmd-select-layout.c
parentFor small allocations (chunk) freezero only validates the given (diff)
downloadwireguard-openbsd-bf0d297eb5fd1d4558a97868432053598642156e.tar.xz
wireguard-openbsd-bf0d297eb5fd1d4558a97868432053598642156e.zip
Get rid of the extra layer of flags and cmd_prepare() and just store the
CMD_FIND_* flags in the cmd_entry and call it for the command. Commands with special requirements call it themselves and update the target for hooks to use.
Diffstat (limited to 'usr.bin/tmux/cmd-select-layout.c')
-rw-r--r--usr.bin/tmux/cmd-select-layout.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/usr.bin/tmux/cmd-select-layout.c b/usr.bin/tmux/cmd-select-layout.c
index 711fa5e9331..b2d572e442c 100644
--- a/usr.bin/tmux/cmd-select-layout.c
+++ b/usr.bin/tmux/cmd-select-layout.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-select-layout.c,v 1.32 2016/10/16 19:04:05 nicm Exp $ */
+/* $OpenBSD: cmd-select-layout.c,v 1.33 2017/04/22 10:22:39 nicm Exp $ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -36,7 +36,7 @@ const struct cmd_entry cmd_select_layout_entry = {
.args = { "nopt:", 0, 1 },
.usage = "[-nop] " CMD_TARGET_WINDOW_USAGE " [layout-name]",
- .tflag = CMD_WINDOW,
+ .target = { 't', CMD_FIND_WINDOW, 0 },
.flags = CMD_AFTERHOOK,
.exec = cmd_select_layout_exec
@@ -49,7 +49,7 @@ const struct cmd_entry cmd_next_layout_entry = {
.args = { "t:", 0, 0 },
.usage = CMD_TARGET_WINDOW_USAGE,
- .tflag = CMD_WINDOW,
+ .target = { 't', CMD_FIND_WINDOW, 0 },
.flags = CMD_AFTERHOOK,
.exec = cmd_select_layout_exec
@@ -62,7 +62,7 @@ const struct cmd_entry cmd_previous_layout_entry = {
.args = { "t:", 0, 0 },
.usage = CMD_TARGET_WINDOW_USAGE,
- .tflag = CMD_WINDOW,
+ .target = { 't', CMD_FIND_WINDOW, 0 },
.flags = CMD_AFTERHOOK,
.exec = cmd_select_layout_exec
@@ -72,7 +72,7 @@ static enum cmd_retval
cmd_select_layout_exec(struct cmd *self, struct cmdq_item *item)
{
struct args *args = self->args;
- struct winlink *wl = item->state.tflag.wl;
+ struct winlink *wl = item->target.wl;
struct window *w;
const char *layoutname;
char *oldlayout;