circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-02 21:56:57 +00:00
Code Issues Projects Releases Wiki Activity

Add -A flag to new-session to make it behave like attach-session if the

Browse Source 
session exists. If -A is used, -D behaves like -d to attach-session.
This commit is contained in:
Nicholas Marriott
2013-03-24 09:58:40 +00:00
parent c71844de63
commit 14fad6a5cc
4 changed files with 53 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
cmd-attach-session.c
View File

@ -39,9 +39,8 @@ const struct cmd_entry cmd_attach_session_entry = {
};
enum cmd_retval
cmd_attach_session_exec(struct cmd *self, struct cmd_q *cmdq)
cmd_attach_session(struct cmd_q *cmdq, const char* tflag, int dflag, int rflag)
{
struct args *args = self->args;
struct session *s;
struct client *c;
const char *update;
@ -53,14 +52,14 @@ cmd_attach_session_exec(struct cmd *self, struct cmd_q *cmdq)
return (CMD_RETURN_ERROR);
}
if ((s = cmd_find_session(cmdq, args_get(args, 't'), 1)) == NULL)
if ((s = cmd_find_session(cmdq, tflag, 1)) == NULL)
return (CMD_RETURN_ERROR);
if (cmdq->client == NULL)
return (CMD_RETURN_NORMAL);
if (cmdq->client->session != NULL) {
if (args_has(self->args, 'd')) {
if (dflag) {
/*
* Can't use server_write_session in case attaching to
* the same session as currently attached to.
@ -87,10 +86,10 @@ cmd_attach_session_exec(struct cmd *self, struct cmd_q *cmdq)
return (CMD_RETURN_ERROR);
}
if (args_has(self->args, 'r'))
if (rflag)
cmdq->client->flags |= CLIENT_READONLY;
if (args_has(self->args, 'd'))
if (dflag)
server_write_session(s, MSG_DETACH, NULL, 0);
update = options_get_string(&s->options, "update-environment");
@ -110,3 +109,12 @@ cmd_attach_session_exec(struct cmd *self, struct cmd_q *cmdq)
return (CMD_RETURN_NORMAL);
}
enum cmd_retval
cmd_attach_session_exec(struct cmd *self, struct cmd_q *cmdq)
{
struct args *args = self->args;
return (cmd_attach_session(cmdq, args_get(args, 't'),
args_has(args, 'd'), args_has(args, 'r')));
}