Thomas Adam
a6a294c8f8
Merge branch 'obsd-master'
2017-04-22 14:01:15 +01:00
nicm
ae1a6c2fc5
Do not need getopt.h.
2017-04-22 12:08:41 +00:00
Thomas Adam
e802b683ea
Merge branch 'obsd-master'
2017-04-22 12:01:19 +01:00
nicm
55cd4c7bc7
Can't collect UTF-8 characters of more than one byte at the moment.
2017-04-22 10:30:56 +00:00
nicm
a4eaac359a
new -A should use the session name.
2017-04-22 10:26:44 +00:00
nicm
ee45a8a149
Get rid of the extra layer of flags and cmd_prepare() and just store the
...
CMD_FIND_* flags in the cmd_entry and call it for the command. Commands
with special requirements call it themselves and update the target for
hooks to use.
2017-04-22 10:22:39 +00:00
Thomas Adam
b08e451c91
Merge branch 'obsd-master'
2017-04-22 10:01:51 +01:00
nicm
2c0f826c36
Mouse bindings and hooks set up an initial current state when running a
...
command. This is used for the session, window and pane for all commands
in the command sequence if there is no -t or -s.
However, using it for all commands in the command sequence means that if
the active pane or current session is changed, subsequent commands still
use the previous state. So make commands which explicitly change the
current state (such as neww and selectp) update it themselves for later
commands. Commands which may invalidate the state (like killp) are
already OK because an invalid state will be ignored.
Also fill in the current state for all key bindings rather than just the
mouse, so that any omissions are easier to spot.
2017-04-22 08:56:24 +00:00
nicm
bcab77e266
We need to collect UTF-8 characters so that width != 1 characters are
...
correctly flushed.
2017-04-22 08:33:28 +00:00
Thomas Adam
d8398af770
Merge branch 'obsd-master'
2017-04-22 08:01:54 +01:00
nicm
30348edc7c
Fix if-shell without a client (so in the config file). Reported by Theo
...
Buehler.
2017-04-22 06:27:15 +00:00
nicm
59ff9b8128
Typo in example.
2017-04-22 06:15:22 +00:00
nicm
2c9bdd9e32
Memory leaks, from David CARLIER.
2017-04-22 06:13:30 +00:00
Thomas Adam
21240c1a8f
Merge branch 'obsd-master'
2017-04-22 00:01:11 +01:00
nicm
c8ecbf38ab
Log error properly when no current state, and some other minor tweaks.
2017-04-21 22:23:24 +00:00
nicm
194a121ef6
Make sure cmd_find_from_* clear the state if they fail.
2017-04-21 22:00:06 +00:00
nicm
8867951144
Rename a variable.
2017-04-21 21:02:26 +00:00
Thomas Adam
fd13731049
Merge branch 'obsd-master'
2017-04-21 22:01:14 +01:00
nicm
c68ceca8cd
Clear shared state if not filling it in.
2017-04-21 20:34:05 +00:00
nicm
efaf4c16cf
Make the cmd_find_* functions more obvious when looking for a client,
...
rather than having it inside other functions. Should be no change to the
way targets are resolved just yet.
2017-04-21 20:26:34 +00:00
nicm
2ad09ab5af
Key needs to be initialized to zero now it has flags in it.
2017-04-21 19:33:07 +00:00
Thomas Adam
1f209ed030
Merge branch 'obsd-master'
2017-04-21 20:01:18 +01:00
nicm
3c876235cc
Style nits and an unused struct.
2017-04-21 18:18:17 +00:00
nicm
afa4e3ed9c
Add cmd_find_from_winlink_pane and use it in a couple of places, and
...
make functions that can't fail void.
2017-04-21 17:22:20 +00:00
Thomas Adam
c376c5a817
Merge branch 'obsd-master'
2017-04-21 18:01:11 +01:00
nicm
92a77e7654
It is annoying that the copy mode key table (or any other key table)
...
will suppress root key table bindings. So change to always check the
root table if no binding is found in the current table (whether it be
the prefix table from pressing the prefix or the copy mode table from a
pane).
A root key binding can be blocked by binding the key to a command that
does nothing (like send-keys with no arguments).
Problem reported by Thomas Sattler.
2017-04-21 16:04:18 +00:00
Thomas Adam
4612419c14
Merge branch 'obsd-master'
2017-04-21 16:01:18 +01:00
nicm
c799425069
More unnecessary arguments now winlink points back to session.
2017-04-21 14:09:44 +00:00
nicm
428be9803c
History needs to be loaded after config parsing is done - now that
...
commands are queued, that's in cfg_done not after start_cfg finishes.
2017-04-21 14:04:54 +00:00
nicm
bba588752f
Store state shared between multiple commands in the queue in a shared
...
structure.
2017-04-21 14:01:19 +00:00
nicm
311dad8c28
Do not run the config file in the context of the first client, instead
...
use no client like we did before. This means commands like new-session
won't try to attach if they are in the config file.
2017-04-21 13:15:43 +00:00
Thomas Adam
93062ad099
Fix after merge
2017-04-21 09:29:22 +01:00
Thomas Adam
22e594fcea
Merge branch 'obsd-master'
...
Conflicts:
Makefile.am
pty.c
2017-04-21 09:25:07 +01:00
Nicholas Marriott
02580ac134
Typo; Daniel Hahler.
2017-04-21 06:49:38 +01:00
Nicholas Marriott
b723f50e65
Do not need getopt.h for getopt, from Eric N Vander Weele.
2017-04-20 20:35:11 +01:00
Nicholas Marriott
4a2e75fc8c
Merge branch 'master' of github.com:tmux/tmux
2017-04-20 19:09:36 +01:00
Nicholas Marriott
9420758127
getptmfd() and fdforkpty() compat.
2017-04-20 19:09:07 +01:00
nicm
87997efe8d
Use fdforkpty() instead of our own unwrapped versions.
2017-04-20 17:49:26 +00:00
Thomas Adam
69e0f28333
Merge branch 'obsd-master'
2017-04-20 18:01:12 +01:00
nicm
51a0dbb172
Only set up a current target for mouse key bindings. Fixes:
...
bind q select-pane -U \; resize-pane -Z
(There is still some possible weirdness with the way we do current
targets, it should probably be done in a different way at some point.)
2017-04-20 15:16:20 +00:00
Nicholas Marriott
7934e7a6b5
Notes on target resolution.
2017-04-20 15:40:28 +01:00
Nicholas Marriott
aebbb15fe2
Turn on debug if $VERSION is master rather than commenting and uncommenting.
2017-04-20 12:06:39 +01:00
Thomas Adam
48371216df
Merge branch 'obsd-master'
2017-04-20 12:01:14 +01:00
Nicholas Marriott
e30f9dc1fa
Merge tag '2.4'
...
Version 2.4.
2017-04-20 11:59:07 +01:00
Nicholas Marriott
f21cb71fbe
Enter date of release.
2017-04-20 11:52:16 +01:00
Nicholas Marriott
990218739a
Missing :.
2017-04-20 11:03:23 +01:00
Nicholas Marriott
e7c2f53f2a
Changes to CHANGES.
2017-04-20 11:00:15 +01:00
nicm
21993105e5
Now that struct winlink has a session pointer, can remove some arguments.
2017-04-20 09:43:45 +00:00
Thomas Adam
9b2f02efbd
Update CHANGES file
2017-04-20 10:39:16 +01:00
nicm
0f25ad3ca3
There is no real need for window_printable_flags to allocate, make it
...
return a buffer from the stack.
2017-04-20 09:39:07 +00:00
