Commit Graph

5563 Commits

Author SHA1 Message Date
380a1ea8ef Default bindings for mouse wheel on status line to change window (like
we had before), from Patrick Palka.
2015-10-26 23:06:18 +00:00
b85be36d1c Handle unknown keys more gracefully, return a string instead of NULL. 2015-10-26 22:03:04 +00:00
54a3ed751e Merge branch 'obsd-master' 2015-10-26 18:01:12 +00:00
a22fe33aa0 Some extra logging of where keys are actually going. 2015-10-26 17:17:06 +00:00
e95df0bc39 Merge branch 'obsd-master' 2015-10-26 02:01:09 +00:00
jmc
c582f7d177 space before punctuation; 2015-10-26 00:15:37 +00:00
ca29903c82 Merge branch 'obsd-master' 2015-10-26 00:01:10 +00:00
e65306d8e7 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}.
2015-10-25 22:29:17 +00:00
c14fb5b633 -sys/types.h 2015-10-25 09:38:08 +00:00
ad437f13d5 Add missing headers for getpid() 2015-10-25 09:34:56 +00:00
4681415a15 Merge branch 'master' of github.com:tmux/tmux 2015-10-25 09:33:11 +00:00
7930cb54c0 ifdef __OpenBSD__ around pledge(). 2015-10-25 09:31:46 +00:00
91f53d590b __OpenBSD__ around pledge() 2015-10-25 09:31:07 +00:00
3e0d31c4e9 Merge branch 'obsd-master' 2015-10-25 09:22:20 +00:00
4acc8d0ff5 Merge branch 'obsd-master'
Conflicts:
	cmd-find.c
2015-10-25 09:21:37 +00:00
3faa51a0ca Pass output from jobs through format_expand() so they are expanded again
(this was the previous behaviour).
2015-10-25 08:59:26 +00:00
3034a71488 Let's see if anyone screams about not being able to specify $TMPDIR
for their tmux sockets.

(Over the years, I have seen $TMPDIR set up worse than /tmp many times,
and don't know how this practice infected other parts of the system.
Nothing uses tmpdir(3), nor a huge-temporary-file program like sort.)
ok nicm
2015-10-25 07:48:16 +00:00
2e2b8a95bd Pasting mouse escape sequences is unlikely, so skip them when working
out whether the user is pasting.
2015-10-23 23:46:36 +00:00
26a55ddcf9 Remove some unnecessary checks before free(). 2015-10-23 16:30:15 +00:00
1a4ddfa8a7 If $TMUX is set, and we are unsure about the session, use it. 2015-10-23 16:29:07 +00:00
5383b047d1 tmux can call pledge() in main with large set and then reduce it
slightly in the server to "stdio rpath wpath cpath fattr unix recvfd
proc exec tty ps".
2015-10-23 16:07:29 +00:00
14da999408 Format for scroll position, from Jorge Morante. 2015-10-23 16:02:21 +00:00
63a3fd3c0f Use tty_term_flag not _has for XT, and make -2 force direct use of
256-colour escape sequences (so setaf/setab can be bypassed if needed).
2015-10-23 15:52:54 +00:00
8c39813665 Merge branch 'obsd-master' 2015-10-22 14:01:12 +01:00
3ebcf25149 If the pane is still on all_window_panes but not actually connected to
window or session (which can happen if it is killed during a command
sequence and something else has a reference), fall back to the best
effort. Fixes "tmux killw\; detach" for Rudis Muiznieks.
2015-10-22 11:23:00 +00:00
a05c27a7e1 Unzoom before -LRUD, reported by Andy Weidenbaum. 2015-10-22 11:19:31 +00:00
6bc3902f5d Merge branch 'obsd-master' 2015-10-22 12:01:09 +01:00
c2c2d44c72 Log identify messages. 2015-10-22 11:00:51 +00:00
515dfea4b7 This should not be changed. 2015-10-22 10:48:30 +00:00
31fd071faa Rename shutdown to exit. 2015-10-22 10:46:24 +00:00
0bfa615997 Merge branch 'obsd-master' 2015-10-21 16:01:08 +01:00
60ca29df64 client_key_table was missing. 2015-10-21 13:14:36 +00:00
35f582583a Merge branch 'obsd-master' 2015-10-21 14:01:09 +01:00
ddbc4a0f6c By popular demand add a default binding for mouse wheel up to scroll
into history (if the mouse is, on of course).
2015-10-21 11:13:47 +00:00
1f4a5b5dfe Merge branch 'obsd-master' 2015-10-21 00:01:19 +01:00
076034345a Use client pointer not file descriptor in logging. 2015-10-20 21:12:08 +00:00
af2d48f4d2 Merge branch 'obsd-master' 2015-10-20 16:01:11 +01:00
8c8cddbe02 The table could change when retrying so don't save it at start of
server_client_handle_key.
2015-10-20 14:19:27 +00:00
bbdc08780c Merge branch 'obsd-master' 2015-10-18 22:01:08 +01:00
174a2ad731 Pass current directory as a string rather than a file descriptor because
pledge doesn't let us pass directory file descriptors.
2015-10-18 20:42:42 +00:00
7c78b2b756 Start working on tmux 2.2 2015-10-18 18:19:08 +01:00
310f0a960c Update for 2.1 release. 2.1 2015-10-18 18:10:43 +01:00
6c3ade76df __OpenBSD__ around pledge(). 2015-10-17 20:16:12 +01:00
487285b325 Merge branch 'obsd-master' 2015-10-17 20:01:08 +01:00
9c601ebde8 Add pledge "stdio unix sendfd proc exec tty" to tmux client process,
"sendfd" is dropped after first message from the server.
2015-10-17 18:30:43 +00:00
0273d809d0 Merge branch 'master' of github.com:tmux/tmux 2015-10-17 18:48:45 +01:00
e0527d7731 time.h is not needed now tzset() is not in log.c. 2015-10-17 18:48:22 +01:00
a204595e4c Merge branch 'obsd-master' 2015-10-16 10:01:09 +01:00
cf89abb013 Don't free after calling paste_set but do after evbuffer_add, from Theo
Buehler.
2015-10-16 07:43:29 +00:00
c06c14fb29 Some header fixes. 2015-10-15 21:42:17 +01:00