diff options
| author | nicm <nicm> | 2017-04-22 10:22:39 +0000 |
|---|---|---|
| committer | nicm <nicm> | 2017-04-22 10:22:39 +0000 |
| commit | ee45a8a149e1a3c8fe7c232a9e32f3a007e21bee (patch) | |
| tree | 21cc9cafd10d55cd7cd92ec616d08ac59adc4a0a /cmd-swap-pane.c | |
| parent | 2c0f826c360fc5a8f0e125759b596eb28441ba65 (diff) | |
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 'cmd-swap-pane.c')
| -rw-r--r-- | cmd-swap-pane.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cmd-swap-pane.c b/cmd-swap-pane.c index 43959140..7283bf53 100644 --- a/cmd-swap-pane.c +++ b/cmd-swap-pane.c @@ -35,8 +35,8 @@ const struct cmd_entry cmd_swap_pane_entry = { .args = { "dDs:t:U", 0, 0 }, .usage = "[-dDU] " CMD_SRCDST_PANE_USAGE, - .sflag = CMD_PANE_MARKED, - .tflag = CMD_PANE, + .source = { 's', CMD_FIND_PANE, CMD_FIND_DEFAULT_MARKED }, + .target = { 't', CMD_FIND_PANE, 0 }, .flags = 0, .exec = cmd_swap_pane_exec @@ -50,10 +50,10 @@ cmd_swap_pane_exec(struct cmd *self, struct cmdq_item *item) struct layout_cell *src_lc, *dst_lc; u_int sx, sy, xoff, yoff; - dst_w = item->state.tflag.wl->window; - dst_wp = item->state.tflag.wp; - src_w = item->state.sflag.wl->window; - src_wp = item->state.sflag.wp; + dst_w = item->target.wl->window; + dst_wp = item->target.wp; + src_w = item->source.wl->window; + src_wp = item->source.wp; server_unzoom_window(dst_w); if (args_has(self->args, 'D')) { |