diff options
| author | Timo Sirainen <cras@irssi.org> | 2001-02-10 10:19:47 +0000 |
|---|---|---|
| committer | cras <cras@dbcabf3a-b0e7-0310-adc4-f8d773084564> | 2001-02-10 10:19:47 +0000 |
| commit | 355e7dd84128a2d247a1021b2dbd9e9bbed0e7f3 (patch) | |
| tree | ef57e77851b5e944970710276c626a2d2e528a5b /src/fe-text | |
| parent | 98a73539aebf81a5c373ef869ae5af9cb5c857b6 (diff) | |
| download | irssi-355e7dd84128a2d247a1021b2dbd9e9bbed0e7f3.zip | |
theme->default_color is now used again, added default_bold_color which
is used with default bolds since A_NORMAL|A_BOLD doesn't seem to do
anything with curses..
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@1206 dbcabf3a-b0e7-0310-adc4-f8d773084564
Diffstat (limited to 'src/fe-text')
| -rw-r--r-- | src/fe-text/gui-printtext.c | 6 | ||||
| -rw-r--r-- | src/fe-text/screen.c | 11 |
2 files changed, 9 insertions, 8 deletions
diff --git a/src/fe-text/gui-printtext.c b/src/fe-text/gui-printtext.c index ea1b64f2..89359208 100644 --- a/src/fe-text/gui-printtext.c +++ b/src/fe-text/gui-printtext.c @@ -266,12 +266,12 @@ static void get_colors(int flags, int *fg, int *bg) /* mirc colors - real range is 0..15, but after 16 colors wrap to 0, 1, ... */ *fg = *fg < 0 ? - /*current_theme->default_color*/0 : mirc_colors[*fg % 16]; + current_theme->default_color : mirc_colors[*fg % 16]; *bg = *bg < 0 ? 0 : mirc_colors[*bg % 16]; } else { /* default colors */ *fg = *fg < 0 || *fg > 15 ? - /*current_theme->default_color*/0 : *fg; + current_theme->default_color : *fg; *bg = *bg < 0 || *bg > 15 ? 0 : *bg; if (*fg > 8) *fg -= 8; @@ -285,7 +285,7 @@ static void get_colors(int flags, int *fg, int *bg) if (*fg == 8) *fg |= ATTR_COLOR8; if (flags & PRINTFLAG_BOLD) { - if (*fg == 0) *fg = current_theme->default_color; + if (*fg == 0) *fg = current_theme->default_bold_color; *fg |= 8; } if (flags & PRINTFLAG_UNDERLINE) *fg |= ATTR_UNDERLINE; diff --git a/src/fe-text/screen.c b/src/fe-text/screen.c index d38ab88f..65f30bf9 100644 --- a/src/fe-text/screen.c +++ b/src/fe-text/screen.c @@ -213,11 +213,12 @@ void set_color(WINDOW *window, int col) if (!use_colors) attr = (col & 0x70) ? A_REVERSE : 0; - else { - attr = (col & ATTR_COLOR8) ? - (A_DIM | COLOR_PAIR(63)) : - (COLOR_PAIR((col&7) + (col&0x70)/2)); - } + else if (col & ATTR_COLOR8) + attr = (A_DIM | COLOR_PAIR(63)); + else if ((col & 0x77) == 0) + attr = A_NORMAL; + else + attr = (COLOR_PAIR((col&7) + (col&0x70)/2)); if (col & 0x08) attr |= A_BOLD; if (col & 0x80) attr |= A_BLINK; |