circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-12-13 10:08:47 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam 2019-05-11 09:02:29 +01:00
commit 50d1d04913
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
resize.c
View File

@ -174,11 +174,12 @@ recalculate_sizes(void)
TAILQ_FOREACH(c, &clients, entry) { TAILQ_FOREACH(c, &clients, entry) {
if (ignore_client_size(c)) if (ignore_client_size(c))
continue; continue;
if (c->tty.sy <= status_line_size(c)) s = c->session;
if (c->tty.sy <= s->statuslines || (c->flags & CLIENT_CONTROL))
c->flags |= CLIENT_STATUSOFF; c->flags |= CLIENT_STATUSOFF;
else else
c->flags &= ~CLIENT_STATUSOFF; c->flags &= ~CLIENT_STATUSOFF;
c->session->attached++; s->attached++;
} }
/* Walk each window and adjust the size. */ /* Walk each window and adjust the size. */

4
status.c
View File

@ -203,7 +203,7 @@ status_at_line(struct client *c)
{ {
struct session *s = c->session; struct session *s = c->session;
if (c->flags & CLIENT_STATUSOFF) if (c->flags & (CLIENT_STATUSOFF|CLIENT_CONTROL))
return (-1); return (-1);
if (s->statusat != 1) if (s->statusat != 1)
return (s->statusat); return (s->statusat);
@ -216,7 +216,7 @@ status_line_size(struct client *c)
{ {
struct session *s = c->session; struct session *s = c->session;
if (c->flags & CLIENT_STATUSOFF) if (c->flags & (CLIENT_STATUSOFF|CLIENT_CONTROL))
return (0); return (0);
return (s->statuslines); return (s->statuslines);
} }

6
tmux.1
View File

@ -4468,17 +4468,17 @@ as a list of menu items separated by
.Ql | . .Ql | .
Each menu item consists of three comma-separated parts: Each menu item consists of three comma-separated parts:
.Bl -enum -width Ds .Bl -enum -width Ds
.It name .It
The menu item name. The menu item name.
This is a format and may include embedded styles, see the This is a format and may include embedded styles, see the
.Sx FORMATS .Sx FORMATS
and and
.Sx STYLES .Sx STYLES
sections. sections.
.It key .It
The menu item shortcut key. The menu item shortcut key.
If this is empty the menu item has no key shortcut. If this is empty the menu item has no key shortcut.
.It command .It
The command run when the menu item is chosen. The command run when the menu item is chosen.
.El .El
.Pp .Pp