ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tweaks: simplify the parsing of color combinations

master
Benno Schulenberg 2017-07-06 09:35:01 +02:00
parent 23f5515fbb
commit 9462ba8217
1 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/rcfile.c
View File

@ -782,33 +782,22 @@ void parse_colors(char *ptr, int rex_flags)
/* Parse the color name, or pair of color names, in combostr. */ /* Parse the color name, or pair of color names, in combostr. */
bool parse_color_names(char *combostr, short *fg, short *bg, bool *bright) bool parse_color_names(char *combostr, short *fg, short *bg, bool *bright)
{ {
bool no_fgcolor = FALSE; char *comma = strchr(combostr, ',');
if (combostr == NULL) if (comma != NULL) {
return FALSE; *comma = '\0';
if (strncasecmp(comma + 1, "bright", 6) == 0) {
if (strchr(combostr, ',') != NULL) { rcfile_error(N_("A background color cannot be bright"));
char *bgcolorname;
strtok(combostr, ",");
bgcolorname = strtok(NULL, ",");
if (bgcolorname == NULL) {
/* If we have a background color without a foreground color,
* parse it properly. */
bgcolorname = combostr + 1;
no_fgcolor = TRUE;
}
if (strncasecmp(bgcolorname, "bright", 6) == 0) {
rcfile_error(N_("Background color \"%s\" cannot be bright"), bgcolorname);
return FALSE; return FALSE;
} }
*bg = color_to_short(bgcolorname, bright); *bg = color_to_short(comma + 1, bright);
} else } else
*bg = -1; *bg = -1;
if (!no_fgcolor) { if (comma != combostr) {
*fg = color_to_short(combostr, bright); *fg = color_to_short(combostr, bright);
/* Don't try to parse screwed-up foreground colors. */ /* If the specified foreground color is bad, ignore the regexes. */
if (*fg == -1) if (*fg == -1)
return FALSE; return FALSE;
} else } else