diff options
| author | Tiago Cunha <tcunha@gmx.com> | 2009-08-21 21:15:00 +0000 |
|---|---|---|
| committer | Tiago Cunha <tcunha@gmx.com> | 2009-08-21 21:15:00 +0000 |
| commit | 633e74ef805f30049b808c067963aba3309f0d47 (patch) | |
| tree | 551d226fd70cc35b4127748cfb8ebc34e6ae342f | |
| parent | 1fa8a8f4a6a2d942896fc4c5c04563826c9a6f70 (diff) | |
| download | rtmux-633e74ef805f30049b808c067963aba3309f0d47.tar.gz rtmux-633e74ef805f30049b808c067963aba3309f0d47.tar.bz2 rtmux-633e74ef805f30049b808c067963aba3309f0d47.zip | |
Sync OpenBSD patchset 287:
Emulate dch/dch1 if missing by redrawing the entire line.
| -rw-r--r-- | tty-term.c | 6 | ||||
| -rw-r--r-- | tty.c | 10 |
2 files changed, 8 insertions, 8 deletions
@@ -1,4 +1,4 @@ -/* $Id: tty-term.c,v 1.28 2009-08-09 16:52:06 tcunha Exp $ */ +/* $Id: tty-term.c,v 1.29 2009-08-21 21:15:00 tcunha Exp $ */ /* * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net> @@ -337,10 +337,6 @@ tty_term_find(char *name, int fd, const char *overrides, char **cause) "terminal does not support ich1 or ich or smir and rmir"); goto error; } - if (!tty_term_has(term, TTYC_DCH1) && !tty_term_has(term, TTYC_DCH)) { - xasprintf(cause, "terminal does not support dch1 or dch"); - goto error; - } /* * Figure out if terminal support default colours. AX is a screen @@ -1,4 +1,4 @@ -/* $Id: tty.c,v 1.129 2009-08-19 09:00:06 nicm Exp $ */ +/* $Id: tty.c,v 1.130 2009-08-21 21:15:00 tcunha Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -604,7 +604,9 @@ tty_cmd_deletecharacter(struct tty *tty, const struct tty_ctx *ctx) struct window_pane *wp = ctx->wp; struct screen *s = wp->screen; - if (wp->xoff != 0 || screen_size_x(s) < tty->sx) { + if (wp->xoff != 0 || screen_size_x(s) < tty->sx || + (!tty_term_has(tty->term, TTYC_DCH) && + !tty_term_has(tty->term, TTYC_DCH1))) { tty_draw_line(tty, wp->screen, ctx->ocy, wp->xoff, wp->yoff); return; } @@ -612,7 +614,9 @@ tty_cmd_deletecharacter(struct tty *tty, const struct tty_ctx *ctx) tty_reset(tty); tty_cursor(tty, ctx->ocx, ctx->ocy, wp->xoff, wp->yoff); - tty_emulate_repeat(tty, TTYC_DCH, TTYC_DCH1, ctx->num); + 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); } void |