OpenBSD CVS

CVS log for src/usr.bin/tmux/cmd-bind-key.c


[BACK] Up to [local] / src / usr.bin / tmux

Request diff between arbitrary revisions


Default branch: MAIN


Revision 1.46 / (download) - annotate - [select for diffs], Fri Aug 27 17:25:55 2021 UTC (2 years, 8 months ago) by nicm
Branch: MAIN
CVS Tags: OPENBSD_7_5_BASE, OPENBSD_7_5, OPENBSD_7_4_BASE, OPENBSD_7_4, OPENBSD_7_3_BASE, OPENBSD_7_3, OPENBSD_7_2_BASE, OPENBSD_7_2, OPENBSD_7_1_BASE, OPENBSD_7_1, OPENBSD_7_0_BASE, OPENBSD_7_0, HEAD
Changes since 1.45: +4 -6 lines
Diff to previous 1.45 (colored)

Replace %% in command lists (by copying them) for template arguments ,
this means they can be used with {} as well. Also make argument
processing from an existing vector preserve commands. GitHub issue 2858.

Revision 1.45 / (download) - annotate - [select for diffs], Wed Aug 25 09:18:08 2021 UTC (2 years, 8 months ago) by nicm
Branch: MAIN
Changes since 1.44: +3 -5 lines
Diff to previous 1.44 (colored)

bind-key needs to allow commands for any argument for the moment.

Revision 1.44 / (download) - annotate - [select for diffs], Wed Aug 25 08:51:55 2021 UTC (2 years, 8 months ago) by nicm
Branch: MAIN
Changes since 1.43: +15 -3 lines
Diff to previous 1.43 (colored)

Validate command argument types (string or command list) and give more
useful error messages.

Revision 1.43 / (download) - annotate - [select for diffs], Mon Aug 23 11:48:21 2021 UTC (2 years, 8 months ago) by nicm
Branch: MAIN
Changes since 1.42: +2 -1 lines
Diff to previous 1.42 (colored)

Key bindings steal a reference to the command instead of adding their
own, it was correct not to add a reference when parsing, but the
bind-key then needs to add one.

Revision 1.42 / (download) - annotate - [select for diffs], Sat Aug 21 20:46:43 2021 UTC (2 years, 8 months ago) by nicm
Branch: MAIN
Changes since 1.41: +28 -19 lines
Diff to previous 1.41 (colored)

Preserve argument type in command and convert to string on demand.

Revision 1.41 / (download) - annotate - [select for diffs], Sat Aug 21 17:25:32 2021 UTC (2 years, 8 months ago) by nicm
Branch: MAIN
Changes since 1.40: +1 -4 lines
Diff to previous 1.40 (colored)

Stop caring about empty commands, just treat as a null command.

Revision 1.40 / (download) - annotate - [select for diffs], Sat Aug 21 10:22:38 2021 UTC (2 years, 8 months ago) by nicm
Branch: MAIN
Changes since 1.39: +2 -2 lines
Diff to previous 1.39 (colored)

Add args parsing callback for some future work, currently unused.

Revision 1.39 / (download) - annotate - [select for diffs], Fri Aug 20 19:50:16 2021 UTC (2 years, 8 months ago) by nicm
Branch: MAIN
Changes since 1.38: +13 -9 lines
Diff to previous 1.38 (colored)

Hide struct args behind a couple of accessor functions.

Revision 1.38 / (download) - annotate - [select for diffs], Tue Sep 8 10:19:19 2020 UTC (3 years, 8 months ago) by nicm
Branch: MAIN
CVS Tags: OPENBSD_6_9_BASE, OPENBSD_6_9, OPENBSD_6_8_BASE, OPENBSD_6_8
Changes since 1.37: +23 -21 lines
Diff to previous 1.37 (colored)

Allow -N without a command to change or add a note to an existing key.

Revision 1.37 / (download) - annotate - [select for diffs], Mon Apr 13 08:26:27 2020 UTC (4 years, 1 month ago) by nicm
Branch: MAIN
CVS Tags: OPENBSD_6_7_BASE, OPENBSD_6_7
Changes since 1.36: +2 -2 lines
Diff to previous 1.36 (colored)

Make struct cmd local to cmd.c and move it out of tmux.h.

Revision 1.36 / (download) - annotate - [select for diffs], Thu Jan 30 08:02:25 2020 UTC (4 years, 3 months ago) by nicm
Branch: MAIN
Changes since 1.35: +3 -3 lines
Diff to previous 1.35 (colored)

Remove bind-key -c which doesn't do anything and is undocumented.

Revision 1.35 / (download) - annotate - [select for diffs], Mon Jan 27 08:53:13 2020 UTC (4 years, 3 months ago) by nicm
Branch: MAIN
Changes since 1.34: +8 -6 lines
Diff to previous 1.34 (colored)

Add support for adding a note to a key binding (with bind-key -N) and
use this to add descriptions to the default key bindings. A new -N flag
to list-keys shows key bindings with notes rather than the default
bind-key command used to create them. Change the default ? binding to
use this to show a readable summary of keys.

Also extend command-prompt to return the name of the key pressed and add
a default binding (/) to show the note for the next key pressed

Suggested by Alex Tremblay in GitHub issue 2000.

Revision 1.34 / (download) - annotate - [select for diffs], Mon May 27 12:16:27 2019 UTC (4 years, 11 months ago) by nicm
Branch: MAIN
CVS Tags: OPENBSD_6_6_BASE, OPENBSD_6_6
Changes since 1.33: +13 -8 lines
Diff to previous 1.33 (colored)

Add an additional {} syntax for defining strings in the configuration
file, making it much tidier to define commands that contain other tmux
or shell commands (like if-shell). Also tweak bind-key to expect a
string if it is only given one argument, so {} can be used with it as
well. From Avi Halachmi.

Revision 1.33 / (download) - annotate - [select for diffs], Sat May 25 07:18:20 2019 UTC (4 years, 11 months ago) by nicm
Branch: MAIN
Changes since 1.32: +16 -13 lines
Diff to previous 1.32 (colored)

Merge cmd_list_parse into cmd-parse.y so it can use the new alias
processing code.

Revision 1.32 / (download) - annotate - [select for diffs], Tue Jan 24 21:50:22 2017 UTC (7 years, 3 months ago) by nicm
Branch: MAIN
CVS Tags: OPENBSD_6_5_BASE, OPENBSD_6_5, OPENBSD_6_4_BASE, OPENBSD_6_4, OPENBSD_6_3_BASE, OPENBSD_6_3, OPENBSD_6_2_BASE, OPENBSD_6_2, OPENBSD_6_1_BASE, OPENBSD_6_1
Changes since 1.31: +4 -58 lines
Diff to previous 1.31 (colored)

Fixed keys for choose mode, and remove the last mode keys bits.

Revision 1.31 / (download) - annotate - [select for diffs], Sun Oct 16 19:04:05 2016 UTC (7 years, 7 months ago) by nicm
Branch: MAIN
Changes since 1.30: +14 -14 lines
Diff to previous 1.30 (colored)

Mass rename struct cmd_q to struct cmdq_item and related.

Revision 1.30 / (download) - annotate - [select for diffs], Fri Oct 14 22:14:22 2016 UTC (7 years, 7 months ago) by nicm
Branch: MAIN
Changes since 1.29: +2 -2 lines
Diff to previous 1.29 (colored)

Add CMD_AFTERHOOK flag to the easy commands that don't need any special handling.

Revision 1.29 / (download) - annotate - [select for diffs], Wed Oct 12 14:50:14 2016 UTC (7 years, 7 months ago) by nicm
Branch: MAIN
Changes since 1.28: +1 -3 lines
Diff to previous 1.28 (colored)

Drop the edit mode key tables and just use fixed key bindings for the
command prompt.

Revision 1.28 / (download) - annotate - [select for diffs], Tue Oct 11 07:23:34 2016 UTC (7 years, 7 months ago) by nicm
Branch: MAIN
Changes since 1.27: +7 -46 lines
Diff to previous 1.27 (colored)

Fundamental change to how copy mode key bindings work:

The vi-copy and emacs-copy mode key tables are gone, and instead copy
mode commands are bound in one of two normal key tables ("copy-mode" or
"copy-mode-vi"). Keys are bound to "send-keys -X copy-mode-command". So:

    bind -temacs-copy C-Up scroll-up
    bind -temacs-copy -R5 WheelUpPane scroll-up

Becomes:

    bind -Tcopy-mode C-Up send -X scroll-up
    bind -Tcopy-mode WheelUpPane send -N5 -X scroll-up

This allows the full command parser and command set to be used - for
example, we can use the normal command prompt for searching, jumping,
and so on instead of a custom one:

    bind -Tcopy-mode C-r command-prompt -p'search up' "send -X search-backward '%%'"

command-prompt also gets a -1 option to only require on key press, which
is needed for jumping.

The plan is to get rid of mode keys entirely, so more to come eventually.

Revision 1.27 / (download) - annotate - [select for diffs], Mon Oct 10 21:51:39 2016 UTC (7 years, 7 months ago) by nicm
Branch: MAIN
Changes since 1.26: +6 -6 lines
Diff to previous 1.26 (colored)

Add static in cmd-* and fix a few other nits.

Revision 1.26 / (download) - annotate - [select for diffs], Mon Sep 12 15:40:58 2016 UTC (7 years, 8 months ago) by nicm
Branch: MAIN
Changes since 1.25: +18 -6 lines
Diff to previous 1.25 (colored)

Allow repeat count to be specified in mode key tables with bind-key -R,
and set the default repeat count to 5 for WheelUp and WheelDown in
copy-mode.

Revision 1.25 / (download) - annotate - [select for diffs], Tue Jan 19 15:59:12 2016 UTC (8 years, 4 months ago) by nicm
Branch: MAIN
CVS Tags: OPENBSD_6_0_BASE, OPENBSD_6_0, OPENBSD_5_9_BASE, OPENBSD_5_9
Changes since 1.24: +2 -2 lines
Diff to previous 1.24 (colored)

I no longer use my SourceForge address so replace it.

Revision 1.24 / (download) - annotate - [select for diffs], Sun Dec 13 21:53:57 2015 UTC (8 years, 5 months ago) by nicm
Branch: MAIN
Changes since 1.23: +10 -6 lines
Diff to previous 1.23 (colored)

Use member names in cmd_entry definitions so I stop getting confused
about the order.

Revision 1.23 / (download) - annotate - [select for diffs], Sat Dec 12 18:19:00 2015 UTC (8 years, 5 months ago) by nicm
Branch: MAIN
Changes since 1.22: +2 -2 lines
Diff to previous 1.22 (colored)

Allow prefix and prefix2 to be set to None to disable (useful if you
would rather bind the prefix in the root table).

Revision 1.22 / (download) - annotate - [select for diffs], Thu Nov 12 11:05:34 2015 UTC (8 years, 6 months ago) by nicm
Branch: MAIN
Changes since 1.21: +5 -4 lines
Diff to previous 1.21 (colored)

Support UTF-8 key bindings by expanding the key type from int to
uint64_t and converting UTF-8 to Unicode on input and the reverse on
output. (This allows key bindings, there are still omissions - the
largest being that the various prompts do not accept UTF-8.)

Revision 1.21 / (download) - annotate - [select for diffs], Mon Apr 20 15:34:56 2015 UTC (9 years, 1 month ago) by nicm
Branch: MAIN
CVS Tags: OPENBSD_5_8_BASE, OPENBSD_5_8
Changes since 1.20: +12 -6 lines
Diff to previous 1.20 (colored)

Support for multiple key tables to commands to be bound to sequences of
keys. The default key bindings become the "prefix" table and -n the
"root" table. Keys may be bound in new tables with bind -T and
switch-client -T used to specify the table in which the next key should
be looked up. Based on a diff from Keith Amling.

Revision 1.20 / (download) - annotate - [select for diffs], Fri Apr 10 16:00:08 2015 UTC (9 years, 1 month ago) by nicm
Branch: MAIN
Changes since 1.19: +23 -7 lines
Diff to previous 1.19 (colored)

Add a -x flag to copy-selection, append-selection and start-named-buffer
to prevent it exiting copy mode after copying. From J Raynor with a few
tweaks by me.

Revision 1.19 / (download) - annotate - [select for diffs], Mon Oct 20 22:29:25 2014 UTC (9 years, 7 months ago) by nicm
Branch: MAIN
CVS Tags: OPENBSD_5_7_BASE, OPENBSD_5_7
Changes since 1.18: +1 -2 lines
Diff to previous 1.18 (colored)

Instead of setting up the default keys by building the key struct
directly with a helper function in the cmd_entry, include a table of
bind-key commands and pass them through the command parser and a
temporary cmd_q.

As well as being smaller, this will allow default bindings to be command
sequences which will probably be needed soon.

Revision 1.18 / (download) - annotate - [select for diffs], Wed May 14 06:45:35 2014 UTC (10 years ago) by nicm
Branch: MAIN
CVS Tags: OPENBSD_5_6_BASE, OPENBSD_5_6
Changes since 1.17: +5 -5 lines
Diff to previous 1.17 (colored)

Change key-table to mode-table to allow for some future work. From Keith
Amling.

Revision 1.17 / (download) - annotate - [select for diffs], Thu Oct 10 12:00:18 2013 UTC (10 years, 7 months ago) by nicm
Branch: MAIN
CVS Tags: OPENBSD_5_5_BASE, OPENBSD_5_5
Changes since 1.16: +13 -16 lines
Diff to previous 1.16 (colored)

Remove the barely-used and unnecessary command check() function.

Revision 1.16 / (download) - annotate - [select for diffs], Sun Mar 24 09:54:10 2013 UTC (11 years, 1 month ago) by nicm
Branch: MAIN
CVS Tags: OPENBSD_5_4_BASE, OPENBSD_5_4
Changes since 1.15: +14 -13 lines
Diff to previous 1.15 (colored)

Add a command queue to standardize and simplify commands that call other
commands and allow a command to block execution of subsequent
commands. This allows run-shell and if-shell to be synchronous which has
been much requested.

Each client has a default command queue and commands are consumed one at
a time from it. A command may suspend execution from the queue by
returning CMD_RETURN_WAIT and then resume it by calling cmd_continue() -
for example run-shell does this from the callback that is fired after
the job is freed.

When the command queue becomes empty, command clients are automatically
exited (unless attaching). A callback is also fired - this is used for
nested commands in, for example, if-shell which can block execution of
the client's cmdq until a new cmdq becomes empty.

Also merge all the old error/info/print functions together and lose the
old curclient/cmdclient distinction - a cmdq is bound to one client (or
none if in the configuration file), this is a command client if
c->session is NULL otherwise an attached client.

Revision 1.15 / (download) - annotate - [select for diffs], Fri Mar 22 15:52:40 2013 UTC (11 years, 1 month ago) by nicm
Branch: MAIN
Changes since 1.14: +24 -10 lines
Diff to previous 1.14 (colored)

Add copy-pipe mode command to copy selection and also pipe to a command.

Revision 1.14 / (download) - annotate - [select for diffs], Wed Jul 11 07:10:15 2012 UTC (11 years, 10 months ago) by nicm
Branch: MAIN
CVS Tags: OPENBSD_5_3_BASE, OPENBSD_5_3, OPENBSD_5_2_BASE, OPENBSD_5_2
Changes since 1.13: +17 -17 lines
Diff to previous 1.13 (colored)

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.

Revision 1.13 / (download) - annotate - [select for diffs], Tue Jul 10 11:53:01 2012 UTC (11 years, 10 months ago) by nicm
Branch: MAIN
Changes since 1.12: +3 -2 lines
Diff to previous 1.12 (colored)

xfree is not particularly helpful, remove it. From Thomas Adam.

Revision 1.12 / (download) - annotate - [select for diffs], Sat Jan 21 11:12:13 2012 UTC (12 years, 4 months ago) by nicm
Branch: MAIN
CVS Tags: OPENBSD_5_1_BASE, OPENBSD_5_1
Changes since 1.11: +3 -3 lines
Diff to previous 1.11 (colored)

Use RB trees not SPLAY.

Revision 1.11 / (download) - annotate - [select for diffs], Sat Jan 15 20:14:41 2011 UTC (13 years, 4 months ago) by nicm
Branch: MAIN
CVS Tags: OPENBSD_5_0_BASE, OPENBSD_5_0, OPENBSD_4_9_BASE, OPENBSD_4_9
Changes since 1.10: +4 -4 lines
Diff to previous 1.10 (colored)

Fix bind-key -t.

Revision 1.10 / (download) - annotate - [select for diffs], Tue Jan 4 00:42:46 2011 UTC (13 years, 4 months ago) by nicm
Branch: MAIN
Changes since 1.9: +45 -136 lines
Diff to previous 1.9 (colored)

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.

Revision 1.9 / (download) - annotate - [select for diffs], Sat Jun 26 18:20:53 2010 UTC (13 years, 10 months ago) by nicm
Branch: MAIN
CVS Tags: OPENBSD_4_8_BASE, OPENBSD_4_8
Changes since 1.8: +12 -3 lines
Diff to previous 1.8 (colored)

Setting the cmdlist pointer in the bind-key to NULL to prevent it being freed
after the command is executing is bogus because it may still be needed if the
same command is going to be executed again (for example if you "bind-key a
bind-key b ..."). Making a copy is hard, so instead add a reference count to
the cmd_list.

While here, also print bind-key -n and the rest of the flags properly.

Fixes problem reported by mcbride@.

Revision 1.8 / (download) - annotate - [select for diffs], Sat Jan 23 17:50:56 2010 UTC (14 years, 3 months ago) by nicm
Branch: MAIN
CVS Tags: OPENBSD_4_7_BASE, OPENBSD_4_7
Changes since 1.7: +3 -2 lines
Diff to previous 1.7 (colored)

Don't leak if arguments appear multiple times, from Tiago Cunha.

Revision 1.7 / (download) - annotate - [select for diffs], Thu Dec 3 22:50:10 2009 UTC (14 years, 5 months ago) by nicm
Branch: MAIN
Changes since 1.6: +2 -2 lines
Diff to previous 1.6 (colored)

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...

Revision 1.6 / (download) - annotate - [select for diffs], Fri Nov 13 19:53:28 2009 UTC (14 years, 6 months ago) by nicm
Branch: MAIN
Changes since 1.5: +2 -2 lines
Diff to previous 1.5 (colored)

Get rid of the ugly CMD_CHFLAG macro and use a const string (eg "dDU") in the
command entry structs and a couple of functions to check/set the flags.

Revision 1.5 / (download) - annotate - [select for diffs], Tue Jul 28 17:05:10 2009 UTC (14 years, 9 months ago) by nicm
Branch: MAIN
Changes since 1.4: +67 -5 lines
Diff to previous 1.4 (colored)

Final pieces of mode key rebinding: bind-key and unbind-key now accept a -t
argument to modify a table.

Revision 1.4 / (download) - annotate - [select for diffs], Sun Jul 26 12:58:44 2009 UTC (14 years, 9 months ago) by nicm
Branch: MAIN
Changes since 1.3: +1 -24 lines
Diff to previous 1.3 (colored)

Make all messages sent between the client and server fixed size.

This is the first of two changes to make the protocol more resilient and less
sensitive to other changes in the code, particularly with commands. The client
now packs argv into a buffer and sends it to the server for parsing, rather
than doing it itself and sending the parsed command data.

As a side-effect this also removes a lot of now-unused command marshalling
code.

Mixing a server without this change and a client with or vice versa will cause
tmux to hang or crash, please ensure that tmux is entirely killed before
upgrading.

Revision 1.3 / (download) - annotate - [select for diffs], Fri Jul 24 14:52:47 2009 UTC (14 years, 9 months ago) by nicm
Branch: MAIN
Changes since 1.2: +9 -4 lines
Diff to previous 1.2 (colored)

Permit commands to be bound to key presses without the prefix key first. The
new -n flag to bind-key and unbind-key sets or removes these bindings, and
list-key shows them in []s.

Revision 1.2 / (download) - annotate - [select for diffs], Mon Jul 13 23:11:35 2009 UTC (14 years, 10 months ago) by nicm
Branch: MAIN
Changes since 1.1: +2 -2 lines
Diff to previous 1.1 (colored)

Having fixed flags for single-character getopt options is a bit hard to
maintain and is only going to get worse as more are used. So instead, add a new
uint64_t member to cmd_entry which is a bitmask of upper and lowercase options
accepted by the command.

This means new single character options can be used without the need to add it
explicitly to the list.

Revision 1.1 / (download) - annotate - [select for diffs], Mon Jun 1 22:58:49 2009 UTC (14 years, 11 months ago) by nicm
Branch: MAIN
CVS Tags: OPENBSD_4_6_BASE, OPENBSD_4_6

Import tmux, a terminal multiplexor allowing (among other things) a single
terminal to be switched between several different windows and programs
displayed on one terminal be detached from one terminal and moved to another.

ok deraadt pirofti

This form allows you to request diff's between any two revisions of a file. You may select a symbolic revision name using the selection box or you may type in a numeric name using the type-in text box.