The branch, hooks has been updated
via 7f9bcb1dcac142e47867a317c9070d91f6930ca1 (commit)
from 6e80058d23751e100ec99ef21e9a1abf1fa28a2d (commit)
- Log -----------------------------------------------------------------
commit 7f9bcb1dcac142e47867a317c9070d91f6930ca1
Author: Nicholas Marriott <[email protected]>
Commit: Nicholas Marriott <[email protected]>
Use prepare flags for swap-pane.
---
cmd-swap-pane.c | 40 ++++++++++++++--------------------------
1 files changed, 14 insertions(+), 26 deletions(-)
diff --git a/cmd-swap-pane.c b/cmd-swap-pane.c
index 918a2e4..e8b5f75 100644
--- a/cmd-swap-pane.c
+++ b/cmd-swap-pane.c
@@ -32,47 +32,35 @@ const struct cmd_entry cmd_swap_pane_entry = {
"swap-pane", "swapp",
"dDs:t:U", 0, 0,
"[-dDU] " CMD_SRCDST_PANE_USAGE,
- 0,
+ CMD_PREP_PANE_S|CMD_PREP_PANE_T,
cmd_swap_pane_exec
};
enum cmd_retval
cmd_swap_pane_exec(struct cmd *self, struct cmd_q *cmdq)
{
- struct args *args = self->args;
- struct winlink *src_wl, *dst_wl;
struct window *src_w, *dst_w;
struct window_pane *tmp_wp, *src_wp, *dst_wp;
struct layout_cell *src_lc, *dst_lc;
u_int sx, sy, xoff, yoff;
- dst_wl = cmd_find_pane(cmdq, args_get(args, 't'), NULL, &dst_wp);
- if (dst_wl == NULL)
- return (CMD_RETURN_ERROR);
- dst_w = dst_wl->window;
+ dst_w = cmdq->state.tflag.wl->window;
+ dst_wp = cmdq->state.tflag.wp;
server_unzoom_window(dst_w);
- if (!args_has(args, 's')) {
+ if (args_has(self->args, 'D')) {
src_w = dst_w;
- if (args_has(self->args, 'D')) {
- src_wp = TAILQ_NEXT(dst_wp, entry);
- if (src_wp == NULL)
- src_wp = TAILQ_FIRST(&dst_w->panes);
- } else if (args_has(self->args, 'U')) {
- src_wp = TAILQ_PREV(dst_wp, window_panes, entry);
- if (src_wp == NULL)
- src_wp = TAILQ_LAST(&dst_w->panes,
window_panes);
- } else {
- src_wl = cmd_find_pane(cmdq, NULL, NULL, &src_wp);
- if (src_wl == NULL)
- return (CMD_RETURN_ERROR);
- src_w = src_wl->window;
- }
+ src_wp = TAILQ_NEXT(dst_wp, entry);
+ if (src_wp == NULL)
+ src_wp = TAILQ_FIRST(&dst_w->panes);
+ } else if (args_has(self->args, 'U')) {
+ src_w = dst_w;
+ src_wp = TAILQ_PREV(dst_wp, window_panes, entry);
+ if (src_wp == NULL)
+ src_wp = TAILQ_LAST(&dst_w->panes, window_panes);
} else {
- src_wl = cmd_find_pane(cmdq, args_get(args, 's'), NULL,
&src_wp);
- if (src_wl == NULL)
- return (CMD_RETURN_ERROR);
- src_w = src_wl->window;
+ src_w = cmdq->state.sflag.wl->window;
+ src_wp = cmdq->state.sflag.wp;
}
server_unzoom_window(src_w);
-----------------------------------------------------------------------
Summary of changes:
cmd-swap-pane.c | 40 ++++++++++++++--------------------------
1 files changed, 14 insertions(+), 26 deletions(-)
hooks/post-receive
--
tmux
------------------------------------------------------------------------------
Dive into the World of Parallel Programming. The Go Parallel Website,
sponsored by Intel and developed in partnership with Slashdot Media, is your
hub for all things parallel software development, from weekly thought
leadership blogs to news, videos, case studies, tutorials and more. Take a
look and join the conversation now. http://goparallel.sourceforge.net/
_______________________________________________
tmux-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tmux-cvs
