From d05debbe198699a84ddeaacfa4d5bf57e6afaac8 Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Tue, 5 Mar 2013 18:00:14 +0000 Subject: Unzoom on last-pane and fix a typo, from Romain Francoise. --- tmux.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tmux.1') diff --git a/tmux.1 b/tmux.1 index a65ce221..1a9c0583 100644 --- a/tmux.1 +++ b/tmux.1 @@ -1619,7 +1619,7 @@ is given in lines or cells (the default is 1). .Pp With .Fl Z , -the active pane is toggled between occupying the whole of the window and it's +the active pane is toggled between occupying the whole of the window and its normal position in the layout. .It Xo Ic respawn-pane .Op Fl k -- cgit From 7fd4d49d562d2f57e21d9198bc28914891478f7c Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Wed, 6 Mar 2013 09:57:26 +0000 Subject: 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. --- tmux.1 | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'tmux.1') diff --git a/tmux.1 b/tmux.1 index 1a9c0583..8df7975e 100644 --- a/tmux.1 +++ b/tmux.1 @@ -3553,6 +3553,19 @@ If the command doesn't return success, the exit status is also displayed. .It Ic server-info .D1 (alias: Ic info ) Show server information and terminal details. +.It Xo Ic wait-for +.Fl S +.Ar channel +.Xc +.D1 (alias: Ic wait ) +When used without +.Fl S , +prevents the client from exiting until woken using +.Ic wait-for +.Fl S +with the same channel. +This command only works from outside +.Nm . .El .Sh TERMINFO EXTENSIONS .Nm -- cgit From bc3580fa066ee38fd752b8414cb72af7bf3861b8 Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Wed, 6 Mar 2013 11:00:55 +0000 Subject: Add wait-for -L and -U for lock and unlock, from Thiago Padilha. --- tmux.1 | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'tmux.1') diff --git a/tmux.1 b/tmux.1 index 8df7975e..0b5d6a6a 100644 --- a/tmux.1 +++ b/tmux.1 @@ -3554,16 +3554,20 @@ If the command doesn't return success, the exit status is also displayed. .D1 (alias: Ic info ) Show server information and terminal details. .It Xo Ic wait-for -.Fl S +.Fl LSU .Ar channel .Xc .D1 (alias: Ic wait ) -When used without -.Fl S , -prevents the client from exiting until woken using +When used without options, prevents the client from exiting until woken using .Ic wait-for .Fl S with the same channel. +When +.Fl L +is used, the channel is locked and any clients that try to lock the same +channel are made to wait until the channel is unlocked with +.Ic wait-for +.Fl U . This command only works from outside .Nm . .El -- cgit From f47a063841f2baa1590fb9e53713b3713a03020d Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Thu, 7 Mar 2013 10:07:22 +0000 Subject: Rename session idx to session id throughout and add $ prefix to targets to use it, extended from a diff from George Nachman. --- tmux.1 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'tmux.1') diff --git a/tmux.1 b/tmux.1 index 0b5d6a6a..f219615e 100644 --- a/tmux.1 +++ b/tmux.1 @@ -369,9 +369,9 @@ Clients may be listed with the command. .Pp .Ar target-session -is either the name of a session (as listed by the +is the session id prefixed with a $, the name of a session (as listed by the .Ic list-sessions -command) or the name of a client with the same syntax as +command), or the name of a client with the same syntax as .Ar target-client , in which case the session attached to the client is used. When looking for the session name, @@ -3085,6 +3085,7 @@ The following variables are available, where appropriate: .It Li "session_group" Ta "Number of session group" .It Li "session_grouped" Ta "1 if session in a group" .It Li "session_height" Ta "Height of session" +.It Li "session_id" Ta "Unique session ID" .It Li "session_name" Ta "Name of session" .It Li "session_width" Ta "Width of session" .It Li "session_windows" Ta "Number of windows in session" -- cgit From 7b4084a15a5c82824737051143dfe0115cff52e5 Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Mon, 11 Mar 2013 13:06:30 +0000 Subject: Document control mode in the manpage, from George Nachman. --- tmux.1 | 95 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 94 insertions(+), 1 deletion(-) (limited to 'tmux.1') diff --git a/tmux.1 b/tmux.1 index f219615e..f73af3fa 100644 --- a/tmux.1 +++ b/tmux.1 @@ -23,7 +23,7 @@ .Sh SYNOPSIS .Nm tmux .Bk -words -.Op Fl 28lquvV +.Op Fl 28lCquvV .Op Fl c Ar shell-command .Op Fl f Ar file .Op Fl L Ar socket-name @@ -102,6 +102,11 @@ to assume the terminal supports 256 colours. Like .Fl 2 , but indicates that the terminal supports 88 colours. +.It Fl C +Start in control mode. +Given twice +.Xo ( Fl CC ) Xc +disables echo. .It Fl c Ar shell-command Execute .Ar shell-command @@ -3610,6 +3615,94 @@ option above and the .Xr xterm 1 man page. .El +.Sh CONTROL MODE +.Nm +offers a textual interface called +.Em control mode . +This allows applications to communicate with +.Nm +using a simple text-only protocol. +.Pp +In control mode, a client sends +.Nm +commands or command sequences terminated by newlines on standard input. +Each command will produce one block of output on standard output. +An output block consists of a +.Em %begin +line followed by the output (which may be empty). +The output block ends with a +.Em %end +or +.Em %error . +.Em %begin +and matching +.Em %end +or +.Em %error +have two arguments: an integer time (as seconds from epoch) and command number. +For example: +.Bd -literal -offset indent +%begin 1363006971 2 +0: ksh* (1 panes) [80x24] [layout b25f,80x24,0,0,2] @2 (active) +%end 1363006971 2 +.Ed +.Pp +In control mode, +.Nm +outputs notifications. +A notification will never occur inside an output block. +.Pp +The following notifications are defined: +.Pp +.Bl -tag -width Ds +.It Ic %exit Op Ar reason +The +.Nm +client is exiting immediately, either because it is not attached to any session +or an error occurred. +If present, +.Ar reason +describes why the client exited. +.It Ic %layout-change Ar window-id Ar window-layout +The layout of a window with ID +.Ar window-id +changed. +The new layout is +.Ar window-layout . +.It Ic %output Ar source-pane Ar value +A window pane, +.Ar source-pane , +produced output. +.Ar value +contains that output with each byte encoded as two hex digits. +.It Ic %session-changed Ar session-id Ar name +The client is now attached to the session with ID +.Ar session-id , +which is named +.Ar name . +.It Ic %session-renamed Ar name +The current session was renamed to +.Ar name . +.It Ic %sessions-changed +A session was created or destroyed. +.It Ic %unlinked-window-add Ar window-id +The window with ID +.Ar window-id +was created but is not linked to the current session. +.It Ic %window-add Ar window-id +The window with ID +.Ar window-id +was linked to the current session. +.It Ic %window-close Ar window-id +The window with ID +.Ar window-id +closed. +.It Ic %window-renamed Ar window-id Ar name +The window with ID +.Ar window-id +was renamed to +.Ar name . +.El .Sh FILES .Bl -tag -width "/etc/tmux.confXXX" -compact .It Pa ~/.tmux.conf -- cgit From 7c009509676b4580065fdc6f0084a93b9758fac0 Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Mon, 11 Mar 2013 15:28:34 +0000 Subject: Don't add prefix to %output pane id. --- tmux.1 | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'tmux.1') diff --git a/tmux.1 b/tmux.1 index f73af3fa..519bf6fa 100644 --- a/tmux.1 +++ b/tmux.1 @@ -3669,10 +3669,8 @@ The layout of a window with ID changed. The new layout is .Ar window-layout . -.It Ic %output Ar source-pane Ar value -A window pane, -.Ar source-pane , -produced output. +.It Ic %output Ar pane-id Ar value +A window pane produced output. .Ar value contains that output with each byte encoded as two hex digits. .It Ic %session-changed Ar session-id Ar name -- cgit