diff options
| author |   nicm <nicm@openbsd.org> | 2014-02-14 14:37:08 +0000 |
|---|---|---|
| committer | nicm <nicm@openbsd.org> | 2014-02-14 14:37:08 +0000 |
| commit | 86500bfa171c4c308c628569d01c3a0c76dbd414 (patch) | |
| tree | c369031905abc29a95b6006ec6f8fe106a186f77 | |
| parent | explain about crypto signatures (diff) | |
| download | wireguard-openbsd-86500bfa171c4c308c628569d01c3a0c76dbd414.tar.xz wireguard-openbsd-86500bfa171c4c308c628569d01c3a0c76dbd414.zip | |
If the terminfo entry has colors#256, assume that setaf and setab work
and use them for the 256 colour set. If the terminfo entry doesn't have
colors#256 and the user gives -2 to the client, use a \033[38;5;Xm
sequence as before. Should allow fbterm to work with it's weird setaf
and setab.
| -rw-r--r-- | usr.bin/tmux/tty.c | 30 |
1 files changed, 23 insertions, 7 deletions
diff --git a/usr.bin/tmux/tty.c b/usr.bin/tmux/tty.c index be384a81d52..80e09b6da0b 100644 --- a/usr.bin/tmux/tty.c +++ b/usr.bin/tmux/tty.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tty.c,v 1.164 2014/01/28 23:07:09 nicm Exp $ */ +/* $OpenBSD: tty.c,v 1.165 2014/02/14 14:37:08 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -1581,13 +1581,29 @@ tty_try_256(struct tty *tty, u_char colour, const char *type) { char s[32]; - if (!(tty->term->flags & TERM_256COLOURS) && - !(tty->term_flags & TERM_256COLOURS)) - return (-1); + /* + * If the terminfo entry has 256 colours, assume that setaf and setab + * work correctly. + */ + if (tty->term->flags & TERM_256COLOURS) { + if (*type == '3') + tty_putcode1(tty, TTYC_SETAF, colour); + else + tty_putcode1(tty, TTYC_SETAB, colour); + return (0); + } - xsnprintf(s, sizeof s, "\033[%s;5;%hhum", type, colour); - tty_puts(tty, s); - return (0); + /* + * If the user has specified -2 to the client, setaf and setab may not + * work, so send the usual sequence. + */ + if (tty->term_flags & TERM_256COLOURS) { + xsnprintf(s, sizeof s, "\033[%s;5;%hhum", type, colour); + tty_puts(tty, s); + return (0); + } + + return (-1); } void |