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
6e8d29e9a2
tmux/cmd-split-window.c

191 lines
5.0 KiB
C
Raw Normal View History

No need for $Id$ now.
2014-11-08 12:27:43 +00:00
/* $OpenBSD$ */
Window splitting. Two vertical panes fixed 50% each. This is a huge diff, still a couple of bugs (notably heap corruption somewhere causing segfault on exit).
2009-01-11 23:31:46 +00:00
/*
I no longer use my SourceForge address so replace it.
2016-01-19 15:59:12 +00:00
* Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
Window splitting. Two vertical panes fixed 50% each. This is a huge diff, still a couple of bugs (notably heap corruption somewhere causing segfault on exit).
2009-01-11 23:31:46 +00:00
*
* 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>
Alter how tmux handles the working directory to internally use file descriptors rather than strings. - Each session still has a current working directory. - New sessions still get their working directory from the client that created them or its attached session if any. - New windows are created by default in the session working directory. - The -c flag to new, neww, splitw allows the working directory to be overridden. - The -c flag to attach let's the session working directory be changed. - The default-path option has been removed. To get the equivalent to default-path '.', do: bind c neww -c $PWD To get the equivalent of default-path '', do: bind c neww -c '#{pane_current_path}' The equivalent of default-path '~' is left as an exercise for the reader. This also changes the client identify protocol to be a set of messages rather than one as well as some other changes that should make it easier to make backwards-compatible protocol changes in future.
2013-10-06 20:02:23 +00:00
#include <errno.h>
#include <fcntl.h>
Window splitting. Two vertical panes fixed 50% each. This is a huge diff, still a couple of bugs (notably heap corruption somewhere causing segfault on exit).
2009-01-11 23:31:46 +00:00
#include <stdlib.h>
Alter how tmux handles the working directory to internally use file descriptors rather than strings. - Each session still has a current working directory. - New sessions still get their working directory from the client that created them or its attached session if any. - New windows are created by default in the session working directory. - The -c flag to new, neww, splitw allows the working directory to be overridden. - The -c flag to attach let's the session working directory be changed. - The default-path option has been removed. To get the equivalent to default-path '.', do: bind c neww -c $PWD To get the equivalent of default-path '', do: bind c neww -c '#{pane_current_path}' The equivalent of default-path '~' is left as an exercise for the reader. This also changes the client identify protocol to be a set of messages rather than one as well as some other changes that should make it easier to make backwards-compatible protocol changes in future.
2013-10-06 20:02:23 +00:00
#include <string.h>
Window splitting. Two vertical panes fixed 50% each. This is a huge diff, still a couple of bugs (notably heap corruption somewhere causing segfault on exit).
2009-01-11 23:31:46 +00:00
#include <unistd.h>
#include "tmux.h"
/*
rotate-window command.
2009-04-03 17:21:46 +00:00
* Split a window (add a new pane).
Window splitting. Two vertical panes fixed 50% each. This is a huge diff, still a couple of bugs (notably heap corruption somewhere causing segfault on exit).
2009-01-11 23:31:46 +00:00
*/
Move template defines back into .c files.
2014-10-20 23:35:28 +00:00
#define SPLIT_WINDOW_TEMPLATE "#{session_name}:#{window_index}.#{pane_index}"
Mass rename struct cmd_q to struct cmdq_item and related.
2016-10-16 19:04:05 +00:00
static enum cmd_retval cmd_split_window_exec(struct cmd *,
struct cmdq_item *);
Window splitting. Two vertical panes fixed 50% each. This is a huge diff, still a couple of bugs (notably heap corruption somewhere causing segfault on exit).
2009-01-11 23:31:46 +00:00
const struct cmd_entry cmd_split_window_entry = {
Use member names in cmd_entry definitions so I stop getting confused about the order.
2015-12-13 21:53:57 +00:00
.name = "split-window",
.alias = "splitw",
Add support for performing a full width split (with splitw -f), rather than splitting the current cell. From Stephen Kent.
2016-09-04 17:37:06 +00:00
.args = { "bc:dfF:l:hp:Pt:v", 0, -1 },
.usage = "[-bdfhvP] [-c start-directory] [-F format] "
Use member names in cmd_entry definitions so I stop getting confused about the order.
2015-12-13 21:53:57 +00:00
"[-p percentage|-l size] " CMD_TARGET_PANE_USAGE " [command]",
Get rid of the extra layer of flags and cmd_prepare() and just store the CMD_FIND_* flags in the cmd_entry and call it for the command. Commands with special requirements call it themselves and update the target for hooks to use.
2017-04-22 10:22:39 +00:00
.target = { 't', CMD_FIND_PANE, 0 },
Instead of combined flags for -c, -s, -t, split into different sets using an enum and simplify the parsing code.
2015-12-14 00:31:54 +00:00
.flags = 0,
Use member names in cmd_entry definitions so I stop getting confused about the order.
2015-12-13 21:53:57 +00:00
.exec = cmd_split_window_exec
Window splitting. Two vertical panes fixed 50% each. This is a huge diff, still a couple of bugs (notably heap corruption somewhere causing segfault on exit).
2009-01-11 23:31:46 +00:00
};
Add static in cmd-* and fix a few other nits.
2016-10-10 21:51:39 +00:00
static enum cmd_retval
Mass rename struct cmd_q to struct cmdq_item and related.
2016-10-16 19:04:05 +00:00
cmd_split_window_exec(struct cmd *self, struct cmdq_item *item)
Window splitting. Two vertical panes fixed 50% each. This is a huge diff, still a couple of bugs (notably heap corruption somewhere causing segfault on exit).
2009-01-11 23:31:46 +00:00
{
Mouse bindings and hooks set up an initial current state when running a command. This is used for the session, window and pane for all commands in the command sequence if there is no -t or -s. However, using it for all commands in the command sequence means that if the active pane or current session is changed, subsequent commands still use the previous state. So make commands which explicitly change the current state (such as neww and selectp) update it themselves for later commands. Commands which may invalidate the state (like killp) are already OK because an invalid state will be ignored. Also fill in the current state for all key bindings rather than just the mouse, so that any omissions are easier to spot.
2017-04-22 08:56:24 +00:00
struct cmd_find_state *current = &item->shared->current;
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;
Get rid of the extra layer of flags and cmd_prepare() and just store the CMD_FIND_* flags in the cmd_entry and call it for the command. Commands with special requirements call it themselves and update the target for hooks to use.
2017-04-22 10:22:39 +00:00
struct client *c = cmd_find_client(item, NULL, 1);
struct session *s = item->target.s;
struct winlink *wl = item->target.wl;
Instead of every command resolving the target (-t or -s) itself, prepare the state (client, session, winlink, pane) for it it before entering the command. Each command provides some flags that tell the prepare step what it is expecting. This is a requirement for having hooks on commands (for example, if you hook "select-window -t1:2", the hook command should to operate on window 1:2 not whatever it thinks is the current window), and should allow some other target improvements. The old cmd_find_* functions remain for the moment but that layer will be dropped later. Joint work with Thomas Adam.
2015-12-13 14:32:38 +00:00
struct window *w = wl->window;
Get rid of the extra layer of flags and cmd_prepare() and just store the CMD_FIND_* flags in the cmd_entry and call it for the command. Commands with special requirements call it themselves and update the target for hooks to use.
2017-04-22 10:22:39 +00:00
struct window_pane *wp = item->target.wp, *new_wp = NULL;
Like options, move the environ struct into environ.c.
2015-10-28 09:51:55 +00:00
struct environ *env;
Add -c for respawn-pane and respawn-window, from J Raynor.
2017-07-21 09:17:19 +00:00
const char *cmd, *path, *shell, *template, *cwd;
char **argv, *cause, *new_cause, *cp, *to_free = NULL;
Sync OpenBSD patchset 1041: Add -F format to new-window and split-window to use with the -P flag, from George Nachman.
2012-03-07 13:39:29 +00:00
u_int hlimit;
Because pledge(2) does not allow us to pass directory file descriptors around, we can't use file descriptors for the working directory because we will be unable to pass it to a privileged process to tell it where to read or write files or spawn children. So move tmux back to using strings for the current working directory. We try to check it exists with access() when it is set but ultimately fall back to ~ if it fails at time of use (or / if that fails too).
2015-10-31 08:13:58 +00:00
int argc, size, percentage;
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
enum layout_type type;
struct layout_cell *lc;
Set PATH explicitly, either from client or session environment. Previously it came from the session environment. From J Raynor.
2014-04-17 13:02:59 +00:00
struct environ_entry *envent;
Trying to do hooks generically is way too complicated and unreliable and confusing, particularly trying to automatically figure out what target hooks should be using. So simplify it: - drop before hooks entirely, they don't seem to be very useful; - commands with special requirements now fire their own after hook (for example, if they change session or window, or if they have -t and -s and need to choose which one the hook uses as current target); - commands with no special requirements can have the CMD_AFTERHOOK flag added and they will use the -t state. At the moment new-session, new-window, split-window fire their own hook, and display-message uses the flag. The remaining commands still need to be looked at.
2016-10-13 22:48:51 +00:00
struct cmd_find_state fs;
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
Add resize-pane -Z to temporary zoom the active pane to occupy the full window or unzoom (restored to the normal layout) if it already zoomed, bound to C-b z by default. The pane is unzoomed on pretty much any excuse whatsoever. We considered making this a new layout but the requirements are quite different from layouts so decided it is better as a special case. Each current layout cell is saved, a temporary one-cell layout generated and all except the active pane set to NULL. Prompted by suggestions and scripts from several. Thanks to Aaron Jensen and Thiago Padilha for testing an earlier version.
2013-02-24 00:25:03 +00:00
server_unzoom_window(w);
Window splitting. Two vertical panes fixed 50% each. This is a huge diff, still a couple of bugs (notably heap corruption somewhere causing segfault on exit).
2009-01-11 23:31:46 +00:00
If multiple arguments are given to new-session, new-window, split-window, respawn-window or respawn-pane, pass them directly to execvp() to help avoid quoting problems. One argument still goes to "sh -c" like before. Requested by many over the years. Patch from J Raynor.
2014-05-13 08:08:32 +00:00
if (args->argc == 0) {
Move struct options into options.c.
2015-10-27 15:58:42 +00:00
cmd = options_get_string(s->options, "default-command");
If multiple arguments are given to new-session, new-window, split-window, respawn-window or respawn-pane, pass them directly to execvp() to help avoid quoting problems. One argument still goes to "sh -c" like before. Requested by many over the years. Patch from J Raynor.
2014-05-13 08:08:32 +00:00
if (cmd != NULL && *cmd != '\0') {
argc = 1;
Various minor style and spacing nits.
2014-09-01 21:50:18 +00:00
argv = (char **)&cmd;
If multiple arguments are given to new-session, new-window, split-window, respawn-window or respawn-pane, pass them directly to execvp() to help avoid quoting problems. One argument still goes to "sh -c" like before. Requested by many over the years. Patch from J Raynor.
2014-05-13 08:08:32 +00:00
} else {
argc = 0;
argv = NULL;
}
} else {
argc = args->argc;
argv = args->argv;
}
Alter how tmux handles the working directory to internally use file descriptors rather than strings. - Each session still has a current working directory. - New sessions still get their working directory from the client that created them or its attached session if any. - New windows are created by default in the session working directory. - The -c flag to new, neww, splitw allows the working directory to be overridden. - The -c flag to attach let's the session working directory be changed. - The default-path option has been removed. To get the equivalent to default-path '.', do: bind c neww -c $PWD To get the equivalent of default-path '', do: bind c neww -c '#{pane_current_path}' The equivalent of default-path '~' is left as an exercise for the reader. This also changes the client identify protocol to be a set of messages rather than one as well as some other changes that should make it easier to make backwards-compatible protocol changes in future.
2013-10-06 20:02:23 +00:00
if (args_has(args, 'c')) {
Add a helper function for the most common format_create/defaults/expand pattern.
2017-03-08 13:36:12 +00:00
cwd = args_get(args, 'c');
Add -c for respawn-pane and respawn-window, from J Raynor.
2017-07-21 09:17:19 +00:00
to_free = format_single(item, cwd, c, s, NULL, NULL);
cwd = to_free;
Mass rename struct cmd_q to struct cmdq_item and related.
2016-10-16 19:04:05 +00:00
} else if (item->client != NULL && item->client->session == NULL)
cwd = item->client->cwd;
Alter how tmux handles the working directory to internally use file descriptors rather than strings. - Each session still has a current working directory. - New sessions still get their working directory from the client that created them or its attached session if any. - New windows are created by default in the session working directory. - The -c flag to new, neww, splitw allows the working directory to be overridden. - The -c flag to attach let's the session working directory be changed. - The default-path option has been removed. To get the equivalent to default-path '.', do: bind c neww -c $PWD To get the equivalent of default-path '', do: bind c neww -c '#{pane_current_path}' The equivalent of default-path '~' is left as an exercise for the reader. This also changes the client identify protocol to be a set of messages rather than one as well as some other changes that should make it easier to make backwards-compatible protocol changes in future.
2013-10-06 20:02:23 +00:00
else
cwd = s->cwd;
Window splitting. Two vertical panes fixed 50% each. This is a huge diff, still a couple of bugs (notably heap corruption somewhere causing segfault on exit).
2009-01-11 23:31:46 +00:00
Sync OpenBSD patchset 558: When -h and -p are given to split-window, calculate the percentage size using the width instead of the height.
2009-11-22 00:12:33 +00:00
type = LAYOUT_TOPBOTTOM;
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(args, 'h'))
Sync OpenBSD patchset 558: When -h and -p are given to split-window, calculate the percentage size using the width instead of the height.
2009-11-22 00:12:33 +00:00
type = LAYOUT_LEFTRIGHT;
Sync OpenBSD patchset 142: Each window now has a tree of layout cells associated with it. In this tree, each node is either a horizontal or vertical cell containing a list of other cells running from left-to-right or top-to-bottom, or a leaf cell which is associated with a pane. The major functional changes are: - panes may now be split arbitrarily both horizontally (splitw -h, C-b %) and vertically (splitw -v, C-b "); - panes may be resized both horizontally and vertically (resizep -L/-R/-U/-D, bound to C-b left/right/up/down and C-b M-left/right/up/down); - layouts are now applied and then may be modified by resizing or splitting panes, rather than being fixed and reapplied when the window is resized or panes are added; - manual-vertical layout is no longer necessary, and active-only layout is gone (but may return in future); - the main-pane layouts now reduce the size of the main pane to fit all panes if possible. Thanks to all who tested.
2009-07-20 15:42:05 +00:00
size = -1;
Sync OpenBSD patchset 862: Size on split-window is -l not -s. Doh.
2011-02-15 15:26:54 +00:00
if (args_has(args, 'l')) {
size = args_strtonum(args, 'l', 0, INT_MAX, &cause);
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 (cause != NULL) {
Sync OpenBSD patchset 955: Plug memory leak, from Tiago Cunha.
2011-09-21 16:34:04 +00:00
xasprintf(&new_cause, "size %s", cause);
Sync OpenBSD patchset 1150: xfree is not particularly helpful, remove it. From Thomas Adam.
2012-07-11 19:34:16 +00:00
free(cause);
Sync OpenBSD patchset 955: Plug memory leak, from Tiago Cunha.
2011-09-21 16:34:04 +00:00
cause = new_cause;
goto error;
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
}
} else if (args_has(args, 'p')) {
percentage = args_strtonum(args, 'p', 0, INT_MAX, &cause);
if (cause != NULL) {
Sync OpenBSD patchset 955: Plug memory leak, from Tiago Cunha.
2011-09-21 16:34:04 +00:00
xasprintf(&new_cause, "percentage %s", cause);
Sync OpenBSD patchset 1150: xfree is not particularly helpful, remove it. From Thomas Adam.
2012-07-11 19:34:16 +00:00
free(cause);
Sync OpenBSD patchset 955: Plug memory leak, from Tiago Cunha.
2011-09-21 16:34:04 +00:00
cause = new_cause;
goto error;
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
}
Sync OpenBSD patchset 558: When -h and -p are given to split-window, calculate the percentage size using the width instead of the height.
2009-11-22 00:12:33 +00:00
if (type == LAYOUT_TOPBOTTOM)
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
size = (wp->sy * percentage) / 100;
Sync OpenBSD patchset 558: When -h and -p are given to split-window, calculate the percentage size using the width instead of the height.
2009-11-22 00:12:33 +00:00
else
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
size = (wp->sx * percentage) / 100;
Sync OpenBSD patchset 558: When -h and -p are given to split-window, calculate the percentage size using the width instead of the height.
2009-11-22 00:12:33 +00:00
}
Move struct options into options.c.
2015-10-27 15:58:42 +00:00
hlimit = options_get_number(s->options, "history-limit");
Sync OpenBSD patchset 142: Each window now has a tree of layout cells associated with it. In this tree, each node is either a horizontal or vertical cell containing a list of other cells running from left-to-right or top-to-bottom, or a leaf cell which is associated with a pane. The major functional changes are: - panes may now be split arbitrarily both horizontally (splitw -h, C-b %) and vertically (splitw -v, C-b "); - panes may be resized both horizontally and vertically (resizep -L/-R/-U/-D, bound to C-b left/right/up/down and C-b M-left/right/up/down); - layouts are now applied and then may be modified by resizing or splitting panes, rather than being fixed and reapplied when the window is resized or panes are added; - manual-vertical layout is no longer necessary, and active-only layout is gone (but may return in future); - the main-pane layouts now reduce the size of the main pane to fit all panes if possible. Thanks to all who tested.
2009-07-20 15:42:05 +00:00
Move struct options into options.c.
2015-10-27 15:58:42 +00:00
shell = options_get_string(s->options, "default-shell");
Sync OpenBSD patchset 305: When using tmux as a login shell, there is currently no way to specify a shell to be used as a login shell inside tmux, so add a default-shell session option. This sets the shell invoked as a login shell when the default-command option is empty. The default option value is whichever of $SHELL, getpwuid(getuid())'s pw_shell or /bin/sh is valid first. Based on a diff from martynas@, changed by me to be a session option rather than a window option.
2009-09-02 01:02:44 +00:00
if (*shell == '\0' || areshell(shell))
shell = _PATH_BSHELL;
Add support for performing a full width split (with splitw -f), rather than splitting the current cell. From Stephen Kent.
2016-09-04 17:37:06 +00:00
lc = layout_split_pane(wp, type, size, args_has(args, 'b'),
args_has(args, 'f'));
Add -b to splitw like joinw, from Felix Rosencrantz.
2014-11-12 22:57:06 +00:00
if (lc == NULL) {
Sync OpenBSD patchset 142: Each window now has a tree of layout cells associated with it. In this tree, each node is either a horizontal or vertical cell containing a list of other cells running from left-to-right or top-to-bottom, or a leaf cell which is associated with a pane. The major functional changes are: - panes may now be split arbitrarily both horizontally (splitw -h, C-b %) and vertically (splitw -v, C-b "); - panes may be resized both horizontally and vertically (resizep -L/-R/-U/-D, bound to C-b left/right/up/down and C-b M-left/right/up/down); - layouts are now applied and then may be modified by resizing or splitting panes, rather than being fixed and reapplied when the window is resized or panes are added; - manual-vertical layout is no longer necessary, and active-only layout is gone (but may return in future); - the main-pane layouts now reduce the size of the main pane to fit all panes if possible. Thanks to all who tested.
2009-07-20 15:42:05 +00:00
cause = xstrdup("pane too small");
goto error;
Window splitting. Two vertical panes fixed 50% each. This is a huge diff, still a couple of bugs (notably heap corruption somewhere causing segfault on exit).
2009-01-11 23:31:46 +00:00
}
If splitw -b is used, insert the new pane before the current one in the pane list. This means the numbering is in order (for example for display-panes) and fixes a problem with redrawing the active pane borders.
2017-02-27 13:07:57 +00:00
new_wp = window_add_pane(w, wp, args_has(args, 'b'), hlimit);
Rewrite of choose mode, both to simplify and tidy the code and to add some modern features. Now the common code is in mode-tree.c, which provides an API used by the three modes now separated into window-{buffer,client,tree}.c. Buffer mode shows buffers, client mode clients and tree mode a tree of sessions, windows and panes. Each mode has a common set of key bindings plus a few that are specific to the mode. Other changes are: - each mode has a preview pane: for buffers this is the buffer content (very useful), for others it is a preview of the pane; - items may be sorted in different ways ('O' key); - multiple items may be tagged and an operation applied to all of them (for example, to delete multiple buffers at once); - in tree mode a command may be run on the selected item (session, window, pane) or on tagged items (key ':'); - displayed items may be filtered in tree mode by using a format (this is used to implement find-window) (key 'f'); - the custom format (-F) for the display is no longer available; - shortcut keys change from 0-9, a-z, A-Z which was always a bit weird with keys used for other uses to 0-9, M-a to M-z. Now that the code is simpler, other improvements will come later. Primary key bindings for each mode are documented under the commands in the man page (choose-buffer, choose-client, choose-tree). Parts written by Thomas Adam.
2017-05-30 21:44:59 +00:00
layout_make_leaf(lc, new_wp);
Set PATH explicitly, either from client or session environment. Previously it came from the session environment. From J Raynor.
2014-04-17 13:02:59 +00:00
path = NULL;
Mass rename struct cmd_q to struct cmdq_item and related.
2016-10-16 19:04:05 +00:00
if (item->client != NULL && item->client->session == NULL)
envent = environ_find(item->client->environ, "PATH");
Set PATH explicitly, either from client or session environment. Previously it came from the session environment. From J Raynor.
2014-04-17 13:02:59 +00:00
else
Like options, move the environ struct into environ.c.
2015-10-28 09:51:55 +00:00
envent = environ_find(s->environ, "PATH");
Set PATH explicitly, either from client or session environment. Previously it came from the session environment. From J Raynor.
2014-04-17 13:02:59 +00:00
if (envent != NULL)
path = envent->value;
Do not update TERM into config file parsing has finished.
2017-04-25 15:35:10 +00:00
env = environ_for_session(s, 0);
Like options, move the environ struct into environ.c.
2015-10-28 09:51:55 +00:00
if (window_pane_spawn(new_wp, argc, argv, path, shell, cwd, env,
Move server_fill_environ into environ.c and move some other common code into it.
2017-03-09 17:02:38 +00:00
s->tio, &cause) != 0) {
environ_free(env);
Sync OpenBSD patchset 604: New command, join-pane, to split and move an existing pane into the space (like splitw then movep, or the reverse of breakp).
2010-01-08 16:31:35 +00:00
goto error;
Move server_fill_environ into environ.c and move some other common code into it.
2017-03-09 17:02:38 +00:00
}
environ_free(env);
Sync OpenBSD patchset 142: Each window now has a tree of layout cells associated with it. In this tree, each node is either a horizontal or vertical cell containing a list of other cells running from left-to-right or top-to-bottom, or a leaf cell which is associated with a pane. The major functional changes are: - panes may now be split arbitrarily both horizontally (splitw -h, C-b %) and vertically (splitw -v, C-b "); - panes may be resized both horizontally and vertically (resizep -L/-R/-U/-D, bound to C-b left/right/up/down and C-b M-left/right/up/down); - layouts are now applied and then may be modified by resizing or splitting panes, rather than being fixed and reapplied when the window is resized or panes are added; - manual-vertical layout is no longer necessary, and active-only layout is gone (but may return in future); - the main-pane layouts now reduce the size of the main pane to fit all panes if possible. Thanks to all who tested.
2009-07-20 15:42:05 +00:00
Rewrite of choose mode, both to simplify and tidy the code and to add some modern features. Now the common code is in mode-tree.c, which provides an API used by the three modes now separated into window-{buffer,client,tree}.c. Buffer mode shows buffers, client mode clients and tree mode a tree of sessions, windows and panes. Each mode has a common set of key bindings plus a few that are specific to the mode. Other changes are: - each mode has a preview pane: for buffers this is the buffer content (very useful), for others it is a preview of the pane; - items may be sorted in different ways ('O' key); - multiple items may be tagged and an operation applied to all of them (for example, to delete multiple buffers at once); - in tree mode a command may be run on the selected item (session, window, pane) or on tagged items (key ':'); - displayed items may be filtered in tree mode by using a format (this is used to implement find-window) (key 'f'); - the custom format (-F) for the display is no longer available; - shortcut keys change from 0-9, a-z, A-Z which was always a bit weird with keys used for other uses to 0-9, M-a to M-z. Now that the code is simpler, other improvements will come later. Primary key bindings for each mode are documented under the commands in the man page (choose-buffer, choose-client, choose-tree). Parts written by Thomas Adam.
2017-05-30 21:44:59 +00:00
layout_fix_panes(w, w->sx, w->sy);
Make the window pane code handle panes of different sizes, and add a -l and -p arguments to split-window to specify the new window size in lines or as a percentage.
2009-01-12 18:22:47 +00:00
server_redraw_window(w);
Space trimmage mega-diff.
2009-05-04 17:58:27 +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(args, 'd')) {
Sync OpenBSD patchset 600: Change split-window to accept a pane target (it should be split-pane but renaming the command would be annoying).
2010-01-08 16:23:38 +00:00
window_set_active_pane(w, new_wp);
Window splitting. Two vertical panes fixed 50% each. This is a huge diff, still a couple of bugs (notably heap corruption somewhere causing segfault on exit).
2009-01-11 23:31:46 +00:00
session_select(s, wl->idx);
Pass flags into cmd_find_from_* to fix prefer-unattached, reported by Thomas Sattler.
2017-08-30 10:33:57 +00:00
cmd_find_from_session(current, s, 0);
Window splitting. Two vertical panes fixed 50% each. This is a huge diff, still a couple of bugs (notably heap corruption somewhere causing segfault on exit).
2009-01-11 23:31:46 +00:00
server_redraw_session(s);
} else
Codes no longer needed.
2009-01-11 23:41:29 +00:00
server_status_session(s);
Window splitting. Two vertical panes fixed 50% each. This is a huge diff, still a couple of bugs (notably heap corruption somewhere causing segfault on exit).
2009-01-11 23:31:46 +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(args, 'P')) {
Sync OpenBSD patchset 1119: Switch all of the various choose- and list- commands over to the format infrastructure, from Thomas Adam.
2012-05-22 21:03:25 +00:00
if ((template = args_get(args, 'F')) == NULL)
Sync OpenBSD patchset 1162: Use a separate define for each default format template and strip clutter from the choose-tree defaults.
2012-08-31 09:18:50 +00:00
template = SPLIT_WINDOW_TEMPLATE;
Add a helper function for the most common format_create/defaults/expand pattern.
2017-03-08 13:36:12 +00:00
cp = format_single(item, template, c, s, wl, new_wp);
Mass rename struct cmd_q to struct cmdq_item and related.
2016-10-16 19:04:05 +00:00
cmdq_print(item, "%s", cp);
Sync OpenBSD patchset 1150: xfree is not particularly helpful, remove it. From Thomas Adam.
2012-07-11 19:34:16 +00:00
free(cp);
Sync OpenBSD patchset 820: Add a -P option to new-window and split-window to print the new window or pane index in target form (useful to pass it into other commands).
2011-01-03 23:29:09 +00:00
}
Use the notify name string instead of going via an enum and change existing hooks to use notifys instead.
2016-10-16 22:06:40 +00:00
notify_window("window-layout-changed", w);
Alter how tmux handles the working directory to internally use file descriptors rather than strings. - Each session still has a current working directory. - New sessions still get their working directory from the client that created them or its attached session if any. - New windows are created by default in the session working directory. - The -c flag to new, neww, splitw allows the working directory to be overridden. - The -c flag to attach let's the session working directory be changed. - The default-path option has been removed. To get the equivalent to default-path '.', do: bind c neww -c $PWD To get the equivalent of default-path '', do: bind c neww -c '#{pane_current_path}' The equivalent of default-path '~' is left as an exercise for the reader. This also changes the client identify protocol to be a set of messages rather than one as well as some other changes that should make it easier to make backwards-compatible protocol changes in future.
2013-10-06 20:02:23 +00:00
Pass flags into cmd_find_from_* to fix prefer-unattached, reported by Thomas Sattler.
2017-08-30 10:33:57 +00:00
cmd_find_from_winlink_pane(&fs, wl, new_wp, 0);
Mass rename struct cmd_q to struct cmdq_item and related.
2016-10-16 19:04:05 +00:00
hooks_insert(s->hooks, item, &fs, "after-split-window");
Rewrite command queue handling. Each client still has a command queue, but there is also now a global command queue. Instead of command queues being dispatched on demand from wherever the command happens to be added, they are now all dispatched from the top level server loop. Command queues may now also include callbacks as well as commands, and items may be inserted after the current command as well as at the end. This all makes command queues significantly more predictable and easier to use, and avoids the complex multiple nested command queues used by source-file, if-shell and friends. A mass rename of struct cmdq to a better name (cmdq_item probably) is coming.
2016-10-16 17:55:14 +00:00
Add -c for respawn-pane and respawn-window, from J Raynor.
2017-07-21 09:17:19 +00:00
free(to_free);
Sync OpenBSD patchset 1151: Make command exec functions return an enum rather than -1/0/1 values and add a new value to mean "leave client running but don't attach" to fix problems with using some commands in a command sequence. Most of the work by Thomas Adam, problem reported by "jspenguin" on SF bug 3535531.
2012-07-11 19:37:32 +00:00
return (CMD_RETURN_NORMAL);
Sync OpenBSD patchset 142: Each window now has a tree of layout cells associated with it. In this tree, each node is either a horizontal or vertical cell containing a list of other cells running from left-to-right or top-to-bottom, or a leaf cell which is associated with a pane. The major functional changes are: - panes may now be split arbitrarily both horizontally (splitw -h, C-b %) and vertically (splitw -v, C-b "); - panes may be resized both horizontally and vertically (resizep -L/-R/-U/-D, bound to C-b left/right/up/down and C-b M-left/right/up/down); - layouts are now applied and then may be modified by resizing or splitting panes, rather than being fixed and reapplied when the window is resized or panes are added; - manual-vertical layout is no longer necessary, and active-only layout is gone (but may return in future); - the main-pane layouts now reduce the size of the main pane to fit all panes if possible. Thanks to all who tested.
2009-07-20 15:42:05 +00:00
error:
Remove panes from layout if spawning them fails, reported by Anthony J Bentley.
2015-04-26 20:25:20 +00:00
if (new_wp != NULL) {
layout_close_pane(new_wp);
Sync OpenBSD patchset 600: Change split-window to accept a pane target (it should be split-pane but renaming the command would be annoying).
2010-01-08 16:23:38 +00:00
window_remove_pane(w, new_wp);
Remove panes from layout if spawning them fails, reported by Anthony J Bentley.
2015-04-26 20:25:20 +00:00
}
Mass rename struct cmd_q to struct cmdq_item and related.
2016-10-16 19:04:05 +00:00
cmdq_error(item, "create pane failed: %s", cause);
Sync OpenBSD patchset 1150: xfree is not particularly helpful, remove it. From Thomas Adam.
2012-07-11 19:34:16 +00:00
free(cause);
Because pledge(2) does not allow us to pass directory file descriptors around, we can't use file descriptors for the working directory because we will be unable to pass it to a privileged process to tell it where to read or write files or spawn children. So move tmux back to using strings for the current working directory. We try to check it exists with access() when it is set but ultimately fall back to ~ if it fails at time of use (or / if that fails too).
2015-10-31 08:13:58 +00:00
Add -c for respawn-pane and respawn-window, from J Raynor.
2017-07-21 09:17:19 +00:00
free(to_free);
Sync OpenBSD patchset 1151: Make command exec functions return an enum rather than -1/0/1 values and add a new value to mean "leave client running but don't attach" to fix problems with using some commands in a command sequence. Most of the work by Thomas Adam, problem reported by "jspenguin" on SF bug 3535531.
2012-07-11 19:37:32 +00:00
return (CMD_RETURN_ERROR);
Window splitting. Two vertical panes fixed 50% each. This is a huge diff, still a couple of bugs (notably heap corruption somewhere causing segfault on exit).
2009-01-11 23:31:46 +00:00
}
Reference in New Issue Copy Permalink