extern/tmate
1
0
Fork 0
mirror of https://github.com/tmate-io/tmate.git synced 2025-04-04 13:11:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

If the terminal has colors=256, only try to use setaf/setab if they

Browse Source 
exist, reported by Filipe Brandenburger.
This commit is contained in:
nicm 2015-09-25 23:30:12 +00:00
parent 28f23f18e9
commit 03d7dba5d8
1 changed files with 16 additions and 9 deletions

25
tty.c
View File

@ -1648,14 +1648,19 @@ tty_try_256(struct tty *tty, u_char colour, const char *type)
char s[32]; char s[32];
/* /*
* If the terminfo entry has 256 colours, assume that setaf and setab * If the terminfo entry has 256 colours and setaf and setab exist,
* work correctly. * assume that they work correctly.
*/ */
if (tty->term->flags & TERM_256COLOURS) { if (tty->term->flags & TERM_256COLOURS) {
if (*type == '3') if (*type == '3') {
if (!tty_term_has(tty->term, TTYC_SETAF))
goto fallback;
tty_putcode1(tty, TTYC_SETAF, colour); tty_putcode1(tty, TTYC_SETAF, colour);
else } else {
if (!tty_term_has(tty->term, TTYC_SETAB))
goto fallback;
tty_putcode1(tty, TTYC_SETAB, colour); tty_putcode1(tty, TTYC_SETAB, colour);
}
return (0); return (0);
} }
@ -1663,13 +1668,15 @@ tty_try_256(struct tty *tty, u_char colour, const char *type)
* If the user has specified -2 to the client, setaf and setab may not * If the user has specified -2 to the client, setaf and setab may not
* work, so send the usual sequence. * work, so send the usual sequence.
*/ */
if (tty->term_flags & TERM_256COLOURS) { if (tty->term_flags & TERM_256COLOURS)
xsnprintf(s, sizeof s, "\033[%s;5;%hhum", type, colour); goto fallback;
tty_puts(tty, s);
return (0);
}
return (-1); return (-1);
fallback:
xsnprintf(s, sizeof s, "\033[%s;5;%hhum", type, colour);
tty_puts(tty, s);
return (0);
} }
void void