aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2016-10-03 22:01:12 +0100
committerThomas Adam <thomas@xteddy.org>2016-10-03 22:01:12 +0100
commit6943fbbb8123ee75915f86783a12d2c291de8d81 (patch)
treecac98c268f0d2319fbbb7d1ce64075e9f5c59669
parent23254f59daea7415c96bc323d3b48d35c1b21327 (diff)
parent61dfbe702e61807b0b6f1e3f1767dff1d07bcfcb (diff)
downloadrtmux-6943fbbb8123ee75915f86783a12d2c291de8d81.tar.gz
rtmux-6943fbbb8123ee75915f86783a12d2c291de8d81.tar.bz2
rtmux-6943fbbb8123ee75915f86783a12d2c291de8d81.zip
Merge branch 'obsd-master'
-rw-r--r--tty.c14
1 files changed, 5 insertions, 9 deletions
diff --git a/tty.c b/tty.c
index b94a18b6..6cb0ef67 100644
--- a/tty.c
+++ b/tty.c
@@ -747,7 +747,9 @@ tty_cmd_insertcharacter(struct tty *tty, const struct tty_ctx *ctx)
{
struct window_pane *wp = ctx->wp;
- if (!tty_pane_full_width(tty, ctx)) {
+ if (!tty_pane_full_width(tty, ctx) || tty_fake_bce(tty, wp) ||
+ (!tty_term_has(tty->term, TTYC_DCH) &&
+ !tty_term_has(tty->term, TTYC_DCH1))) {
tty_draw_pane(tty, wp, ctx->ocy, ctx->xoff, ctx->yoff);
return;
}
@@ -756,11 +758,7 @@ tty_cmd_insertcharacter(struct tty *tty, const struct tty_ctx *ctx)
tty_cursor_pane(tty, ctx, ctx->ocx, ctx->ocy);
- if (!tty_fake_bce(tty, wp) && (tty_term_has(tty->term, TTYC_ICH) ||
- tty_term_has(tty->term, TTYC_ICH1)))
- tty_emulate_repeat(tty, TTYC_ICH, TTYC_ICH1, ctx->num);
- else
- tty_draw_pane(tty, wp, ctx->ocy, ctx->xoff, ctx->yoff);
+ tty_emulate_repeat(tty, TTYC_ICH, TTYC_ICH1, ctx->num);
}
void
@@ -779,9 +777,7 @@ tty_cmd_deletecharacter(struct tty *tty, const struct tty_ctx *ctx)
tty_cursor_pane(tty, ctx, ctx->ocx, ctx->ocy);
- if (tty_term_has(tty->term, TTYC_DCH) ||
- tty_term_has(tty->term, TTYC_DCH1))
- tty_emulate_repeat(tty, TTYC_DCH, TTYC_DCH1, ctx->num);
+ tty_emulate_repeat(tty, TTYC_DCH, TTYC_DCH1, ctx->num);
}
void