circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-11-05 02:18:47 +00:00
Code Issues Projects Releases Wiki Activity
b2b5d88f3f
tmux/cmd-select-pane.c

90 lines
2.4 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-select-pane.c,v 1.14 2011-01-07 14:45:34 tcunha Exp $ */
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
/*
* Copyright (c) 2009 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"
/*
switch-pane is now select-pane.
2009-01-14 19:56:55 +00:00
* Select 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
*/
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
void cmd_select_pane_key_binding(struct cmd *, int);
Pass return code from _exec; allow command sequences to work from the command line.
2009-01-19 18:23:40 +00:00
int cmd_select_pane_exec(struct cmd *, struct cmd_ctx *);
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
switch-pane is now select-pane.
2009-01-14 19:56:55 +00:00
const struct cmd_entry cmd_select_pane_entry = {
"select-pane", "selectp",
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
"DLRt:U", 0, 0,
Support up, down, left, right movement through panes with -UDLR flags to select-pane. Also remove up- and down-pane: equivalent behaviour is now available using -t :.+ and -t :.-.
2010-03-15 22:03:38 +00:00
"[-DLRU] " CMD_TARGET_PANE_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
0,
cmd_select_pane_key_binding,
NULL,
cmd_select_pane_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
};
Support up, down, left, right movement through panes with -UDLR flags to select-pane. Also remove up- and down-pane: equivalent behaviour is now available using -t :.+ and -t :.-.
2010-03-15 22:03:38 +00:00
void
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_select_pane_key_binding(struct cmd *self, int key)
Support up, down, left, right movement through panes with -UDLR flags to select-pane. Also remove up- and down-pane: equivalent behaviour is now available using -t :.+ and -t :.-.
2010-03-15 22:03:38 +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
self->args = args_create(0);
Support up, down, left, right movement through panes with -UDLR flags to select-pane. Also remove up- and down-pane: equivalent behaviour is now available using -t :.+ and -t :.-.
2010-03-15 22:03:38 +00:00
if (key == KEYC_UP)
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
args_set(self->args, 'U', NULL);
Support up, down, left, right movement through panes with -UDLR flags to select-pane. Also remove up- and down-pane: equivalent behaviour is now available using -t :.+ and -t :.-.
2010-03-15 22:03:38 +00:00
if (key == KEYC_DOWN)
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
args_set(self->args, 'D', NULL);
Support up, down, left, right movement through panes with -UDLR flags to select-pane. Also remove up- and down-pane: equivalent behaviour is now available using -t :.+ and -t :.-.
2010-03-15 22:03:38 +00:00
if (key == KEYC_LEFT)
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
args_set(self->args, 'L', NULL);
Support up, down, left, right movement through panes with -UDLR flags to select-pane. Also remove up- and down-pane: equivalent behaviour is now available using -t :.+ and -t :.-.
2010-03-15 22:03:38 +00:00
if (key == KEYC_RIGHT)
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
args_set(self->args, 'R', NULL);
Support up, down, left, right movement through panes with -UDLR flags to select-pane. Also remove up- and down-pane: equivalent behaviour is now available using -t :.+ and -t :.-.
2010-03-15 22:03:38 +00:00
if (key == 'o')
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
args_set(self->args, 't', ":.+");
Support up, down, left, right movement through panes with -UDLR flags to select-pane. Also remove up- and down-pane: equivalent behaviour is now available using -t :.+ and -t :.-.
2010-03-15 22:03:38 +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
switch-pane is now select-pane.
2009-01-14 19:56:55 +00:00
cmd_select_pane_exec(struct cmd *self, struct cmd_ctx *ctx)
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
struct args *args = self->args;
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
struct winlink *wl;
Multiple window splitting.
2009-01-14 19:29:32 +00:00
struct window_pane *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
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 ((wl = cmd_find_pane(ctx, args_get(args, 't'), NULL, &wp)) == 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);
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
Get rid of the PANE_HIDDEN flag in favour of a function, and moving the decision for whether or not a pane should be drawn out of the layout code and into the redraw code. This is needed for the new layout design, getting it in now to make that easier to work on.
2009-07-15 17:42:44 +00:00
if (!window_pane_visible(wp)) {
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
ctx->error(ctx, "pane not visible");
Pass return code from _exec; allow command sequences to work from the command line.
2009-01-19 18:23:40 +00:00
return (-1);
switch-pane is now select-pane.
2009-01-14 19:56:55 +00:00
}
Support up, down, left, right movement through panes with -UDLR flags to select-pane. Also remove up- and down-pane: equivalent behaviour is now available using -t :.+ and -t :.-.
2010-03-15 22:03:38 +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, 'L'))
Support up, down, left, right movement through panes with -UDLR flags to select-pane. Also remove up- and down-pane: equivalent behaviour is now available using -t :.+ and -t :.-.
2010-03-15 22:03:38 +00:00
wp = window_pane_find_left(wp);
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(self->args, 'R'))
Support up, down, left, right movement through panes with -UDLR flags to select-pane. Also remove up- and down-pane: equivalent behaviour is now available using -t :.+ and -t :.-.
2010-03-15 22:03:38 +00:00
wp = window_pane_find_right(wp);
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(self->args, 'U'))
Support up, down, left, right movement through panes with -UDLR flags to select-pane. Also remove up- and down-pane: equivalent behaviour is now available using -t :.+ and -t :.-.
2010-03-15 22:03:38 +00:00
wp = window_pane_find_up(wp);
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(self->args, 'D'))
Support up, down, left, right movement through panes with -UDLR flags to select-pane. Also remove up- and down-pane: equivalent behaviour is now available using -t :.+ and -t :.-.
2010-03-15 22:03:38 +00:00
wp = window_pane_find_down(wp);
if (wp == NULL) {
ctx->error(ctx, "pane not found");
return (-1);
}
switch-pane is now select-pane.
2009-01-14 19:56:55 +00:00
window_set_active_pane(wl->window, wp);
Sync OpenBSD patchset 150: Now that #P could be in the status line, flag it for redraw when the active pane changes.
2009-07-21 16:27:41 +00:00
server_status_window(wl->window);
Sync OpenBSD patchset 597: Options to set the colour of the pane borders, with different colours for the active pane.
2010-01-05 23:52:37 +00:00
server_redraw_window_borders(wl->window);
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
Pass return code from _exec; allow command sequences to work from the command line.
2009-01-19 18:23:40 +00:00
return (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
}
Reference in New Issue Copy Permalink