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

5425 Commits (a5e4d3a2d8c2fb288488ee5922a561a4a9e6803a)

Author SHA1 Message Date
Thomas Adam a5e4d3a2d8 Merge branch 'obsd-master' 2015-10-28 12:01:11 +00:00
nicm bf9c933cae Like options, move the environ struct into environ.c. 2015-10-28 09:51:55 +00:00
Thomas Adam da1f6fc2c8 Merge branch 'obsd-master' 
Conflicts:
	Makefile
	client.c
	server-client.c
	server.c
	tmux.c
	tmux.h
 2015-10-27 23:27:26 +00:00
nicm 44657bf932 Move struct options into options.c. 2015-10-27 15:58:42 +00:00
nicm 67c3a014b9 No more TMPDIR. 2015-10-27 14:51:35 +00:00
nicm 07b0ea03c3 Break the common process set up, event loop and imsg dispatch code 
between server and client out into a separate internal API. This will
make it easier to add another process.
 2015-10-27 13:23:24 +00:00
Thomas Adam 147b5ae514 Merge branch 'obsd-master' 2015-10-27 10:01:13 +00:00
nicm 9952201ca7 Count brackets in #{?...} so that nested conditional formats work, from 
Daniel De Graaf.
 2015-10-27 09:28:31 +00:00
nicm 17c2c4219d The format callback may not always succeed, so we need to check for 
NULL. From Patrick Palka.
 2015-10-27 09:18:06 +00:00
nicm 3fc001d0a2 Use copy-mode -et= in WheelUpPane binding, from Patrick Palka. 2015-10-27 09:15:21 +00:00
Thomas Adam 9c69a79f9a Merge branch 'obsd-master' 2015-10-27 00:01:09 +00:00
nicm 640c6fdd5f If a mouse event has no key binding, pass it through to the pane it 
happened in, not the active pane like normal key presses. Fixes problems
seen by Enrico Ghirardi.
 2015-10-26 23:16:18 +00:00
nicm 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
nicm b85be36d1c Handle unknown keys more gracefully, return a string instead of NULL. 2015-10-26 22:03:04 +00:00
Thomas Adam 54a3ed751e Merge branch 'obsd-master' 2015-10-26 18:01:12 +00:00
nicm a22fe33aa0 Some extra logging of where keys are actually going. 2015-10-26 17:17:06 +00:00
Thomas Adam 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
Thomas Adam ca29903c82 Merge branch 'obsd-master' 2015-10-26 00:01:10 +00:00
nicm 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
Nicholas Marriott c14fb5b633 -sys/types.h 2015-10-25 09:38:08 +00:00
Thomas Adam ad437f13d5 Add missing headers for getpid() 2015-10-25 09:34:56 +00:00
Thomas Adam 4681415a15 Merge branch 'master' of github.com:tmux/tmux 2015-10-25 09:33:11 +00:00
Nicholas Marriott 7930cb54c0 ifdef __OpenBSD__ around pledge(). 2015-10-25 09:31:46 +00:00
Thomas Adam 91f53d590b __OpenBSD__ around pledge() 2015-10-25 09:31:07 +00:00
Thomas Adam 3e0d31c4e9 Merge branch 'obsd-master' 2015-10-25 09:22:20 +00:00
Thomas Adam 4acc8d0ff5 Merge branch 'obsd-master' 
Conflicts:
	cmd-find.c
 2015-10-25 09:21:37 +00:00
nicm 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
deraadt 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
nicm 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
nicm 26a55ddcf9 Remove some unnecessary checks before free(). 2015-10-23 16:30:15 +00:00
nicm 1a4ddfa8a7 If $TMUX is set, and we are unsure about the session, use it. 2015-10-23 16:29:07 +00:00
nicm 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
nicm 14da999408 Format for scroll position, from Jorge Morante. 2015-10-23 16:02:21 +00:00
nicm 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
Thomas Adam 8c39813665 Merge branch 'obsd-master' 2015-10-22 14:01:12 +01:00
nicm 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
nicm a05c27a7e1 Unzoom before -LRUD, reported by Andy Weidenbaum. 2015-10-22 11:19:31 +00:00
Thomas Adam 6bc3902f5d Merge branch 'obsd-master' 2015-10-22 12:01:09 +01:00
nicm c2c2d44c72 Log identify messages. 2015-10-22 11:00:51 +00:00
nicm 515dfea4b7 This should not be changed. 2015-10-22 10:48:30 +00:00
nicm 31fd071faa Rename shutdown to exit. 2015-10-22 10:46:24 +00:00
Thomas Adam 0bfa615997 Merge branch 'obsd-master' 2015-10-21 16:01:08 +01:00
nicm 60ca29df64 client_key_table was missing. 2015-10-21 13:14:36 +00:00
Thomas Adam 35f582583a Merge branch 'obsd-master' 2015-10-21 14:01:09 +01:00
nicm 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
Thomas Adam 1f4a5b5dfe Merge branch 'obsd-master' 2015-10-21 00:01:19 +01:00
nicm 076034345a Use client pointer not file descriptor in logging. 2015-10-20 21:12:08 +00:00
Thomas Adam af2d48f4d2 Merge branch 'obsd-master' 2015-10-20 16:01:11 +01:00
nicm 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