Sync OpenBSD patchset 1006:

Add strings to allow the aixterm bright colours to be used when
configuring colours, requested by Elliott Cable a few months ago.
This commit is contained in:
Tiago Cunha
2012-01-21 19:33:45 +00:00
parent cc967ffeb9
commit d4c2a935f2
4 changed files with 49 additions and 5 deletions

8
tty.c
View File

@ -1440,7 +1440,7 @@ tty_check_bg(struct tty *tty, struct grid_cell *gc)
/* Is this an aixterm colour? */
colours = tty_term_number(tty->term, TTYC_COLORS);
if (gc->bg >= 100 && gc->bg <= 107 && colours < 16) {
if (gc->bg >= 90 && gc->bg <= 97 && colours < 16) {
gc->bg -= 90;
gc->attr |= GRID_ATTR_BRIGHT;
}
@ -1500,14 +1500,14 @@ tty_colours_bg(struct tty *tty, const struct grid_cell *gc)
}
/* Is this an aixterm bright colour? */
if (bg >= 100 && bg <= 107) {
if (bg >= 90 && bg <= 97) {
/* 16 colour terminals or above only. */
if (tty_term_number(tty->term, TTYC_COLORS) >= 16) {
xsnprintf(s, sizeof s, "\033[%dm", bg);
xsnprintf(s, sizeof s, "\033[%dm", bg + 10);
tty_puts(tty, s);
goto save_bg;
}
bg -= 100;
bg -= 90;
/* no such thing as a bold background */
}