Commit Graph

6701 Commits

Author SHA1 Message Date
acbbc93501 Merge branch 'obsd-master' 2017-07-14 22:01:10 +01:00
932f6cfbfc Because ignore SIGCHLD early, letting signal_del restore it doesn't work
correctly, so set it explicitly back to default (and the others for good
measure).
2017-07-14 18:49:07 +00:00
1265e212e4 Merge branch 'obsd-master' 2017-07-14 10:01:11 +01:00
e4cd8751a2 Update CHANGES. 2017-07-14 09:14:23 +01:00
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
e3698e6e1f Merge branch 'obsd-master' 2017-07-12 16:01:11 +01:00
8b84fc177c Line up keys in tree mode, and don't expand windows with one pane. From
Thomas Adam.
2017-07-12 14:31:06 +00:00
5122f3477f Merge branch 'obsd-master' 2017-07-12 14:01:13 +01:00
1076a2e26c Merge branch 'obsd-master'
Conflicts:
	cmd-pipe-pane.c
	proc.c
	tmux.c
	window.c
2017-07-12 13:43:08 +01:00
fba6140a4a Do not need to set up USR2 twice. 2017-07-12 12:35:31 +00:00
51112221ee Block signals between forking and clearing signal handlers (or calling
event_reinit) - if the child gets a signal and fires the libevent signal
handler during this period it could write a signal into the parent's
signal pipe. GitHub issue 1001 from Aaron van Geffen.
2017-07-12 10:04:51 +00:00
0453ad0146 Move signal code into proc.c. 2017-07-12 09:24:17 +00:00
ed3cfaafb2 Make shell_command a global like other stuff rather than making it an
exception and using callback argument.
2017-07-12 09:21:25 +00:00
d0d42dc4cb proc_send_s now seems unnecessary. 2017-07-12 09:07:52 +00:00
fbbf5a108b Merge branch 'obsd-master' 2017-07-10 00:01:15 +01:00
58b796608f Some extra logging to show why tmux might exit. 2017-07-09 22:33:09 +00:00
05062e7d2d Merge branch 'obsd-master' 2017-07-07 18:01:15 +01:00
bfaa885f10 Fix size of rightmost preview section. 2017-07-07 16:27:26 +00:00
9913cce3ba Add a pane_pipe format to show if pipe-pane is active, GitHub issue 990. 2017-07-07 14:39:45 +00:00
1029f2b277 Merge branch 'obsd-master' 2017-07-07 10:01:09 +01:00
1f7ca973c5 When working out the current client (for example for switch-client with
no target), prefer clients attached to the current session if there is
one. GitHub issue 995 from Jan Larres.
2017-07-07 07:13:14 +00:00
6b1ceca86a Merge branch 'obsd-master' 2017-07-05 00:01:10 +01:00
53d4ed22e8 < and > keys to scroll preview list left and right in tree mode. 2017-07-04 22:21:31 +00:00
feb044bd2d Merge branch 'obsd-master' 2017-07-04 14:01:15 +01:00
bedf8bd437 Handle 0 size of preview box in caller. 2017-07-04 12:26:14 +00:00
6cb4a3bb19 Merge branch 'obsd-master' 2017-07-04 02:01:13 +01:00
4039802fce Change session and window preview so that the current window or pane is
always shown.
2017-07-03 22:48:02 +00:00
5e98770936 Merge branch 'obsd-master' 2017-07-03 16:01:14 +01:00
6ee0afb579 Change previous to not wait for both process exit and pty close -
instead if there is a pipe-pane active, do not exit until all data is
read (including any libevent hasn't seen yet). Fixes problem reported by
Theo Buehler and still seems to solve the original issue.
2017-07-03 12:38:50 +00:00
4e01036cb6 Merge branch 'obsd-master' 2017-07-03 10:01:14 +01:00
28687f2d55 Do not close panes until process has exited and any outstanding data
has been written to the pipe-pane event if there is one. GitHub issue 991.
2017-07-03 08:16:03 +00:00
42285ac989 Try C.UTF-8 which is also a commonly useful locale on some platforms,
from Romain Francoise.
2017-07-03 08:08:30 +00:00
6fba9a39b7 Merge branch 'obsd-master' 2017-07-01 00:01:21 +01:00
fa677fc0e1 Don't write over right border. 2017-06-30 22:37:35 +00:00
b565644c81 Fix previous when we end up able to show no panes. 2017-06-30 22:36:11 +00:00
7247553c77 Try to show a better preview of sessions and windows in tree mode. 2017-06-30 22:24:08 +00:00
f059fe3ef2 Merge branch 'obsd-master' 2017-06-30 00:01:14 +01:00
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
336beeb09a Merge branch 'obsd-master' 2017-06-28 14:01:13 +01:00
a00b0d13ed Apply the xterm key flag when needed for send-keys, fixes problem
reported by Franky Spamschleuder.
2017-06-28 11:36:39 +00:00
1ca920bbeb Merge branch 'obsd-master' 2017-06-28 10:01:16 +01:00
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
6995497e5b Merge branch 'obsd-master' 2017-06-23 18:01:11 +01:00
95ed7d48c8 Add user-keys option to allow user-defined keys to be set, from Dan
Aloni.
2017-06-23 15:36:52 +00:00
a61200776d Merge branch 'obsd-master' 2017-06-16 18:01:13 +01:00
a67df17763 Tweak some logging. 2017-06-16 15:12:38 +00:00
233bae6992 Merge branch 'obsd-master' 2017-06-16 14:01:14 +01:00
d685604d04 Log terminal capabilities for each new terminal. 2017-06-16 11:50:06 +00:00
91dec25fc9 Merge branch 'obsd-master' 2017-06-14 10:01:10 +01:00
af93453190 Don't overwrite error message when it is available in
cmd_string_parse. Reported by Jimi Damon in GitHub issue 975.
2017-06-14 07:42:41 +00:00