Skip to content
Permalink
Browse files

-a flag to insert a window after an existing one, moving other windows

up as necessary.
  • Loading branch information
nicm committed Mar 27, 2010
1 parent 51c776f commit dd7abd9b4cc864fffbf20ed433549e684431c4e9
Showing with 48 additions and 11 deletions.
  1. +34 −6 cmd-new-window.c
  2. +14 −5 tmux.1
@@ -1,4 +1,4 @@
/* $Id: cmd-new-window.c,v 1.43 2010-01-22 17:28:34 tcunha Exp $ */
/* $OpenBSD: cmd-new-window.c,v 1.13 2010/03/27 11:46:58 nicm Exp $ */

/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -36,13 +36,14 @@ struct cmd_new_window_data {
char *target;
char *name;
char *cmd;
int flag_insert_after;
int flag_detached;
int flag_kill;
};

const struct cmd_entry cmd_new_window_entry = {
"new-window", "neww",
"[-dk] [-n window-name] [-t target-window] [command]",
"[-adk] [-n window-name] [-t target-window] [command]",
0, "",
cmd_new_window_init,
cmd_new_window_parse,
@@ -61,6 +62,7 @@ cmd_new_window_init(struct cmd *self, unused int arg)
data->target = NULL;
data->name = NULL;
data->cmd = NULL;
data->flag_insert_after = 0;
data->flag_detached = 0;
data->flag_kill = 0;
}
@@ -74,8 +76,11 @@ cmd_new_window_parse(struct cmd *self, int argc, char **argv, char **cause)
self->entry->init(self, KEYC_NONE);
data = self->data;

while ((opt = getopt(argc, argv, "dkt:n:")) != -1) {
while ((opt = getopt(argc, argv, "adkt:n:")) != -1) {
switch (opt) {
case 'a':
data->flag_insert_after = 1;
break;
case 'd':
data->flag_detached = 1;
break;
@@ -118,13 +123,36 @@ cmd_new_window_exec(struct cmd *self, struct cmd_ctx *ctx)
struct session *s;
struct winlink *wl;
char *cmd, *cwd, *cause;
int idx;
int idx, last;

if (data == NULL)
return (0);

if ((idx = cmd_find_index(ctx, data->target, &s)) == -2)
return (-1);
if (data->flag_insert_after) {
if ((wl = cmd_find_window(ctx, data->target, &s)) == NULL)
return (-1);
idx = wl->idx + 1;

/* Find the next free index. */
for (last = idx; last < INT_MAX; last++) {
if (winlink_find_by_index(&s->windows, last) == NULL)
break;
}
if (last == INT_MAX) {
ctx->error(ctx, "no free window indexes");
return (-1);
}

/* Move everything from last - 1 to idx up a bit. */
for (; last > idx; last--) {
wl = winlink_find_by_index(&s->windows, last - 1);
server_link_window(s, wl, s, last, 0, 0, NULL);
server_unlink_window(s, wl);
}
} else {
if ((idx = cmd_find_index(ctx, data->target, &s)) == -2)
return (-1);
}

wl = NULL;
if (idx != -1)
19 tmux.1
@@ -1,4 +1,4 @@
.\" $Id: tmux.1,v 1.241 2010-03-18 21:02:41 nicm Exp $
.\" $OpenBSD: tmux.1,v 1.160 2010/03/27 11:46:58 nicm Exp $
.\"
.\" Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
.\"
@@ -14,7 +14,7 @@
.\" IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
.Dd $Mdocdate: March 2 2010 $
.Dd $Mdocdate: March 27 2010 $
.Dt TMUX 1
.Os
.Sh NAME
@@ -405,9 +405,9 @@ Or from
.Bd -literal -offset indent
$ tmux kill-window -t :1

$ tmux new-window \\; split-window -d
$ tmux new-window \e; split-window -d

$ tmux new-session -d 'vi /etc/passwd' \\; split-window -d \\; attach
$ tmux new-session -d 'vi /etc/passwd' \e; split-window -d \e; attach
.Ed
.Sh CLIENTS AND SESSIONS
The
@@ -976,13 +976,22 @@ except the window at
is moved to
.Ar dst-window .
.It Xo Ic new-window
.Op Fl dk
.Op Fl adk
.Op Fl n Ar window-name
.Op Fl t Ar target-window
.Op Ar shell-command
.Xc
.D1 (alias: Ic neww )
Create a new window.
With
.Fl a ,
the new window is inserted at the next index up from the specified
.Ar target-window ,
moving windows up if necessary,
otherwise
.Ar target-window
is the new window location.
.Pp
If
.Fl d
is given, the session does not make the new window the current window.

0 comments on commit dd7abd9

Please sign in to comment.
You can’t perform that action at this time.