87794a3adb
Merge remote-tracking branch 'tmux/master'
2016-03-11 13:26:22 -05:00
5fce21728e
Merge branch 'obsd-master'
2016-01-31 12:01:09 +00:00
8028560f82
Support negative trim values (#{=-10:pane_title}) to trim from the end,
...
suggested by Kevin Brubeck Unhammer.
2016-01-31 09:54:46 +00:00
dc42c35f1f
Merge branch 'obsd-master'
2016-01-19 18:01:15 +00:00
995af0e2b7
I no longer use my SourceForge address so replace it.
2016-01-19 15:59:12 +00:00
9b2778c439
Merge with latest tmux
2015-12-23 05:46:44 -05:00
845a664bb2
Merge branch 'obsd-master'
2015-12-12 20:01:15 +00:00
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
4909a70174
Merge branch 'obsd-master'
2015-12-11 13:24:45 +00:00
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
af8134a6ff
Merge branch 'obsd-master'
2015-12-08 10:01:16 +00:00
e0f26dcda3
Remove format_create_flags and just pass flags to format_create.
2015-12-08 08:34:18 +00:00
890d8da2e3
Merge branch 'obsd-master'
...
Conflicts:
log.c
proc.c
tmux.c
2015-11-25 16:37:30 +00:00
1e2df2d464
Remove the -I part of show-messages which isn't really that useful; the
...
server start time can now be accessed with a new start_time format (use:
tmux display -p '#{t:start_time}')
2015-11-24 21:52:06 +00:00
7fe8edc396
Merge branch 'obsd-master'
2015-11-18 16:01:23 +00:00
577c0e3e5a
Use __unused rather than rolling our own.
2015-11-18 14:27:44 +00:00
5a5b950e8b
Add s/foo/bar/: prefix for formats to substitute bar for foo.
2015-11-18 14:13:55 +00:00
45a10dde95
Merge branch 'obsd-master'
2015-11-13 14:01:10 +00:00
88aa1c8dc3
Two spacing and spelling nits.
2015-11-13 12:18:52 +00:00
e2917b2627
Merge branch 'obsd-master'
2015-11-13 10:43:07 +00:00
3df4959f51
Merge branch 'obsd-master'
...
Conflicts:
Makefile
2015-11-13 10:42:45 +00:00
531869bd92
Add window_visible_layout which ignores zoomed panes and use it for
...
control mode (which needs to know all panes), from George Nachman.
2015-11-13 10:00:26 +00:00
c5689a5a40
Long overdue change to the way we store cells in the grid: now, instead
...
of storing a full grid_cell with UTF-8 data and everything, store a new
type grid_cell_entry. This can either be the cell itself (for ASCII
cells), or an offset into an extended array (per line) for UTF-8
data.
This avoid a large (8 byte) overhead on non-UTF-8 cells (by far the
majority for most users) without the complexity of the shadow array we
had before. Grid memory without any UTF-8 is about half.
The disadvantage that cells can no longer be modified in place and need
to be copied out of the grid and back but it turned out to be lot less
complicated than I expected.
2015-11-13 08:09:28 +00:00
5f483499f3
Merge branch 'obsd-master'
2015-11-12 12:01:17 +00:00
1b86f520ea
Nuke the utf8 and status-utf8 options and make tmux only a UTF-8
...
terminal. We still support non-UTF-8 terminals outside tmux, but inside
it is always UTF-8 (as when the utf8 and status-utf8 options were on).
2015-11-12 11:09:11 +00:00
a0f3999ce7
Remove the mouse_utf8_flag format as well.
2015-11-12 11:07:10 +00:00
17f6c3be8e
Merge branch 'obsd-master'
2015-10-31 10:01:12 +00:00
01defc9f49
Because pledge(2) does not allow us to pass directory file descriptors
...
around, we can't use file descriptors for the working directory because
we will be unable to pass it to a privileged process to tell it where to
read or write files or spawn children. So move tmux back to using
strings for the current working directory. We try to check it exists
with access() when it is set but ultimately fall back to ~ if it fails
at time of use (or / if that fails too).
2015-10-31 08:13:58 +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
44657bf932
Move struct options into options.c.
2015-10-27 15:58:42 +00:00
147b5ae514
Merge branch 'obsd-master'
2015-10-27 10:01:13 +00:00
9952201ca7
Count brackets in #{?...} so that nested conditional formats work, from
...
Daniel De Graaf.
2015-10-27 09:28:31 +00:00
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
ca29903c82
Merge branch 'obsd-master'
2015-10-26 00:01:10 +00:00
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
3e0d31c4e9
Merge branch 'obsd-master'
2015-10-25 09:22:20 +00:00
4acc8d0ff5
Merge branch 'obsd-master'
...
Conflicts:
cmd-find.c
2015-10-25 09:21:37 +00:00
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
14da999408
Format for scroll position, from Jorge Morante.
2015-10-23 16:02:21 +00:00
74b958ecbe
Merge branch 'obsd-master'
...
Conflicts:
Makefile
2015-09-14 12:42:19 +01:00
16efa84838
Make refresh-client force update of jobs, from Sina Siadat.
2015-09-14 10:25:52 +00:00
1fd756066c
Merge branch 'obsd-master'
2015-09-10 12:01:08 +01:00
cfabe30bec
Add session_last_attached time and format, from Sina Siadat.
2015-09-10 08:58:14 +00:00
76688d2040
Merge branch 'obsd-master'
...
Conflicts:
cfg.c
tmux.c
2015-09-06 20:47:50 +01:00
82326dcbe2
A couple of style nits.
2015-09-03 14:30:23 +00:00
2c6ea705fd
Bring back pane_current_path.
2015-08-31 19:57:37 +01:00
29f2120e5b
Linux: get_proc_name() -> osdep_get_name()
2015-08-30 21:47:50 +01:00
cb89f2f2a1
Merge branch 'obsd-master'
...
Conflicts:
Makefile
format.c
2015-08-30 21:44:01 +01:00
