circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-03 06:17:04 +00:00
Code Issues Projects Releases Wiki Activity

Allow -c anywhere -s was allowed.

Browse Source
This commit is contained in:
Nicholas Marriott
2008-06-03 16:55:09 +00:00
parent 3e6b145923
commit 743956edf8
13 changed files with 339 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
cmd-swap-window.c
View File

@ -1,4 +1,4 @@
/* $Id: cmd-swap-window.c,v 1.7 2008-06-03 05:35:51 nicm Exp $ */
/* $Id: cmd-swap-window.c,v 1.8 2008-06-03 16:55:09 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -34,6 +34,7 @@ void cmd_swap_window_recv(void **, struct buffer *);
void cmd_swap_window_free(void *);
struct cmd_swap_window_data {
char *cname;
char *sname;
int dstidx;
int srcidx;
@ -43,7 +44,7 @@ struct cmd_swap_window_data {
const struct cmd_entry cmd_swap_window_entry = {
"swap-window", "swapw",
"[-i index] [-s session-name] session-name index",
"[-c client-tty|-s session-name] [-i index] session-name index",
0,
cmd_swap_window_parse,
cmd_swap_window_exec,
@ -62,14 +63,21 @@ cmd_swap_window_parse(
int opt;
*ptr = data = xmalloc(sizeof *data);
data->cname = NULL;
data->sname = NULL;
data->flag_detached = 0;
data->dstidx = -1;
data->srcidx = -1;
data->srcname = NULL;
while ((opt = getopt(argc, argv, "di:s:")) != EOF) {
while ((opt = getopt(argc, argv, "c:di:s:")) != EOF) {
switch (opt) {
case 'c':
if (data->sname != NULL)
goto usage;
if (data->cname == NULL)
data->cname = xstrdup(optarg);
break;
case 'd':
data->flag_detached = 1;
break;
@ -81,7 +89,10 @@ cmd_swap_window_parse(
}
break;
case 's':
data->sname = xstrdup(optarg);
if (data->cname != NULL)
goto usage;
if (data->sname == NULL)
data->sname = xstrdup(optarg);
break;
default:
goto usage;
@ -120,7 +131,7 @@ cmd_swap_window_exec(void *ptr, struct cmd_ctx *ctx)
if (data == NULL)
return;
if ((s = cmd_find_session(ctx, data->sname)) == NULL)
if ((s = cmd_find_session(ctx, data->cname, data->sname)) == NULL)
return;
if ((src = session_find(data->srcname)) == NULL) {
@ -175,6 +186,7 @@ cmd_swap_window_send(void *ptr, struct buffer *b)
struct cmd_swap_window_data *data = ptr;
buffer_write(b, data, sizeof *data);
cmd_send_string(b, data->cname);
cmd_send_string(b, data->sname);
cmd_send_string(b, data->srcname);
}
@ -186,6 +198,7 @@ cmd_swap_window_recv(void **ptr, struct buffer *b)
*ptr = data = xmalloc(sizeof *data);
buffer_read(b, data, sizeof *data);
data->cname = cmd_recv_string(b);
data->sname = cmd_recv_string(b);
data->srcname = cmd_recv_string(b);
}
@ -195,6 +208,8 @@ cmd_swap_window_free(void *ptr)
{
struct cmd_swap_window_data *data = ptr;
if (data->cname != NULL)
xfree(data->cname);
if (data->sname != NULL)
xfree(data->sname);
if (data->srcname != NULL)