aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTiago Cunha <tcunha@gmx.com>2009-11-13 16:57:21 +0000
committerTiago Cunha <tcunha@gmx.com>2009-11-13 16:57:21 +0000
commit2bd39071d3e5add8e734d31566574f7dbf54ee4b (patch)
tree0bd5153c783fdb1fb8d17649226fdd778b81a2eb
parentac6b1a817b635689543138cbfa43cfcd1f762a53 (diff)
downloadrtmux-2bd39071d3e5add8e734d31566574f7dbf54ee4b.tar.gz
rtmux-2bd39071d3e5add8e734d31566574f7dbf54ee4b.tar.bz2
rtmux-2bd39071d3e5add8e734d31566574f7dbf54ee4b.zip
Sync OpenBSD patchset 532:
Emulate the ri (reverse index) capability: this allows tmux to at least start on Sun consoles (TERM=sun or sun-color), even if there appear to still be problems on some boxes (my Blade 100 is fine but edd's Blade 1000 shows odd screen corruption).
-rw-r--r--tty-term.c6
-rw-r--r--tty.c5
2 files changed, 4 insertions, 7 deletions
diff --git a/tty-term.c b/tty-term.c
index 98957b17..53f63aa3 100644
--- a/tty-term.c
+++ b/tty-term.c
@@ -1,4 +1,4 @@
-/* $Id: tty-term.c,v 1.35 2009-10-28 23:01:44 tcunha Exp $ */
+/* $Id: tty-term.c,v 1.36 2009-11-13 16:57:21 tcunha Exp $ */
/*
* Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -377,10 +377,6 @@ tty_term_find(char *name, int fd, const char *overrides, char **cause)
xasprintf(cause, "terminal does not support clear");
goto error;
}
- if (!tty_term_has(term, TTYC_RI)) {
- xasprintf(cause, "terminal does not support ri");
- goto error;
- }
if (!tty_term_has(term, TTYC_CUP)) {
xasprintf(cause, "terminal does not support cup");
goto error;
diff --git a/tty.c b/tty.c
index 15cc53b3..a5e1770b 100644
--- a/tty.c
+++ b/tty.c
@@ -1,4 +1,4 @@
-/* $Id: tty.c,v 1.173 2009-11-10 23:27:57 tcunha Exp $ */
+/* $Id: tty.c,v 1.174 2009-11-13 16:57:21 tcunha Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -716,7 +716,8 @@ tty_cmd_reverseindex(struct tty *tty, const struct tty_ctx *ctx)
return;
if (wp->xoff != 0 || screen_size_x(s) < tty->sx ||
- !tty_term_has(tty->term, TTYC_CSR)) {
+ !tty_term_has(tty->term, TTYC_CSR) ||
+ !tty_term_has(tty->term, TTYC_RI)) {
tty_redraw_region(tty, ctx);
return;
}