pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-07-01 15:26:37 +02:00
Code Activity

core: make color names and attributes case sensitive (issue #1872)

Browse Source
This commit is contained in:
Sébastien Helleu
2023-01-26 23:22:01 +01:00
parent 73c3c03915
commit 7a8ce6c9ae
2 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/curses/gui-curses-color.c
+1 -1
View File
@@ -125,7 +125,7 @@ gui_color_search (const char *color_name)
for (i = 0; gui_weechat_colors[i].string; i++)
{
if (string_strcasecmp (gui_weechat_colors[i].string, color_name) == 0)
if (string_strcmp (gui_weechat_colors[i].string, color_name) == 0)
return i;
}
src/gui/gui-color.c
+18 -18
View File
@@ -276,111 +276,111 @@ gui_color_get_custom (const char *color_name)
ptr_color_name - color_name);
}
if (string_strcasecmp (ptr_color_name, "reset") == 0)
if (string_strcmp (ptr_color_name, "reset") == 0)
{
snprintf (color[index_color], sizeof (color[index_color]),
"%c",
GUI_COLOR_RESET_CHAR);
}
else if (string_strcasecmp (ptr_color_name, "resetcolor") == 0)
else if (string_strcmp (ptr_color_name, "resetcolor") == 0)
{
snprintf (color[index_color], sizeof (color[index_color]),
"%c%c",
GUI_COLOR_COLOR_CHAR,
GUI_COLOR_RESET_CHAR);
}
else if (string_strcasecmp (ptr_color_name, "emphasis") == 0)
else if (string_strcmp (ptr_color_name, "emphasis") == 0)
{
snprintf (color[index_color], sizeof (color[index_color]),
"%c%c",
GUI_COLOR_COLOR_CHAR,
GUI_COLOR_EMPHASIS_CHAR);
}
else if (string_strcasecmp (ptr_color_name, "blink") == 0)
else if (string_strcmp (ptr_color_name, "blink") == 0)
{
snprintf (color[index_color], sizeof (color[index_color]),
"%c%c",
GUI_COLOR_SET_ATTR_CHAR,
GUI_COLOR_ATTR_BLINK_CHAR);
}
else if (string_strcasecmp (ptr_color_name, "-blink") == 0)
else if (string_strcmp (ptr_color_name, "-blink") == 0)
{
snprintf (color[index_color], sizeof (color[index_color]),
"%c%c",
GUI_COLOR_REMOVE_ATTR_CHAR,
GUI_COLOR_ATTR_BLINK_CHAR);
}
else if (string_strcasecmp (ptr_color_name, "dim") == 0)
else if (string_strcmp (ptr_color_name, "dim") == 0)
{
snprintf (color[index_color], sizeof (color[index_color]),
"%c%c",
GUI_COLOR_SET_ATTR_CHAR,
GUI_COLOR_ATTR_DIM_CHAR);
}
else if (string_strcasecmp (ptr_color_name, "-dim") == 0)
else if (string_strcmp (ptr_color_name, "-dim") == 0)
{
snprintf (color[index_color], sizeof (color[index_color]),
"%c%c",
GUI_COLOR_REMOVE_ATTR_CHAR,
GUI_COLOR_ATTR_DIM_CHAR);
}
else if (string_strcasecmp (ptr_color_name, "bold") == 0)
else if (string_strcmp (ptr_color_name, "bold") == 0)
{
snprintf (color[index_color], sizeof (color[index_color]),
"%c%c",
GUI_COLOR_SET_ATTR_CHAR,
GUI_COLOR_ATTR_BOLD_CHAR);
}
else if (string_strcasecmp (ptr_color_name, "-bold") == 0)
else if (string_strcmp (ptr_color_name, "-bold") == 0)
{
snprintf (color[index_color], sizeof (color[index_color]),
"%c%c",
GUI_COLOR_REMOVE_ATTR_CHAR,
GUI_COLOR_ATTR_BOLD_CHAR);
}
else if (string_strcasecmp (ptr_color_name, "reverse") == 0)
else if (string_strcmp (ptr_color_name, "reverse") == 0)
{
snprintf (color[index_color], sizeof (color[index_color]),
"%c%c",
GUI_COLOR_SET_ATTR_CHAR,
GUI_COLOR_ATTR_REVERSE_CHAR);
}
else if (string_strcasecmp (ptr_color_name, "-reverse") == 0)
else if (string_strcmp (ptr_color_name, "-reverse") == 0)
{
snprintf (color[index_color], sizeof (color[index_color]),
"%c%c",
GUI_COLOR_REMOVE_ATTR_CHAR,
GUI_COLOR_ATTR_REVERSE_CHAR);
}
else if (string_strcasecmp (ptr_color_name, "italic") == 0)
else if (string_strcmp (ptr_color_name, "italic") == 0)
{
snprintf (color[index_color], sizeof (color[index_color]),
"%c%c",
GUI_COLOR_SET_ATTR_CHAR,
GUI_COLOR_ATTR_ITALIC_CHAR);
}
else if (string_strcasecmp (ptr_color_name, "-italic") == 0)
else if (string_strcmp (ptr_color_name, "-italic") == 0)
{
snprintf (color[index_color], sizeof (color[index_color]),
"%c%c",
GUI_COLOR_REMOVE_ATTR_CHAR,
GUI_COLOR_ATTR_ITALIC_CHAR);
}
else if (string_strcasecmp (ptr_color_name, "underline") == 0)
else if (string_strcmp (ptr_color_name, "underline") == 0)
{
snprintf (color[index_color], sizeof (color[index_color]),
"%c%c",
GUI_COLOR_SET_ATTR_CHAR,
GUI_COLOR_ATTR_UNDERLINE_CHAR);
}
else if (string_strcasecmp (ptr_color_name, "-underline") == 0)
else if (string_strcmp (ptr_color_name, "-underline") == 0)
{
snprintf (color[index_color], sizeof (color[index_color]),
"%c%c",
GUI_COLOR_REMOVE_ATTR_CHAR,
GUI_COLOR_ATTR_UNDERLINE_CHAR);
}
else if (string_strcasecmp (ptr_color_name, "bar_fg") == 0)
else if (string_strcmp (ptr_color_name, "bar_fg") == 0)
{
snprintf (color[index_color], sizeof (color[index_color]),
"%c%c%c",
@@ -388,7 +388,7 @@ gui_color_get_custom (const char *color_name)
GUI_COLOR_BAR_CHAR,
GUI_COLOR_BAR_FG_CHAR);
}
else if (string_strcasecmp (ptr_color_name, "bar_delim") == 0)
else if (string_strcmp (ptr_color_name, "bar_delim") == 0)
{
snprintf (color[index_color], sizeof (color[index_color]),
"%c%c%c",
@@ -396,7 +396,7 @@ gui_color_get_custom (const char *color_name)
GUI_COLOR_BAR_CHAR,
GUI_COLOR_BAR_DELIM_CHAR);
}
else if (string_strcasecmp (ptr_color_name, "bar_bg") == 0)
else if (string_strcmp (ptr_color_name, "bar_bg") == 0)
{
snprintf (color[index_color], sizeof (color[index_color]),
"%c%c%c",