circlecloud
/
tmux
mirror of https://github.com/tmux/tmux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
7,626 Commits 1 Branch 35 Tags 67 MiB
Commit Graph

1309 Commits

Author SHA1 Message Date
Thomas Adam 713e0ddef3 Merge branch 'obsd-master' 2018-06-08 13:02:25 +01:00
nicm ff45b2d343 Tweak previous - check for a NULL client and simplify manual text. 2018-06-08 09:43:58 +00:00
Thomas Adam 7de25d86e1 Merge branch 'obsd-master' 2018-06-03 13:02:31 +01:00
nicm ba31d3a88c Increment the lines counter when skipping a line to avoid an infinite 
loop, and fix a check to avoid a potential out-of-bounds access. Problem
reported by Yuxiang Qin and tracked down by Karl Beldan; GitHub issue
1352.

Also a man page fix request by jmc@.
 2018-06-03 10:17:30 +00:00
Thomas Adam 058d2b94dc Merge branch 'obsd-master' 2018-05-28 15:02:31 +01:00
nicm b602c1fb9a Document escaping inside conditionals, from "sadie-parayno" in GitHub 
issue 1359.
 2018-05-28 11:45:26 +00:00
Thomas Adam f0ac0d6793 Merge branch 'obsd-master' 2018-05-22 11:02:33 +01:00
nicm 2a04665626 Allow escaping , and } with # in #{}; GitHub issue 1332. 2018-05-22 08:49:12 +00:00
Thomas Adam 82c0eed36d Merge branch 'obsd-master' 2018-05-09 19:02:35 +01:00
nicm 80994a8de1 Mention allow-rename with \033k. 2018-05-09 16:20:50 +00:00
Thomas Adam d24bd7394d Merge branch 'obsd-master' 2018-04-23 17:02:32 +01:00
nicm 068d1b97b2 #aabbcc will use RGB if supported so don't say it is closest match. 2018-04-23 13:51:21 +00:00
Thomas Adam 6ebd737590 Merge branch 'obsd-master' 2018-04-18 15:02:25 +01:00
nicm e64d078a4c Fix || example. 2018-04-18 12:50:11 +00:00
Thomas Adam 1bd66b65a3 Merge branch 'obsd-master' 2018-04-10 13:02:28 +01:00
nicm c6975b3bb4 Add x and X to choose-tree (with a confirmation prompt) to kill an 
item. Suggested by Matt Zagrabelny.
 2018-04-10 10:48:44 +00:00
Thomas Adam 0ca9664ecf Merge branch 'obsd-master' 2018-02-28 10:02:29 +00:00
nicm 508e2f0b3a Add -Z flag to choose-tree, choose-client, choose-buffer to 
automatically zoom the pane when the mode is entered and unzoom when it
exits, assuming the pane is not already zoomed. Add -Z to the default
key bindings.
 2018-02-28 08:55:44 +00:00
Thomas Adam c2aa40449c Merge branch 'obsd-master' 2018-02-22 12:02:31 +00:00
nicm 623f4b12d3 Add exit-empty option to exit server if no sessions (defaults to on). 2018-02-22 10:54:51 +00:00
Thomas Adam 84ddc72744 Merge branch 'obsd-master' 2018-01-17 11:26:10 +00:00
nicm 5849b73b81 Add -I to pipe-pane to connect pane stdin as well as stdout, suggested 
by Kristof Kovacs in GitHub issue 1186.
 2018-01-16 09:00:38 +00:00
Thomas Adam e19df0e869 Merge branch 'obsd-master' 2017-12-22 12:01:22 +00:00
nicm 5c82432200 Remove duplicate WheelUp/WheelDown entries in list, GitHub issue 1184. 2017-12-22 10:16:36 +00:00
Thomas Adam 5fddddbe21 Merge branch 'obsd-master' 2017-11-16 12:01:18 +00:00
nicm e5ae9dd53d Add -and-cancel variants for scrolling commands to exit copy mode when 
the bottom is reached, from Stephen Hicks.
 2017-11-16 11:16:15 +00:00
Thomas Adam 102df8dc80 Merge branch 'obsd-master' 2017-11-15 22:01:22 +00:00
nicm 3b649d2fcd Add a common function for spreading out cells and use it for the two 
even layouts and to add a -E flag to select-layout to spread out cells
evenly without changing parent cells.
 2017-11-15 19:59:27 +00:00
Thomas Adam 8c29f7413b Merge branch 'obsd-master' 2017-11-02 20:01:26 +00:00
nicm 17655e5ba6 Format for group list of "other sessions" is a bit weird, just list all 
the sessions in the group.
 2017-11-02 18:52:05 +00:00
nicm c1f62f1fde Only show the first member of session groups in tree mode (-G flag 
disables).
 2017-11-02 18:27:35 +00:00
Thomas Adam cf782c4f54 Merge branch 'obsd-master' 2017-10-26 10:01:18 +01:00
nicm e91e8a2a6c Fix crash exiting command prompt (from Alex Maese in GitHub issue 1139) 
and a man page tweak from jmc.
 2017-10-26 08:17:12 +00:00
Thomas Adam d36ac3db15 Merge branch 'obsd-master' 2017-10-25 18:01:17 +01:00
nicm be4c01697c Note that notifications are also hooks. 2017-10-25 15:20:10 +00:00
Thomas Adam 0072bc65e6 Merge branch 'obsd-master' 2017-10-25 16:01:22 +01:00
nicm 578a63bbc9 Default allow-rename to off because it is ridiculous that applications 
are even able to do this and confusing when they do.
 2017-10-25 14:14:52 +00:00
Thomas Adam 6b83ca0077 Merge branch 'obsd-master' 2017-10-25 14:01:26 +01:00
nicm 8dd776106d Add P key to paste tagged in buffer mode, and trim some code that should 
no longer be necessary.
 2017-10-25 11:26:11 +00:00
Thomas Adam ceab7154d4 Merge branch 'obsd-master' 2017-10-08 18:40:41 +01:00
nicm 0b4c408168 Fix description of history_size, from Campbell Barton. 2017-10-08 16:45:01 +00:00
Thomas Adam f069c0ba09 Merge branch 'obsd-master' 2017-10-06 20:01:17 +01:00
nicm 9c4caf49a2 Support %else in config files to match %if, from Brad Town in GitHub 
issue 1071.
 2017-10-06 18:02:30 +00:00
Thomas Adam d8c397d1b7 Merge branch 'obsd-master' 2017-09-11 10:01:11 +01:00
nicm d8d6c2746e Mention that filter is a format. 2017-09-11 06:53:06 +00:00
Thomas Adam ff3d05d92f Merge branch 'obsd-master' 2017-09-04 12:01:11 +01:00
nicm eadd79acec Move to current mouse position not last when clcking in copy mode; fixes 
GitHub issue 1055. Also a man page fix from jmc.
 2017-09-04 09:18:51 +00:00
Thomas Adam d019821281 Merge branch 'obsd-master' 2017-09-02 20:01:18 +01:00
nicm f4848b437f Add selectp -T to set pane title. 2017-09-02 17:51:54 +00:00
Nicholas Marriott fa20f19494 Fix position of -v, pointed out by Thomas Sattler. 2017-08-30 09:33:53 +01:00
Thomas Adam 3b40f8e42c Merge branch 'obsd-master' 2017-08-23 12:01:13 +01:00
nicm 08b125194e Key (v) and flag (-N) to toggle preview in choose modes. 2017-08-23 09:39:11 +00:00
Thomas Adam ccdc369025 Merge branch 'obsd-master' 2017-08-20 00:01:22 +01:00
nicm 768740ae98 Fix example for user-keys. 2017-08-19 20:40:16 +00:00
Thomas Adam 07a13697e1 Merge branch 'obsd-master' 2017-08-17 12:01:17 +01:00
nicm 8daa1d5f54 Add monitor-bell window option to match the activity and silence 
options, from Brad Town.
 2017-08-17 08:37:38 +00:00
Thomas Adam 2103a09430 Merge branch 'obsd-master' 2017-08-16 14:01:15 +01:00
nicm c6a8ad23a1 Add -d flag to display-panes to specify timeout, and make 0 mean no 
timeout. From Laurens Post.
 2017-08-16 12:12:54 +00:00
Thomas Adam 27c3852103 Merge branch 'obsd-master' 
Conflicts:
	tmux.1
 2017-08-09 15:07:18 +01:00
nicm 5dd5543fe4 Add -F to choose-tree, choose-client, choose-buffer to specify the 
format of each line, as well as adding a couple of formats needed for
the default display.
 2017-08-09 11:43:45 +00:00
Thomas Adam e7b1e05bbd Merge branch 'obsd-master' 2017-08-02 14:01:10 +01:00
nicm 6f9b9655d7 Add selection_present format so commands in copy mode can use it, GitHub 
issue 1028.
 2017-08-02 11:10:48 +00:00
Thomas Adam 147740ed40 Merge branch 'obsd-master' 2017-07-27 14:01:13 +01:00
nicm 3df7c91f1a Add pane_at_left/right/top/bottom formats, from Amos Bird. 2017-07-27 10:42:05 +00:00
Thomas Adam 58744de3eb Merge branch 'obsd-master' 2017-07-26 18:01:16 +01:00
nicm 76887b1d27 Make bell, activity and silence alerting more consistent: 
- remove the bell-on-alert option;

- add activity-action and silence-action options with the same possible
  values as the existing bell-action;

- add "both" value for the visual-bell, visual-activity and
  visual-silence options to trigger both a bell and a message.

This means all three work the same way. Based on changes from Yvain Thonnart.
 2017-07-26 16:14:08 +00:00
Thomas Adam e725b96a59 Merge branch 'obsd-master' 2017-07-21 12:01:16 +01:00
nicm 11e2af6df7 Add -c for respawn-pane and respawn-window, from J Raynor. 2017-07-21 09:17:19 +00:00
Thomas Adam 05062e7d2d Merge branch 'obsd-master' 2017-07-07 18:01:15 +01:00
nicm 9913cce3ba Add a pane_pipe format to show if pipe-pane is active, GitHub issue 990. 2017-07-07 14:39:45 +00:00
Thomas Adam 6b1ceca86a Merge branch 'obsd-master' 2017-07-05 00:01:10 +01:00
nicm 53d4ed22e8 < and > keys to scroll preview list left and right in tree mode. 2017-07-04 22:21:31 +00:00
Thomas Adam f059fe3ef2 Merge branch 'obsd-master' 2017-06-30 00:01:14 +01:00
nicm 8b0fd63ddb Use 100 as the example for command-alias because the defaults are from 0 
to (currently) 5.
 2017-06-29 22:02:19 +00:00
Thomas Adam 1ca920bbeb Merge branch 'obsd-master' 2017-06-28 10:01:16 +01:00
nicm 1e376be13d Fix visual-silence (check accidentally the wrong way round), from Brad 
Town. Plus some tmux.1 fixes from jmc@.
 2017-06-28 06:45:31 +00:00
Thomas Adam 6995497e5b Merge branch 'obsd-master' 2017-06-23 18:01:11 +01:00
nicm 95ed7d48c8 Add user-keys option to allow user-defined keys to be set, from Dan 
Aloni.
 2017-06-23 15:36:52 +00:00
Thomas Adam 4dbab75855 Merge branch 'obsd-master' 2017-06-09 18:01:14 +01:00
nicm adcd5aff6f Extend filters (f key) to buffer and client mode and add -f flag to 
specify to command.
 2017-06-09 16:01:39 +00:00
nicm bab4da5133 Add -O option to choose-* to set initial sort order. 2017-06-09 15:29:15 +00:00
Thomas Adam e640907d24 Merge branch 'obsd-master' 2017-06-09 12:01:17 +01:00
nicm 74b2deae1c Add a hook when the clipboard is set. 2017-06-09 09:21:24 +00:00
Thomas Adam 86d6666fe7 Merge branch 'obsd-master' 2017-06-07 16:01:10 +01:00
nicm 405cc337f3 Add simple searching (C-s and n) to the various choose modes: by name 
for client and tree, and by name and content for buffer.
 2017-06-07 14:37:30 +00:00
Thomas Adam e62e17d046 Merge branch 'obsd-master' 
Conflicts:
	tmux.1
	window.c
 2017-06-05 11:59:38 +01:00
nicm adf5628087 Support SIGUSR2 to stop and start logging for an existing server. Also 
we currently only have two log levels so just use -v and -vv rather than
-v and -vvvv, and clarify the man page entry for -v.
 2017-06-04 08:25:57 +00:00
nicm 184039044a Typo/style; plus man page escaping from jmc. 2017-06-04 08:02:20 +00:00
Thomas Adam 757eb060cd Merge branch 'obsd-master' 2017-06-03 20:01:10 +01:00
nicm 3442066054 Make set-clipboard a three-state option so tmux itself can ignore the 
sequencess.
 2017-06-03 17:43:01 +00:00
Thomas Adam f17ecaa495 Merge branch 'obsd-master' 
Conflicts:
	Makefile.am
	cfg.c
	server-client.c
 2017-05-31 15:56:13 +01:00
nicm aad4e4ddb1 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
Thomas Adam 5bc5fe5e7e Merge branch 'obsd-master' 2017-05-29 20:01:12 +01:00
nicm a2ace9da24 Add ||, && format operators and C: to search pane content. 2017-05-29 18:06:34 +00:00
Thomas Adam d3959a2118 Merge branch 'obsd-master' 2017-05-29 18:01:14 +01:00
nicm 1257501499 Add m: for fnmatch(3) format matching. 2017-05-29 15:43:48 +00:00
Thomas Adam bfd7209053 Merge branch 'obsd-master' 2017-05-29 10:01:15 +01:00
nicm 15253448af Tweak text to mention initial size, from John Hood. 2017-05-29 07:46:32 +00:00
Thomas Adam 0868512bbc Merge branch 'obsd-master' 2017-05-10 16:01:10 +01:00
nicm b519551153 Expand formats in option names and add -F flag to do so in option values as well. 2017-05-10 13:05:41 +00:00
Thomas Adam a651b08a2f Merge branch 'obsd-master' 
Conflicts:
	format.c
 2017-05-09 15:44:13 +01:00
nicm 5fee4638e0 Add a format for the name of the pane's mode, lets it be used as a 
conditional for key bindings.
 2017-05-07 22:27:57 +00:00
nicm 2fef10b9ac Add some formats to look at the session window stack, suggested by Scott 
ROCHFORD.
 2017-05-05 11:59:47 +00:00
Thomas Adam f3221941f2 Merge branch 'obsd-master' 2017-05-04 10:01:12 +01:00
nicm d98d316903 Some new notifications, mainly for active pane and current window and 
session:

    pane-mode-changed
    window-pane-changed
    client-session-changed
    session-window-changed

From Joshua Brot.
 2017-05-04 07:16:43 +00:00
Thomas Adam 97ecb4f9d8 Merge branch 'obsd-master' 2017-05-03 08:01:14 +01:00
nicm ca6a121e63 Add a format for the last search string in copy mode and fix the prompt 
so it can work when in -I, suggested by Suraj N Kurapati.
 2017-05-03 05:53:34 +00:00
Thomas Adam 99b0f48b2e Merge branch 'obsd-master' 2017-04-28 16:01:12 +01:00
nicm c12711affd Default for xterm-keys was wrong, stop documenting it. 2017-04-28 13:39:59 +00:00
Thomas Adam d8398af770 Merge branch 'obsd-master' 2017-04-22 08:01:54 +01:00
nicm 59ff9b8128 Typo in example. 2017-04-22 06:15:22 +00:00
Thomas Adam 48371216df Merge branch 'obsd-master' 2017-04-20 12:01:14 +01:00
nicm 0b44ad99b5 If a #() command doesn't exit, use its most recent line of output (it 
must be a full line). Don't let it redraw the status line more than once
a second.

Requested by someone about 10 years ago...
 2017-04-20 09:20:22 +00:00
Thomas Adam 85af9c9c9d Merge branch 'obsd-master' 2017-04-19 10:01:12 +01:00
nicm fa6deb5866 When the data we have buffered to write to a terminal grows beyond a 
reasonable amount (currently width * height * 8 bytes), discard all
output to the terminal and start trying to redraw periodically
instead. Continue with this until the amount of data we are trying to
write falls to a low level again.

This helps to prevent tmux sitting on a huge buffer of data when there
are processes with fast output running inside tmux but the outside
terminal is slow.

A new client_discarded format holds the amount of data that has been
discarded due to this mechanism.

The three variables (when to start this, when to stop, and how often to
redraw) are basically "works for me" at the moment, this is going in to
see how it goes and if it causes problems for anyone else.
 2017-04-19 06:52:27 +00:00
Thomas Adam a54309147d Merge branch 'obsd-master' 2017-04-18 18:01:17 +01:00
nicm fb3c5efa50 Add a format for number of bytes writtent to client, useful for debugging. 2017-04-18 15:44:17 +00:00
Thomas Adam 5f662d91db Merge branch 'obsd-master' 
Conflicts:
	server-client.c
	tmux.1
 2017-04-06 11:10:17 +01:00
nicm 9b28200578 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.
 2017-04-05 10:49:46 +00:00
Thomas Adam 843e605b89 Merge branch 'obsd-master' 2017-03-22 08:01:17 +00:00
nicm df3ab87964 Add support for the strikethrough attribute (SGR 9), using the new smxx 
terminfo capability. This means there are now nine attribute bits, so
anything above 0xff uses an extended cell.
 2017-03-22 07:16:54 +00:00
Thomas Adam 631a89954f Merge branch 'obsd-master' 2017-02-15 10:01:17 +00:00
nicm 640d9e54b7 "status bar" -> "status line" for consistency, from Benjamin Dopplinger. 2017-02-15 08:47:55 +00:00
Thomas Adam 02e04477de Merge branch 'obsd-master' 
Conflicts:
	server.c
 2017-02-14 13:55:16 +00:00
nicm d22c15107b Don't use a bufferevent for the tty, so we can keep better track of what 
is being written and when.

Also a manpage typo fix from jmc@.
 2017-02-10 12:59:18 +00:00
nicm c6a3446398 Instead of numbering session groups, give them a name which may be given 
to -t instead of a target session. Also allow them to contain only one
session.
 2017-02-09 15:04:53 +00:00
nicm 8de4c15dfa Document refresh-client -C. 2017-02-09 14:49:00 +00:00
Thomas Adam 96ad1d7779 Merge branch 'obsd-master' 2017-02-09 14:01:18 +00:00
nicm b7ddfb39f3 Don't lie about the default size in the man page. 2017-02-09 12:00:42 +00:00
Thomas Adam 9b1f620aa0 Merge branch 'obsd-master' 2017-02-01 12:01:18 +00:00
nicm dd0c814779 Implement "all event" (1003) mouse mode but in a way that works. The 
main issue is that if we have two panes, A with 1002 and B with 1003, we
need to set 1003 outside tmux in order to get all the mouse events, but
then we need to suppress the ones that pane A doesn't want. This is easy
in SGR mouse mode, because buttons == 3 is only used for movement events
(for other events the trailing m/M marks a release instead), but in
normal mouse mode we can't tell so easily. So for that, look at the
previous event instead - if it is drag+release as well, then the current
event is a movement event.
 2017-02-01 09:55:07 +00:00
Thomas Adam 9094f01c6b Merge branch 'obsd-master' 2017-01-30 00:01:13 +00:00
nicm b6099f31ea Add -n to break-pane. 2017-01-29 22:10:55 +00:00
Thomas Adam 21d8f77a0d Merge branch 'obsd-master' 2017-01-25 16:01:13 +00:00
nicm 0a63ab4f0f If xterm-keys is on, use xterm(1) style keys for Home and End as well as 
modified keys.
 2017-01-25 14:24:54 +00:00
Thomas Adam 418ab1a553 Merge branch 'obsd-master' 2017-01-24 22:01:13 +00:00
nicm 4b2821ff98 Make update-environment an array as well. 2017-01-24 20:15:32 +00:00
nicm b77dd75b57 Convert terminal-overrides to an array option. 2017-01-24 20:05:15 +00:00
nicm 16e43d6a42 Remove some lies about terminal-overrides from tmux.1. 2017-01-24 20:01:34 +00:00
nicm 85338bb75f Add support for custom command aliases, this is an array option which 
contains items of the form "alias=command". This is consulted when an
unknown command is parsed.
 2017-01-24 19:53:37 +00:00
Thomas Adam 2311bbd28a Merge branch 'obsd-master' 2017-01-13 12:01:12 +00:00
nicm 95950bf668 Add -E to detach-client to exec a command to replace the client instead 
of exiting it, useful if tmux wasn't exec'd itself. From Jenna Magius.
 2017-01-13 10:12:12 +00:00
Thomas Adam d87ab0cadf Merge branch 'obsd-master' 2017-01-11 18:01:13 +00:00
nicm bf6a5c056d Add a format for terminal type. 2017-01-11 16:09:57 +00:00
Thomas Adam 1e12e1d843 Merge branch 'obsd-master' 2017-01-10 12:01:10 +00:00
nicm e78142232f Some manpage fixes: rephrase a convoluted sentence, make the names of 
some keys more standard, and use Ql instead of Dq.
 2017-01-10 10:08:59 +00:00
Thomas Adam 628f3ad9f4 Merge branch 'obsd-master' 2017-01-10 10:01:11 +00:00
jmc 40fddfbdd6 avoid unneccessary markup; tweaked and ok nicm 2017-01-10 07:55:48 +00:00
Thomas Adam 2c862b04af Merge branch 'obsd-master' 2017-01-09 22:01:12 +00:00
Nicholas Marriott 36619607ba Add a format for the version. 2017-01-09 21:44:19 +00:00