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
6447404cc2
Merge branch 'obsd-master'
2015-08-12 12:01:09 +01:00
nicm
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
Thomas Adam
ff18787b2c
Merge branch 'obsd-master'
2015-07-27 10:01:08 +01:00
nicm
d33adc4fd0
Make -q suppress ambiguous option warnings too, from Cam Hutchison.
2015-07-27 08:45:45 +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
dedd9edf7f
Merge branch 'obsd-master'
2015-07-20 12:01:07 +01:00
nicm
d4ce210713
Correct the tsl/fsl sequence to ]0 not ]2 (from Marcel Korpel). While
...
here, Xr xterm and remove some advice about elinks that is better
elsewhere.
2015-07-20 10:34:11 +00:00
Thomas Adam
07aef38591
Merge branch 'obsd-master'
2015-07-13 18:01:09 +01:00
nicm
81069f66f9
Add a format to show if client is a control client. From Bruno Sutic.
2015-07-13 15:37:26 +00:00
Thomas Adam
38d4d69639
Merge branch 'obsd-master'
2015-07-13 16:01:09 +01:00
nicm
6308c48efd
Add a -s flag to show-environment to output Bourne shell commands a la
...
ssh-agent. Mostly from Cam Hutchison with some changes by me.
2015-07-13 13:36:29 +00:00
Thomas Adam
0ef3e28609
Merge branch 'obsd-master'
2015-06-19 02:01:10 +01:00
nicm
164ba041c9
Remove a stray : and tweak paragraph.
2015-06-18 23:53:56 +00:00
Thomas Adam
86018a3947
Merge branch 'obsd-master'
2015-06-17 22:01:13 +01:00
nicm
85120b37ea
Change break-pane to take target and source panes (-t and -s) in line
...
with other commands, from Thomas Adam.
2015-06-17 19:56:08 +00:00
Thomas Adam
21a2ccc5f1
Merge branch 'obsd-master'
2015-06-17 20:01:12 +01:00
nicm
0ff335961e
Move the shuffle code from new-window -a into a function and add a -a
...
flag for move-window too. From Thomas Adam.
2015-06-17 16:50:28 +00:00
Thomas Adam
9fdc3a069a
Merge branch 'obsd-master'
2015-06-15 14:01:09 +01:00
nicm
d96ab34019
Add window_activity format, from Thomas Adam based on a diff originally
...
from propos6 at gmail dot com.
2015-06-15 10:58:01 +00:00
Thomas Adam
37005d04a9
Merge branch 'obsd-master'
2015-06-14 12:01:10 +01:00
nicm
29c29e7717
Add a format for client PID (client_pid) and server PID (pid). Diff for
...
client_pid from Thomas Adam.
2015-06-14 10:07:44 +00:00
Thomas Adam
7acc4addb5
Merge branch 'obsd-master'
...
Conflicts:
client.c
tmux.1
tmux.c
2015-06-07 23:42:25 +01:00
nicm
c4e811e519
Add -E flag when attaching or switching client to bypass
...
update-environment, from Steven Lu.
2015-06-07 21:39:39 +00:00
nicm
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
jmc
dc0d34e137
tweak SYNOPSIS and usage();
2015-06-04 20:34:22 +00:00
Thomas Adam
83a70172a4
Merge branch 'obsd-master'
2015-06-04 16:01:07 +01:00
nicm
4a6c06d6a9
Make unsetting a global option restore it to the default. Diff lying
...
around for a while, I have forgotten who suggested it :-/.
2015-06-04 14:29:33 +00:00
Thomas Adam
02e348c069
Merge branch 'obsd-master'
2015-06-04 12:59:41 +01:00
nicm
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
Nicholas Marriott
09bcbc57da
$Id$ -> $OpenBSD$.
2015-06-03 18:28:26 +01:00
Thomas Adam
beffdf6575
Merge branch 'obsd-master'
2015-05-27 16:01:22 +01:00
nicm
379400cfa6
Move the jobs output cache into the formats code so that #() work more
...
generally (for example, again working in set-titles-string).
2015-05-27 13:28: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
44364d7112
Remove the c0-* options which never really worked satisfactorily. Going
...
to try something else...
2015-05-11 10:10:16 +00:00
Thomas Adam
504b97b6a4
Merge branch 'obsd-master'
...
Conflicts:
tmux.h
2015-05-09 12:52:38 +01:00
nicm
c4a4bd6ac5
Move input parser structs into input.c (removing fairly useless
...
saved_cursor_[xy] formats as a side-effect).
2015-05-08 16:18:04 +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
dc2adc6bc1
Merge branch 'obsd-master'
2015-04-28 14:57:15 +01:00
nicm
771744426e
Add select-layout -o to undo the last layout change (apply the previously
...
set layout).
2015-04-28 10:43:13 +00:00
Thomas Adam
94a8ef1cae
Merge branch 'obsd-master'
...
Conflicts:
Makefile
tmux.1
2015-04-27 21:21:55 +01:00
nicm
95195f5258
Rewrite of the target resolution internals to be simpler and more
...
consistent but with much less duplication, but keeping the same internal
API. Also adds more readable aliases for some of the special tokens used
in targets (eg "{start}" instead of "^"). Some behaviours may have
changed, for example prefix matches now happen before fnmatch.
2015-04-27 16:25:57 +00:00
Thomas Adam
0a88377086
Merge branch 'obsd-master'
2015-04-22 10:05:54 +01:00
nicm
93b2871cab
Do not die on USR1 if any of the socket parent directories are
...
missing. Reported by Robin Powell.
2015-04-21 22:32:40 +00:00
nicm
bded743706
Support for multiple key tables to commands to be bound to sequences of
...
keys. The default key bindings become the "prefix" table and -n the
"root" table. Keys may be bound in new tables with bind -T and
switch-client -T used to specify the table in which the next key should
be looked up. Based on a diff from Keith Amling.
2015-04-20 15:34:56 +00:00
Thomas Adam
b25dc423b0
Merge branch 'obsd-master'
2015-04-20 15:44:27 +01:00
jmc
8101f1ef16
tweak previous;
2015-04-19 22:10:30 +00: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
370cf75458
Merge branch 'obsd-master'
2015-04-19 14:44:56 +01:00
nicm
0cd55eb1e7
Add a -x flag to copy-selection, append-selection and start-named-buffer
...
to prevent it exiting copy mode after copying. From J Raynor with a few
tweaks by me.
2015-04-10 16:00:08 +00:00
nicm
009a5e4213
in the case -> in this case.
2015-04-10 07:23:14 +00:00
nicm
3aa72b42b2
Add a helper function to convert time, and add session_activity formats
...
(the latter from Takatoshi Matsumoto).
2015-03-31 17:58:36 +00:00
nicm
cd9ccbc1e9
set-titles-string now uses formats, not the status bits (so no #() for
...
now). Reported by landry.
2015-03-11 08:17:37 +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
Thomas Adam
da72a0b7a8
Merge branch 'obsd-master'
2015-01-10 21:38:50 +00:00
nicm
be0ad01b7c
Add missing default bindings, from Theo Buehler.
2015-01-06 09:12:02 +00:00
Thomas Adam
5f8138faf5
Merge branch 'obsd-master'
...
Conflicts:
format.c
2014-12-19 19:22:19 +00:00
nicm
7a0c94b28a
Add pane_dead_status for exit status of dead panes.
2014-12-09 19:23:35 +00:00
Thomas Adam
ccbe2545d9
Merge branch 'obsd-master'
2014-12-03 08:41:08 +00:00
nicm
54ca7b230d
Add -F to if-shell to allow it to be used to check for format or option
...
values rather than executing a command.
2014-12-02 23:39:02 +00:00
nicm
575fd1e322
Permit option values to be used in formats.
2014-12-02 23:19:45 +00:00
Thomas Adam
3e8efcc555
Merge branch 'obsd-master'
2014-11-19 09:22:03 +00:00
nicm
d37f266524
Add -b to splitw like joinw, from Felix Rosencrantz.
2014-11-12 22:57:06 +00:00
Thomas Adam
fc05bf255a
Merge branch 'obsd-master'
2014-11-09 00:15:51 +00:00
nicm
3c12b477d3
V should be vi not emacs, also sort. From Theo Buehler.
2014-11-07 12:28:28 +00:00
nicm
e4bf1e5128
Add V for select line with vi(1) keys. From Juho Pohjala.
2014-11-06 09:17:25 +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
35ffd093d7
Merge branch 'obsd-master'
...
Conflicts:
Makefile
cmd-link-window.c
cmd-unlink-window.c
2014-10-29 12:51:21 +00:00
nicm
428b51e031
Add pane_input_off format, from Anish R Athalye.
2014-10-25 08:47:04 +00:00
Thomas Adam
562af864bd
Merge branch 'obsd-master'
...
Conflicts:
Makefile
cmd-list-commands.c
cmd-suspend-client.c
job.c
tmux.h
xmalloc.c
2014-10-21 07:11:44 +01:00
nicm
f0b69c7711
Fix description of Ss and Se.
2014-10-18 20:28:19 +00:00
nicm
6610e89689
Top function key is F12 now.
2014-10-02 14:21:06 +00:00
nicm
304f86cdbb
Support ! for last pane.
2014-09-25 12:45:35 +00:00
Thomas Adam
2874a431c0
Merge branch 'obsd-master'
2014-09-25 11:29:54 +01:00
nicm
9bda7e881a
Add window_last_flag and window_zoomed_flag. From John Morrissey.
2014-09-08 14:29:05 +00:00
nicm
8a473b5757
Fix typo (paneas -> panes).
2014-09-01 22:00:42 +00:00
nicm
f518a077b1
Add flags to selectp to enable and disable input to a pane, from Anish
...
Athalye.
2014-08-11 22:14:30 +00:00
Thomas Adam
814e40522c
Merge branch 'obsd-master'
2014-06-20 12:59:43 +01:00
nicm
c8efffb4db
Make -S- and -E- mean the start and end to capture-pane to avoid having
...
to faff around with huge numbers to get everything.
2014-06-20 10:46:59 +00:00
nicm
7160b8c2d5
Add some formats for pane bounds.
2014-05-27 12:49:36 +00:00
nicm
191f695bad
Change key-table to mode-table to allow for some future work. From Keith
...
Amling.
2014-05-14 06:45:35 +00:00
Thomas Adam
bae95844d7
Merge branch 'obsd-master'
...
Conflicts:
format.c
window.c
2014-05-13 21:58:48 +01:00
nicm
b3e8d440ed
If multiple arguments are given to new-session, new-window,
...
split-window, respawn-window or respawn-pane, pass them directly to
execvp() to help avoid quoting problems. One argument still goes to "sh
-c" like before. Requested by many over the years. Patch from J Raynor.
2014-05-13 08:08:32 +00:00
nicm
b1a06ef22e
Add a copy mode key binding to copy to a named buffer. From J Raynor.
2014-05-13 07:54:20 +00:00
nicm
3dbacbb62b
Add support for named buffers. If you don't name a buffer, things work
...
much as before - buffers are automatically named "buffer0000",
"buffer0001" and so on and ordered as a stack. Buffers can be named
explicitly when creating ("loadb -b foo" etc) or renamed ("setb -b
buffer0000 -n foo"). If buffers are named explicitly, they are not
deleted when buffer-limit is reached. Diff from J Raynor.
2014-05-13 07:34:35 +00:00
Thomas Adam
953c3ef47a
Merge branch 'obsd-master'
...
Conflicts:
Makefile
tmux.1
window.c
2014-04-23 11:26:11 +01:00
nicm
64613b9d41
#nnT went away a while ago, remove a leftover from the manpage.
2014-04-17 15:48:02 +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
877bdb46ed
Extend the -q flag to set-option to suppress errors about unknown
...
options - this will allow options to be removed more easily.
2014-04-17 07:51:38 +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
nicm
14a96df9ee
Remove the choose-list command to prepare for some later choose-* work.
2014-04-16 21:02:41 +00:00