mirror of
https://github.com/irssi/irssi.git
synced 2026-08-10 12:23:37 +02:00
%n+bg color change doesn't anymore set foreground black. changed theme's
default_bold_color to default_real_color. Activity list printed first item with white always. Color redrawed itself every second. git-svn-id: http://svn.irssi.org/repos/irssi/trunk@1381 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
parent
7ced2beab4
commit
1d453ed92c
4 changed files with 24 additions and 14 deletions
|
|
@ -282,16 +282,17 @@ static void get_colors(int flags, int *fg, int *bg)
|
|||
if (flags & PRINTFLAG_MIRC_COLOR) {
|
||||
/* mirc colors - real range is 0..15, but after 16
|
||||
colors wrap to 0, 1, ... */
|
||||
*fg = *fg < 0 ?
|
||||
current_theme->default_color : mirc_colors[*fg % 16];
|
||||
*bg = *bg < 0 ? 0 : mirc_colors[*bg % 16];
|
||||
if (*fg > 0) *fg = mirc_colors[*fg % 16];
|
||||
} else {
|
||||
/* default colors */
|
||||
*fg = *fg < 0 || *fg > 15 ?
|
||||
current_theme->default_color : *fg;
|
||||
*bg = *bg < 0 || *bg > 15 ? 0 : *bg;
|
||||
if (*fg > 8) *fg &= ~8;
|
||||
}
|
||||
|
||||
if (*fg > 8) *fg -= 8;
|
||||
if (*fg < 0 || *fg > 15) {
|
||||
*fg = *bg == 0 ? current_theme->default_color :
|
||||
current_theme->default_real_color;
|
||||
}
|
||||
|
||||
if (flags & PRINTFLAG_REVERSE) {
|
||||
|
|
@ -302,7 +303,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_bold_color;
|
||||
if (*fg == 0) *fg = current_theme->default_real_color;
|
||||
*fg |= 8;
|
||||
}
|
||||
if (flags & PRINTFLAG_UNDERLINE) *fg |= ATTR_UNDERLINE;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue