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

6764 Commits

Author SHA1 Message Date
nicm 886d50dcab ECH needs to use background colour. 2017-05-12 10:50:11 +00:00
nicm 7d3e2c83d4 Store copy mode search string in pane so search-again command works even 
if you exit and reenter copy mode (it doesn't remember the position,
just the search string), suggested by espie@.
 2017-05-12 10:45:38 +00:00
Nicholas Marriott 1cdc4568bd Merge branch '2.5-rc' 2017-05-11 23:28:56 +01:00
nicm 69df38f8d8 Clear to start of screen needs to use background colour. 2017-05-11 23:28:44 +01:00
nicm 5e30b81825 Need to redraw out to cellsize (total cells used in a line) rather than 
cellused (only non-space cells) because there may be cells with a
nondefault background.
 2017-05-11 23:28:22 +01:00
Thomas Adam 99582befc4 Merge branch 'obsd-master' 2017-05-11 14:01:10 +01:00
nicm c0d3f204b0 Clear to start of screen needs to use background colour. 2017-05-11 11:39:30 +00:00
nicm 989cdca95f Need to redraw out to cellsize (total cells used in a line) rather than 
cellused (only non-space cells) because there may be cells with a
nondefault background.
 2017-05-11 11:38:49 +00:00
Thomas Adam def8f852e3 Merge branch 'obsd-master' 2017-05-11 10:01:10 +01:00
nicm 349cdd6110 Make environ_log prefix take a format. 2017-05-11 07:34:54 +00:00
nicm c54a5b3690 Change how we resolve which pane is dragging when there are multiple 
options - choose the largest pane, which is more likely to be the one the
user wants to resize. Prompted by a report from Thomas Sattler.
 2017-05-11 07:24:42 +00:00
Thomas Adam 6d961d672d Merge branch 'obsd-master' 2017-05-10 22:01:13 +01:00
Thomas Adam 247ec2ad88 Merge branch 'obsd-master' 2017-05-10 20:01:17 +01:00
nicm 8ab2753521 Move to the right cursor position before using spaces to clear. 2017-05-10 18:40:13 +00:00
nicm 2dc9bfd93a Prevent control clients from affecting the session size until they have 
specified a size with refresh-client -C. Prompted by a different change
with the same purpose from George Nachman.
 2017-05-10 16:48:36 +00:00
nicm 9dc6946ebf We can use ECH to clear sections of lines, so use it for internal panes 
(that don't touch an edge). Move all the tty clear code into two common
functions rather than having the same bunch of checks everywhere.
 2017-05-10 16:47:03 +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 f8b3f1622d Merge branch 'obsd-master' 2017-05-10 14:01:11 +01:00
nicm 0e3c5ebe1a Insert copy mode bindings at the right place in the command queue. 2017-05-10 10:46:59 +00:00
Nicholas Marriott daef51e038 Typo. 2017-05-09 23:18:48 +01:00
Nicholas Marriott e82c42661b Back to master. 2017-05-09 23:11:01 +01:00
Nicholas Marriott 3a47dec424 Fix test. 2017-05-09 23:01:10 +01:00
Nicholas Marriott 7b17618890 2.5-rc and changes. 2017-05-09 22:53:36 +01:00
Nicholas Marriott 71bc255e6f Merge branch 'master' of github.com:tmux/tmux 2017-05-09 22:34:15 +01:00
Nicholas Marriott 8f990c573c Update TODO. 2017-05-09 22:33:39 +01:00
Thomas Adam 3f1d6102f3 Merge branch 'obsd-master' 2017-05-09 20:01:10 +01:00
nicm 3712b41aba If the target pane for send-keys in in a mode with a key table (that is, 
copy mode), then look the key up in the table and fire any command
instead of delivering the key to the pane directly where it will be
ignored. This makes C-b C-b (send-prefix) work in copy mode again.
 2017-05-09 17:56:55 +00:00
Thomas Adam 4bcb64f8c1 Merge branch 'obsd-master' 2017-05-09 15:44:33 +01:00
Thomas Adam a651b08a2f Merge branch 'obsd-master' 
Conflicts:
	format.c
 2017-05-09 15:44:13 +01:00
nicm 3b35daacf7 If the current screen was complex enough, it was possible to make redraw 
itself hit the "terminal can't keep up" check. To avoid this, record how
much data we send during redraw (we know we will be starting with 0) and
skip the check until it has been flushed. GitHub issue 912.
 2017-05-09 13:04:36 +00:00
nicm 18f36906a9 Set current pane in rotate-window. 2017-05-09 11:00:48 +00: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 d52f579fd5 Up to now, tmux sees \033\033[OA as M-Up and since we turned on 
xterm-keys by default, generates \033[1;3A instead of
\033\033[OA. Unfortunately this confuses vi, which doesn't understand
xterm keys and now sees Escape+Up pressed within escape-time as Escape
followed by A.

The issue doesn't happen in xterm itself because it gets the keys from X
and can distinguish between a genuine M-Up and Escape+Up.

Because xterm can, tmux can too: xterm will give us \033[1;3A (that is,
kUP3) for a real M-Up and \033\033OA for Escape+Up - in fact, we can be
sure any \033 preceding an xterm key is a real Escape key press because
Meta would be part of the xterm key instead of a separate \033.

So change tmux to recognise both sequences as M-Up for its own purposes,
but generate the xterm version of M-Up only if it originally received
the xterm version from the terminal.

This means we will return to sending \033\033OA instead of the xterm key
for terminals that do not support xterm keys themselves, but there is no
practical way around this because they do not allow us to distinguish
between Escape+Up and M-Up. xterm style escape sequences are now the de
facto standard for these keys in any case.

Problem reported by jsing@ and subsequently by Cecile Tonglet in GitHub
issue 907.
 2017-05-07 21:25:59 +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 e354b0e40f Merge branch 'obsd-master' 2017-05-01 14:01:14 +01:00
nicm 0ccfb61bb0 In order that people can use formats like #D in #() in the status line 
and not have to wait for an update when they change pane, we allow
commands to run more than once a second if the expanded form
changes. Unfortunately this can mean them being run far too often
(pretty much continually) when multiple clients exist, because some
formats (including #D) will always differ between clients.

To avoid this, give each client its own tree of jobs which means that
the same command will be different instances for each client - similar
to how we have the tag to separate commands for different panes.

GitHub issue 889; test case reported by Paul Johnson.
 2017-05-01 12:20:55 +00:00
Nicholas Marriott 4b39120d22 .NOTPARALLEL. 2017-04-30 13:55:32 +01:00
Nicholas Marriott 76950a6401 Add regress/Makefile. 2017-04-30 13:47:25 +01:00
Nicholas Marriott 909d962d3a Make example match reality; Greg Hurrell. 2017-04-30 08:27:23 +01:00
Nicholas Marriott dde53cfde1 Add to TODO. 2017-04-30 08:23:14 +01:00
Thomas Adam 0adb60b3a6 Merge branch 'obsd-master' 2017-04-30 00:01:17 +01:00
nicm a2dd7daf4e Fix UTF-8 combining characters in column 0, based on a diff from Keith 
Winstein.
 2017-04-29 21:27:46 +00:00
Thomas Adam 3a8e56b282 Merge branch 'obsd-master' 2017-04-28 22:01:18 +01:00
Nicholas Marriott 36202a63e9 Merge branch 'master' of github.com:tmux/tmux 2017-04-28 20:22:31 +01:00
Nicholas Marriott abad809e7a Test that kill-session closes the panes (processes end up dead). 2017-04-28 20:22:01 +01:00