1
0
mirror of https://github.com/irssi/irssi.git synced 2024-06-30 06:45:25 +00:00

reset colour at comma, like mIRC

Fixes #742 and #740
This commit is contained in:
ailin-nemui 2017-11-15 16:33:06 +01:00
parent 4e8c1548e0
commit 3acc72f842

View File

@ -1072,7 +1072,8 @@ static void get_mirc_color(const char **str, int *fg_ret, int *bg_ret)
fg = fg_ret == NULL ? -1 : *fg_ret;
bg = bg_ret == NULL ? -1 : *bg_ret;
if (!i_isdigit(**str) && **str != ',') {
if (!i_isdigit(**str)) {
/* turn off color */
fg = -1;
bg = -1;
} else {
@ -1085,11 +1086,8 @@ static void get_mirc_color(const char **str, int *fg_ret, int *bg_ret)
(*str)++;
}
}
if (**str == ',') {
if ((*str)[0] == ',' && i_isdigit((*str)[1])) {
/* background color */
if (!i_isdigit((*str)[1]))
bg = -1;
else {
(*str)++;
bg = **str-'0';
(*str)++;
@ -1097,7 +1095,6 @@ static void get_mirc_color(const char **str, int *fg_ret, int *bg_ret)
bg = bg*10 + (**str-'0');
(*str)++;
}
}
}
}