aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-10-27 05:20:20 -04:00
Code

fix colour 0 again

Browse Source 
the previous commit was broken, as it conflicted with the colour
\#000000. Now both the "real colour black" and the "terminal colour 0"
are working.
This commit is contained in:
Ailin Nemui 2014-07-24 00:09:48 +02:00
parent 41fab0707f
commit 1cf7017ac9
1 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/fe-text/term-terminfo.c
View File

@ -324,6 +324,7 @@ static int termctl_set_color_24bit(int bg, unsigned int lc)
} }
#define COLOR_RESET UINT_MAX #define COLOR_RESET UINT_MAX
#define COLOR_BLACK24 COLOR_RESET - 1
/* Change active color */ /* Change active color */
#ifdef TERM_TRUECOLOR #ifdef TERM_TRUECOLOR
@ -334,17 +335,26 @@ void term_set_color(TERM_WINDOW *window, int col)
{ {
int set_normal; int set_normal;
unsigned int fg = unsigned int fg, bg;
#ifdef TERM_TRUECOLOR #ifdef TERM_TRUECOLOR
(col & ATTR_FGCOLOR24) ? fgcol24 << 8 : if (col & ATTR_FGCOLOR24) {
if (fgcol24)
fg = fgcol24 << 8;
else
fg = COLOR_BLACK24;
} else
#endif #endif
(col & FG_MASK); fg = (col & FG_MASK);
unsigned int bg =
#ifdef TERM_TRUECOLOR #ifdef TERM_TRUECOLOR
(col & ATTR_BGCOLOR24) ? bgcol24 << 8 : if (col & ATTR_BGCOLOR24) {
if (bgcol24)
bg = bgcol24 << 8;
else
bg = COLOR_BLACK24;
} else
#endif #endif
((col & BG_MASK) >> BG_SHIFT); bg = ((col & BG_MASK) >> BG_SHIFT);
if (!term_use_colors && bg > 0) if (!term_use_colors && bg > 0)
col |= ATTR_REVERSE; col |= ATTR_REVERSE;
@ -370,8 +380,10 @@ void term_set_color(TERM_WINDOW *window, int col)
(fg != 0 || (col & ATTR_RESETFG) == 0)) { (fg != 0 || (col & ATTR_RESETFG) == 0)) {
if (term_use_colors) { if (term_use_colors) {
last_fg = fg; last_fg = fg;
if (fg && !(fg & 0xff)) if (fg >> 8)
termctl_set_color_24bit(0, last_fg >> 8); termctl_set_color_24bit(0,
last_fg == COLOR_BLACK24 ? 0
: last_fg >> 8);
else else
terminfo_set_fg(last_fg); terminfo_set_fg(last_fg);
} }
@ -387,8 +399,10 @@ void term_set_color(TERM_WINDOW *window, int col)
(bg != 0 || (col & ATTR_RESETBG) == 0)) { (bg != 0 || (col & ATTR_RESETBG) == 0)) {
if (term_use_colors) { if (term_use_colors) {
last_bg = bg; last_bg = bg;
if (bg && !(bg & 0xff)) if (bg >> 8)
termctl_set_color_24bit(1, last_bg >> 8); termctl_set_color_24bit(1,
last_bg == COLOR_BLACK24 ? 0
: last_bg >> 8);
else else
terminfo_set_bg(last_bg); terminfo_set_bg(last_bg);
} }