Nicolas Viennot
2680e4fa04
master.tmate.io -> ssh.tmate.io
2015-12-23 23:17:35 -05:00
Nicolas Viennot
16e1b82cb8
fix options scope
2015-12-23 05:58:09 -05:00
Nicolas Viennot
9b2778c439
Merge with latest tmux
2015-12-23 05:46:44 -05: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
Thomas Adam
534f9e3ab1
Merge branch 'obsd-master'
2015-11-24 10:01:13 +00:00
nicm
b32ce34cf2
Don't allow options in table without scope set.
2015-11-24 09:34:55 +00:00
Thomas Adam
d63de1e407
Merge branch 'obsd-master'
...
Conflicts:
server.c
tmux.c
2015-11-23 21:20:54 +00:00
tim
4fcc02ee9d
If display-time is set to 0, show status messages until a key is pressed;
...
OK nicm@
2015-11-22 18:28:01 +00:00
Thomas Adam
78a00c845c
Merge branch 'obsd-master'
...
Conflicts:
tmux.h
2015-11-21 14:24:33 +00:00
nicm
fce56c56ef
Instead of separate tables for different types of options, give each
...
option a scope type (server, session, window) in one table.
2015-11-20 12:01:19 +00:00
Thomas Adam
5f483499f3
Merge branch 'obsd-master'
2015-11-12 12:01:17 +00:00
nicm
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
Thomas Adam
333da3b64b
Merge branch 'obsd-master'
2015-11-12 10:01:09 +00:00
nicm
7062b0e65d
Default history-file should be "" not NULL, from Greg Onufe.
2015-11-12 08:19:18 +00:00
Thomas Adam
f2e4aa8d1c
Merge branch 'obsd-master'
2015-11-12 00:01:10 +00:00
nicm
00c34df186
Drop mouse-utf8 option and always turn on UTF-8 mouse if the client says
...
it supports UTF-8.
2015-11-11 23:23:33 +00:00
Thomas Adam
7120ab2f16
Merge branch 'obsd-master'
2015-09-26 02:01:16 +01:00
nicm
695a591f8e
Adding colors=256 to *256color* was always pretty stupid and now it
...
won't work (without adding setaf@:setab@ too).
2015-09-25 23:30:24 +00:00
Thomas Adam
84eabb2658
Merge branch 'obsd-master'
2015-08-28 14:01:11 +01:00
nicm
675def0396
Remove the lock-server option which is a bit redundant, it isn't that
...
different without it.
2015-08-28 12:31:55 +00:00
Thomas Adam
18a64ad52d
Merge branch 'obsd-master'
2015-07-20 18:01:10 +01:00
nicm
92af3766ec
Add an option (history-file) for a file to save/restore command prompt
...
history, from Olof-Joachim Frahm.
2015-07-20 15:50:04 +00:00
Thomas Adam
00471dc783
Merge branch 'obsd-master'
2015-05-13 09:44:11 +01:00
nicm
ec34439f9c
Add a session_alerts format which is a list of all the alerts in the
...
current session in symbolic form (something like "0!,4~,5!"). Use this
in the default set-titles-string. Prompted by a request from Jan ONDREJ.
2015-05-12 15:29:29 +00:00
nicm
e958db09a7
Add bell-action "other" to pass through bells in all windows except the
...
current, suggested by Jan ONDREJ.
2015-05-12 15:27:46 +00:00
nicm
b833fabeb2
Left the c0-* options behind in the table.
2015-05-11 10:58:22 +00:00
Thomas Adam
f10d3675f8
Merge branch 'obsd-master'
2015-05-06 10:03:52 +01:00
nicm
31b1ab4852
Add a format window_linked which is 1 if a window has been linked
...
multiple times, also remove the default space in window_flags and use a
conditional to add it in window-status-format (this means additional
flags can be added in the option without extra spaces). From Thomas Adam
with tweaks by me.
2015-05-06 08:35:39 +00:00
Thomas Adam
c0cf4843e5
Merge branch 'obsd-master'
2015-04-29 18:42:12 +01:00
nicm
7382ba82c5
If default-terminal is set to "screen" or "screen-*", emulate screen's
...
historical (incorrect) behaviour for SGR 3 and send smso
(standout). Previously, we would send sitm (italics) if the terminal
outside had it and smso otherwise. This was acceptably until recently
because xterm's terminfo entry lacked sitm, so most users got smso.
People who want italics should set default-terminal to the forthcoming
"tmux" entry (and be prepared to deal with it being missing on older
hosts).
As a side-effect this changes default-terminal to be a server rather
than a session option.
suggested by and ok naddy
2015-04-29 15:59:08 +00:00
Thomas Adam
b25dc423b0
Merge branch 'obsd-master'
2015-04-20 15:44:27 +01:00
nicm
bf635e7741
Rewrite of tmux mouse support which was a mess. Instead of having
...
options for "mouse-this" and "mouse-that", mouse events may be bound as
keys and there is one option "mouse" that turns on mouse support
entirely (set -g mouse on).
See the new MOUSE SUPPORT section of the man page for description of the
key names and new flags (-t= to specify the pane or window under mouse
as a target, and send-keys -M to pass through a mouse event).
The default builtin bindings for the mouse are:
bind -n MouseDown1Pane select-pane -t=; send-keys -M
bind -n MouseDown1Status select-window -t=
bind -n MouseDrag1Pane copy-mode -M
bind -n MouseDrag1Border resize-pane -M
To get the effect of turning mode-mouse off, do:
unbind -n MouseDrag1Pane
unbind -temacs-copy MouseDrag1Pane
The old mouse options are now gone, set-option -q may be used to
suppress warnings if mixing configuration files.
2015-04-19 21:34:21 +00:00
nicm
ee123c2489
Support setting the default window and pane background colours (window
...
and active pane via window-style and window-active-style options, an
individual pane by a new select-pane -P flag). From J Raynor.
2015-04-19 21:05:27 +00:00
Thomas Adam
833fe5bdee
Merge branch 'obsd-master'
...
Conflicts:
cmd-pipe-pane.c
2015-02-06 19:07:43 +00:00
nicm
83a8e1fd20
Move pane border options to window options rather than session, from Marc Finet.
2015-02-06 15:09:34 +00:00
sthen
c38f0d85da
In options-table.c r1.51 an extra space was added to the default status-right,
...
overrunning status-right-length with long window titles. Allow for the extra
space so the last digit of the year isn't lost. ok nicm@
2015-01-21 12:20:56 +00:00
Thomas Adam
fc05bf255a
Merge branch 'obsd-master'
2014-11-09 00:15:51 +00:00
Nicholas Marriott
747cab4281
No need for $Id$ now.
2014-11-08 12:27:43 +00:00
nicm
d24c9d7d3e
Do not put a space between status-left/status-right and the window list,
...
instead move the space into the defaults for the options (so status-left
now defaults to "[#S] ". From Balazs Kezes.
2014-11-05 23:15:11 +00:00
Thomas Adam
953c3ef47a
Merge branch 'obsd-master'
...
Conflicts:
Makefile
tmux.1
window.c
2014-04-23 11:26:11 +01:00
nicm
c3b2e5eed3
Wrap some long lines.
2014-04-17 12:57:28 +00:00
nicm
bce952777a
Remove some unnecessary includes and fix a typo.
2014-04-17 11:38:35 +00:00
nicm
2740490e27
Remove the "info" message mechanism, this was only used for about five
...
mostly useless and annoying messages. Change those commands to silence
on success like all the others. Still accept the -q command line flag
and "quiet" server option for now.
2014-04-17 07:55:43 +00:00
nicm
992ef70fb6
Remove the monitor-content option and associated bits and bobs. It's
...
never worked very well. If there is a big demand for it to return, will
consider better ways to do it.
2014-04-17 07:36:45 +00:00
Thomas Adam
0c99c7dbff
Merge branch 'obsd-master'
...
Conflicts:
Makefile
tty-keys.c
2014-04-05 12:36:14 +01:00
nicm
dca7d1c0fd
Make message-limit a server option.
2014-03-31 21:41:35 +00:00
Nicholas Marriott
683ca270d4
Make message-limit a server option.
2014-03-07 15:37:01 +00:00
nicm
f1828921df
Change terminal-overrides to a server option (now that we have them), it
...
doesn't make much sense as a session option.
2014-02-23 00:53:06 +00:00
Thomas Adam
d50e47fc4a
Merge branch 'obsd-master'
...
Conflicts:
Makefile
cmd-server-info.c
cmd-start-server.c
2014-01-31 21:39:56 +00:00