circlecloud
/
tmux
mirror of https://github.com/tmux/tmux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam 2019-03-25 15:57:47 +00:00
parent e8f4ca6a52 517d673dbe
commit a07ad6b5a3
2 changed files with 41 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
server-client.c
View File

@ -504,14 +504,13 @@ have_event:
m->statusat = status_at_line(c);
if (m->statusat != -1 &&
y >= (u_int)m->statusat &&
y < m->statusat + status_line_size(c))
y < m->statusat + status_line_size(c)) {
sr = status_get_range(c, x, y - m->statusat);
else
sr = NULL;
if (sr != NULL) {
if (sr == NULL)
return (KEYC_UNKNOWN);
switch (sr->type) {
case STYLE_RANGE_NONE:
break;
return (KEYC_UNKNOWN);
case STYLE_RANGE_LEFT:
where = STATUS_LEFT;
break;
@ -520,10 +519,11 @@ have_event:
break;
case STYLE_RANGE_WINDOW:
wl = winlink_find_by_index(&s->windows, sr->argument);
if (wl != NULL) {
m->w = wl->window->id;
where = STATUS;
}
if (wl == NULL)
return (KEYC_UNKNOWN);
m->w = wl->window->id;
where = STATUS;
break;
}
}

47
tmux.1
View File

@ -629,13 +629,13 @@ refers to a
.Nm
command, passed with the command and arguments separately, for example:
.Bd -literal -offset indent
bind-key F1 set-window-option synchronize-panes on
bind-key F1 set-option status off
.Ed
.Pp
Or if using
.Xr sh 1 :
.Bd -literal -offset indent
$ tmux bind-key F1 set-window-option synchronize-panes on
$ tmux bind-key F1 set-option status off
.Ed
.Pp
Multiple commands may be specified together as part of a
@ -1983,7 +1983,7 @@ and unzoomed (its normal position in the layout).
begins mouse resizing (only valid if bound to a mouse key binding, see
.Sx MOUSE SUPPORT ) .
.It Xo Ic resize-window
.Op Fl aADLUR
.Op Fl aADLRU
.Op Fl t Ar target-window
.Op Fl x Ar width
.Op Fl y Ar height
@ -1998,24 +1998,22 @@ with
.Fl L
or
.Fl R ,
or
to an absolute size
with
.Fl x
or
.Fl y ,
or to the size of the smallest or largest session (with
.Fl a
or
.Fl A ) .
.Fl y .
The
.Ar adjustment
is given in lines or cells (the default is 1).
.Pp
This command automatically sets the
.Fl A
sets the size of the largest session containing the window;
.Fl a
the size of the smallest.
This command will automatically set
.Ic window-size
option to
.Ar manual
for the window.
to manual in the window options.
.It Xo Ic respawn-pane
.Op Fl c Ar start-directory
.Op Fl k
@ -2785,6 +2783,10 @@ or
This option should be configured when
.Nm
is used as a login shell.
.It Ic default-size Ar XxY
Set the default size of windows when the size is not set or the
.Ic window-size
option is manual.
.It Xo Ic destroy-unattached
.Op Ic on | off
.Xc
@ -3397,6 +3399,21 @@ see the
.Sx STYLES
section.
.Pp
.It Xo Ic window-size
.Op Ic smallest | largest | manual
.Xc
Tell
.Nm
how to automatically size windows either the size of the smallest session
containing the window, the size of the largest, or manual size.
See also the
.Ic resize-window
command and the
.Ic default-size
and
.Ic aggressive-resize
options.
.Pp
.It Xo Ic wrap-search
.Op Ic on | off
.Xc
@ -3963,7 +3980,7 @@ and
A style may be the single term
.Ql default
to specify the default style (which may inherit from another option) or a space
separated list of the following:
or comma separated list of the following:
.Bl -tag -width Ds
.It Ic fg=colour
Set the foreground colour.
@ -4064,7 +4081,7 @@ is a window index.
.Pp
Examples are:
.Bd -literal -offset indent
fg=yellow,bold,underscore,blink
fg=yellow bold underscore blink
bg=black,fg=default,noreverse
.Ed
.Sh NAMES AND TITLES