version 1.39, 2014/04/17 13:02:59 |
version 1.40, 2014/05/13 08:08:32 |
|
|
|
|
const struct cmd_entry cmd_new_window_entry = { |
const struct cmd_entry cmd_new_window_entry = { |
"new-window", "neww", |
"new-window", "neww", |
"ac:dF:kn:Pt:", 0, 1, |
"ac:dF:kn:Pt:", 0, -1, |
"[-adkP] [-c start-directory] [-F format] [-n window-name] " |
"[-adkP] [-c start-directory] [-F format] [-n window-name] " |
CMD_TARGET_WINDOW_USAGE " [command]", |
CMD_TARGET_WINDOW_USAGE " [command]", |
0, |
0, |
|
|
struct winlink *wl; |
struct winlink *wl; |
struct client *c; |
struct client *c; |
const char *cmd, *path, *template; |
const char *cmd, *path, *template; |
char *cause, *cp; |
char **argv, *cause, *cp; |
int idx, last, detached, cwd, fd = -1; |
int argc, idx, last, detached, cwd, fd = -1; |
struct format_tree *ft; |
struct format_tree *ft; |
struct environ_entry *envent; |
struct environ_entry *envent; |
|
|
|
|
} |
} |
detached = args_has(args, 'd'); |
detached = args_has(args, 'd'); |
|
|
if (args->argc == 0) |
if (args->argc == 0) { |
cmd = options_get_string(&s->options, "default-command"); |
cmd = options_get_string(&s->options, "default-command"); |
else |
if (cmd != NULL && *cmd != '\0') { |
cmd = args->argv[0]; |
argc = 1; |
|
argv = (char**)&cmd; |
|
} else { |
|
argc = 0; |
|
argv = NULL; |
|
} |
|
} else { |
|
argc = args->argc; |
|
argv = args->argv; |
|
} |
|
|
path = NULL; |
path = NULL; |
if (cmdq->client != NULL && cmdq->client->session == NULL) |
if (cmdq->client != NULL && cmdq->client->session == NULL) |
|
|
|
|
if (idx == -1) |
if (idx == -1) |
idx = -1 - options_get_number(&s->options, "base-index"); |
idx = -1 - options_get_number(&s->options, "base-index"); |
wl = session_new(s, args_get(args, 'n'), cmd, path, cwd, idx, &cause); |
wl = session_new(s, args_get(args, 'n'), argc, argv, path, cwd, idx, |
|
&cause); |
if (wl == NULL) { |
if (wl == NULL) { |
cmdq_error(cmdq, "create window failed: %s", cause); |
cmdq_error(cmdq, "create window failed: %s", cause); |
free(cause); |
free(cause); |