circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-11-04 00:56:10 +00:00
Code Issues Projects Releases Wiki Activity

Handle cells outside any pane correctly.

Browse Source
This commit is contained in:
Nicholas Marriott
2020-04-29 16:50:20 +01:00
parent a9743fa047
commit 881b8e9bb5
1 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
screen-redraw.c
View File

@@ -45,6 +45,10 @@ static void screen_redraw_draw_pane(struct screen_redraw_ctx *,
#define CELL_BORDERS " xqlkmjwvtun~" #define CELL_BORDERS " xqlkmjwvtun~"
const struct grid_cell screen_redraw_border_cell = {
{ { ' ' }, 0, 1, 1 }, GRID_ATTR_CHARSET, 0, 8, 8, 0
};
/* Return if window has only two panes. */ /* Return if window has only two panes. */
static int static int
screen_redraw_two_panes(struct window *w) screen_redraw_two_panes(struct window *w)
@@ -556,26 +560,31 @@ screen_redraw_draw_borders_cell(struct screen_redraw_ctx *ctx, u_int i, u_int j)
struct tty *tty = &c->tty; struct tty *tty = &c->tty;
struct window_pane *wp; struct window_pane *wp;
u_int type, x = ctx->ox + i, y = ctx->oy + j; u_int type, x = ctx->ox + i, y = ctx->oy + j;
int pane_status = ctx->pane_status;
const struct grid_cell *gc; const struct grid_cell *gc;
struct grid_cell copy; struct grid_cell copy;
if (c->overlay_check != NULL && !c->overlay_check(c, x, y)) if (c->overlay_check != NULL && !c->overlay_check(c, x, y))
return; return;
type = screen_redraw_check_cell(c, x, y, ctx->pane_status, &wp); type = screen_redraw_check_cell(c, x, y, pane_status, &wp);
if (type == CELL_INSIDE) if (type == CELL_INSIDE)
return; return;
if (wp == NULL)
gc = &screen_redraw_border_cell;
else {
gc = screen_redraw_draw_borders_style(ctx, x, y, wp); gc = screen_redraw_draw_borders_style(ctx, x, y, wp);
if (gc == NULL) if (gc == NULL)
return; return;
if (server_is_marked(s, s->curw, marked_pane.wp) && if (server_is_marked(s, s->curw, marked_pane.wp) &&
screen_redraw_check_is(x, y, ctx->pane_status, marked_pane.wp)) { screen_redraw_check_is(x, y, pane_status, marked_pane.wp)) {
memcpy(&copy, gc, sizeof copy); memcpy(&copy, gc, sizeof copy);
copy.attr ^= GRID_ATTR_REVERSE; copy.attr ^= GRID_ATTR_REVERSE;
gc = © gc = ©
} }
}
tty_attributes(tty, gc, NULL); tty_attributes(tty, gc, NULL);
if (ctx->statustop) if (ctx->statustop)