diff options
| author |   nicm <nicm@openbsd.org> | 2020-04-13 10:59:58 +0000 |
|---|---|---|
| committer | nicm <nicm@openbsd.org> | 2020-04-13 10:59:58 +0000 |
| commit | 040343ae18e7aa6a49c6acf6e4add8a0b76f6fff (patch) | |
| tree | 8ed8ccb63639c656437cc1539d3d2b96b405d399 /usr.bin/tmux/cmd-join-pane.c | |
| parent | Make struct cmd local to cmd.c and move it out of tmux.h. (diff) | |
| download | wireguard-openbsd-040343ae18e7aa6a49c6acf6e4add8a0b76f6fff.tar.xz wireguard-openbsd-040343ae18e7aa6a49c6acf6e4add8a0b76f6fff.zip | |
Also move cmdq_item and cmdq_list into cmd-queue.c (this is to make its
use more clearly defined and preparation for some future work).
Diffstat (limited to 'usr.bin/tmux/cmd-join-pane.c')
| -rw-r--r-- | usr.bin/tmux/cmd-join-pane.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/usr.bin/tmux/cmd-join-pane.c b/usr.bin/tmux/cmd-join-pane.c index df2a9cb0605..3d9db557660 100644 --- a/usr.bin/tmux/cmd-join-pane.c +++ b/usr.bin/tmux/cmd-join-pane.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd-join-pane.c,v 1.40 2020/04/13 08:26:27 nicm Exp $ */ +/* $OpenBSD: cmd-join-pane.c,v 1.41 2020/04/13 10:59:58 nicm Exp $ */ /* * Copyright (c) 2011 George Nachman <tmux@georgester.com> @@ -64,7 +64,10 @@ static enum cmd_retval cmd_join_pane_exec(struct cmd *self, struct cmdq_item *item) { struct args *args = cmd_get_args(self); - struct cmd_find_state *current = &item->shared->current; + struct cmdq_shared *shared = cmdq_get_shared(item); + struct cmd_find_state *current = &shared->current; + struct cmd_find_state *target = cmdq_get_target(item); + struct cmd_find_state *source = cmdq_get_source(item); struct session *dst_s; struct winlink *src_wl, *dst_wl; struct window *src_w, *dst_w; @@ -80,15 +83,15 @@ cmd_join_pane_exec(struct cmd *self, struct cmdq_item *item) else not_same_window = 0; - dst_s = item->target.s; - dst_wl = item->target.wl; - dst_wp = item->target.wp; + dst_s = target->s; + dst_wl = target->wl; + dst_wp = target->wp; dst_w = dst_wl->window; dst_idx = dst_wl->idx; server_unzoom_window(dst_w); - src_wl = item->source.wl; - src_wp = item->source.wp; + src_wl = source->wl; + src_wp = source->wp; src_w = src_wl->window; server_unzoom_window(src_w); |