Thomas Adam
399d7380a5
Merge branch 'obsd-master'
2013-05-31 21:44:42 +01:00
Nicholas Marriott
c231381aa3
Demote the old single-character replacement variables (#S and friends)
...
to aliases of formats. From Tiago Cunha.
2013-05-31 19:56:05 +00:00
Nicholas Marriott
c30d60f7ae
Add host_short format, from Tiago Cunha.
2013-05-31 19:46:42 +00:00
Thomas Adam
76cb088d16
Merge branch 'obsd-master'
...
Conflicts:
tmux.h
2013-05-25 11:48:12 +01:00
Nicholas Marriott
907ad00300
Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code
...
Conflicts:
Makefile.am
2013-05-15 16:50:15 +01:00
Nicholas Marriott
5b1cf02f2e
Rename tmux.1.in back to tmux.1 and generate tmux.1.{mdoc,man} instead.
2013-05-15 16:27:30 +01:00
Nicholas Marriott
2555ac58cc
.Op Fl b not .Fl b for run-shell synopsis, from Ben Boeckel.
2013-04-24 10:15:47 +00:00
Nicholas Marriott
c24b58e2ee
Generate tmux.1 using mdoc2man.awk on Solaris, issue brought up and changes
...
tested by Dagobert Michelsen.
2013-04-16 11:33:53 +01:00
Thomas Adam
b58bca9a72
Merge branch 'obsd-master'
...
Conflicts:
tmux.c
2013-04-13 17:05:49 +01:00
Nicholas Marriott
20f0d917be
Missed -o from set-window-option, from Ben Boeckel.
2013-04-10 12:07:18 +00:00
Nicholas Marriott
7f63658709
Add TMUX_TMPDIR variable to put the socket directory outside
...
TMPDIR. From Ben Boeckel.
2013-03-27 11:24:18 +00:00
Thomas
00af2df102
Merge branch 'obsd-master'
2013-03-25 16:30:37 +00:00
Nicholas Marriott
e44bd9f750
Revert the command-prefix change which breaks sequences of commands.
2013-03-25 15:59:57 +00:00
Nicholas Marriott
e97e0d7e54
Man page fixes.
2013-03-25 11:49:54 +00:00
Nicholas Marriott
4119c476aa
b comes before t.
2013-03-25 11:46:28 +00:00
Nicholas Marriott
6fee3e9e4b
Rename session idx to session id throughout and add $ prefix to targets
...
to use it, extended from a diff from George Nachman.
2013-03-25 10:11:45 +00:00
Nicholas Marriott
748acdc77c
Add wait-for -L and -U for lock and unlock, from Thiago Padilha.
2013-03-25 10:09:35 +00:00
Nicholas Marriott
14fad6a5cc
Add -A flag to new-session to make it behave like attach-session if the
...
session exists. If -A is used, -D behaves like -d to attach-session.
2013-03-24 09:58:40 +00:00
Nicholas Marriott
a05b8c4143
Add a -o option to set-option to prevent setting an option already set,
...
from Thiago Padilha.
2013-03-24 09:55:02 +00:00
Nicholas Marriott
66edb3392b
Expand format variables in the run-shell and if-shell shell commands,
...
from Thiago Padilha.
2013-03-24 09:33:35 +00:00
Nicholas Marriott
ac1fe83596
Couple of fixes pointed out by jmc.
2013-03-22 18:45:36 +00:00
Nicholas Marriott
7f191c7951
Add -P and -F to new-session.
2013-03-22 17:01:15 +00:00
Nicholas Marriott
702ab8bab0
Add a load of miscellaneous pane formats, from George Nachman.
2013-03-22 16:03:35 +00:00
Nicholas Marriott
8478895eeb
Add -e flag to capture-pane to include embedded ANSI SGR escape
...
sequences, from George Nachman.
2013-03-22 15:51:54 +00:00
Nicholas Marriott
f0efa576e0
Add resize-pane -x and -y for absolute pane size (much requested).
2013-03-22 10:37:39 +00:00
Nicholas Marriott
ad760b3bf7
Add client_session and client_last_session formats.
2013-03-22 10:32:36 +00:00
Nicholas Marriott
78543cce30
Support capture-pane -p to send to stdout.
2013-03-21 18:43:34 +00:00
Jason McIntyre
55bf2ecc68
tweak previous; ok nicm
2013-03-21 17:42:36 +00:00
Nicholas Marriott
4920306486
Clarify choose-tree entry in man page.
2013-03-21 16:23:46 +00:00
Nicholas Marriott
180faf73af
Allow choose commands to be used outside tmux, so long as at least one
...
client is attached.
2013-03-21 16:09:59 +00:00
Nicholas Marriott
f5de847a0c
Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code
2013-03-17 23:45:19 +00:00
Nicholas Marriott
9e879b4aab
Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code
2013-03-12 22:49:56 +00:00
Nicholas Marriott
99934bf998
Write escaped output in control mode rather than hex, from George Nachman.
2013-03-12 22:48:58 +00:00
Nicholas Marriott
d32a546d6e
Clarify zoom/unzoom, from Romain Francoise.
2013-03-12 14:58:48 +00:00
Nicholas Marriott
7c00950967
Don't add prefix to %output pane id.
2013-03-11 15:28:34 +00:00
Nicholas Marriott
b5516771d3
Clean up capture-pane and add -P option to dump pending output, based on code
...
from George Nachman.
2013-03-11 13:47:29 +00:00
Nicholas Marriott
7b4084a15a
Document control mode in the manpage, from George Nachman.
2013-03-11 13:06:30 +00:00
Nicholas Marriott
f47a063841
Rename session idx to session id throughout and add $ prefix to targets to use
...
it, extended from a diff from George Nachman.
2013-03-07 10:07:22 +00:00
Nicholas Marriott
bc3580fa06
Add wait-for -L and -U for lock and unlock, from Thiago Padilha.
2013-03-06 11:00:55 +00:00
Nicholas Marriott
7fd4d49d56
Add a wait-for command which blocks a client on a named channel until it is
...
wokrn up again (with wait-for -S). From Thiago Padilha.
2013-03-06 09:57:26 +00:00
Nicholas Marriott
d05debbe19
Unzoom on last-pane and fix a typo, from Romain Francoise.
2013-03-05 18:00:14 +00:00
Nicholas Marriott
aaeee34c32
Preserve trailing spaces with capture-pane -J, from George Nachman.
2013-03-04 11:03:03 +00:00
Nicholas Marriott
1cb1fb5bd4
Add -q flags to shut up errors to capture-pane and show-options, from George
...
Nachman.
2013-03-04 09:00:24 +00:00
Nicholas Marriott
b2a61348dd
Add -a to capture-pane to capture alternate screen, from George Nachman.
2013-02-24 07:52:03 +00:00
Nicholas Marriott
f339cfd315
Add -A flag to new-session to make it behave like attach-session if the session
...
exists. If -A is used, -D behaves like -d to attach-session.
2013-02-24 00:43:28 +00:00
Nicholas Marriott
c5239c5984
Add resize-pane -Z to temporary zoom the active pane to occupy the full window
...
or unzoom (restored to the normal layout) if it already zoomed, bound to C-b z
by default. The pane is unzoomed on pretty much any excuse whatsoever.
We considered making this a new layout but the requirements are quite different
from layouts so decided it is better as a special case. Each current layout
cell is saved, a temporary one-cell layout generated and all except the active
pane set to NULL.
Prompted by suggestions and scripts from several. Thanks to Aaron Jensen and
Thiago Padilha for testing an earlier version.
2013-02-24 00:25:03 +00:00
Nicholas Marriott
be13479f09
Add a -o option to set-option to prevent setting an option already set, from
...
Thiago Padilha.
2013-02-23 23:22:03 +00:00
Nicholas Marriott
69a8d64716
Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code
...
Conflicts:
cmd-if-shell.c
cmd-run-shell.c
tmux.1
2013-02-23 22:42:49 +00:00
Nicholas Marriott
3964309c67
Add a command queue to standardize and simplify commands that call other
...
commands and allow a command to block execution of subsequent commands. This
allows run-shell and if-shell to be synchronous which has been much requested.
Each client has a default command queue and commands are consumed one at a time
from it. A command may suspend execution from the queue by returning
CMD_RETURN_WAIT and then resume it by calling cmd_continue() - for example
run-shell does this from the callback that is fired after the job is freed.
When the command queue becomes empty, command clients are automatically exited
(unless attaching). A callback is also fired - this is used for nested commands
in, for example, if-shell which can block execution of the client's cmdq until
a new cmdq becomes empty.
Also merge all the old error/info/print functions together and lose the old
curclient/cmdclient distinction - a cmdq is bound to one client (or none if in
the configuration file), this is a command client if c->session is NULL
otherwise an attached client.
2013-02-23 22:25:58 +00:00
Nicholas Marriott
497b27dafb
Expand format variables in the run-shell and if-shell shell commands, from
...
Thiago Padilha.
2013-02-23 19:24:42 +00:00