circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-11-05 10:28:48 +00:00
Code Issues Projects Releases Wiki Activity
6c3186a19a
tmux/cmd-attach-session.c

113 lines
3.1 KiB
C
Raw Normal View History

Sync OpenBSD patchset 829: Clean up and simplify tmux command argument parsing. Originally, tmux commands were parsed in the client process into a struct with the command data which was then serialised and sent to the server to be executed. The parsing was later moved into the server (an argv was sent from the client), but the parse step and intermediate struct was kept. This change removes that struct and the separate parse step. Argument parsing and printing is now common to all commands (in arguments.c) with each command left with just an optional check function (to validate the arguments at parse time), the exec function and a function to set up any key bindings (renamed from the old init function). This is overall more simple and consistent. There should be no changes to any commands behaviour or syntax although as this touches every command please watch for any unexpected changes.
2011-01-07 14:45:34 +00:00
/* $Id: cmd-attach-session.c,v 1.39 2011-01-07 14:45:33 tcunha Exp $ */
Window attachment, malloc debugging, fix a segfault with no sessions.
2007-10-04 11:52:03 +00:00
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
* WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER
* IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <sys/types.h>
#include "tmux.h"
/*
* Attach existing session to the current terminal.
*/
Pass return code from _exec; allow command sequences to work from the command line.
2009-01-19 18:23:40 +00:00
int cmd_attach_session_exec(struct cmd *, struct cmd_ctx *);
Window attachment, malloc debugging, fix a segfault with no sessions.
2007-10-04 11:52:03 +00:00
const struct cmd_entry cmd_attach_session_entry = {
Move -s and -c down a level so handling them is the responsibility of the command (with some helper functions), rather than the top-level. This changes the action command syntax so that -s and -c must be after the command rather than before.
2008-06-02 18:08:17 +00:00
"attach-session", "attach",
Sync OpenBSD patchset 829: Clean up and simplify tmux command argument parsing. Originally, tmux commands were parsed in the client process into a struct with the command data which was then serialised and sent to the server to be executed. The parsing was later moved into the server (an argv was sent from the client), but the parse step and intermediate struct was kept. This change removes that struct and the separate parse step. Argument parsing and printing is now common to all commands (in arguments.c) with each command left with just an optional check function (to validate the arguments at parse time), the exec function and a function to set up any key bindings (renamed from the old init function). This is overall more simple and consistent. There should be no changes to any commands behaviour or syntax although as this touches every command please watch for any unexpected changes.
2011-01-07 14:45:34 +00:00
"drt:", 0, 0,
Sync OpenBSD patchset 639: Support attaching a client read-only with a new -r flag to the attach-session command.
2010-02-08 18:27:34 +00:00
"[-dr] " CMD_TARGET_SESSION_USAGE,
Sync OpenBSD patchset 829: Clean up and simplify tmux command argument parsing. Originally, tmux commands were parsed in the client process into a struct with the command data which was then serialised and sent to the server to be executed. The parsing was later moved into the server (an argv was sent from the client), but the parse step and intermediate struct was kept. This change removes that struct and the separate parse step. Argument parsing and printing is now common to all commands (in arguments.c) with each command left with just an optional check function (to validate the arguments at parse time), the exec function and a function to set up any key bindings (renamed from the old init function). This is overall more simple and consistent. There should be no changes to any commands behaviour or syntax although as this touches every command please watch for any unexpected changes.
2011-01-07 14:45:34 +00:00
CMD_CANTNEST|CMD_STARTSERVER|CMD_SENDENVIRON,
NULL,
NULL,
cmd_attach_session_exec
Window attachment, malloc debugging, fix a segfault with no sessions.
2007-10-04 11:52:03 +00:00
};
Pass return code from _exec; allow command sequences to work from the command line.
2009-01-19 18:23:40 +00:00
int
Easy bits of arg printing for list-keys.
2008-06-05 16:35:32 +00:00
cmd_attach_session_exec(struct cmd *self, struct cmd_ctx *ctx)
Window attachment, malloc debugging, fix a segfault with no sessions.
2007-10-04 11:52:03 +00:00
{
Sync OpenBSD patchset 829: Clean up and simplify tmux command argument parsing. Originally, tmux commands were parsed in the client process into a struct with the command data which was then serialised and sent to the server to be executed. The parsing was later moved into the server (an argv was sent from the client), but the parse step and intermediate struct was kept. This change removes that struct and the separate parse step. Argument parsing and printing is now common to all commands (in arguments.c) with each command left with just an optional check function (to validate the arguments at parse time), the exec function and a function to set up any key bindings (renamed from the old init function). This is overall more simple and consistent. There should be no changes to any commands behaviour or syntax although as this touches every command please watch for any unexpected changes.
2011-01-07 14:45:34 +00:00
struct args *args = self->args;
struct session *s;
struct client *c;
const char *update;
char *overrides, *cause;
u_int i;
Trimify.
2008-06-18 22:21:51 +00:00
Sync OpenBSD patchset 806: Store sessions in an RB tree by name rather than a list, this is tidier and allows them to easily be shown sorted in various lists (list-sessions/choose-sessions). Keep a session index which is used in a couple of places internally but make it an ever-increasing number rather than filling in gaps with new sessions.
2010-12-22 15:36:44 +00:00
if (RB_EMPTY(&sessions)) {
Start the first client with a special socketpair so it is already known to the server rather than playing silly games to get them synchronised before doing anything. Change attach-session to start the server.
2009-01-19 17:16:09 +00:00
ctx->error(ctx, "no sessions");
Pass return code from _exec; allow command sequences to work from the command line.
2009-01-19 18:23:40 +00:00
return (-1);
Start the first client with a special socketpair so it is already known to the server rather than playing silly games to get them synchronised before doing anything. Change attach-session to start the server.
2009-01-19 17:16:09 +00:00
}
Sync OpenBSD patchset 829: Clean up and simplify tmux command argument parsing. Originally, tmux commands were parsed in the client process into a struct with the command data which was then serialised and sent to the server to be executed. The parsing was later moved into the server (an argv was sent from the client), but the parse step and intermediate struct was kept. This change removes that struct and the separate parse step. Argument parsing and printing is now common to all commands (in arguments.c) with each command left with just an optional check function (to validate the arguments at parse time), the exec function and a function to set up any key bindings (renamed from the old init function). This is overall more simple and consistent. There should be no changes to any commands behaviour or syntax although as this touches every command please watch for any unexpected changes.
2011-01-07 14:45:34 +00:00
if ((s = cmd_find_session(ctx, args_get(args, 't'))) == NULL)
Pass return code from _exec; allow command sequences to work from the command line.
2009-01-19 18:23:40 +00:00
return (-1);
Move -s and -c down a level so handling them is the responsibility of the command (with some helper functions), rather than the top-level. This changes the action command syntax so that -s and -c must be after the command rather than before.
2008-06-02 18:08:17 +00:00
Sync OpenBSD patchset 168: Both of cmdclient and curclient CAN be NULL - if the command is executed from the configuration file. In this case, attach-session can't do much, and new-session should just assume -d.
2009-07-23 13:25:27 +00:00
if (ctx->cmdclient == NULL && ctx->curclient == NULL)
return (0);
Tidy up new-session and attach-session and change them to work from inside tmux, switching the current client to the new or requested session.
2009-07-18 11:06:09 +00:00
if (ctx->cmdclient == NULL) {
Sync OpenBSD patchset 829: Clean up and simplify tmux command argument parsing. Originally, tmux commands were parsed in the client process into a struct with the command data which was then serialised and sent to the server to be executed. The parsing was later moved into the server (an argv was sent from the client), but the parse step and intermediate struct was kept. This change removes that struct and the separate parse step. Argument parsing and printing is now common to all commands (in arguments.c) with each command left with just an optional check function (to validate the arguments at parse time), the exec function and a function to set up any key bindings (renamed from the old init function). This is overall more simple and consistent. There should be no changes to any commands behaviour or syntax although as this touches every command please watch for any unexpected changes.
2011-01-07 14:45:34 +00:00
if (args_has(self->args, 'd')) {
Sync OpenBSD patchset 581: Massive spaces->tabs and trailing whitespace cleanup, hopefully for the last time now I've configured emacs to make them displayed in really annoying colours...
2009-12-04 22:14:47 +00:00
/*
Tidy up new-session and attach-session and change them to work from inside tmux, switching the current client to the new or requested session.
2009-07-18 11:06:09 +00:00
* Can't use server_write_session in case attaching to
* the same session as currently attached to.
*/
for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
c = ARRAY_ITEM(&clients, i);
if (c == NULL || c->session != s)
continue;
if (c == ctx->curclient)
continue;
server_write_client(c, MSG_DETACH, NULL, 0);
}
}
Sync OpenBSD patchset 581: Massive spaces->tabs and trailing whitespace cleanup, hopefully for the last time now I've configured emacs to make them displayed in really annoying colours...
2009-12-04 22:14:47 +00:00
Tidy up new-session and attach-session and change them to work from inside tmux, switching the current client to the new or requested session.
2009-07-18 11:06:09 +00:00
ctx->curclient->session = s;
Sync OpenBSD patchset 819: Don't reset the activity timer for unattached sessions every second, this screws up the choice of most-recently-used. Instead, break the time update into a little function and do it when the session is attached. Pointed out by joshe@.
2011-01-03 23:27:54 +00:00
session_update_activity(s);
Tidy up new-session and attach-session and change them to work from inside tmux, switching the current client to the new or requested session.
2009-07-18 11:06:09 +00:00
server_redraw_client(ctx->curclient);
} else {
if (!(ctx->cmdclient->flags & CLIENT_TERMINAL)) {
ctx->error(ctx, "not a terminal");
return (-1);
}
-d option to attach. Also fix CC in Makefile and make it build with DEBUG again.
2007-10-04 21:21:48 +00:00
Sync OpenBSD patchset 211: Add a terminal-overrides session option allowing individual terminfo(5) entries to be overridden. The 88col/256col checks are now moved into the default setting and out of the code. Also remove a couple of old workarounds for xterm and rxvt which are no longer necessary (tmux can emulate them if missing).
2009-08-09 15:26:24 +00:00
overrides =
options_get_string(&s->options, "terminal-overrides");
if (tty_open(&ctx->cmdclient->tty, overrides, &cause) != 0) {
Tidy up new-session and attach-session and change them to work from inside tmux, switching the current client to the new or requested session.
2009-07-18 11:06:09 +00:00
ctx->error(ctx, "terminal open failed: %s", cause);
xfree(cause);
return (-1);
}
Big internal reorganisation to move tty control into parent.
2007-11-27 19:23:34 +00:00
Sync OpenBSD patchset 829: Clean up and simplify tmux command argument parsing. Originally, tmux commands were parsed in the client process into a struct with the command data which was then serialised and sent to the server to be executed. The parsing was later moved into the server (an argv was sent from the client), but the parse step and intermediate struct was kept. This change removes that struct and the separate parse step. Argument parsing and printing is now common to all commands (in arguments.c) with each command left with just an optional check function (to validate the arguments at parse time), the exec function and a function to set up any key bindings (renamed from the old init function). This is overall more simple and consistent. There should be no changes to any commands behaviour or syntax although as this touches every command please watch for any unexpected changes.
2011-01-07 14:45:34 +00:00
if (args_has(self->args, 'r'))
Sync OpenBSD patchset 639: Support attaching a client read-only with a new -r flag to the attach-session command.
2010-02-08 18:27:34 +00:00
ctx->cmdclient->flags |= CLIENT_READONLY;
Sync OpenBSD patchset 829: Clean up and simplify tmux command argument parsing. Originally, tmux commands were parsed in the client process into a struct with the command data which was then serialised and sent to the server to be executed. The parsing was later moved into the server (an argv was sent from the client), but the parse step and intermediate struct was kept. This change removes that struct and the separate parse step. Argument parsing and printing is now common to all commands (in arguments.c) with each command left with just an optional check function (to validate the arguments at parse time), the exec function and a function to set up any key bindings (renamed from the old init function). This is overall more simple and consistent. There should be no changes to any commands behaviour or syntax although as this touches every command please watch for any unexpected changes.
2011-01-07 14:45:34 +00:00
if (args_has(self->args, 'd'))
Tidy up new-session and attach-session and change them to work from inside tmux, switching the current client to the new or requested session.
2009-07-18 11:06:09 +00:00
server_write_session(s, MSG_DETACH, NULL, 0);
Window attachment, malloc debugging, fix a segfault with no sessions.
2007-10-04 11:52:03 +00:00
Tidy up new-session and attach-session and change them to work from inside tmux, switching the current client to the new or requested session.
2009-07-18 11:06:09 +00:00
ctx->cmdclient->session = s;
Sync OpenBSD patchset 819: Don't reset the activity timer for unattached sessions every second, this screws up the choice of most-recently-used. Instead, break the time update into a little function and do it when the session is attached. Pointed out by joshe@.
2011-01-03 23:27:54 +00:00
session_update_activity(s);
Tidy up new-session and attach-session and change them to work from inside tmux, switching the current client to the new or requested session.
2009-07-18 11:06:09 +00:00
server_write_client(ctx->cmdclient, MSG_READY, NULL, 0);
Sync OpenBSD patchset 231: Infrastructure and commands to manage the environment for processes started within tmux. There is a global environment, copied from the external environment when the server is started and each session has an (initially empty) session environment which overrides it. New commands set-environment and show-environment manipulate or display the environments. A new session option, update-environment, is a space-separated list of variables which are updated from the external environment into the session environment every time a new session is created - the default is DISPLAY.
2009-08-09 17:48:55 +00:00
update = options_get_string(&s->options, "update-environment");
environ_update(update, &ctx->cmdclient->environ, &s->environ);
Tidy up new-session and attach-session and change them to work from inside tmux, switching the current client to the new or requested session.
2009-07-18 11:06:09 +00:00
server_redraw_client(ctx->cmdclient);
}
Incomplete resize support.
2007-10-04 19:03:52 +00:00
recalculate_sizes();
Sync OpenBSD patchset 527: Only need to chmod +x or -x the socket when a client is created, lost or attached, rather than every event loop.
2009-11-13 16:51:49 +00:00
server_update_socket();
Pass return code from _exec; allow command sequences to work from the command line.
2009-01-19 18:23:40 +00:00
Tidy up new-session and attach-session and change them to work from inside tmux, switching the current client to the new or requested session.
2009-07-18 11:06:09 +00:00
return (1); /* 1 means don't tell command client to exit */
Window attachment, malloc debugging, fix a segfault with no sessions.
2007-10-04 11:52:03 +00:00
}
Reference in New Issue Copy Permalink