From 1a0b9427e0b27bd9f1a63a4f4eda24e1f3c93a48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Helleu?= Date: Sat, 11 May 2024 13:51:35 +0200 Subject: core: fix conversion of WeeChat bar colors to ANSI colors --- src/gui/gui-color.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'src') diff --git a/src/gui/gui-color.c b/src/gui/gui-color.c index c895d5e7c..8823bde65 100644 --- a/src/gui/gui-color.c +++ b/src/gui/gui-color.c @@ -1544,8 +1544,41 @@ gui_color_encode_ansi (const char *string) switch (ptr_string[0]) { case GUI_COLOR_BAR_FG_CHAR: + snprintf (str_concat, sizeof (str_concat), + "\x1B[%dm", + GUI_COLOR_ANSI_DEFAULT_FG); + string_dyn_concat (out, str_concat, -1); + ptr_string++; + break; case GUI_COLOR_BAR_BG_CHAR: + snprintf (str_concat, sizeof (str_concat), + "\x1B[%dm", + GUI_COLOR_ANSI_DEFAULT_BG); + string_dyn_concat (out, str_concat, -1); + ptr_string++; + break; case GUI_COLOR_BAR_DELIM_CHAR: + color = CONFIG_COLOR(config_color_chat_delimiters); + if (color & GUI_COLOR_EXTENDED_FLAG) + { + snprintf (str_concat, sizeof (str_concat), + "\x1B[48;5;%dm", + color & GUI_COLOR_EXTENDED_MASK); + } + else + { + ansi_color = gui_color_weechat_to_ansi ( + CONFIG_COLOR(config_color_chat_delimiters)); + snprintf (str_concat, sizeof (str_concat), + "\x1B[%dm", + (ansi_color < 0) ? + GUI_COLOR_ANSI_DEFAULT_FG : + ((ansi_color < 8) ? + ansi_color + 40 : ansi_color - 8 + 100)); + } + string_dyn_concat (out, str_concat, -1); + ptr_string++; + break; case GUI_COLOR_BAR_START_INPUT_CHAR: case GUI_COLOR_BAR_START_INPUT_HIDDEN_CHAR: case GUI_COLOR_BAR_MOVE_CURSOR_CHAR: -- cgit debian/1.2.3+git2.25.1-1-2-gaceb0