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

Merge branch 'obsd-master' into master

Browse Source
This commit is contained in:
Thomas Adam
2020-12-07 10:01:20 +00:00
parent e288ea153c f6095cad99
commit caf096394b
2 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
screen-redraw.c
View File

@@ -407,7 +407,7 @@ screen_redraw_make_pane_status(struct client *c, struct window_pane *wp,
struct format_tree *ft; struct format_tree *ft;
char *expanded; char *expanded;
int pane_status = rctx->pane_status; int pane_status = rctx->pane_status;
u_int width, i, cell_type, top, px, py; u_int width, i, cell_type, px, py;
struct screen_write_ctx ctx; struct screen_write_ctx ctx;
struct screen old; struct screen old;
@@ -432,16 +432,12 @@ screen_redraw_make_pane_status(struct client *c, struct window_pane *wp,
screen_write_start(&ctx, &wp->status_screen); screen_write_start(&ctx, &wp->status_screen);
if (rctx->statustop)
top = rctx->statuslines;
else
top = 0;
for (i = 0; i < width; i++) { for (i = 0; i < width; i++) {
px = wp->xoff + 2 + i; px = wp->xoff + 2 + i;
if (rctx->pane_status == PANE_STATUS_TOP) if (rctx->pane_status == PANE_STATUS_TOP)
py = top + wp->yoff - 1; py = wp->yoff - 1;
else else
py = top + wp->yoff + wp->sy; py = wp->yoff + wp->sy;
cell_type = screen_redraw_type_of_cell(c, px, py, pane_status); cell_type = screen_redraw_type_of_cell(c, px, py, pane_status);
screen_redraw_border_set(wp, pane_lines, cell_type, &gc); screen_redraw_border_set(wp, pane_lines, cell_type, &gc);
screen_write_cell(&ctx, &gc); screen_write_cell(&ctx, &gc);

2
screen-write.c
View File

@@ -1240,8 +1240,6 @@ screen_write_linefeed(struct screen_write_ctx *ctx, int wrapped, u_int bg)
gl = grid_get_line(gd, gd->hsize + s->cy); gl = grid_get_line(gd, gd->hsize + s->cy);
if (wrapped) if (wrapped)
gl->flags |= GRID_LINE_WRAPPED; gl->flags |= GRID_LINE_WRAPPED;
else
gl->flags &= ~GRID_LINE_WRAPPED;
log_debug("%s: at %u,%u (region %u-%u)", __func__, s->cx, s->cy, log_debug("%s: at %u,%u (region %u-%u)", __func__, s->cx, s->cy,
s->rupper, s->rlower); s->rupper, s->rlower);