circlecloud
/
tmux
mirror of https://github.com/tmux/tmux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add -P and -F to new-session.

This commit is contained in:
Nicholas Marriott 2013-03-25 11:44:00 +00:00
parent 599dd2a560
commit 43fb9835fa
3 changed files with 43 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
cmd-new-session.c
View File

@ -35,9 +35,9 @@ enum cmd_retval cmd_new_session_exec(struct cmd *, struct cmd_q *);
const struct cmd_entry cmd_new_session_entry = { const struct cmd_entry cmd_new_session_entry = {
"new-session", "new", "new-session", "new",
"AdDn:s:t:x:y:", 0, 1, "AdDF:n:Ps:t:x:y:", 0, 1,
"[-AdD] [-n window-name] [-s session-name] " CMD_TARGET_SESSION_USAGE "[-AdDP] [-F format] [-n window-name] [-s session-name] "
" [-x width] [-y height] [command]", CMD_TARGET_SESSION_USAGE " [-x width] [-y height] [command]",
CMD_STARTSERVER|CMD_CANTNEST|CMD_SENDENVIRON, CMD_STARTSERVER|CMD_CANTNEST|CMD_SENDENVIRON,
NULL, NULL,
cmd_new_session_check, cmd_new_session_check,
@ -63,11 +63,12 @@ cmd_new_session_exec(struct cmd *self, struct cmd_q *cmdq)
struct termios tio, *tiop; struct termios tio, *tiop;
struct passwd *pw; struct passwd *pw;
const char *newname, *target, *update, *cwd, *errstr; const char *newname, *target, *update, *cwd, *errstr;
char *cmd, *cause; const char *template;
char *cmd, *cause, *cp;
int detached, idx; int detached, idx;
u_int sx, sy; u_int sx, sy;
int already_attached; int already_attached;
struct format_tree *ft;
newname = args_get(args, 's'); newname = args_get(args, 's');
if (newname != NULL) { if (newname != NULL) {
@ -233,6 +234,23 @@ cmd_new_session_exec(struct cmd *self, struct cmd_q *cmdq)
if (cfg_finished) if (cfg_finished)
cfg_show_causes(s); cfg_show_causes(s);
/* Print if requested. */
if (args_has(args, 'P')) {
if ((template = args_get(args, 'F')) == NULL)
template = NEW_SESSION_TEMPLATE;
ft = format_create();
if ((c = cmd_find_client(cmdq, NULL, 1)) != NULL)
format_client(ft, c);
format_session(ft, s);
cp = format_expand(ft, template);
cmdq_print(cmdq, "%s", cp);
free(cp);
format_free(ft);
}
if (!detached) if (!detached)
cmdq->client_exit = 0; cmdq->client_exit = 0;
return (CMD_RETURN_NORMAL); return (CMD_RETURN_NORMAL);

6
cmd-new-window.c
View File

@ -46,12 +46,10 @@ cmd_new_window_exec(struct cmd *self, struct cmd_q *cmdq)
struct session *s; struct session *s;
struct winlink *wl; struct winlink *wl;
struct client *c; struct client *c;
const char *cmd, *cwd; const char *cmd, *cwd, *template;
const char *template; char *cause, *cp;
char *cause;
int idx, last, detached; int idx, last, detached;
struct format_tree *ft; struct format_tree *ft;
char *cp;
if (args_has(args, 'a')) { if (args_has(args, 'a')) {
wl = cmd_find_window(cmdq, args_get(args, 't'), &s); wl = cmd_find_window(cmdq, args_get(args, 't'), &s);

12
tmux.h
View File

@ -159,6 +159,7 @@ extern char **environ;
/* Default templates for break-pane, new-window and split-window. */ /* Default templates for break-pane, new-window and split-window. */
#define BREAK_PANE_TEMPLATE "#{session_name}:#{window_index}.#{pane_index}" #define BREAK_PANE_TEMPLATE "#{session_name}:#{window_index}.#{pane_index}"
#define NEW_SESSION_TEMPLATE "#{session_name}:"
#define NEW_WINDOW_TEMPLATE BREAK_PANE_TEMPLATE #define NEW_WINDOW_TEMPLATE BREAK_PANE_TEMPLATE
#define SPLIT_WINDOW_TEMPLATE BREAK_PANE_TEMPLATE #define SPLIT_WINDOW_TEMPLATE BREAK_PANE_TEMPLATE
@ -780,9 +781,6 @@ struct job {
int fd; int fd;
struct bufferevent *event; struct bufferevent *event;
struct bufferevent *out;
int outdone;
void (*callbackfn)(struct job *); void (*callbackfn)(struct job *);
void (*freefn)(void *); void (*freefn)(void *);
void *data; void *data;
@ -1416,6 +1414,9 @@ struct cmd_q {
struct cmd_q_item *item; struct cmd_q_item *item;
struct cmd *cmd; struct cmd *cmd;
time_t time;
u_int number;
void (*emptyfn)(struct cmd_q *); void (*emptyfn)(struct cmd_q *);
void *data; void *data;
@ -1611,8 +1612,8 @@ int options_table_find(const char *, const struct options_table_entry **,
/* job.c */ /* job.c */
extern struct joblist all_jobs; extern struct joblist all_jobs;
struct job *job_run( struct job *job_run(const char *, struct session *,
const char *, void (*)(struct job *), void (*)(void *), void *); void (*)(struct job *), void (*)(void *), void *);
void job_free(struct job *); void job_free(struct job *);
void job_died(struct job *, int); void job_died(struct job *, int);
@ -1857,6 +1858,7 @@ int cmdq_free(struct cmd_q *);
void printflike2 cmdq_print(struct cmd_q *, const char *, ...); void printflike2 cmdq_print(struct cmd_q *, const char *, ...);
void printflike2 cmdq_info(struct cmd_q *, const char *, ...); void printflike2 cmdq_info(struct cmd_q *, const char *, ...);
void printflike2 cmdq_error(struct cmd_q *, const char *, ...); void printflike2 cmdq_error(struct cmd_q *, const char *, ...);
int cmdq_guard(struct cmd_q *, const char *);
void cmdq_run(struct cmd_q *, struct cmd_list *); void cmdq_run(struct cmd_q *, struct cmd_list *);
void cmdq_append(struct cmd_q *, struct cmd_list *); void cmdq_append(struct cmd_q *, struct cmd_list *);
int cmdq_continue(struct cmd_q *); int cmdq_continue(struct cmd_q *);