mirror of
https://github.com/tmux/tmux.git
synced 2024-12-13 01:48:47 +00:00
Merge branch 'obsd-master'
This commit is contained in:
commit
d001a94d7b
@ -1505,10 +1505,9 @@ screen_write_fullredraw(struct screen_write_ctx *ctx)
|
|||||||
|
|
||||||
screen_write_collect_flush(ctx, 0, __func__);
|
screen_write_collect_flush(ctx, 0, __func__);
|
||||||
|
|
||||||
if (ttyctx.redraw_cb != NULL) {
|
screen_write_initctx(ctx, &ttyctx, 1);
|
||||||
screen_write_initctx(ctx, &ttyctx, 1);
|
if (ttyctx.redraw_cb != NULL)
|
||||||
ttyctx.redraw_cb(&ttyctx);
|
ttyctx.redraw_cb(&ttyctx);
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Trim collected items. */
|
/* Trim collected items. */
|
||||||
@ -2129,10 +2128,9 @@ screen_write_alternateon(struct screen_write_ctx *ctx, struct grid_cell *gc,
|
|||||||
screen_write_collect_flush(ctx, 0, __func__);
|
screen_write_collect_flush(ctx, 0, __func__);
|
||||||
screen_alternate_on(ctx->s, gc, cursor);
|
screen_alternate_on(ctx->s, gc, cursor);
|
||||||
|
|
||||||
if (ttyctx.redraw_cb != NULL) {
|
screen_write_initctx(ctx, &ttyctx, 1);
|
||||||
screen_write_initctx(ctx, &ttyctx, 1);
|
if (ttyctx.redraw_cb != NULL)
|
||||||
ttyctx.redraw_cb(&ttyctx);
|
ttyctx.redraw_cb(&ttyctx);
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Turn alternate screen off. */
|
/* Turn alternate screen off. */
|
||||||
@ -2149,8 +2147,7 @@ screen_write_alternateoff(struct screen_write_ctx *ctx, struct grid_cell *gc,
|
|||||||
screen_write_collect_flush(ctx, 0, __func__);
|
screen_write_collect_flush(ctx, 0, __func__);
|
||||||
screen_alternate_off(ctx->s, gc, cursor);
|
screen_alternate_off(ctx->s, gc, cursor);
|
||||||
|
|
||||||
if (ttyctx.redraw_cb != NULL) {
|
screen_write_initctx(ctx, &ttyctx, 1);
|
||||||
screen_write_initctx(ctx, &ttyctx, 1);
|
if (ttyctx.redraw_cb != NULL)
|
||||||
ttyctx.redraw_cb(&ttyctx);
|
ttyctx.redraw_cb(&ttyctx);
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user