diff options
| author | Thomas Adam <thomas@xteddy.org> | 2014-10-29 12:50:05 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2014-10-29 12:51:21 +0000 |
| commit | 35ffd093d724053046ae49984af0beb0530e5560 (patch) | |
| tree | d5b89a213621dc56b852fc7eb8a1daba12046830 /cmd-move-window.c | |
| parent | 201036ad80f2e51f7238db2adf05914a4a4f5819 (diff) | |
| parent | 10a9440055ccdda5788965bcb048207eab2a0548 (diff) | |
| download | rtmux-35ffd093d724053046ae49984af0beb0530e5560.tar.gz rtmux-35ffd093d724053046ae49984af0beb0530e5560.tar.bz2 rtmux-35ffd093d724053046ae49984af0beb0530e5560.zip | |
Merge branch 'obsd-master'
Conflicts:
Makefile
cmd-link-window.c
cmd-unlink-window.c
Diffstat (limited to 'cmd-move-window.c')
| -rw-r--r-- | cmd-move-window.c | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/cmd-move-window.c b/cmd-move-window.c index 7867dca8..b39ece81 100644 --- a/cmd-move-window.c +++ b/cmd-move-window.c @@ -36,6 +36,14 @@ const struct cmd_entry cmd_move_window_entry = { cmd_move_window_exec }; +const struct cmd_entry cmd_link_window_entry = { + "link-window", "linkw", + "dks:t:", 0, 0, + "[-dk] " CMD_SRCDST_WINDOW_USAGE, + 0, + cmd_move_window_exec +}; + enum cmd_retval cmd_move_window_exec(struct cmd *self, struct cmd_q *cmdq) { @@ -46,7 +54,8 @@ cmd_move_window_exec(struct cmd *self, struct cmd_q *cmdq) int idx, kflag, dflag; if (args_has(args, 'r')) { - if ((s = cmd_find_session(cmdq, args_get(args, 't'), 0)) == NULL) + s = cmd_find_session(cmdq, args_get(args, 't'), 0); + if (s == NULL) return (CMD_RETURN_ERROR); session_renumber_windows(s); @@ -62,12 +71,14 @@ cmd_move_window_exec(struct cmd *self, struct cmd_q *cmdq) kflag = args_has(self->args, 'k'); dflag = args_has(self->args, 'd'); - if (server_link_window(src, wl, dst, idx, kflag, !dflag, &cause) != 0) { - cmdq_error(cmdq, "can't move window: %s", cause); + if (server_link_window(src, wl, dst, idx, kflag, !dflag, + &cause) != 0) { + cmdq_error(cmdq, "can't link window: %s", cause); free(cause); return (CMD_RETURN_ERROR); } - server_unlink_window(src, wl); + if (self->entry == &cmd_move_window_entry) + server_unlink_window(src, wl); recalculate_sizes(); return (CMD_RETURN_NORMAL); |