|
|
|
|
@ -1,7 +1,7 @@
|
|
|
|
|
Index: arguments.c
|
|
|
|
|
--- arguments.c.orig 2018-11-15 14:50:13.000000000 +0100
|
|
|
|
|
+++ arguments.c 2019-05-04 10:41:08.740056000 +0200
|
|
|
|
|
@@ -65,7 +65,9 @@
|
|
|
|
|
--- arguments.c.orig 2019-07-29 11:50:43.000000000 +0200
|
|
|
|
|
+++ arguments.c 2019-11-27 19:20:26.835041000 +0100
|
|
|
|
|
@@ -72,7 +72,9 @@
|
|
|
|
|
|
|
|
|
|
args = xcalloc(1, sizeof *args);
|
|
|
|
|
|
|
|
|
|
@ -12,9 +12,9 @@ Index: arguments.c
|
|
|
|
|
|
|
|
|
|
while ((opt = getopt(argc, argv, template)) != -1) {
|
|
|
|
|
Index: compat.h
|
|
|
|
|
--- compat.h.orig 2019-04-24 23:34:48.000000000 +0200
|
|
|
|
|
+++ compat.h 2019-05-04 10:41:08.740185000 +0200
|
|
|
|
|
@@ -221,6 +221,22 @@
|
|
|
|
|
--- compat.h.orig 2019-06-26 13:26:30.000000000 +0200
|
|
|
|
|
+++ compat.h 2019-11-27 19:20:26.835169000 +0100
|
|
|
|
|
@@ -222,6 +222,22 @@
|
|
|
|
|
int getdtablecount(void);
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
@ -38,8 +38,8 @@ Index: compat.h
|
|
|
|
|
/* closefrom.c */
|
|
|
|
|
void closefrom(int);
|
|
|
|
|
Index: osdep-freebsd.c
|
|
|
|
|
--- osdep-freebsd.c.orig 2019-04-02 17:51:09.000000000 +0200
|
|
|
|
|
+++ osdep-freebsd.c 2019-05-04 10:41:08.740303000 +0200
|
|
|
|
|
--- osdep-freebsd.c.orig 2019-05-13 12:13:54.000000000 +0200
|
|
|
|
|
+++ osdep-freebsd.c 2019-11-27 19:20:26.835293000 +0100
|
|
|
|
|
@@ -29,7 +29,9 @@
|
|
|
|
|
#include <stdlib.h>
|
|
|
|
|
#include <string.h>
|
|
|
|
|
@ -66,56 +66,10 @@ Index: osdep-freebsd.c
|
|
|
|
|
return (NULL);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Index: status.c
|
|
|
|
|
--- status.c.orig 2019-04-24 23:34:48.000000000 +0200
|
|
|
|
|
+++ status.c 2019-05-04 10:43:00.591743000 +0200
|
|
|
|
|
@@ -320,7 +320,7 @@
|
|
|
|
|
struct session *s = c->session;
|
|
|
|
|
struct screen_write_ctx ctx;
|
|
|
|
|
struct grid_cell gc;
|
|
|
|
|
- u_int lines, i, width = c->tty.sx;
|
|
|
|
|
+ u_int lines, i, n, width = c->tty.sx;
|
|
|
|
|
int flags, force = 0, changed = 0;
|
|
|
|
|
struct options_entry *o;
|
|
|
|
|
struct format_tree *ft;
|
|
|
|
|
@@ -364,15 +364,17 @@
|
|
|
|
|
|
|
|
|
|
/* Write the status lines. */
|
|
|
|
|
o = options_get(s->options, "status-format");
|
|
|
|
|
- if (o == NULL)
|
|
|
|
|
- screen_write_clearscreen(&ctx, gc.bg);
|
|
|
|
|
- else {
|
|
|
|
|
+ if (o == NULL) {
|
|
|
|
|
+ for (n = 0; n < width * lines; n++)
|
|
|
|
|
+ screen_write_putc(&ctx, &gc, ' ');
|
|
|
|
|
+ } else {
|
|
|
|
|
for (i = 0; i < lines; i++) {
|
|
|
|
|
screen_write_cursormove(&ctx, 0, i, 0);
|
|
|
|
|
|
|
|
|
|
fmt = options_array_get(o, i);
|
|
|
|
|
if (fmt == NULL) {
|
|
|
|
|
- screen_write_clearline(&ctx, gc.bg);
|
|
|
|
|
+ for (n = 0; n < width; n++)
|
|
|
|
|
+ screen_write_putc(&ctx, &gc, ' ');
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
sle = &sl->entries[i];
|
|
|
|
|
@@ -386,7 +388,10 @@
|
|
|
|
|
}
|
|
|
|
|
changed = 1;
|
|
|
|
|
|
|
|
|
|
- screen_write_clearline(&ctx, gc.bg);
|
|
|
|
|
+ for (n = 0; n < width; n++)
|
|
|
|
|
+ screen_write_putc(&ctx, &gc, ' ');
|
|
|
|
|
+ screen_write_cursormove(&ctx, 0, i, 0);
|
|
|
|
|
+
|
|
|
|
|
status_free_ranges(&sle->ranges);
|
|
|
|
|
format_draw(&ctx, &gc, width, expanded, &sle->ranges);
|
|
|
|
|
|
|
|
|
|
Index: tmux.1
|
|
|
|
|
--- tmux.1.orig 2019-04-24 23:34:48.000000000 +0200
|
|
|
|
|
+++ tmux.1 2019-05-04 10:41:08.740838000 +0200
|
|
|
|
|
@@ -535,7 +535,7 @@
|
|
|
|
|
--- tmux.1.orig 2019-11-26 14:09:07.000000000 +0100
|
|
|
|
|
+++ tmux.1 2019-11-27 19:22:26.534143000 +0100
|
|
|
|
|
@@ -769,7 +769,7 @@
|
|
|
|
|
.Ql -
|
|
|
|
|
may be followed by an offset, for example:
|
|
|
|
|
.Bd -literal -offset indent
|
|
|
|
|
@ -124,25 +78,21 @@ Index: tmux.1
|
|
|
|
|
.Ed
|
|
|
|
|
.Pp
|
|
|
|
|
In addition,
|
|
|
|
|
@@ -652,13 +652,13 @@
|
|
|
|
|
.Nm
|
|
|
|
|
commands include:
|
|
|
|
|
@@ -879,11 +879,11 @@
|
|
|
|
|
.Bd -literal -offset indent
|
|
|
|
|
-refresh-client -t/dev/ttyp2
|
|
|
|
|
+refresh-client \-t/dev/ttyp2
|
|
|
|
|
refresh-client -t/dev/ttyp2
|
|
|
|
|
|
|
|
|
|
-rename-session -tfirst newname
|
|
|
|
|
+rename-session \-tfirst newname
|
|
|
|
|
|
|
|
|
|
-set-window-option -t:0 monitor-activity on
|
|
|
|
|
+set-window-option \-t:0 monitor-activity on
|
|
|
|
|
set-option -wt:0 monitor-activity on
|
|
|
|
|
|
|
|
|
|
-new-window ; split-window -d
|
|
|
|
|
+new-window ; split-window \-d
|
|
|
|
|
|
|
|
|
|
bind-key R source-file ~/.tmux.conf \e; \e
|
|
|
|
|
display-message "source-file done"
|
|
|
|
|
@@ -667,11 +667,11 @@
|
|
|
|
|
@@ -892,11 +892,11 @@
|
|
|
|
|
Or from
|
|
|
|
|
.Xr sh 1 :
|
|
|
|
|
.Bd -literal -offset indent
|
|
|
|
|
@ -157,7 +107,7 @@ Index: tmux.1
|
|
|
|
|
.Ed
|
|
|
|
|
.Sh CLIENTS AND SESSIONS
|
|
|
|
|
The
|
|
|
|
|
@@ -1484,7 +1484,7 @@
|
|
|
|
|
@@ -1721,7 +1721,7 @@
|
|
|
|
|
and the result executed as a command.
|
|
|
|
|
If
|
|
|
|
|
.Ar template
|
|
|
|
|
@ -166,7 +116,7 @@ Index: tmux.1
|
|
|
|
|
.Pp
|
|
|
|
|
.Fl O
|
|
|
|
|
specifies the initial sort order: one of
|
|
|
|
|
@@ -1548,7 +1548,7 @@
|
|
|
|
|
@@ -1785,7 +1785,7 @@
|
|
|
|
|
and the result executed as a command.
|
|
|
|
|
If
|
|
|
|
|
.Ar template
|
|
|
|
|
@ -175,7 +125,7 @@ Index: tmux.1
|
|
|
|
|
.Pp
|
|
|
|
|
.Fl O
|
|
|
|
|
specifies the initial sort order: one of
|
|
|
|
|
@@ -1603,7 +1603,7 @@
|
|
|
|
|
@@ -1840,7 +1840,7 @@
|
|
|
|
|
substituted by the pane ID.
|
|
|
|
|
The default
|
|
|
|
|
.Ar template
|
|
|
|
|
@ -184,7 +134,7 @@ Index: tmux.1
|
|
|
|
|
With
|
|
|
|
|
.Fl b ,
|
|
|
|
|
other commands are not blocked from running until the indicator is closed.
|
|
|
|
|
@@ -1923,7 +1923,7 @@
|
|
|
|
|
@@ -2171,7 +2171,7 @@
|
|
|
|
|
option only opens a new pipe if no previous pipe exists, allowing a pipe to
|
|
|
|
|
be toggled with a single key, for example:
|
|
|
|
|
.Bd -literal -offset indent
|
|
|
|
|
@ -193,16 +143,7 @@ Index: tmux.1
|
|
|
|
|
.Ed
|
|
|
|
|
.It Xo Ic previous-layout
|
|
|
|
|
.Op Fl t Ar target-window
|
|
|
|
|
@@ -2135,7 +2135,7 @@
|
|
|
|
|
sets the style for a single pane.
|
|
|
|
|
For example, to set the pane 1 background to red:
|
|
|
|
|
.Bd -literal -offset indent
|
|
|
|
|
-select-pane -t:.1 -P 'bg=red'
|
|
|
|
|
+select-pane \-t:.1 -P 'bg=red'
|
|
|
|
|
.Ed
|
|
|
|
|
.Pp
|
|
|
|
|
.Fl g
|
|
|
|
|
@@ -2492,8 +2492,8 @@
|
|
|
|
|
@@ -2771,8 +2771,8 @@
|
|
|
|
|
and be set to any string.
|
|
|
|
|
For example:
|
|
|
|
|
.Bd -literal -offset indent
|
|
|
|
|
@ -213,7 +154,28 @@ Index: tmux.1
|
|
|
|
|
abc123
|
|
|
|
|
.Ed
|
|
|
|
|
.Pp
|
|
|
|
|
@@ -2986,7 +2986,7 @@
|
|
|
|
|
@@ -2826,16 +2826,16 @@
|
|
|
|
|
is appended to the existing setting.
|
|
|
|
|
For example:
|
|
|
|
|
.Bd -literal -offset indent
|
|
|
|
|
-set -g status-left "foo"
|
|
|
|
|
-set -ag status-left "bar"
|
|
|
|
|
+set \-g status-left "foo"
|
|
|
|
|
+set \-ag status-left "bar"
|
|
|
|
|
.Ed
|
|
|
|
|
.Pp
|
|
|
|
|
Will result in
|
|
|
|
|
.Ql foobar .
|
|
|
|
|
And:
|
|
|
|
|
.Bd -literal -offset indent
|
|
|
|
|
-set -g status-style "bg=red"
|
|
|
|
|
-set -ag status-style "fg=blue"
|
|
|
|
|
+set \-g status-style "bg=red"
|
|
|
|
|
+set \-ag status-style "fg=blue"
|
|
|
|
|
.Ed
|
|
|
|
|
.Pp
|
|
|
|
|
Will result in a red background
|
|
|
|
|
@@ -3318,7 +3318,7 @@
|
|
|
|
|
Examples are:
|
|
|
|
|
.Bd -literal -offset indent
|
|
|
|
|
#(sysctl vm.loadavg)
|
|
|
|
|
@ -222,16 +184,27 @@ Index: tmux.1
|
|
|
|
|
.Ed
|
|
|
|
|
.Pp
|
|
|
|
|
The default is
|
|
|
|
|
@@ -3172,7 +3172,7 @@
|
|
|
|
|
or with a terminal escape sequence.
|
|
|
|
|
It may be switched off globally with:
|
|
|
|
|
@@ -3741,8 +3741,8 @@
|
|
|
|
|
.Fl H .
|
|
|
|
|
The following two commands are equivalent:
|
|
|
|
|
.Bd -literal -offset indent.
|
|
|
|
|
-set-hook -g pane-mode-changed[42] 'set -g status-left-style bg=red'
|
|
|
|
|
-set-option -g pane-mode-changed[42] 'set -g status-left-style bg=red'
|
|
|
|
|
+set-hook \-g pane-mode-changed[42] 'set \-g status-left-style bg=red'
|
|
|
|
|
+set-option \-g pane-mode-changed[42] 'set \-g status-left-style bg=red'
|
|
|
|
|
.Ed
|
|
|
|
|
.Pp
|
|
|
|
|
Setting a hook without specifying an array index clears the hook and sets the
|
|
|
|
|
@@ -3758,7 +3758,7 @@
|
|
|
|
|
layout after every
|
|
|
|
|
.Ic split-window :
|
|
|
|
|
.Bd -literal -offset indent
|
|
|
|
|
-set-window-option -g automatic-rename off
|
|
|
|
|
+set-window-option \-g automatic-rename off
|
|
|
|
|
-set-hook -g after-split-window "selectl even-vertical"
|
|
|
|
|
+set-hook \-g after-split-window "selectl even-vertical"
|
|
|
|
|
.Ed
|
|
|
|
|
.Pp
|
|
|
|
|
.It Ic automatic-rename-format Ar format
|
|
|
|
|
@@ -4484,7 +4484,7 @@
|
|
|
|
|
All the notifications listed in the
|
|
|
|
|
@@ -4881,7 +4881,7 @@
|
|
|
|
|
and the result executed as a command.
|
|
|
|
|
If
|
|
|
|
|
.Ar template
|
|
|
|
|
@ -240,7 +213,7 @@ Index: tmux.1
|
|
|
|
|
.Pp
|
|
|
|
|
.Fl O
|
|
|
|
|
specifies the initial sort order: one of
|
|
|
|
|
@@ -4901,22 +4901,22 @@
|
|
|
|
|
@@ -5407,22 +5407,22 @@
|
|
|
|
|
.Pp
|
|
|
|
|
Changing the default prefix key:
|
|
|
|
|
.Bd -literal -offset indent
|
|
|
|
|
|
