diff options
| author | Lukas Mai <l.mai@web.de> | 2011-11-06 20:40:25 +0100 |
|---|---|---|
| committer | Ailin Nemui <ailin@esf51.localdomain> | 2014-07-07 00:32:07 +0200 |
| commit | 0e294d5c2e4d4dd686378f2050abc9a9f2fae199 (patch) | |
| tree | 5c39edb7d60860ec430953553c277da83d666373 /src/fe-text/term-terminfo.c | |
| parent | fc00b9e6f07379f09ea13fa42d9feed377d2d762 (diff) | |
| download | irssi-0e294d5c2e4d4dd686378f2050abc9a9f2fae199.zip | |
add italics support; don't use standout for reverse
Diffstat (limited to 'src/fe-text/term-terminfo.c')
| -rw-r--r-- | src/fe-text/term-terminfo.c | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/src/fe-text/term-terminfo.c b/src/fe-text/term-terminfo.c index 9c718aad..a0b257c4 100644 --- a/src/fe-text/term-terminfo.c +++ b/src/fe-text/term-terminfo.c @@ -346,12 +346,16 @@ void term_set_color(TERM_WINDOW *window, int col) #endif ((col & BG_MASK) >> BG_SHIFT); + if (!term_use_colors && bg > 0) + col |= ATTR_REVERSE; + set_normal = ((col & ATTR_RESETFG) && last_fg != COLOR_RESET) || ((col & ATTR_RESETBG) && last_bg != COLOR_RESET); if (((last_attrs & ATTR_BOLD) && (col & ATTR_BOLD) == 0) || + ((last_attrs & ATTR_REVERSE) && (col & ATTR_REVERSE) == 0) || ((last_attrs & ATTR_BLINK) && (col & ATTR_BLINK) == 0)) { - /* we'll need to get rid of bold/blink - this can only be - done with setting the default color */ + /* we'll need to get rid of bold/blink/reverse - this + can only be done with setting the default color */ set_normal = TRUE; } @@ -361,16 +365,6 @@ void term_set_color(TERM_WINDOW *window, int col) terminfo_set_normal(); } - if (!term_use_colors && bg > 0) - col |= ATTR_REVERSE; - - /* reversed text (use standout) */ - if (col & ATTR_REVERSE) { - if ((last_attrs & ATTR_REVERSE) == 0) - terminfo_set_standout(TRUE); - } else if (last_attrs & ATTR_REVERSE) - terminfo_set_standout(FALSE); - /* set foreground color */ if (fg != last_fg && (fg != 0 || (col & ATTR_RESETFG) == 0)) { @@ -400,6 +394,10 @@ void term_set_color(TERM_WINDOW *window, int col) } } + /* reversed text */ + if (col & ATTR_REVERSE) + terminfo_set_reverse(); + /* bold */ if (window && (term_color256map[fg&0xff]&8) == window->term->TI_colors) col |= ATTR_BOLD; @@ -413,6 +411,13 @@ void term_set_color(TERM_WINDOW *window, int col) } else if (last_attrs & ATTR_UNDERLINE) terminfo_set_uline(FALSE); + /* italic */ + if (col & ATTR_ITALIC) { + if ((last_attrs & ATTR_ITALIC) == 0) + terminfo_set_italic(TRUE); + } else if (last_attrs & ATTR_ITALIC) + terminfo_set_italic(FALSE); + /* update the new attribute settings whilst ignoring color values. */ last_attrs = col & ~( BG_MASK | FG_MASK ); } @@ -516,7 +521,7 @@ void term_clrtoeol(TERM_WINDOW *window) { /* clrtoeol() doesn't necessarily understand colors */ if (last_fg == -1 && last_bg == -1 && - (last_attrs & (ATTR_UNDERLINE|ATTR_REVERSE)) == 0) { + (last_attrs & (ATTR_UNDERLINE|ATTR_REVERSE|ATTR_ITALIC)) == 0) { if (!term_lines_empty[vcy]) { if (vcmove) term_move_real(); terminfo_clrtoeol(); |