Thomas Adam
f7a6482e6b
Merge branch 'obsd-master'
2015-12-15 16:01:12 +00:00
nicm
909b737289
Copy state directly rather than dereferencing wl (which could be NULL).
2015-12-15 14:32:55 +00:00
Thomas Adam
e5caf64815
Merge branch 'obsd-master'
2015-12-15 14:01:12 +00:00
nicm
ac9778395f
Some hooks API changes to fire a hook while waiting another cmdq and
...
infrastructure that will be needed soon.
2015-12-15 13:43:07 +00:00
Thomas Adam
1a33ea9671
Merge branch 'obsd-master'
2015-12-15 02:01:14 +00:00
nicm
9d88d82d5e
Allow list-keys and list-commands to be run without a running server.
2015-12-15 00:52:17 +00:00
nicm
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
nicm
56d097cfe0
Don't copy marked pane when can just point to it.
2015-12-15 00:11:24 +00:00
Thomas Adam
6ab17e3e15
Merge branch 'obsd-master'
2015-12-15 00:01:08 +00:00
nicm
12da13c9d1
Make the marked pane a cmd_find_state.
2015-12-15 00:00:01 +00:00
nicm
d5999f8b5c
Use cmd_find_clear_state instead of an extra function doing the same.
2015-12-14 23:30:58 +00:00
Thomas Adam
bc6137f9e4
Merge branch 'obsd-master'
2015-12-14 01:30:15 +00:00
nicm
a585a1b81a
Remove some stray debug code.
2015-12-14 00:32:19 +00:00
nicm
a3129fd4e8
Instead of combined flags for -c, -s, -t, split into different sets
...
using an enum and simplify the parsing code.
2015-12-14 00:31:54 +00:00
Thomas Adam
5caec3020d
Merge branch 'obsd-master'
2015-12-13 23:46:58 +00:00
Thomas Adam
f4adcfa0e2
Merge branch 'obsd-master'
2015-12-13 22:01:08 +00:00
nicm
ecfeee2e82
Use member names in cmd_entry definitions so I stop getting confused
...
about the order.
2015-12-13 21:53:57 +00:00
nicm
899bee0056
Actually I thought cmd_get_state_client was unnecessary but it will be
...
needed.
2015-12-13 21:17:37 +00:00
Thomas Adam
00da99f2c4
Merge branch 'obsd-master'
2015-12-13 20:01:09 +00:00
nicm
72948d9f1d
-c needs to be able for fail for display-message.
2015-12-13 18:31:47 +00:00
nicm
66d1193a00
Remove an unnecessary function.
2015-12-13 18:27:47 +00:00
nicm
fd47084224
show-options and environment need CANFAIL flag.
2015-12-13 18:15:13 +00:00
Thomas Adam
d37a580085
Merge branch 'obsd-master'
2015-12-13 18:01:11 +00:00
nicm
50f8ead4e6
Don't log an error when doing the first check for move-window.
2015-12-13 17:58:26 +00:00
nicm
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
nicm
9b7697db62
Change cmd_find_target to use a state struct from the caller.
2015-12-13 16:44:35 +00:00
nicm
208e2dad1e
If command returns error, report it.
2015-12-13 16:11:42 +00:00
Thomas Adam
ae5ddfdc1a
Merge branch 'obsd-master'
2015-12-13 16:01:13 +00:00
nicm
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
nicm
9d191a6093
Move logging into cmd_find_target rather than each function.
2015-12-13 15:00:37 +00:00
nicm
4a4daf1303
Instead of every command resolving the target (-t or -s) itself, prepare
...
the state (client, session, winlink, pane) for it it before entering the
command. Each command provides some flags that tell the prepare step
what it is expecting.
This is a requirement for having hooks on commands (for example, if you
hook "select-window -t1:2", the hook command should to operate on window
1:2 not whatever it thinks is the current window), and should allow some
other target improvements.
The old cmd_find_* functions remain for the moment but that layer will
be dropped later.
Joint work with Thomas Adam.
2015-12-13 14:32:38 +00:00
Nicholas Marriott
92f187d1c2
Need to use pkg-config --static when doing a static build.
2015-12-12 22:04:25 +00:00
Thomas Adam
845a664bb2
Merge branch 'obsd-master'
2015-12-12 20:01:15 +00:00
nicm
5ed17e84fa
Add key-table option to set the default key table for a session, allows
...
different key bindings for different sessions and a few other things.
2015-12-12 18:32:24 +00:00
nicm
6a50cf89b4
Return after changing key table.
2015-12-12 18:28:47 +00:00
nicm
39cf9c9d31
Allow prefix and prefix2 to be set to None to disable (useful if you
...
would rather bind the prefix in the root table).
2015-12-12 18:19:00 +00:00
Nicholas Marriott
5a5db02b85
Merge branch 'master' of github.com:tmux/tmux
2015-12-11 19:59:08 +00:00
Nicholas Marriott
38cc1a1843
Look for ncurses with PKG_CONFIG, and remove libtinfo because it just causes
...
confusion.
2015-12-11 19:58:41 +00:00
Thomas Adam
2a6b215328
Merge branch 'obsd-master'
2015-12-11 18:01:11 +00:00
nicm
88bc8f3528
Style nits and line wrapping of function declarations.
2015-12-11 16:37:21 +00:00
nicm
f2be3ad46f
Mention {src,dst}-{window,pane} where we define target-{window,pane}.
2015-12-11 16:27:01 +00:00
Thomas Adam
2a3456cd3b
Merge branch 'obsd-master'
2015-12-11 16:01:16 +00:00
nicm
bd5918760e
We cannot do hooks_find and then hooks_remove because it might have come
...
from the parent (global) tree, instead make it remove by name like options.
While here, also tidy up a few bits of options and hooks handling (use
RB_FOREACH_SAFE, and a helper function for the free).
2015-12-11 15:46:57 +00:00
Thomas Adam
4909a70174
Merge branch 'obsd-master'
2015-12-11 13:24:45 +00:00
nicm
d7e11d0af7
Check alerts when session changes, from Patrick Palka.
2015-12-11 12:39:47 +00:00
nicm
01831da5f5
Add cmdq as an argument to format_create and add a format for the
...
command name (will also be used for more later).
2015-12-11 12:27:36 +00:00
Thomas Adam
af8134a6ff
Merge branch 'obsd-master'
2015-12-08 10:01:16 +00:00
Nicholas Marriott
a988c36ccb
Add to .mailmap, and sort.
2015-12-08 08:46:06 +00:00
nicm
e0f26dcda3
Remove format_create_flags and just pass flags to format_create.
2015-12-08 08:34:18 +00:00
nicm
8f671d3eef
Spacing nits.
2015-12-08 08:14:04 +00:00
