mirror of
https://github.com/irssi/irssi.git
synced 2026-08-09 03:40:16 +02:00
Handle bold/blink attributes like other attributes rather than mapping them to
the eighth bit of the color. The formats KBGCRMYW and the mirc colors are now mapped to colors 8-15. fe-text translates colors 8-15 to bold/blink+0-7 if the terminal supports only 8 colors. git-svn-id: file:///var/www/svn.irssi.org/SVN/irssi/trunk@4909 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
parent
efe2bad590
commit
621761cff3
7 changed files with 45 additions and 62 deletions
|
|
@ -104,8 +104,8 @@ static void textbuffer_cache_unref(TEXT_BUFFER_CACHE_REC *cache)
|
|||
textbuffer_cache_destroy(cache);
|
||||
}
|
||||
|
||||
#define FGATTR (ATTR_NOCOLORS | ATTR_RESETFG | ATTR_BOLD | 0x0f)
|
||||
#define BGATTR (ATTR_NOCOLORS | ATTR_RESETBG | ATTR_BLINK | 0xf0)
|
||||
#define FGATTR (ATTR_NOCOLORS | ATTR_RESETFG | 0x0f)
|
||||
#define BGATTR (ATTR_NOCOLORS | ATTR_RESETBG | 0xf0)
|
||||
|
||||
static void update_cmd_color(unsigned char cmd, int *color)
|
||||
{
|
||||
|
|
@ -117,8 +117,6 @@ static void update_cmd_color(unsigned char cmd, int *color)
|
|||
*color |= (cmd & 0x0f) << 4;
|
||||
else {
|
||||
*color = (*color & FGATTR) | ATTR_RESETBG;
|
||||
if (cmd & LINE_COLOR_BLINK)
|
||||
*color |= ATTR_BLINK;
|
||||
}
|
||||
} else {
|
||||
/* set foreground color */
|
||||
|
|
@ -127,8 +125,6 @@ static void update_cmd_color(unsigned char cmd, int *color)
|
|||
*color |= cmd & 0x0f;
|
||||
else {
|
||||
*color = (*color & BGATTR) | ATTR_RESETFG;
|
||||
if (cmd & LINE_COLOR_BOLD)
|
||||
*color |= ATTR_BOLD;
|
||||
}
|
||||
}
|
||||
} else switch (cmd) {
|
||||
|
|
@ -138,6 +134,12 @@ static void update_cmd_color(unsigned char cmd, int *color)
|
|||
case LINE_CMD_REVERSE:
|
||||
*color ^= ATTR_REVERSE;
|
||||
break;
|
||||
case LINE_CMD_BLINK:
|
||||
*color ^= ATTR_BLINK;
|
||||
break;
|
||||
case LINE_CMD_BOLD:
|
||||
*color ^= ATTR_BOLD;
|
||||
break;
|
||||
case LINE_CMD_COLOR0:
|
||||
*color &= BGATTR;
|
||||
break;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue