circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-01 20:57:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2020-04-22 12:01:38 +01:00
parent dd5299841a b72498c4ff
commit 8ae3915cc2
6 changed files with 70 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
screen.c
View File

@ -47,7 +47,7 @@ struct screen_title_entry {
};
TAILQ_HEAD(screen_titles, screen_title_entry);
static void screen_resize_y(struct screen *, u_int, int);
static void screen_resize_y(struct screen *, u_int, int, u_int *);
static void screen_reflow(struct screen *, u_int, u_int *, u_int *);
/* Free titles stack. */
@ -253,7 +253,7 @@ screen_resize_cursor(struct screen *s, u_int sx, u_int sy, int reflow,
reflow = 0;
if (sy != screen_size_y(s))
screen_resize_y(s, sy, eat_empty);
screen_resize_y(s, sy, eat_empty, cy);
if (reflow)
screen_reflow(s, sx, cx, cy);
@ -280,7 +280,7 @@ screen_resize(struct screen *s, u_int sx, u_int sy, int reflow)
}
static void
screen_resize_y(struct screen *s, u_int sy, int eat_empty)
screen_resize_y(struct screen *s, u_int sy, int eat_empty, u_int *cy)
{
struct grid *gd = s->grid;
u_int needed, available, oldy, i;
@ -329,6 +329,7 @@ screen_resize_y(struct screen *s, u_int sy, int eat_empty)
if (available > needed)
available = needed;
grid_view_delete_lines(gd, 0, available, 8);
(*cy) -= available;
}
}