circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-12-25 10:58:48 +00:00
Code Issues Projects Releases Wiki Activity
6,035 Commits 3 Branches 37 Tags 36 MiB
2864a31311
Commit Graph

1049 Commits

Author SHA1 Message Date
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
Thomas Adam
0c99c7dbff Merge branch 'obsd-master' 
Conflicts:
	Makefile
	tty-keys.c
 2014-04-05 12:36:14 +01:00
nicm
252a7373d6 Support UTF-8 with choose-buffer, from Kosuke ASAMI. Also make 
buffer_sample bigger to let it trim at window right edge.
 2014-04-02 18:12:18 +00:00
nicm
b52b40b2bc pane_start_path has gone away. 2014-04-02 07:55:09 +00:00
nicm
dca7d1c0fd Make message-limit a server option. 2014-03-31 21:41:35 +00:00
nicm
0e4d1d8493 Add setb -a to append and a copy mode append command, from J Raynor with 
minor changes.
 2014-03-31 21:39:31 +00:00
nicm
b11de5adc7 Make session_attached a count and add session_many_attached flag. 2014-03-31 21:37:55 +00:00
Nicholas Marriott
683ca270d4 Make message-limit a server option. 2014-03-07 15:37:01 +00:00
Nicholas Marriott
8c0edcbfa3 Add setb -a to append and a copy mode append command, from J Raynor with minor 
changes.
 2014-03-06 11:50:07 +00:00
Nicholas Marriott
b7f6356053 Make session_attached a count and add session_many_attached flag. 2014-03-06 11:25:27 +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
b7589750a1 Correct Linux-specific manpage sections 
Some of the man page locations on Linux differ to those on *BSD.  Noticed by
Christopher Meng.
 2014-02-21 09:27:28 +00:00
Thomas Adam
b3de4a3dec Merge branch 'obsd-master' 
Conflicts:
	tmux.1
	tmux.c
 2014-02-16 23:02:07 +00:00
nicm
81db6bab91 Leftovers from removing 88 colour support, from Theo Buehler. 2014-02-16 12:45:17 +00:00
Thomas Adam
1721056f35 Remove references to 88colour support 
Tmux doesn't directly support terminals with 88 colours directly anymore.
 2014-02-05 10:51:25 +00:00
jmc
973de5a704 fix some minor formatting glitches; 2014-02-02 08:48:48 +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
nicm
945339b443 Allow replacing each of the many sets of separate foo-{fg,bg,attr} 
options with a single foo-style option. For example:

    set -g status-fg yellow
    set -g status-bg red
    set -g status-attr blink

Becomes:

    set -g status-style fg=yellow,bg=red,blink

The -a flag to set can be used to add to rather than replace a style. So:

    set -g status-bg red

Becomes:

    set -ag status-style bg=red

Currently this is fully backwards compatible (all *-{fg,bg,attr} options
remain) but the plan is to deprecate them over time.

From Tiago Cunha.
 2014-01-28 23:07:09 +00:00
nicm
d23561f381 Merge server-info into show-messages and remove some not useful output. 2014-01-22 14:43:42 +00:00
nicm
1286c56188 Replace ## by # in format. 2013-11-24 11:29:09 +00:00
Thomas Adam
3e498cdb49 Merge branch 'obsd-master' 2013-11-14 07:51:26 +00:00
nicm
7fa55b0419 Key to swap to other end of selection (bound to o with vi keys), from J 
Raynor.
 2013-10-23 11:31:03 +00:00
Nicholas Marriott
8bcdd8fc21 Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code 
Conflicts:
	cmd-split-window.c
	cmd-unbind-key.c
	format.c
	osdep-openbsd.c
 2013-10-11 16:52:39 +01:00
Thomas
7f479ffdce Merge branch 'obsd-master' into mtemp 2013-10-11 14:33:29 +01:00
nicm
17ec688ced Bracket in the wrong place in description of c0-change-trigger. 2013-10-10 23:31:28 +00:00
nicm
d0566a474a Remove the KERN_PROC_CWD the proc_current_path format (which is the only 
thing that uses it now).
 2013-10-10 12:39:24 +00:00
nicm
282c5f9644 Alter how tmux handles the working directory to internally use file 
descriptors rather than strings.

- Each session still has a current working directory.

- New sessions still get their working directory from the client that
  created them or its attached session if any.

- New windows are created by default in the session working directory.

- The -c flag to new, neww, splitw allows the working directory to be
  overridden.

- The -c flag to attach let's the session working directory be changed.

- The default-path option has been removed.

To get the equivalent to default-path '.', do:

        bind c neww -c $PWD

To get the equivalent of default-path '~', do:

        bind c neww -c ~

This also changes the client identify protocol to be a set of messages rather
than one as well as some other changes that should make it easier to make
backwards-compatible protocol changes in future.
 2013-10-10 12:26:34 +00:00
nicm
b822d24b15 Support -c for new-session, based on code from J Raynor. 2013-10-10 12:07:36 +00:00
nicm
40811eb8d4 Add length limit operator for formats. 2013-10-10 11:50:20 +00:00
nicm
d75dd2ab1c Add formats for window flags. 2013-10-10 11:47:52 +00:00
Nicholas Marriott
4538c269d0 Alter how tmux handles the working directory to internally use file descriptors 
rather than strings.

- Each session still has a current working directory.

- New sessions still get their working directory from the client that created
  them or its attached session if any.

- New windows are created by default in the session working directory.

- The -c flag to new, neww, splitw allows the working directory to be
  overridden.

- The -c flag to attach let's the session working directory be changed.

- The default-path option has been removed.

To get the equivalent to default-path '.', do:

        bind c neww -c $PWD

To get the equivalent of default-path '', do:

        bind c neww -c '#{pane_current_path}'

The equivalent of default-path '~' is left as an exercise for the reader.

This also changes the client identify protocol to be a set of messages rather
than one as well as some other changes that should make it easier to make
backwards-compatible protocol changes in future.
 2013-10-06 21:02:23 +01:00
nicm
7c71c3e27d Change the default for the default-path option to ~. This is a quick 
change to turn off the KERN_PROC_CWD code which is unpredictable. Later
it will go away and there may be other changes to how this works.
 2013-10-05 13:56:48 +00:00
Nicholas Marriott
13360ad541 Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code 2013-10-01 23:50:24 +01:00
Nicholas Marriott
9389cfbec9 Support -c for new-session, based on code from J Raynor. 2013-10-01 23:48:03 +01:00
Tiago Cunha
75ec17f0b5 Mark flags as optional and mutually exclusive. 2013-08-31 11:16:47 +01:00
Nicholas Marriott
a0802dd486 A couple of manpage fixes from Tiago Cunha. 2013-08-22 00:32:55 +01:00
Nicholas Marriott
23519fc0b4 Add automatic-rename-format option allowing automatic rename to use something 
other than pane_current_command.
 2013-08-19 22:16:11 +01:00
Nicholas Marriott
84c22d053b Add length limit operator for formats. 2013-08-03 21:06:38 +01:00
Nicholas Marriott
bcd9bcae2a Add formats for window flags. 2013-08-01 23:41:39 +01:00
schwarze
304ea079d2 use .Mt for email addresses; from Jan Stary <hans at stare dot cz>; ok jmc@ 2013-07-16 00:07:52 +00:00
Thomas Adam
bdea2f9eda Merge branch 'obsd-master' 2013-07-06 11:18:49 +01:00
Nicholas Marriott
f5b041e394 Add pane_synchronized format, from Romain Francoise. 2013-07-05 15:27:14 +00:00
Nicholas Marriott
c7a121cfc0 Focus events can cause trouble if left on and they can't be turned off 
during idle periods (like the other states are) because we'd miss
events. So add a server option to control them. Defaults to off.
 2013-06-28 20:55:16 +01:00
Nicholas Marriott
3977dba761 Focus events can cause trouble if left on and they can't be turned off 
during idle periods (like the other states are) because we'd miss
events. So add a server option to control them. Defaults to off.
 2013-06-23 13:10:46 +00:00
Thomas Adam
06b5805479 Merge branch 'obsd-master' 2013-06-13 18:12:49 +01:00
Jason McIntyre
ddb52a2b15 escape "Ss", becuase groff thinks it has found a macro; 2013-06-02 14:40:17 +00:00
Nicholas Marriott
13441e8cb8 The actual terminfo entries we ended up with for cursor changes are Cs, 
Ce, Ss and Se (not Cc, Ce, Cs, Csr). So use and document these instead
of the ones we were using earlier.
 2013-06-02 07:52:15 +00:00
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
Nicholas Marriott
5f904aa350 Add pane_tags format to format_window_pane based on code from George Nachman. 2013-02-23 13:02:52 +00:00
Nicholas Marriott
ce7bf1083e Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code 2013-02-22 16:25:50 +00:00
Nicholas Marriott
1db4ec6e63 Add pane_current_command format. 2013-02-22 16:25:21 +00:00
Nicholas Marriott
31407b70e0 Add option command-prefix which is automatically prepended to any command 
(apart from a naked default-shell). The default is "exec ".
 2013-02-22 14:31:38 +00:00
Nicholas Marriott
374dae6635 Add a load of miscellaneous pane formats, from George Nachman. 2013-02-21 19:44:27 +00:00
Nicholas Marriott
b8b5631d9d Add -C and -J to capture pane to escape control sequences and to join wrapped 
line, based on a diff from George Nachman.
 2013-02-21 09:35:01 +00:00
Nicholas Marriott
c3859d1df1 Add copy-pipe mode command to copy selection and also pipe to a command. 2013-02-19 17:49:53 +00:00
Nicholas Marriott
4d1d4d6e8e Add -e flag to capture-pane to include embedded ANSI SGR escape sequences, from 
George Nachman.
 2013-02-19 09:55:02 +00:00
Nicholas Marriott
a96dd1932a Don't use a target-client for stdout, just always cmdclient. 2013-02-19 09:51:04 +00:00
Nicholas Marriott
e4bb87032e Add resize-pane -x and -y for absolute pane size. 2013-02-18 17:00:35 +00:00
Nicholas Marriott
d8261019f1 Add client_session and client_last_session formats. 2013-02-18 14:23:40 +00:00
Nicholas Marriott
1d591ada76 Support capture-pane -p to send to stdout. 2013-02-15 09:31:45 +00:00
Nicholas Marriott
931b0103cd Clarify choose-tree entry in man page. 2013-02-13 11:07:21 +00:00
Nicholas Marriott
36fe146a74 Fix choose-tree usage. 2013-02-13 09:55:37 +00:00
Nicholas Marriott
caa29af2a9 Add user options, prefixed with @. May be set to any arbitrary string. 2013-02-13 09:54:24 +00:00
Nicholas Marriott
102cb77435 Add -v to set and setw to show only option value. 2013-02-12 20:12:10 +00:00
Nicholas Marriott
a6fd92bd8d Remove stray change accidentally committed. 2013-02-10 19:15:49 +00:00
Nicholas Marriott
06ac4b628d Add a format client_prefix which is 1 if prefix key has been pressed, used for 
example #{?client_prefix,X,Y}. Also a few extra server_client_status needed.
 2013-02-10 18:58:05 +00:00
Nicholas Marriott
f1ce95915c Allow choose commands to be used outside tmux, so long as at least one client 
is attached.
 2013-02-10 17:52:51 +00:00
Thomas Adam
de194016ec Merge branch 'obsd-master' 2013-01-17 01:38:21 +00:00
Nicholas Marriott
e33ba57c13 Remove the layout undo/redo code which never really worked. 2013-01-17 00:11:22 +00:00
Nicholas Marriott
bc2e4a36df If timing between keys is less than (by default) 1 millisecond, assume 
the text is being pasted. assume-paste-time option changes the value (0
disables). Based on a diff from Marcin Kulik.
 2013-01-15 22:55:29 +00:00
Thomas Adam
675c6b3773 Merge branch 'obsd-master' 
Sync from OpenBSD.
 2012-12-31 18:50:37 +00:00
Nicholas Marriott
854e8ae04d Add ^ and $ special command targets to select lowest and highest 
numbered windows, from Raghavendra D Prabhu.
 2012-12-24 12:38:57 +00:00
Thomas Adam
39631edb98 Merge branch 'obsd-master' 
Sync from OpenBSD.
 2012-11-27 18:12:04 +00:00
Nicholas Marriott
4aa4e9fb26 Allow cmd-run-shell to accept -t to specify the pane to display the 
output, requested by Alexander Tsepkov.
 2012-11-27 15:09:35 +00:00
Nicholas Marriott
93224260ae Add window-status-last-* options, from Boris Faure. 2012-11-27 13:52:23 +00:00
Thomas Adam
c04aa90207 Merge branch 'obsd-master' 
Sync from OpenBSD.

* obsd-master:
  Add halfpage commands to mode command string table (missed by accident), from Thomas Adam.
  Clarify some points about config files, notably that they are only read at server start. From Thomas Adam.
  Use a utility function for common code to show errors in config file, from Thomas Adam.
 2012-11-22 13:24:14 +00:00
Nicholas Marriott
9a7e5bd1d3 Clarify some points about config files, notably that they are only read 
at server start. From Thomas Adam.
 2012-11-19 10:50:24 +00:00
Thomas Adam
31f93d8445 Merge branch 'obsd-master' 
Sync from OpenBSD.
 2012-10-25 23:32:14 +01:00
Nicholas Marriott
589b4b8c6a Fix typo bell->bells from Thomas Adam. 2012-10-25 11:11:58 +00:00
Thomas Adam
619ffe1f4f Merge branch 'obsd-master' 
Sync from OpenBSD.

* obsd-master:
  Allow session tree (C-b s) to expand and collapse sessions with left/right/space keys. From Thomas Adam.
  Remove some out of date text from man page, from Thomas Adam.
 2012-10-02 10:47:16 +01:00
Nicholas Marriott
ea289bc457 Remove some out of date text from man page, from Thomas Adam. 2012-10-02 08:02:21 +00:00
Nicholas Marriott
28fd3a3835 add cmd-choose-list to allow arbitrary options to be selected. From 
Thomas Adam.
 2012-09-04 22:37:29 +01:00
Nicholas Marriott
7263fa36eb add cmd-choose-list to allow arbitrary options to be selected. From 
Thomas Adam.
 2012-09-03 09:57:57 +00:00
Tiago Cunha
061027fefc Sync OpenBSD patchset 1158: 
Another missing format from sam at sltosis.org.
 2012-08-12 19:30:11 +00:00
Tiago Cunha
30b801decf Sync OpenBSD patchset 1155: 
Add some missing formats from Samuel Le Thiec.
 2012-08-12 19:25:15 +00:00
Tiago Cunha
ca3f92e78c Sync OpenBSD patchset 1154: 
Document pane_index variable, from sam at sltosis dot org.
 2012-08-12 19:24:31 +00:00
Nicholas Marriott
cf2e65c0e2 Another missing format from sam at sltosis.org. 2012-08-11 07:10:01 +00:00
Nicholas Marriott
ff4097e02c Add some missing formats from Samuel Le Thiec. 2012-08-11 05:55:12 +00:00
Nicholas Marriott
89a96b05fa Document pane_index variable, from sam at sltosis dot org. 2012-07-15 06:51:57 +00:00
Tiago Cunha
bbd3e822c7 Sync OpenBSD patchset 1147: 
remove extraneous line;
 2012-07-11 17:15:53 +00:00
Tiago Cunha
a10143a2d1 Sync OpenBSD patchset 1146: 
Add choose-tree command to show windows and sessions in the same
list. Change choose-window and -session to use the same code. From
Thomas Adam.
 2012-07-11 17:13:55 +00:00
Jason McIntyre
b0f4f94b5b remove extraneous line; 2012-07-08 17:24:29 +00:00
Nicholas Marriott
f20c6fe009 Add choose-tree command to show windows and sessions in the same 
list. Change choose-window and -session to use the same code. From
Thomas Adam.
 2012-07-08 16:04:38 +00:00
Tiago Cunha
1c15848c47 Sync OpenBSD patchset 1134: 
Add -a for kill-session, from Thomas Adam.
 2012-06-18 15:12:54 +00:00
Tiago Cunha
4a634a7da4 Sync OpenBSD patchset 1133: 
Add -a flag for detach-client, from Thomas Adam.
 2012-06-18 15:11:35 +00:00
Tiago Cunha
576f2694b1 Sync OpenBSD patchset 1132: 
Simplify references to alerts in the man page, from Thomas Adam.
 2012-06-18 15:10:40 +00:00
Nicholas Marriott
2113115cdd Add -a for kill-session, from Thomas Adam. 2012-06-18 09:16:15 +00:00
Nicholas Marriott
038e8b770d Add -a flag for detach-client, from Thomas Adam. 2012-06-18 09:15:22 +00:00
Nicholas Marriott
04ac61ecd7 Simplify references to alerts in the man page, from Thomas Adam. 2012-06-18 09:13:12 +00:00
Tiago Cunha
5cc4961fd2 Sync OpenBSD patchset 1119: 
Switch all of the various choose- and list- commands over to the format
infrastructure, from Thomas Adam.
 2012-05-22 21:03:25 +00:00
Tiago Cunha
04bf0d8efc Sync OpenBSD patchset 1113: 
Ignore line continuation when escaped as \\, from Simon Nicolussi.
 2012-05-22 20:50:51 +00:00
Nicholas Marriott
ebf94bc9cb Switch all of the various choose- and list- commands over to the format 
infrastructure, from Thomas Adam.
 2012-05-22 11:35:37 +00:00
Nicholas Marriott
ac7e2f13e9 Ignore line continuation when escaped as \\, from Simon Nicolussi. 2012-05-17 21:21:31 +00:00
Tiago Cunha
e79c647052 Sync OpenBSD patchset 1105: 
default-path has the same possibilities as new-window -c now.
 2012-05-03 17:53:50 +00:00
Tiago Cunha
b728970c65 Sync OpenBSD patchset 1104: 
Add a flag to move-window to renumber the windows in a session (closing
any gaps) and add an option to do this automatically each time a window
is killed. From Thomas Adam.
 2012-05-03 17:51:04 +00:00
Nicholas Marriott
cc979bda0f default-path has the same possibilities as new-window -c now. 2012-05-02 19:29:13 +00:00
Nicholas Marriott
a6c22d650b Add a flag to move-window to renumber the windows in a session (closing 
any gaps) and add an option to do this automatically each time a window
is killed. From Thomas Adam.
 2012-04-29 17:20:01 +00:00
Tiago Cunha
6df8953f4f Sync OpenBSD patchset 1097: 
Add window-status-separator option, from Thomas Adam.
 2012-04-24 16:20:18 +00:00
Tiago Cunha
00e2e35740 Sync OpenBSD patchset 1096: 
Add -a flag to kill-window, from Thomas Adam.
 2012-04-24 16:19:27 +00:00
Nicholas Marriott
e02d1bce98 Add window-status-separator option, from Thomas Adam. 2012-04-23 22:23:14 +00:00
Nicholas Marriott
ed58b2d353 Add -a flag to kill-window, from Thomas Adam. 2012-04-23 22:10:45 +00:00
Tiago Cunha
f99de22808 Sync OpenBSD patchset 1084: 
Add a layout history which can be stepped through with select-layout -u
and -U commands (bound to 'u' and 'U' by default).
 2012-04-10 09:52:45 +00:00
Tiago Cunha
2ce636a315 Sync OpenBSD patchset 1083: 
Add pane_current_path format, suggested by Mikolaj Kucharski.
 2012-04-10 09:49:04 +00:00
Nicholas Marriott
85f5485cb5 Add a layout history which can be stepped through with select-layout -u 
and -U commands (bound to 'u' and 'U' by default).
 2012-04-01 13:18:38 +00:00
Nicholas Marriott
b831f86354 Add pane_current_path format, suggested by Mikolaj Kucharski. 2012-04-01 10:42:39 +00:00
Tiago Cunha
faf51d748e Sync OpenBSD patchset 1079: 
Accept an argument to show-environment to show one variable, based on a
diff from Kazuhiko Sakaguchi.
 2012-03-29 21:10:10 +00:00
Tiago Cunha
65748fb197 Sync OpenBSD patchset 1075: 
Add -C -N -T flags to find-window to find in content, name, title. From
Jonathan Daugherty.
 2012-03-29 21:07:28 +00:00
Tiago Cunha
8ff20a5c6d Sync OpenBSD patchset 1073: 
50 is a too low trigger default on larger terminals, bump to 250.
 2012-03-29 21:05:53 +00:00
Tiago Cunha
f9f6eea444 Sync OpenBSD patchset 1072: 
Add a simple form of output rate limiting by counting the number of
certain C0 sequences (linefeeds, backspaces, carriage returns) and if it
exceeds a threshold (current default 50/millisecond), start to redraw
the pane every 100 milliseconds instead of making each change as it
comes. Two configuration options - c0-change-trigger and
c0-change-interval.

This makes tmux much more responsive under very fast output (for example
yes(1) or accidentally cat'ing a large file) but may not be perfect on
all terminals and connections - feedback very welcome, particularly
where this change has a negative rather than positive effect (making it
off by default is a possibility).

After much experimentation based originally on a request Robin Lee
Powell (which ended with a completely different solution), this idea
from discussion with Ailin Nemui.
 2012-03-29 21:05:16 +00:00
Nicholas Marriott
c0cfbe12e4 Accept an argument to show-environment to show one variable, based on a 
diff from Kazuhiko Sakaguchi.
 2012-03-22 11:11:57 +00:00
Nicholas Marriott
90bf560fe4 Add -C -N -T flags to find-window to find in content, name, title. From 
Jonathan Daugherty.
 2012-03-20 17:09:48 +00:00
Nicholas Marriott
01f2b5d64b 50 is a too low trigger default on larger terminals, bump to 250. 2012-03-20 11:23:12 +00:00
Nicholas Marriott
f59971276a Add a simple form of output rate limiting by counting the number of 
certain C0 sequences (linefeeds, backspaces, carriage returns) and if it
exceeds a threshold (current default 50/millisecond), start to redraw
the pane every 100 milliseconds instead of making each change as it
comes. Two configuration options - c0-change-trigger and
c0-change-interval.

This makes tmux much more responsive under very fast output (for example
yes(1) or accidentally cat'ing a large file) but may not be perfect on
all terminals and connections - feedback very welcome, particularly
where this change has a negative rather than positive effect (making it
off by default is a possibility).

After much experimentation based originally on a request Robin Lee
Powell (which ended with a completely different solution), this idea
from discussion with Ailin Nemui.
 2012-03-20 11:01:00 +00:00
Tiago Cunha
e4eb43ec71 Sync OpenBSD patchset 1066: 
Add a wrap-search option to turn off wrapping of searches in copy
mode. From Jacobo de Vera.
 2012-03-18 02:12:24 +00:00
Tiago Cunha
68ba5377e3 Sync OpenBSD patchset 1063: 
Add -q option to set-option to turn off info message, from marcel partap.
 2012-03-18 02:09:51 +00:00
Tiago Cunha
3893cc17a4 Sync OpenBSD patchset 1049: 
Add -P/-F flags to break-pane too, from George Nachman.
 2012-03-18 01:38:27 +00:00
Nicholas Marriott
95f48a219a Add a wrap-search option to turn off wrapping of searches in copy 
mode. From Jacobo de Vera.
 2012-03-17 21:40:53 +00:00
Nicholas Marriott
f152379e5a Add -q option to set-option to turn off info message, from marcel partap. 2012-03-17 21:33:33 +00:00
Nicholas Marriott
4e05a2c0ae Add -P/-F flags to break-pane too, from George Nachman. 2012-03-12 13:31:09 +00:00
Tiago Cunha
3d98adaf91 Sync OpenBSD patchset 1041: 
Add -F format to new-window and split-window to use with the -P flag,
from George Nachman.
 2012-03-07 13:39:29 +00:00
Tiago Cunha
3275e9bd5b Sync OpenBSD patchset 1037: 
Support "bracketed paste" mode. This adds a -p flag to paste-buffer - if
this is used and the application has requested bracketed pastes, then
tmux surrounds the pasted text by \033[200~ and \033[201~. Applications
like vim can (apparently) use this to avoid, for example, indenting the
text. From Ailin Nemui.
 2012-03-07 13:36:19 +00:00
Nicholas Marriott
03dca66ae2 Add -F format to new-window and split-window to use with the -P flag, 
from George Nachman.
 2012-03-04 20:50:53 +00:00
Nicholas Marriott
f4fdddc930 Support "bracketed paste" mode. This adds a -p flag to paste-buffer - if 
this is used and the application has requested bracketed pastes, then
tmux surrounds the pasted text by \033[200~ and \033[201~. Applications
like vim can (apparently) use this to avoid, for example, indenting the
text. From Ailin Nemui.
 2012-03-03 09:43:22 +00:00
Tiago Cunha
e4f1fbd008 Sync OpenBSD patchset 1035: 
Add move-pane command (like join-pane but allows the same window). Also
-b flag to join-pane and move-pane to place the pane to the left or
above. From George Nachman.
 2012-03-03 09:19:40 +00:00
Tiago Cunha
95f427c34e Sync OpenBSD patchset 1032: 
Allow a single option to be specified to show-options to show just that
option.
 2012-03-03 09:16:52 +00:00
Tiago Cunha
e0d2221879 Sync OpenBSD patchset 1031: 
Use format for display-message, based on a diff from George Nachman.
 2012-03-03 09:14:21 +00:00
Nicholas Marriott
07ac16807f Add move-pane command (like join-pane but allows the same window). Also 
-b flag to join-pane and move-pane to place the pane to the left or
above. From George Nachman.
 2012-03-03 08:31:18 +00:00
Nicholas Marriott
4e7de210e4 Allow a single option to be specified to show-options to show just that 
option.
 2012-02-25 12:57:42 +00:00
Nicholas Marriott
aaf0bfccf4 Use format for display-message, based on a diff from George Nachman. 2012-02-23 22:40:58 +00:00
Tiago Cunha
6e6e8046ba Sync OpenBSD patchset 1026: 
Document option values, particularly that omitting on|off for a flag is
a toggle.
 2012-02-15 19:30:17 +00:00
Nicholas Marriott
fe7cf0ba90 Document option values, particularly that omitting on|off for a flag is 
a toggle.
 2012-02-02 22:33:05 +00:00
Tiago Cunha
94e46dd724 Sync OpenBSD patchset 1025: 
Add -l flag to send-keys to send input literally (without translating
key names). From Frank Terbeck.
 2012-02-02 02:01:18 +00:00
Tiago Cunha
4bb01c1768 Sync OpenBSD patchset 1021: 
Provide defined ways to set the various default-path possibilities: ~
for home directory, . for server start directory, - for session start
directory and empty for the pane's working directory (the default). All
can also be used as part of a relative path (eg -/foo). Also provide -c
flags to neww and splitw to override default-path setting.

Based on a diff from sthen. ok sthen
 2012-02-02 01:55:34 +00:00
Nicholas Marriott
efb639e1d2 Add -l flag to send-keys to send input literally (without translating 
key names). From Frank Terbeck.
 2012-02-02 00:15:28 +00:00
Nicholas Marriott
908a22e41c Provide defined ways to set the various default-path possibilities: ~ 
for home directory, . for server start directory, - for session start
directory and empty for the pane's working directory (the default). All
can also be used as part of a relative path (eg -/foo). Also provide -c
flags to neww and splitw to override default-path setting.

Based on a diff from sthen. ok sthen
 2012-01-31 15:52:21 +00:00
Tiago Cunha
6b3988b749 Sync OpenBSD patchset 1019: 
id -> ID; ok nicm
 2012-01-31 12:03:00 +00:00
Tiago Cunha
2ee0d851d9 Sync OpenBSD patchset 1017: 
Give each window a unique id, like panes but prefixed with @. Based on
work from George Nachman.
 2012-01-31 12:01:43 +00:00
Jason McIntyre
677ed3e5f0 id -> ID; ok nicm 2012-01-30 20:48:28 +00:00
Nicholas Marriott
0e59bc75fd Give each window a unique id, like panes but prefixed with @. Based on 
work from George Nachman.
 2012-01-30 09:39:34 +00:00
Tiago Cunha
e4a7cefe0c Sync OpenBSD patchset 1015: 
Add an option to move the status line to the top of the screen,
requested by many.
 2012-01-29 12:57:01 +00:00
Nicholas Marriott
230d0fbc9e Add an option to move the status line to the top of the screen, 
requested by many.
 2012-01-29 09:37:02 +00:00
Tiago Cunha
ebce251183 Sync OpenBSD patchset 1009: 
it's -> its.
 2012-01-21 21:40:33 +00:00
Nicholas Marriott
e870a3f3ec it's -> its. 2012-01-21 20:40:28 +00:00
Tiago Cunha
a7b0b30bdd Sync OpenBSD patchset 1007: 
Drop the ability to have a list of keys in the prefix in favour of two
separate options, prefix and prefix2. This simplifies the code and gets
rid the data options type which was only used for this one option.

Also add a -2 flag to send-prefix to send the secondary prefix key,
fixing a cause of minor irritation.

People who want three prefix keys are out of luck :-).
 2012-01-21 19:36:40 +00:00
Tiago Cunha
d4c2a935f2 Sync OpenBSD patchset 1006: 
Add strings to allow the aixterm bright colours to be used when
configuring colours, requested by Elliott Cable a few months ago.
 2012-01-21 19:33:45 +00:00
Tiago Cunha
4bea559037 Sync OpenBSD patchset 1004: 
Add a -R flag to send-keys to reset the terminal. Written ages ago and
Suggested by someone, I forget who.
 2012-01-21 19:31:59 +00:00
Nicholas Marriott
535286c05a Drop the ability to have a list of keys in the prefix in favour of two 
separate options, prefix and prefix2. This simplifies the code and gets
rid the data options type which was only used for this one option.

Also add a -2 flag to send-prefix to send the secondary prefix key,
fixing a cause of minor irritation.

People who want three prefix keys are out of luck :-).
 2012-01-21 08:40:09 +00:00
Nicholas Marriott
7f24020cbe Add strings to allow the aixterm bright colours to be used when 
configuring colours, requested by Elliott Cable a few months ago.
 2012-01-21 08:23:12 +00:00
Nicholas Marriott
66f04514cf Add a -R flag to send-keys to reset the terminal. Written ages ago and 
Suggested by someone, I forget who.
 2012-01-21 08:10:21 +00:00
Tiago Cunha
b7551c9193 Sync OpenBSD patchset 1001: 
Add some trivial additional status line attributes from jwcxz at users
dot sourceforge dot net.
 2012-01-20 21:20:35 +00:00
Tiago Cunha
d4312281da Sync OpenBSD patchset 1000: 
Remove trailing spaces.
 2012-01-20 21:19:20 +00:00
Tiago Cunha
d9eb34b28d Sync OpenBSD patchset 999: 
Add an option to disable the window rename escape sequence, from Romain
Francoise.
 2012-01-20 21:18:39 +00:00
Nicholas Marriott
8cf19ab770 Add some trivial additional status line attributes from jwcxz at users 
dot sourceforge dot net.
 2012-01-20 19:51:28 +00:00
Nicholas Marriott
199d148740 Remove trailing spaces. 2012-01-20 19:16:16 +00:00
Nicholas Marriott
dcad13155b Add an option to disable the window rename escape sequence, from Romain 
Francoise.
 2012-01-20 19:15:40 +00:00
Tiago Cunha
60069fe8fe Sync OpenBSD patchset 995: 
Add a man page section on window names and pane titles, from Felix
Rosencrantz.
 2012-01-03 18:36:40 +00:00
Tiago Cunha
d817f88fec Sync OpenBSD patchset 995: 
Show how to set default-path to revert to tmux's old behaviour of opening
new windows in the current working directory at the time tmux was started,
it's not obvious. naddy@ agrees this is a useful inclusion.
 2012-01-03 18:35:54 +00:00
Nicholas Marriott
eeaf92ad06 Add a man page section on window names and pane titles, from Felix 
Rosencrantz.
 2011-12-31 03:40:15 +00:00
Stuart Henderson
16f9667620 Show how to set default-path to revert to tmux's old behaviour of opening 
new windows in the current working directory at the time tmux was started,
it's not obvious. naddy@ agrees this is a useful inclusion.
 2011-12-30 14:59:13 +00:00
Tiago Cunha
e2d59a6c17 Sync OpenBSD patchset 993: 
Allow $HOME as default-path in tmux.conf so the same config file can be used
on different machines regardless of where the user's home directory is.
ok nicm
 2011-12-30 14:21:02 +00:00
Tiago Cunha
e210abf335 $Id$ not $OpenBSD$. 2011-12-30 14:18:27 +00:00
Stefan Sperling
fdd1d0b72e Allow $HOME as default-path in tmux.conf so the same config file can be used 
on different machines regardless of where the user's home directory is.
ok nicm
 2011-12-27 14:07:20 +00:00
Tiago Cunha
9e7ec2e971 Sync OpenBSD patchset 989: 
formatting errors, found using freebsd's "igor";
 2011-12-25 23:36:27 +00:00
Jason McIntyre
da145e7c20 formatting errors, found using freebsd's "igor"; 2011-12-24 08:46:48 +00:00
Nicholas Marriott
c1b9948525 Change the way the working directory for new processes is discovered. If 
default-path isn't empty, it is used. Otherwise:

1) If tmux neww is run from the command line, the working directory of the
client is used.

2) Otherwise use some platform specific code to retrieve the current working
directory of the process in the active pane.

3) If that fails, the directory where the session was created is used.

Idea and support code, Linux, Solaris, FreeBSD bits by Romain Francoise,
OpenBSD bits by me.
 2011-12-09 16:37:29 +00:00
Nicholas Marriott
f308ba93aa Change the way the working directory for new processes is discovered. If 
default-path isn't empty, it is used. Otherwise:

1) If tmux neww is run from the command line, the working directory of the
   client is used.

2) Otherwise sysctl KERN_PROC_CWD is used to retrieve the current
   working directory of the process in the active pane.

3) If that fails, the directory where the session was created is used.

Support code by Romain Francois, OpenBSD specific bits by me.

Note this requires a recent userland and kernel with KERN_PROC_CWD.
 2011-12-09 16:28:18 +00:00