Commit Graph

57 Commits

Author SHA1 Message Date
6c35d17800 Merge branch 'obsd-master' 2016-03-03 16:01:11 +00:00
fa81d838da Accept clients as sessions in cmd_find_get_session. 2016-03-03 14:14:46 +00:00
dc42c35f1f Merge branch 'obsd-master' 2016-01-19 18:01:15 +00:00
b5b5221c13 Split out getting the current state from the target search so it can be
replaced if we already know the current.
2016-01-19 16:01:30 +00:00
995af0e2b7 I no longer use my SourceForge address so replace it. 2016-01-19 15:59:12 +00:00
5d21faa99c Merge branch 'obsd-master' 2016-01-16 02:01:10 +00:00
c9815307eb Add hooks for alerts (bell, silence, activity), from Thomas Adam. 2016-01-16 00:36:53 +00:00
2ad9caad3f Merge branch 'obsd-master' 2015-12-18 00:01:08 +00:00
a337403868 As well as setting up the state, actually use it in cmd_find_target. 2015-12-17 23:08:22 +00:00
e0cae08c04 Merge branch 'obsd-master' 2015-12-17 00:01:08 +00:00
021c64310d Add infrastructure to work out the best target given a pane or window
alone and use it to add pane_died and pane_exited hooks.
2015-12-16 21:50:37 +00:00
f7a6482e6b Merge branch 'obsd-master' 2015-12-15 16:01:12 +00:00
909b737289 Copy state directly rather than dereferencing wl (which could be NULL). 2015-12-15 14:32:55 +00:00
1a33ea9671 Merge branch 'obsd-master' 2015-12-15 02:01:14 +00:00
6f417ec943 We changed somewhat recently to us the pty when tmux was run inside
itself to work out the current pane. This is confusing in many cases
(particularly notable is that "tmux neww\; splitw" would not split the
new window), and the few advantages do not make up for the confusion.

So drop this behaviour and return to using the current window and pane;
keep the pty check but only use it to limit the list of possible current
sessions.
2015-12-15 00:45:02 +00:00
56d097cfe0 Don't copy marked pane when can just point to it. 2015-12-15 00:11:24 +00:00
6ab17e3e15 Merge branch 'obsd-master' 2015-12-15 00:01:08 +00:00
12da13c9d1 Make the marked pane a cmd_find_state. 2015-12-15 00:00:01 +00:00
d5999f8b5c Use cmd_find_clear_state instead of an extra function doing the same. 2015-12-14 23:30:58 +00:00
00da99f2c4 Merge branch 'obsd-master' 2015-12-13 20:01:09 +00:00
d37a580085 Merge branch 'obsd-master' 2015-12-13 18:01:11 +00:00
9f5aca62a9 Use struct cmd_find_state directly and remove cmd_state_flag, also
change so that winlink is set even if an index is too.
2015-12-13 17:55:14 +00:00
9b7697db62 Change cmd_find_target to use a state struct from the caller. 2015-12-13 16:44:35 +00:00
ae5ddfdc1a Merge branch 'obsd-master' 2015-12-13 16:01:13 +00:00
ff599f4004 Remove the cmd_find_{session,window,pane,index} functions (which are
just wrappers around cmd_find_target) and just use cmd_find_target
directly.
2015-12-13 15:32:12 +00:00
9d191a6093 Move logging into cmd_find_target rather than each function. 2015-12-13 15:00:37 +00:00
a5e4d3a2d8 Merge branch 'obsd-master' 2015-10-28 12:01:11 +00:00
bf9c933cae Like options, move the environ struct into environ.c. 2015-10-28 09:51:55 +00:00
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
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
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
4acc8d0ff5 Merge branch 'obsd-master'
Conflicts:
	cmd-find.c
2015-10-25 09:21:37 +00:00
1a4ddfa8a7 If $TMUX is set, and we are unsure about the session, use it. 2015-10-23 16:29:07 +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
b5d789a531 Merge branch 'obsd-master' 2015-09-14 16:01:08 +01:00
16ee4de5df Remove some extra blank lines. 2015-09-14 13:22:02 +00:00
778612d152 Merge branch 'obsd-master' 2015-08-13 18:01:07 +01:00
46aa92420a right-up should be right-of, also rename the values too. 2015-08-13 15:02:23 +00:00
6447404cc2 Merge branch 'obsd-master' 2015-08-12 12:01:09 +01:00
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
7acc4addb5 Merge branch 'obsd-master'
Conflicts:
	client.c
	tmux.1
	tmux.c
2015-06-07 23:42:25 +01:00
2f586905fc Fix a warning. 2015-06-05 09:09:08 +00:00
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
02e348c069 Merge branch 'obsd-master' 2015-06-04 12:59:41 +01:00
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
504b97b6a4 Merge branch 'obsd-master'
Conflicts:
	tmux.h
2015-05-09 12:52:38 +01:00
8e9b6e0948 Style spacing nits. 2015-05-07 11:42:56 +00:00
c0cf4843e5 Merge branch 'obsd-master' 2015-04-29 18:42:12 +01:00