Sync OpenBSD patchset 1117:

Use tty_pane_full_width macro in some more places.
This commit is contained in:
Tiago Cunha 2012-05-22 20:59:12 +00:00
parent d9cb07df3b
commit 49b2a255b6

6
tty.c
View File

@ -740,9 +740,8 @@ void
tty_cmd_insertcharacter(struct tty *tty, const struct tty_ctx *ctx) tty_cmd_insertcharacter(struct tty *tty, const struct tty_ctx *ctx)
{ {
struct window_pane *wp = ctx->wp; struct window_pane *wp = ctx->wp;
struct screen *s = wp->screen;
if (ctx->xoff != 0 || screen_size_x(s) < tty->sx) { if (!tty_pane_full_width(tty, ctx)) {
tty_draw_line(tty, wp->screen, ctx->ocy, ctx->xoff, ctx->yoff); tty_draw_line(tty, wp->screen, ctx->ocy, ctx->xoff, ctx->yoff);
return; return;
} }
@ -762,9 +761,8 @@ void
tty_cmd_deletecharacter(struct tty *tty, const struct tty_ctx *ctx) tty_cmd_deletecharacter(struct tty *tty, const struct tty_ctx *ctx)
{ {
struct window_pane *wp = ctx->wp; struct window_pane *wp = ctx->wp;
struct screen *s = wp->screen;
if (ctx->xoff != 0 || screen_size_x(s) < tty->sx || if (!tty_pane_full_width(tty, ctx) ||
(!tty_term_has(tty->term, TTYC_DCH) && (!tty_term_has(tty->term, TTYC_DCH) &&
!tty_term_has(tty->term, TTYC_DCH1))) { !tty_term_has(tty->term, TTYC_DCH1))) {
tty_draw_line(tty, wp->screen, ctx->ocy, ctx->xoff, ctx->yoff); tty_draw_line(tty, wp->screen, ctx->ocy, ctx->xoff, ctx->yoff);