![[BACK]](/icons/back.gif){kind=icon}
Up to [local] / src / usr.bin / tmux
Request diff between arbitrary revisions
Default branch: MAIN
Revision 1.34, Tue May 30 21:44:59 2017 UTC (6 years, 11 months ago) by nicm
Branch: MAIN
CVS Tags: HEAD
Changes since 1.33: +1 -1 lines
FILE REMOVED
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.
Revision 1.33 / (download) - annotate - [select for diffs], Sat Apr 22 10:22:39 2017 UTC (7 years ago) by nicm
Branch: MAIN
Changes since 1.32: +4 -4 lines
Diff to previous 1.32 (colored)
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.
Revision 1.32 / (download) - annotate - [select for diffs], Wed Apr 5 10:49:46 2017 UTC (7 years, 1 month ago) by nicm
Branch: MAIN
Changes since 1.31: +4 -4 lines
Diff to previous 1.31 (colored)
Give each client a name. This defaults to the tty name as before but falls back to an alternative if the tty name is not available. This is clearer than overloading the client ttyname member and allows us to remove the path stored in the tty struct, it should always be the same as the client.
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
CVS Tags: OPENBSD_6_1_BASE,
OPENBSD_6_1
Changes since 1.30: +8 -7 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], Mon Oct 10 21:51:39 2016 UTC (7 years, 7 months ago) by nicm
Branch: MAIN
Changes since 1.29: +5 -5 lines
Diff to previous 1.29 (colored)
Add static in cmd-* and fix a few other nits.
Revision 1.29 / (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.28: +2 -2 lines
Diff to previous 1.28 (colored)
I no longer use my SourceForge address so replace it.
Revision 1.28 / (download) - annotate - [select for diffs], Mon Dec 14 00:31:54 2015 UTC (8 years, 5 months ago) by nicm
Branch: MAIN
Changes since 1.27: +4 -2 lines
Diff to previous 1.27 (colored)
Instead of combined flags for -c, -s, -t, split into different sets using an enum and simplify the parsing code.
Revision 1.27 / (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.26: +9 -6 lines
Diff to previous 1.26 (colored)
Use member names in cmd_entry definitions so I stop getting confused about the order.
Revision 1.26 / (download) - annotate - [select for diffs], Sun Dec 13 14:32:38 2015 UTC (8 years, 5 months ago) by nicm
Branch: MAIN
Changes since 1.25: +5 -8 lines
Diff to previous 1.25 (colored)
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.
Revision 1.25 / (download) - annotate - [select for diffs], Sun Oct 25 22:29:17 2015 UTC (8 years, 6 months ago) by nicm
Branch: MAIN
Changes since 1.24: +2 -2 lines
Diff to previous 1.24 (colored)
Extend the modifiers allowed before formats: as well as the existing
#{=10:...} length limit, add #{t:...} to convert a time_t format to a
string, #{b:...} for basename and #{d:...} for dirname. Remove all the
foo_string time formats as they can now be replaced by "t:", for example
#{window_activity_string} becomes #{t:window_activity}.
Revision 1.24 / (download) - annotate - [select for diffs], Mon Apr 27 16:25:57 2015 UTC (9 years ago) by nicm
Branch: MAIN
CVS Tags: OPENBSD_5_8_BASE,
OPENBSD_5_8
Changes since 1.23: +2 -2 lines
Diff to previous 1.23 (colored)
Rewrite of the target resolution internals to be simpler and more
consistent but with much less duplication, but keeping the same internal
API. Also adds more readable aliases for some of the special tokens used
in targets (eg "{start}" instead of "^"). Some behaviours may have
changed, for example prefix matches now happen before fnmatch.
Revision 1.23 / (download) - annotate - [select for diffs], Fri Apr 24 23:17:11 2015 UTC (9 years ago) by nicm
Branch: MAIN
Changes since 1.22: +15 -11 lines
Diff to previous 1.22 (colored)
Convert clients list into a TAILQ.
Revision 1.22 / (download) - annotate - [select for diffs], Thu Feb 5 10:29:43 2015 UTC (9 years, 3 months ago) by nicm
Branch: MAIN
CVS Tags: OPENBSD_5_7_BASE,
OPENBSD_5_7
Changes since 1.21: +2 -3 lines
Diff to previous 1.21 (colored)
Wrap all the individual format_* calls in a single format_defaults functions.
Revision 1.21 / (download) - annotate - [select for diffs], Mon Oct 20 23:35:28 2014 UTC (9 years, 7 months ago) by nicm
Branch: MAIN
Changes since 1.20: +7 -1 lines
Diff to previous 1.20 (colored)
Move template defines back into .c files.
Revision 1.20 / (download) - annotate - [select for diffs], Mon Oct 20 22:29:25 2014 UTC (9 years, 7 months ago) by nicm
Branch: MAIN
Changes since 1.19: +1 -2 lines
Diff to previous 1.19 (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.19 / (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_6_BASE,
OPENBSD_5_6,
OPENBSD_5_5_BASE,
OPENBSD_5_5
Changes since 1.18: +1 -2 lines
Diff to previous 1.18 (colored)
Remove the barely-used and unnecessary command check() function.
Revision 1.18 / (download) - annotate - [select for diffs], Mon Mar 25 10:04:44 2013 UTC (11 years, 1 month ago) by nicm
Branch: MAIN
CVS Tags: OPENBSD_5_4_BASE,
OPENBSD_5_4
Changes since 1.17: +2 -2 lines
Diff to previous 1.17 (colored)
tty.path can be NULL, don't dereference it. From George Nachman.
Revision 1.17 / (download) - annotate - [select for diffs], Sun Mar 24 09:54:10 2013 UTC (11 years, 1 month ago) by nicm
Branch: MAIN
Changes since 1.16: +7 -7 lines
Diff to previous 1.16 (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.16 / (download) - annotate - [select for diffs], Thu Mar 21 16:09:59 2013 UTC (11 years, 2 months ago) by nicm
Branch: MAIN
Changes since 1.15: +3 -4 lines
Diff to previous 1.15 (colored)
Allow choose commands to be used outside tmux, so long as at least one client is attached.
Revision 1.15 / (download) - annotate - [select for diffs], Thu Mar 21 16:09:17 2013 UTC (11 years, 2 months ago) by nicm
Branch: MAIN
Changes since 1.14: +2 -2 lines
Diff to previous 1.14 (colored)
Remove free callback for window_choose_data objects.
Revision 1.14 / (download) - annotate - [select for diffs], Thu Mar 21 16:08:24 2013 UTC (11 years, 2 months ago) by nicm
Branch: MAIN
Changes since 1.13: +15 -29 lines
Diff to previous 1.13 (colored)
Miscellaneous tidying of choose API, including: - rename client and session to start_client and start_session in window_choose_data struct. also add TREE_OTHER define and reorder the struct - rename window_choose_ctx to window_choose_data_run - don't pass a cmd_ctx into window_choose_create (will let it use a different client later). instead take type, session, client - add window_choose_data_free and use it to dispose of wcd rather than each cmd-*.c doing it individually - change so ref counting is done by wcd_add and wcd_free rather than callers - also add a ref to tree_session - all the callbacks except choose-client and find-window are the same so remove them and add window_choose_default_callback - reorder/rename some other bits and pieces for tidyness
Revision 1.13 / (download) - annotate - [select for diffs], Thu Jan 17 20:30:43 2013 UTC (11 years, 4 months ago) by nicm
Branch: MAIN
CVS Tags: OPENBSD_5_3_BASE,
OPENBSD_5_3
Changes since 1.12: +1 -2 lines
Diff to previous 1.12 (colored)
Do not allow cursor colours to be set beginning with ? as that will report the colour, from Hayaki Saito.
Revision 1.12 / (download) - annotate - [select for diffs], Tue Aug 14 08:51:53 2012 UTC (11 years, 9 months ago) by nicm
Branch: MAIN
Changes since 1.11: +2 -2 lines
Diff to previous 1.11 (colored)
Use a separate define for each default format template and strip clutter from the choose-tree defaults.
Revision 1.11 / (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_2_BASE,
OPENBSD_5_2
Changes since 1.10: +7 -7 lines
Diff to previous 1.10 (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.10 / (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.9: +6 -5 lines
Diff to previous 1.9 (colored)
xfree is not particularly helpful, remove it. From Thomas Adam.
Revision 1.9 / (download) - annotate - [select for diffs], Mon Jun 25 14:27:25 2012 UTC (11 years, 10 months ago) by nicm
Branch: MAIN
Changes since 1.8: +11 -8 lines
Diff to previous 1.8 (colored)
Provide common helper function for adding windows and sessions to choose lists and expand %% in command before using it rather than at callback time. From Thomas Adam.
Revision 1.8 / (download) - annotate - [select for diffs], Mon Jun 25 14:08:55 2012 UTC (11 years, 10 months ago) by nicm
Branch: MAIN
Changes since 1.7: +33 -59 lines
Diff to previous 1.7 (colored)
Clean up and simplify the choose mode code, from Thomas Adam.
Revision 1.7 / (download) - annotate - [select for diffs], Tue May 22 11:35:37 2012 UTC (12 years ago) by nicm
Branch: MAIN
Changes since 1.6: +19 -9 lines
Diff to previous 1.6 (colored)
Switch all of the various choose- and list- commands over to the format infrastructure, from Thomas Adam.
Revision 1.6 / (download) - annotate - [select for diffs], Tue Aug 16 10:00:52 2011 UTC (12 years, 9 months ago) by nicm
Branch: MAIN
CVS Tags: OPENBSD_5_1_BASE,
OPENBSD_5_1
Changes since 1.5: +5 -3 lines
Diff to previous 1.5 (colored)
Add a -r flag to switch-client to toggle the client read-only flag. From Johan Commelin.
Revision 1.5 / (download) - annotate - [select for diffs], Tue Jan 4 00:42:46 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.4: +10 -11 lines
Diff to previous 1.4 (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.4 / (download) - annotate - [select for diffs], Fri Nov 13 19:53:28 2009 UTC (14 years, 6 months ago) by nicm
Branch: MAIN
CVS Tags: OPENBSD_4_8_BASE,
OPENBSD_4_8,
OPENBSD_4_7_BASE,
OPENBSD_4_7
Changes since 1.3: +2 -2 lines
Diff to previous 1.3 (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.3 / (download) - annotate - [select for diffs], Mon Sep 7 21:01:50 2009 UTC (14 years, 8 months ago) by nicm
Branch: MAIN
Changes since 1.2: +11 -10 lines
Diff to previous 1.2 (colored)
Reference count clients and sessions rather than relying on a saved index for cmd-choose-*.
Revision 1.2 / (download) - annotate - [select for diffs], Tue Aug 25 13:32:14 2009 UTC (14 years, 8 months ago) by nicm
Branch: MAIN
Changes since 1.1: +3 -1 lines
Diff to previous 1.1 (colored)
These should #include <ctype.h>.
Revision 1.1 / (download) - annotate - [select for diffs], Tue Aug 25 12:18:51 2009 UTC (14 years, 8 months ago) by nicm
Branch: MAIN
Add a choose-client command and extend choose-{session,window} to accept a
template. After a choice is made, %% (or %1) in the template is replaced by the
name of the session, window or client suitable for -t and the result executed
as a command. So, for example, "choose-window "killw -t '%%'"" will kill the
selected window.
The defaults if no template is given are (as now) select-window for
choose-window, switch-client for choose-session, and detach-client for
choose-client (now bound to D).