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

31 Commits (4f88344df30bca9fbcf670f1bf749ddba3f42397)

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 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
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 4acc8d0ff5 Merge branch 'obsd-master' 
Conflicts:
	cmd-find.c
 2015-10-25 09:21:37 +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
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
Thomas Adam b5d789a531 Merge branch 'obsd-master' 2015-09-14 16:01:08 +01:00
nicm 16ee4de5df Remove some extra blank lines. 2015-09-14 13:22:02 +00:00
Thomas Adam 778612d152 Merge branch 'obsd-master' 2015-08-13 18:01:07 +01:00
nicm 46aa92420a right-up should be right-of, also rename the values too. 2015-08-13 15:02:23 +00:00
Thomas Adam 6447404cc2 Merge branch 'obsd-master' 2015-08-12 12:01:09 +01:00
nicm 13b7fd82c1 Rename left/right/up/down relative to active pane to add -of suffix 
(left-of/right-of/etc) to remove conflict with left/right meaning
leftmost or rightmost pane. From Ben Boeckel.
 2015-08-12 08:55:20 +00:00
Thomas Adam 7acc4addb5 Merge branch 'obsd-master' 
Conflicts:
	client.c
	tmux.1
	tmux.c
 2015-06-07 23:42:25 +01:00
nicm 2f586905fc Fix a warning. 2015-06-05 09:09:08 +00:00
nicm 4219939c10 Make it so that if a window or session target is prefixed with an =, 
only an exact name or index match is accepted, no special character,
prefix match, or fnmatch.
 2015-06-05 08:14:16 +00:00
Thomas Adam 02e348c069 Merge branch 'obsd-master' 2015-06-04 12:59:41 +01:00
nicm a863834574 Add support for a single "marked pane". There is one marked pane in the 
server at a time; it may be toggled or cleared with select-pane -m and
-M (the border is highlighted). A new target '~' or '{marked}' specifies
the marked pane to commands and it is the default target for the
swap-pane and join-pane -s flag (this makes them much simpler to use -
mark the source pane and then change to the target pane to run swapp or
joinp).
 2015-06-04 11:43:51 +00:00
Thomas Adam 504b97b6a4 Merge branch 'obsd-master' 
Conflicts:
	tmux.h
 2015-05-09 12:52:38 +01:00
nicm 8e9b6e0948 Style spacing nits. 2015-05-07 11:42:56 +00:00
Thomas Adam c0cf4843e5 Merge branch 'obsd-master' 2015-04-29 18:42:12 +01:00
nicm e36fab2f70 If looking for an index, don't fill in window when given a session. 2015-04-28 12:09:24 +00:00
nicm 14d8cd6445 Do not do a search for the tty path if there isn't one. 2015-04-28 11:57:20 +00:00
nicm 094a047ddf If can't find pane as a pane, try as a window; likewise if can't find 
window as a session.
 2015-04-28 11:33:17 +00:00
Nicholas Marriott 3eb40a520a No paths.h on Solaris. 2015-04-28 10:36:17 +01:00
nicm c2bc84aa4d Do not include unattached clients when trying to find one for target. 2015-04-27 22:58:58 +00:00
nicm 91f6347485 Assign to the right variable when comparing clients. 2015-04-27 22:42:10 +00:00
nicm 95195f5258 Rewrite of the target resolution internals to be simpler and more 
consistent but with much less duplication, but keeping the same internal
API. Also adds more readable aliases for some of the special tokens used
in targets (eg "{start}" instead of "^"). Some behaviours may have
changed, for example prefix matches now happen before fnmatch.
 2015-04-27 16:25:57 +00:00