diff options
author | nicm <nicm> | 2014-02-14 14:37:08 +0000 |
---|---|---|
committer | nicm <nicm> | 2014-02-14 14:37:08 +0000 |
commit | f2e54e1e2ff5a1902cdab4db50a503541186638e (patch) | |
tree | 9cecb270285eee257ccfbf6a4ff50166eefb1d4b | |
parent | e9d32f901ac86986943cac3b391442ae5bce883f (diff) |
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-- | tty.c | 28 |
1 files changed, 22 insertions, 6 deletions
@@ -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 |