From 5a954bd9bdd771f64e432b12307026f98a31be3d Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Fri, 26 Oct 2007 13:03:59 +0000 Subject: [PATCH] link-window command to link a window into another session. --- CHANGES | 7 +- Makefile | 4 +- TODO | 4 -- cmd-link-window.c | 176 ++++++++++++++++++++++++++++++++++++++++++++++ cmd.c | 3 +- tmux.h | 3 +- 6 files changed, 188 insertions(+), 9 deletions(-) create mode 100644 cmd-link-window.c diff --git a/CHANGES b/CHANGES index a7b1470d..7f32b2a4 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,10 @@ 26 October 2007 +* (nicm) link-window command to link an existing window into another session + (or another index in the same session). Syntax: + + tmux -s dstname link-window [-i dstidx] srcname srcidx + * (nicm) Redo window data structures. The global array remains, but each per- session list is now a RB tree of winlink structures. This disassociates the window index from the array size (allowing arbitrary indexes) which still @@ -170,5 +175,5 @@ (including mutt, emacs). No status bar yet and no key remapping or other customisation. -$Id: CHANGES,v 1.52 2007-10-26 12:29:07 nicm Exp $ +$Id: CHANGES,v 1.53 2007-10-26 13:03:59 nicm Exp $ diff --git a/Makefile b/Makefile index 79cc34b6..1ef4da8b 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.31 2007-10-25 17:44:24 nicm Exp $ +# $Id: Makefile,v 1.32 2007-10-26 13:03:59 nicm Exp $ .SUFFIXES: .c .o .y .h .PHONY: clean @@ -24,7 +24,7 @@ SRCS= tmux.c server.c server-msg.c server-fn.c buffer.c buffer-poll.c status.c \ cmd-set-option.c cmd-rename-window.c cmd-select-window.c \ cmd-list-windows.c cmd-attach-session.c cmd-send-prefix.c \ cmd-refresh-session.c cmd-kill-window.c cmd-list-clients.c \ - cmd-has-session.c + cmd-has-session.c cmd-link-window.c YACC= yacc -d diff --git a/TODO b/TODO index f40aa2a2..815001bf 100644 --- a/TODO +++ b/TODO @@ -55,10 +55,6 @@ rename sessions swap windows same as link but swap windows if tgt exists else error - link/copy windows - tmux -s link-window -i - link src win to tgt win (at tgt idx if given and - empty else new) unlink window (error if window only linked to one session) tmux -s unlink-window -i kill session (not bound by default) diff --git a/cmd-link-window.c b/cmd-link-window.c new file mode 100644 index 00000000..f83f9c58 --- /dev/null +++ b/cmd-link-window.c @@ -0,0 +1,176 @@ +/* $Id: cmd-link-window.c,v 1.1 2007-10-26 13:03:59 nicm Exp $ */ + +/* + * Copyright (c) 2007 Nicholas Marriott + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER + * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING + * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +#include + +#include +#include + +#include "tmux.h" + +/* + * Link a window into another session. + */ + +int cmd_link_window_parse(void **, int, char **, char **); +void cmd_link_window_exec(void *, struct cmd_ctx *); +void cmd_link_window_send(void *, struct buffer *); +void cmd_link_window_recv(void **, struct buffer *); +void cmd_link_window_free(void *); + +struct cmd_link_window_data { + int dstidx; + int srcidx; + char *srcname; + int flag_detached; +}; + +const struct cmd_entry cmd_link_window_entry = { + "link-window", "linkw", "[-i index] name index", + 0, + cmd_link_window_parse, + cmd_link_window_exec, + cmd_link_window_send, + cmd_link_window_recv, + cmd_link_window_free +}; + +int +cmd_link_window_parse(void **ptr, int argc, char **argv, char **cause) +{ + struct cmd_link_window_data *data; + const char *errstr; + int opt; + + *ptr = data = xmalloc(sizeof *data); + data->flag_detached = 0; + data->dstidx = -1; + data->srcidx = -1; + data->srcname = NULL; + + while ((opt = getopt(argc, argv, "di:")) != EOF) { + switch (opt) { + case 'i': + data->dstidx = strtonum(optarg, 0, UINT_MAX, &errstr); + if (errstr != NULL) { + xasprintf(cause, "index %s", errstr); + goto error; + } + break; + case 'd': + data->flag_detached = 1; + break; + default: + goto usage; + } + } + argc -= optind; + argv += optind; + if (argc != 2) + goto usage; + + data->srcname = xstrdup(argv[0]); + data->srcidx = strtonum(argv[1], 0, UINT_MAX, &errstr); + if (errstr != NULL) { + xasprintf(cause, "index %s", errstr); + goto error; + } + + return (0); + +usage: + usage(cause, "%s %s", + cmd_link_window_entry.name, cmd_link_window_entry.usage); + +error: + cmd_link_window_free(data); + return (-1); +} + +void +cmd_link_window_exec(void *ptr, struct cmd_ctx *ctx) +{ + struct cmd_link_window_data *data = ptr; + struct client *c = ctx->client; + struct session *dst = ctx->session, *src; + struct winlink *wl; + + if (data == NULL) + return; + + if ((src = session_find(data->srcname)) == NULL) { + ctx->error(ctx, "session not found: %s", data->srcname); + return; + } + + if (data->srcidx < 0) + data->srcidx = -1; + if (data->srcidx == -1) + wl = src->curw; + else { + wl = winlink_find_by_index(&src->windows, data->srcidx); + if (wl == NULL) { + ctx->error(ctx, "no window %u", data->srcidx); + return; + } + } + + if (data->dstidx < 0) + data->dstidx = -1; + if ((wl = session_attach(dst, wl->window, data->dstidx)) == NULL) { + ctx->error(ctx, "index in use: %d", data->dstidx); + return; + } + + if (!data->flag_detached) { + session_select(dst, wl->idx); + server_redraw_session(dst); + } + + if (!(ctx->flags & CMD_KEY)) + server_write_client(c, MSG_EXIT, NULL, 0); +} + +void +cmd_link_window_send(void *ptr, struct buffer *b) +{ + struct cmd_link_window_data *data = ptr; + + buffer_write(b, data, sizeof *data); + cmd_send_string(b, data->srcname); +} + +void +cmd_link_window_recv(void **ptr, struct buffer *b) +{ + struct cmd_link_window_data *data; + + *ptr = data = xmalloc(sizeof *data); + buffer_read(b, data, sizeof *data); + data->srcname = cmd_recv_string(b); +} + +void +cmd_link_window_free(void *ptr) +{ + struct cmd_link_window_data *data = ptr; + + if (data->srcname != NULL) + xfree(data->srcname); + xfree(data); +} diff --git a/cmd.c b/cmd.c index da3370a5..b6902647 100644 --- a/cmd.c +++ b/cmd.c @@ -1,4 +1,4 @@ -/* $Id: cmd.c,v 1.20 2007-10-25 17:44:24 nicm Exp $ */ +/* $Id: cmd.c,v 1.21 2007-10-26 13:03:59 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -30,6 +30,7 @@ const struct cmd_entry *cmd_table[] = { &cmd_has_session_entry, &cmd_kill_window_entry, &cmd_last_window_entry, + &cmd_link_window_entry, &cmd_list_clients_entry, &cmd_list_keys_entry, &cmd_list_sessions_entry, diff --git a/tmux.h b/tmux.h index be4ed5e1..9ff5362b 100644 --- a/tmux.h +++ b/tmux.h @@ -1,4 +1,4 @@ -/* $Id: tmux.h,v 1.71 2007-10-26 12:29:07 nicm Exp $ */ +/* $Id: tmux.h,v 1.72 2007-10-26 13:03:59 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -543,6 +543,7 @@ extern const struct cmd_entry cmd_detach_session_entry; extern const struct cmd_entry cmd_has_session_entry; extern const struct cmd_entry cmd_kill_window_entry; extern const struct cmd_entry cmd_last_window_entry; +extern const struct cmd_entry cmd_link_window_entry; extern const struct cmd_entry cmd_list_clients_entry; extern const struct cmd_entry cmd_list_keys_entry; extern const struct cmd_entry cmd_list_sessions_entry;