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

483 Commits (9bdbe171b7f1d57b70419bb2b80996a60280d44f)

Author SHA1 Message Date
Thomas Adam eceaa9a493 Merge branch 'obsd-master' 2018-08-02 15:02:25 +01:00
nicm 6048b0f483 Make key trees and some other bits static. 2018-08-02 11:44:07 +00:00
Thomas Adam 5fc2d4a4fc Merge branch 'obsd-master' 2018-07-17 21:02:24 +01:00
nicm 969af935f3 When a key isn't in the first table, we need to try the same key again 
not the any key. Also rename some labels. Fixes GitHub issue 1406
reeported by Mark Kelly.
 2018-07-17 18:02:40 +00:00
Thomas Adam 4f04b2094c Merge branch 'obsd-master' 2018-07-16 11:02:25 +01:00
nicm 0d88f8a78b Add an "Any" key to run a command if a key is pressed that is not bound 
in the current key table. GitHub issue 1404.
 2018-07-16 08:48:22 +00:00
Thomas Adam 20154f391e Merge branch 'obsd-master' 2018-07-04 15:02:25 +01:00
nicm d254293a6d Add pane focus hooks. 2018-07-04 12:25:26 +00:00
Thomas Adam 7448b38327 Merge branch 'obsd-master' 2018-05-24 13:02:29 +01:00
nicm b9a6162d2f Make server_client_get_cwd used (almost) everywhere we need to work out 
the cwd, and do not fall back to "." as it is pretty useless. GitHub
issue 1331.
 2018-05-24 09:42:49 +00:00
Thomas Adam 9fd9952752 Merge branch 'obsd-master' 2018-03-08 10:02:26 +00:00
nicm 19f3a5c612 Add a missing client-detached hook when the server shuts down, and do 
not exit until jobs started from run-shell/if-shell have finished (add a
job flags member and a flag to indicate other jobs). GitHub issue 1245.
 2018-03-08 08:09:10 +00:00
Thomas Adam c2aa40449c Merge branch 'obsd-master' 2018-02-22 12:02:31 +00:00
nicm e97daead43 Check prefix when retrying so it is checked while repeat flag is 
set. GitHub issue 1239.
 2018-02-22 10:58:12 +00:00
Thomas Adam 88711e885e Merge branch 'obsd-master' 2018-02-05 10:02:31 +00:00
nicm 7f4513ec34 Add struct status_line to hold status line members of struct client, not 
used yet but will be soon. From Thomas Adam.
 2018-02-05 08:21:54 +00:00
Thomas Adam 74ecc866cf Merge branch 'obsd-master' 2017-12-19 16:01:20 +00:00
nicm b20a00f93e Report better error from server when socket create fails, GitHub issue 
1201.
 2017-12-19 15:00:39 +00:00
Thomas Adam 31901e3c07 Merge branch 'obsd-master' 
Conflicts:
	server-fn.c
 2017-10-20 12:36:29 +01:00
nicm 2f6935a630 Infrastructure for drawing status lines of more than one line in height, 
still only one is allowed but this lets tmux draw bigger ones.
 2017-10-16 19:30:53 +00:00
Nicholas Marriott d10def5b0b Check missed during merge. 2017-10-12 11:56:06 +01:00
nicm 466066c3a1 Do not attempt to use TIOCSWINSZ on a -1 file descriptor (possible if 
the pane has already died).
 2017-09-06 07:12:41 +00:00
Thomas Adam 54c5070767 Merge branch 'obsd-master' 2017-08-30 12:01:10 +01:00
nicm 17cf1b21c6 Pass flags into cmd_find_from_* to fix prefer-unattached, reported by 
Thomas Sattler.
 2017-08-30 10:33:57 +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 1265e212e4 Merge branch 'obsd-master' 2017-07-14 10:01:11 +01:00
nicm 2678fe53f5 Fix redraw defer code in the presence of multiple clients - the timer 
may be needed for all of them, so don't delete it on the first; and
don't skip setting the redraw flag if the timer is already running.

Reported by Pol Van Aubel in GitHub issue 1003.
 2017-07-14 08:04:23 +00:00
Thomas Adam 1076a2e26c Merge branch 'obsd-master' 
Conflicts:
	cmd-pipe-pane.c
	proc.c
	tmux.c
	window.c
 2017-07-12 13:43:08 +01:00
nicm d0d42dc4cb proc_send_s now seems unnecessary. 2017-07-12 09:07:52 +00:00
Thomas Adam 154c95d0c9 Merge branch 'obsd-master' 2017-06-13 13:48:37 +01:00
nicm ac7080b31b Remove xterm flag from key before checking prefix, reported by Peter 
Fern in GitHub issue 974.
 2017-06-13 07:12:33 +00:00
Thomas Adam 7077980055 Merge branch 'obsd-master' 2017-06-06 18:01:13 +01:00
nicm 50b27c8c0d Continue and pass keys through if they are repeated keys, so that the 
first key after a repeated key doesn't get lost.
 2017-06-06 15:49:35 +00:00
Nicholas Marriott 35008200bd Differences to OpenBSD. 2017-05-31 16:34:39 +01:00
Nicholas Marriott 113356c848 Build fixes. 2017-05-31 16:29:07 +01: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 d60663ea86 Some applications like vi(1) and tmux until 10 minutes or so ago, do not 
redraw on SIGWINCH if the size returns to the original size between the
original SIGWINCH and when they get around to calling TIOCGWINSZ. So use
the existing resize timer to introduce a small delay between the two
resizes.
 2017-05-31 11:00:00 +00:00
nicm ea6428a5d2 It is not OK to ignore SIGWINCH if SIOCGWINSZ reports the size has 
unchanged, because it may have changed and changed back in the time
between us getting the signal and calling ioctl(). Always redraw when we
see SIGWINCH.
 2017-05-31 10:29:15 +00:00
nicm 80c6b487dc Because we defer actually resizing applications (calling TIOCSWINSZ) 
until the end of the server loop, tmux may have gone through several
internal resizes in between. This can be a problem if the final size is
the same as the initial size (what the application things it currently
is), because the application may choose not to redraw, assuming the
screen state is unchanged, when in fact tmux has thrown away parts of
the screen, assuming the application will redraw them.

To avoid this, do an extra resize if the new size is the same size as
the initial size. This should force the application to redraw when tmux
needs it to, while retaining the benefits of deferring (so we now resize
at most two times instead of at most one - and only two very rarely).

Fixes a problem with break-pane and zoomed panes reported by Michal
Mazurek.
 2017-05-31 10:15:51 +00:00
Thomas Adam 0d073907b5 Merge branch 'obsd-master' 2017-05-30 00:01:14 +01:00
Thomas Adam 5ee6dc2120 Merge branch 'obsd-master' 2017-05-29 22:01:15 +01:00
nicm b95e5827c1 Store a copy of the old status line, will be needed soon for new choose mode. 2017-05-29 20:41:29 +00:00
nicm 8a214b2f8e Function to count clients. 2017-05-29 20:37:30 +00:00
Thomas Adam 3df4e78492 Merge branch 'obsd-master' 2017-05-16 16:01:28 +01:00
nicm 31625c2d17 Line length and spaces to tabs. 2017-05-16 12:57:26 +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
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