summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/curses/gui-curses-bar-window.c14
-rw-r--r--src/gui/curses/gui-curses-color.c293
-rw-r--r--src/gui/curses/gui-curses-window.c50
-rw-r--r--src/gui/gtk/gui-gtk-color.c66
-rw-r--r--src/gui/gui-bar-item.c42
-rw-r--r--src/gui/gui-color.c276
-rw-r--r--src/gui/gui-color.h28
7 files changed, 662 insertions, 107 deletions
diff --git a/src/gui/curses/gui-curses-bar-window.c b/src/gui/curses/gui-curses-bar-window.c
index fe1c617b9..af89feb4e 100644
--- a/src/gui/curses/gui-curses-bar-window.c
+++ b/src/gui/curses/gui-curses-bar-window.c
@@ -248,19 +248,19 @@ gui_bar_window_print_string (struct t_gui_bar_window *bar_window,
case GUI_COLOR_BAR_FG_CHAR:
/* bar foreground */
gui_window_set_custom_color_fg (GUI_BAR_WINDOW_OBJECTS(bar_window)->win_bar,
- CONFIG_INTEGER(bar_window->bar->options[GUI_BAR_OPTION_COLOR_FG]));
+ CONFIG_COLOR(bar_window->bar->options[GUI_BAR_OPTION_COLOR_FG]));
string += 2;
break;
case GUI_COLOR_BAR_DELIM_CHAR:
/* bar delimiter */
gui_window_set_custom_color_fg (GUI_BAR_WINDOW_OBJECTS(bar_window)->win_bar,
- CONFIG_INTEGER(bar_window->bar->options[GUI_BAR_OPTION_COLOR_DELIM]));
+ CONFIG_COLOR(bar_window->bar->options[GUI_BAR_OPTION_COLOR_DELIM]));
string += 2;
break;
case GUI_COLOR_BAR_BG_CHAR:
/* bar background */
gui_window_set_custom_color_bg (GUI_BAR_WINDOW_OBJECTS(bar_window)->win_bar,
- CONFIG_INTEGER(bar_window->bar->options[GUI_BAR_OPTION_COLOR_BG]));
+ CONFIG_COLOR(bar_window->bar->options[GUI_BAR_OPTION_COLOR_BG]));
string += 2;
break;
case GUI_COLOR_BAR_START_INPUT_CHAR:
@@ -301,9 +301,9 @@ gui_bar_window_print_string (struct t_gui_bar_window *bar_window,
break;
case GUI_COLOR_RESET_CHAR:
gui_window_set_custom_color_fg (GUI_BAR_WINDOW_OBJECTS(bar_window)->win_bar,
- CONFIG_INTEGER(bar_window->bar->options[GUI_BAR_OPTION_COLOR_FG]));
+ CONFIG_COLOR(bar_window->bar->options[GUI_BAR_OPTION_COLOR_FG]));
gui_window_set_custom_color_bg (GUI_BAR_WINDOW_OBJECTS(bar_window)->win_bar,
- CONFIG_INTEGER(bar_window->bar->options[GUI_BAR_OPTION_COLOR_BG]));
+ CONFIG_COLOR(bar_window->bar->options[GUI_BAR_OPTION_COLOR_BG]));
gui_window_remove_color_style (GUI_BAR_WINDOW_OBJECTS(bar_window)->win_bar,
A_BOLD | A_UNDERLINE | A_REVERSE);
string++;
@@ -672,7 +672,7 @@ gui_bar_window_draw (struct t_gui_bar_window *bar_window,
y = 0;
gui_window_set_custom_color_fg_bg (GUI_BAR_WINDOW_OBJECTS(bar_window)->win_bar,
CONFIG_COLOR(config_color_bar_more),
- CONFIG_INTEGER(bar_window->bar->options[GUI_BAR_OPTION_COLOR_BG]));
+ CONFIG_COLOR(bar_window->bar->options[GUI_BAR_OPTION_COLOR_BG]));
mvwprintw (GUI_BAR_WINDOW_OBJECTS(bar_window)->win_bar,
y, x, "--");
}
@@ -685,7 +685,7 @@ gui_bar_window_draw (struct t_gui_bar_window *bar_window,
y = (bar_window->height > 1) ? bar_window->height - 1 : 0;
gui_window_set_custom_color_fg_bg (GUI_BAR_WINDOW_OBJECTS(bar_window)->win_bar,
CONFIG_COLOR(config_color_bar_more),
- CONFIG_INTEGER(bar_window->bar->options[GUI_BAR_OPTION_COLOR_BG]));
+ CONFIG_COLOR(bar_window->bar->options[GUI_BAR_OPTION_COLOR_BG]));
mvwprintw (GUI_BAR_WINDOW_OBJECTS(bar_window)->win_bar,
y, x, "++");
}
diff --git a/src/gui/curses/gui-curses-color.c b/src/gui/curses/gui-curses-color.c
index 5508ac832..fd66f6816 100644
--- a/src/gui/curses/gui-curses-color.c
+++ b/src/gui/curses/gui-curses-color.c
@@ -31,8 +31,11 @@
#include "../../core/weechat.h"
#include "../../core/wee-config.h"
+#include "../../core/wee-hashtable.h"
+#include "../../core/wee-list.h"
#include "../../core/wee-string.h"
#include "../../core/wee-utf8.h"
+#include "../../plugins/plugin.h"
#include "../gui-color.h"
#include "../gui-chat.h"
#include "gui-curses.h"
@@ -84,6 +87,7 @@ gui_color_search (const char *color_name)
/*
* gui_color_assign: assign a WeeChat color (read from config)
+ * return 1 if ok, 0 if error
*/
int
@@ -92,15 +96,26 @@ gui_color_assign (int *color, const char *color_name)
int color_index, pair;
char *error;
+ /* search for color alias */
+ pair = gui_color_palette_get_alias (color_name);
+ if (pair >= 0)
+ {
+ *color = GUI_COLOR_PAIR_FLAG | pair;
+ return 1;
+ }
+
+ /* is it pair number? */
error = NULL;
pair = (int)strtol (color_name, &error, 10);
if (error && !error[0] && (pair >= 0))
{
- *color = 0x10000 | pair;
+ /* color_name is a number, use this pair number */
+ *color = GUI_COLOR_PAIR_FLAG | pair;
return 1;
}
else
{
+ /* search for basic WeeChat color */
color_index = gui_color_search (color_name);
if (color_index >= 0)
{
@@ -114,6 +129,57 @@ gui_color_assign (int *color, const char *color_name)
}
/*
+ * gui_color_assign_by_diff: assign color by difference
+ * It is called when a color option is
+ * set with value ++X or --X, to search
+ * another color (for example ++1 is
+ * next color/alias in list)
+ * return 1 if ok, 0 if error
+ */
+
+int
+gui_color_assign_by_diff (int *color, const char *color_name, int diff)
+{
+ int index, list_size;
+ struct t_weelist_item *ptr_item;
+ const char *name;
+
+ index = weelist_search_pos (gui_color_list_with_alias, color_name);
+ if (index < 0)
+ index = 0;
+
+ list_size = weelist_size (gui_color_list_with_alias);
+
+ diff = diff % (list_size + 1);
+
+ if (diff > 0)
+ {
+ index = (index + diff) % (list_size + 1);
+ while (index > list_size - 1)
+ {
+ index -= list_size;
+ }
+ }
+ else
+ {
+ index = (index + list_size + diff) % list_size;
+ while (index < 0)
+ {
+ index += list_size;
+ }
+ }
+
+ ptr_item = weelist_get (gui_color_list_with_alias, index);
+ if (!ptr_item)
+ return 0;
+ name = weelist_string (ptr_item);
+ if (name)
+ return gui_color_assign (color, name);
+
+ return 0;
+}
+
+/*
* gui_color_get_number: get number of available colors
*/
@@ -132,13 +198,17 @@ gui_color_get_name (int num_color)
{
static char color[32][16];
static int index_color = 0;
+ struct t_gui_color_palette *ptr_color_palette;
- if (num_color & 0x10000)
+ if (num_color & GUI_COLOR_PAIR_FLAG)
{
+ ptr_color_palette = gui_color_palette_get (num_color & GUI_COLOR_PAIR_MASK);
+ if (ptr_color_palette && ptr_color_palette->alias)
+ return ptr_color_palette->alias;
index_color = (index_color + 1) % 32;
color[index_color][0] = '\0';
snprintf (color[index_color], sizeof (color[index_color]),
- "%d", num_color & 0xFFFF);
+ "%d", num_color & GUI_COLOR_PAIR_MASK);
return color[index_color];
}
@@ -163,7 +233,7 @@ gui_color_build (int number, int foreground, int background)
gui_color[number]->string = malloc (4);
}
- if (foreground & 0x10000)
+ if (foreground & GUI_COLOR_PAIR_FLAG)
{
gui_color[number]->foreground = foreground;
gui_color[number]->background = 0;
@@ -171,7 +241,7 @@ gui_color_build (int number, int foreground, int background)
}
else
{
- if (background & 0x10000)
+ if (background & GUI_COLOR_PAIR_FLAG)
background = 0;
gui_color[number]->foreground = gui_weechat_colors[foreground].foreground;
gui_color[number]->background = gui_weechat_colors[background].foreground;
@@ -200,6 +270,9 @@ gui_color_get_pair (int num_color)
fg = gui_color[num_color]->foreground;
bg = gui_color[num_color]->background;
+ if ((fg > 0) && (fg & GUI_COLOR_PAIR_FLAG))
+ return fg & GUI_COLOR_PAIR_MASK;
+
if (((fg == -1) || (fg == 99))
&& ((bg == -1) || (bg == 99)))
return gui_color_last_pair;
@@ -212,13 +285,42 @@ gui_color_get_pair (int num_color)
}
/*
+ * gui_color_init_pair: init a color pair
+ */
+
+void
+gui_color_init_pair (int number)
+{
+ struct t_gui_color_palette *ptr_color_palette;
+ int fg, bg;
+
+ if ((number >= 1) && (number <= COLOR_PAIRS - 1))
+ {
+ ptr_color_palette = gui_color_palette_get (number);
+ if (ptr_color_palette)
+ {
+ init_pair (number,
+ ptr_color_palette->foreground,
+ ptr_color_palette->background);
+ }
+ else
+ {
+ fg = (number - 1) % gui_color_num_bg;
+ bg = ((number - 1) < gui_color_num_bg) ? -1 : (number - 1) / gui_color_num_bg;
+ init_pair (number, fg, bg);
+ }
+ }
+}
+
+/*
* gui_color_init_pairs: init color pairs
*/
void
gui_color_init_pairs ()
{
- int i, fg, bg, num_colors;
+ int i, num_colors;
+ struct t_gui_color_palette *ptr_color_palette;
/*
* depending on terminal and $TERM value, we can have for example:
@@ -235,23 +337,29 @@ gui_color_init_pairs ()
{
gui_color_num_bg = (COLOR_PAIRS >= 256) ? 16 : 8;
num_colors = (COLOR_PAIRS >= 256) ? 256 : COLOR_PAIRS;
+ gui_color_last_pair = num_colors - 1;
+
+ /* WeeChat pairs */
for (i = 1; i < num_colors; i++)
{
- fg = (i - 1) % gui_color_num_bg;
- bg = ((i - 1) < gui_color_num_bg) ? -1 : (i - 1) / gui_color_num_bg;
- init_pair (i, fg, bg);
+ gui_color_init_pair (i);
}
- gui_color_last_pair = num_colors - 1;
/* disable white on white, replaced by black on white */
- init_pair (gui_color_last_pair, -1, -1);
+ ptr_color_palette = gui_color_palette_get (gui_color_last_pair);
+ if (!ptr_color_palette)
+ init_pair (gui_color_last_pair, -1, -1);
/*
* white on default bg is default (-1) (for terminals with white/light
* background)
*/
if (!CONFIG_BOOLEAN(config_look_color_real_white))
- init_pair (COLOR_WHITE + 1, -1, -1);
+ {
+ ptr_color_palette = gui_color_palette_get (COLOR_WHITE);
+ if (!ptr_color_palette)
+ init_pair (COLOR_WHITE + 1, -1, -1);
+ }
}
}
@@ -396,6 +504,167 @@ gui_color_display_terminal_colors ()
}
/*
+ * gui_color_palette_add_alias_cb: add an alias in hashtable with aliases
+ */
+
+void
+gui_color_palette_add_alias_cb (void *data,
+ struct t_hashtable *hashtable,
+ const void *key, const void *value)
+{
+ struct t_gui_color_palette *color_palette;
+ char *error;
+ int number;
+
+ /* make C compiler happy */
+ (void) data;
+ (void) hashtable;
+
+ color_palette = (struct t_gui_color_palette *)value;
+
+ if (color_palette && color_palette->alias)
+ {
+ error = NULL;
+ number = (int)strtol ((char *)key, &error, 10);
+ if (error && !error[0])
+ {
+ hashtable_set (gui_color_hash_palette_alias,
+ color_palette->alias,
+ &number);
+ }
+ weelist_add (gui_color_list_with_alias, color_palette->alias,
+ WEECHAT_LIST_POS_END, NULL);
+ }
+}
+
+/*
+ * gui_color_palette_build_aliases: build aliases for palette
+ */
+
+void
+gui_color_palette_build_aliases ()
+{
+ int i;
+
+ hashtable_remove_all (gui_color_hash_palette_alias);
+ weelist_remove_all (gui_color_list_with_alias);
+ for (i = 0; i < GUI_CURSES_NUM_WEECHAT_COLORS; i++)
+ {
+ weelist_add (gui_color_list_with_alias,
+ gui_weechat_colors[i].string,
+ WEECHAT_LIST_POS_END,
+ NULL);
+ }
+ hashtable_map (gui_color_hash_palette_color,
+ &gui_color_palette_add_alias_cb, NULL);
+}
+
+/*
+ * gui_color_palette_new: create a new color in palette
+ */
+
+struct t_gui_color_palette *
+gui_color_palette_new (int number, const char *value)
+{
+ struct t_gui_color_palette *new_color_palette;
+ char **items, *pos, *pos2, *error1, *error2, *error3, str_number[64];
+ int num_items, fg, bg, r, g, b;
+
+ if (!value)
+ return NULL;
+
+ new_color_palette = malloc (sizeof (*new_color_palette));
+ if (new_color_palette)
+ {
+ new_color_palette->alias = NULL;
+ new_color_palette->foreground = number;
+ new_color_palette->background = -1;
+ new_color_palette->r = -1;
+ new_color_palette->g = -1;
+ new_color_palette->b = -1;
+ items = string_split (value, ";", 0, 0, &num_items);
+ if (items)
+ {
+ if ((num_items >= 1) && items[0][0])
+ {
+ new_color_palette->alias = strdup (items[0]);
+ }
+ if ((num_items >= 2) && items[1][0])
+ {
+ pos = strchr (items[1], ',');
+ if (pos)
+ {
+ pos[0] = '\0';
+ error1 = NULL;
+ fg = (int)strtol (items[1], &error1, 10);
+ error2 = NULL;
+ bg = (int)strtol (pos + 1, &error2, 10);
+ if (error1 && !error1[0] && error2 && !error2[0]
+ && (fg >= -1) && (bg >= -1))
+ {
+ new_color_palette->foreground = fg;
+ new_color_palette->background = bg;
+ }
+ }
+ }
+ if ((num_items >= 3) && items[2][0])
+ {
+ pos = strchr (items[2], '/');
+ if (pos)
+ {
+ pos[0] = '\0';
+ pos2 = strchr (pos + 1, '/');
+ if (pos2)
+ {
+ pos2[0] = '\0';
+ error1 = NULL;
+ r = (int)strtol (items[2], &error1, 10);
+ error2 = NULL;
+ g = (int)strtol (pos + 1, &error2, 10);
+ error3 = NULL;
+ b = (int)strtol (pos2 + 1, &error3, 10);
+ if (error1 && !error1[0] && error2 && !error2[0]
+ && error3 && !error3[0]
+ && (r >= 0) && (r <= 1000)
+ && (g >= 0) && (g <= 1000)
+ && (b >= 0) && (b <= 1000))
+ {
+ new_color_palette->r = r;
+ new_color_palette->g = g;
+ new_color_palette->b = b;
+ }
+ }
+ }
+ }
+ string_free_split (items);
+ }
+ if (!new_color_palette->alias)
+ {
+ snprintf (str_number, sizeof (str_number), "%d", number);
+ new_color_palette->alias = strdup (str_number);
+ }
+ }
+
+ return new_color_palette;
+}
+
+/*
+ * gui_color_palette_free: free a color in palette
+ */
+
+void
+gui_color_palette_free (struct t_gui_color_palette *color_palette)
+{
+ if (!color_palette)
+ return;
+
+ if (color_palette->alias)
+ free (color_palette->alias);
+
+ free (color_palette);
+}
+
+/*
* gui_color_end: end GUI colors
*/
diff --git a/src/gui/curses/gui-curses-window.c b/src/gui/curses/gui-curses-window.c
index 5b4848a4d..4b06f5eae 100644
--- a/src/gui/curses/gui-curses-window.c
+++ b/src/gui/curses/gui-curses-window.c
@@ -235,9 +235,9 @@ gui_window_reset_style (WINDOW *window, int num_color)
window_current_style_attr = 0;
window_current_color_attr = 0;
+ wattroff (window, A_BOLD | A_UNDERLINE | A_REVERSE);
wattron (window, COLOR_PAIR(gui_color_get_pair (num_color)) |
gui_color[num_color]->attributes);
- wattroff (window, A_BOLD | A_UNDERLINE | A_REVERSE);
}
/*
@@ -297,9 +297,9 @@ gui_window_set_weechat_color (WINDOW *window, int num_color)
gui_window_reset_style (window, num_color);
wattron (window, gui_color[num_color]->attributes);
if ((gui_color[num_color]->foreground > 0)
- && (gui_color[num_color]->foreground & 0x10000))
+ && (gui_color[num_color]->foreground & GUI_COLOR_PAIR_FLAG))
{
- wattron (window, COLOR_PAIR(gui_color[num_color]->foreground & 0xFFFF));
+ wattron (window, COLOR_PAIR(gui_color[num_color]->foreground & GUI_COLOR_PAIR_MASK));
}
else
{
@@ -354,15 +354,22 @@ void
gui_window_set_custom_color_fg (WINDOW *window, int fg)
{
int current_bg;
-
- if ((fg >= 0) && (fg < GUI_CURSES_NUM_WEECHAT_COLORS))
+
+ if (fg >= 0)
{
- current_bg = window_current_style_bg;
- gui_window_remove_color_style (window, A_BOLD);
- gui_window_set_color_style (window, gui_weechat_colors[fg].attributes);
- gui_window_set_color (window,
- gui_weechat_colors[fg].foreground,
- current_bg);
+ if (fg & GUI_COLOR_PAIR_FLAG)
+ {
+ gui_window_set_custom_color_pair (window, fg & GUI_COLOR_PAIR_MASK);
+ }
+ else if (fg < GUI_CURSES_NUM_WEECHAT_COLORS)
+ {
+ current_bg = window_current_style_bg;
+ gui_window_remove_color_style (window, A_BOLD);
+ gui_window_set_color_style (window, gui_weechat_colors[fg].attributes);
+ gui_window_set_color (window,
+ gui_weechat_colors[fg].foreground,
+ current_bg);
+ }
}
}
@@ -376,14 +383,21 @@ gui_window_set_custom_color_bg (WINDOW *window, int bg)
{
int current_attr, current_fg;
- if ((bg >= 0) && (bg < GUI_CURSES_NUM_WEECHAT_COLORS))
+ if (bg >= 0)
{
- current_attr = window_current_style_attr;
- current_fg = window_current_style_fg;
- gui_window_set_color_style (window, current_attr);
- gui_window_set_color (window, current_fg,
- (gui_color_num_bg > 8) ?
- gui_weechat_colors[bg].background : gui_weechat_colors[bg].foreground);
+ if (bg & GUI_COLOR_PAIR_FLAG)
+ {
+ gui_window_set_custom_color_pair (window, bg & GUI_COLOR_PAIR_MASK);
+ }
+ else if (bg < GUI_CURSES_NUM_WEECHAT_COLORS)
+ {
+ current_attr = window_current_style_attr;
+ current_fg = window_current_style_fg;
+ gui_window_set_color_style (window, current_attr);
+ gui_window_set_color (window, current_fg,
+ (gui_color_num_bg > 8) ?
+ gui_weechat_colors[bg].background : gui_weechat_colors[bg].foreground);
+ }
}
}
diff --git a/src/gui/gtk/gui-gtk-color.c b/src/gui/gtk/gui-gtk-color.c
index 9cbd111d2..96d20c4eb 100644
--- a/src/gui/gtk/gui-gtk-color.c
+++ b/src/gui/gtk/gui-gtk-color.c
@@ -102,6 +102,26 @@ gui_color_assign (int *color, const char *color_name)
}
/*
+ * gui_color_assign_by_diff: assign color by difference
+ * It is called when a color option is
+ * set with value ++X or --X, to search
+ * another color (for example ++1 is
+ * next color/alias in list)
+ * return 1 if ok, 0 if error
+ */
+
+int
+gui_color_assign_by_diff (int *color, const char *color_name, int diff)
+{
+ /* TODO: write this function for Gtk */
+ (void) color;
+ (void) color_name;
+ (void) diff;
+
+ return 1;
+}
+
+/*
* gui_color_get_number: get number of available colors
*/
@@ -148,6 +168,17 @@ gui_color_get_pair (int num_color)
}
/*
+ * gui_color_init_pair: init a color pair
+ */
+
+void
+gui_color_init_pair (int number)
+{
+ /* This function does nothing in Gtk GUI */
+ (void) number;
+}
+
+/*
* gui_color_init_pairs: init color pairs
*/
@@ -228,6 +259,41 @@ gui_color_display_terminal_colors ()
}
/*
+ * gui_color_palette_build_aliases: build aliases for palette
+ */
+
+void
+gui_color_palette_build_aliases ()
+{
+ /* This function does nothing in Gtk GUI */
+}
+
+/*
+ * gui_color_palette_new: create a new color in palette
+ */
+
+struct t_gui_color_palette *
+gui_color_palette_new (int number, const char *value)
+{
+ /* This function does nothing in Gtk GUI */
+ (void) number;
+ (void) value;
+
+ return NULL;
+}
+
+/*
+ * gui_color_palette_free: free a color in palette
+ */
+
+void
+gui_color_palette_free (struct t_gui_color_palette *color_palette)
+{
+ /* This function does nothing in Gtk GUI */
+ (void) color_palette;
+}
+
+/*
* gui_color_end: end GUI colors
*/
diff --git a/src/gui/gui-bar-item.c b/src/gui/gui-bar-item.c
index 56ffb0d08..6a0d4f9f8 100644
--- a/src/gui/gui-bar-item.c
+++ b/src/gui/gui-bar-item.c
@@ -377,16 +377,38 @@ gui_bar_item_get_value (const char *name, struct t_gui_bar *bar,
bar_color[0] = '\0';
if (prefix || suffix)
{
- snprintf (delimiter_color, sizeof (delimiter_color),
- "%c%c%02d",
- GUI_COLOR_COLOR_CHAR,
- GUI_COLOR_FG_CHAR,
- CONFIG_COLOR(bar->options[GUI_BAR_OPTION_COLOR_DELIM]));
- snprintf (bar_color, sizeof (bar_color),
- "%c%c%02d",
- GUI_COLOR_COLOR_CHAR,
- GUI_COLOR_FG_CHAR,
- CONFIG_COLOR(bar->options[GUI_BAR_OPTION_COLOR_FG]));
+ if (CONFIG_COLOR(bar->options[GUI_BAR_OPTION_COLOR_DELIM]) & GUI_COLOR_PAIR_FLAG)
+ {
+ snprintf (delimiter_color, sizeof (delimiter_color),
+ "%c%c%05d",
+ GUI_COLOR_COLOR_CHAR,
+ GUI_COLOR_PAIR_CHAR,
+ CONFIG_COLOR(bar->options[GUI_BAR_OPTION_COLOR_DELIM]) & GUI_COLOR_PAIR_MASK);
+ }
+ else
+ {
+ snprintf (delimiter_color, sizeof (delimiter_color),
+ "%c%c%02d",
+ GUI_COLOR_COLOR_CHAR,
+ GUI_COLOR_FG_CHAR,
+ CONFIG_COLOR(bar->options[GUI_BAR_OPTION_COLOR_DELIM]));
+ }
+ if (CONFIG_COLOR(bar->options[GUI_BAR_OPTION_COLOR_FG]) & GUI_COLOR_PAIR_FLAG)
+ {
+ snprintf (bar_color, sizeof (bar_color),
+ "%c%c%05d",
+ GUI_COLOR_COLOR_CHAR,
+ GUI_COLOR_PAIR_CHAR,
+ CONFIG_COLOR(bar->options[GUI_BAR_OPTION_COLOR_FG]) & GUI_COLOR_PAIR_MASK);
+ }
+ else
+ {
+ snprintf (bar_color, sizeof (bar_color),
+ "%c%c%02d",
+ GUI_COLOR_COLOR_CHAR,
+ GUI_COLOR_FG_CHAR,
+ CONFIG_COLOR(bar->options[GUI_BAR_OPTION_COLOR_FG]));
+ }
}
snprintf (result, length,
"%s%s%s%s%s%s",
diff --git a/src/gui/gui-color.c b/src/gui/gui-color.c
index 326e3f542..acbf18e66 100644
--- a/src/gui/gui-color.c
+++ b/src/gui/gui-color.c
@@ -36,13 +36,22 @@
#include "../core/weechat.h"
#include "../core/wee-config.h"
+#include "../core/wee-hashtable.h"
+#include "../core/wee-list.h"
#include "../core/wee-string.h"
#include "../core/wee-utf8.h"
+#include "../plugins/plugin.h"
#include "gui-color.h"
+#include "gui-window.h"
struct t_gui_color *gui_color[GUI_COLOR_NUM_COLORS]; /* GUI colors */
+/* palette colors and aliases */
+struct t_hashtable *gui_color_hash_palette_color = NULL;
+struct t_hashtable *gui_color_hash_palette_alias = NULL;
+struct t_weelist *gui_color_list_with_alias = NULL;
+
/*
* gui_color_search_config: search a color with configuration option name
@@ -52,27 +61,21 @@ struct t_gui_color *gui_color[GUI_COLOR_NUM_COLORS]; /* GUI colors */
const char *
gui_color_search_config (const char *color_name)
{
- struct t_config_section *ptr_section;
struct t_config_option *ptr_option;
if (color_name)
{
- ptr_section = config_file_search_section (weechat_config_file,
- "color");
- if (ptr_section)
+ for (ptr_option = weechat_config_section_color->options;
+ ptr_option; ptr_option = ptr_option->next_option)
{
- for (ptr_option = ptr_section->options; ptr_option;
- ptr_option = ptr_option->next_option)
+ if (string_strcasecmp (ptr_option->name, color_name) == 0)
{
- if (string_strcasecmp (ptr_option->name, color_name) == 0)
+ if (ptr_option->min < 0)
{
- if (ptr_option->min < 0)
- {
- return gui_color_get_custom (
- gui_color_get_name (CONFIG_COLOR(ptr_option)));
- }
- return GUI_COLOR(ptr_option->min);
+ return gui_color_get_custom (
+ gui_color_get_name (CONFIG_COLOR(ptr_option)));
}
+ return GUI_COLOR(ptr_option->min);
}
}
}
@@ -189,9 +192,8 @@ gui_color_get_custom (const char *color_name)
else
{
/* custom color name (GUI dependent) */
- error = NULL;
- pair = (int)strtol (color_name, &error, 10);
- if (error && !error[0])
+ pair = gui_color_palette_get_alias (color_name);
+ if (pair >= 0)
{
snprintf (color[index_color], sizeof (color[index_color]),
"%s%s%05d",
@@ -201,61 +203,74 @@ gui_color_get_custom (const char *color_name)
}
else
{
- pos_comma = strchr (color_name, ',');
- if (pos_comma)
+ error = NULL;
+ pair = (int)strtol (color_name, &error, 10);
+ if (error && !error[0])
{
- if (pos_comma == color_name)
- str_fg = NULL;
- else
- str_fg = string_strndup (color_name, pos_comma - color_name);
- pos_bg = pos_comma + 1;
+ snprintf (color[index_color], sizeof (color[index_color]),
+ "%s%s%05d",
+ GUI_COLOR_COLOR_STR,
+ GUI_COLOR_PAIR_STR,
+ pair);
}
else
{
- str_fg = strdup (color_name);
- pos_bg = NULL;
- }
-
- if (str_fg && pos_bg)
- {
- fg = gui_color_search (str_fg);
- bg = gui_color_search (pos_bg);
- if ((fg >= 0) && (bg >= 0))
+ pos_comma = strchr (color_name, ',');
+ if (pos_comma)
{
- snprintf (color[index_color], sizeof (color[index_color]),
- "%s%s%02d,%02d",
- GUI_COLOR_COLOR_STR,
- GUI_COLOR_FG_BG_STR,
- fg, bg);
+ if (pos_comma == color_name)
+ str_fg = NULL;
+ else
+ str_fg = string_strndup (color_name, pos_comma - color_name);
+ pos_bg = pos_comma + 1;
}
- }
- else if (str_fg && !pos_bg)
- {
- fg = gui_color_search (str_fg);
- if (fg >= 0)
+ else
{
- snprintf (color[index_color], sizeof (color[index_color]),
- "%s%s%02d",
- GUI_COLOR_COLOR_STR,
- GUI_COLOR_FG_STR,
- fg);
+ str_fg = strdup (color_name);
+ pos_bg = NULL;
}
- }
- else if (!str_fg && pos_bg)
- {
- bg = gui_color_search (pos_bg);
- if (bg >= 0)
+
+ if (str_fg && pos_bg)
+ {
+ fg = gui_color_search (str_fg);
+ bg = gui_color_search (pos_bg);
+ if ((fg >= 0) && (bg >= 0))
+ {
+ snprintf (color[index_color], sizeof (color[index_color]),
+ "%s%s%02d,%02d",
+ GUI_COLOR_COLOR_STR,
+ GUI_COLOR_FG_BG_STR,
+ fg, bg);
+ }
+ }
+ else if (str_fg && !pos_bg)
{
- snprintf (color[index_color], sizeof (color[index_color]),
- "%s%s%02d",
- GUI_COLOR_COLOR_STR,
- GUI_COLOR_BG_STR,
- bg);
+ fg = gui_color_search (str_fg);
+ if (fg >= 0)
+ {
+ snprintf (color[index_color], sizeof (color[index_color]),
+ "%s%s%02d",
+ GUI_COLOR_COLOR_STR,
+ GUI_COLOR_FG_STR,
+ fg);
+ }
+ }
+ else if (!str_fg && pos_bg)
+ {
+ bg = gui_color_search (pos_bg);
+ if (bg >= 0)
+ {
+ snprintf (color[index_color], sizeof (color[index_color]),
+ "%s%s%02d",
+ GUI_COLOR_COLOR_STR,
+ GUI_COLOR_BG_STR,
+ bg);
+ }
}
+
+ if (str_fg)
+ free (str_fg);
}
-
- if (str_fg)
- free (str_fg);
}
}
@@ -463,3 +478,144 @@ gui_color_free (struct t_gui_color *color)
free (color);
}
}
+
+/*
+ * gui_color_palette_alloc: allocate hashtables and lists for palette
+ */
+
+void
+gui_color_palette_alloc ()
+{
+ if (!gui_color_hash_palette_color)
+ {
+ gui_color_hash_palette_color = hashtable_new (16,
+ WEECHAT_HASHTABLE_STRING,
+ WEECHAT_HASHTABLE_POINTER,
+ NULL,
+ NULL);
+ }
+ if (!gui_color_hash_palette_alias)
+ {
+ gui_color_hash_palette_alias = hashtable_new (16,
+ WEECHAT_HASHTABLE_STRING,
+ WEECHAT_HASHTABLE_INTEGER,
+ NULL,
+ NULL);
+ }
+ if (!gui_color_list_with_alias)
+ {
+ gui_color_list_with_alias = weelist_new ();
+ }
+}
+
+/*
+ * gui_color_palette_get_alias: get color pair number with alias
+ * return -1 if alias is not found
+ */
+
+int
+gui_color_palette_get_alias (const char *alias)
+{
+ int *ptr_number;
+
+ if (gui_color_hash_palette_alias)
+ {
+ ptr_number = hashtable_get (gui_color_hash_palette_alias, alias);
+ if (ptr_number)
+ return *ptr_number;
+ }
+
+ /* alias not found */
+ return -1;
+}
+
+/*
+ * gui_color_palette_get: get a color palette with number
+ */
+
+struct t_gui_color_palette *
+gui_color_palette_get (int number)
+{
+ char str_number[64];
+
+ snprintf (str_number, sizeof (str_number), "%d", number);
+ return hashtable_get (gui_color_hash_palette_color,
+ str_number);
+}
+
+/*
+ * gui_color_palette_add: add a color in palette
+ */
+
+void
+gui_color_palette_add (int number, const char *value)
+{
+ struct t_gui_color_palette *new_color_palette, *ptr_color_palette;
+ char str_number[64];
+
+ gui_color_palette_alloc ();
+
+ new_color_palette = gui_color_palette_new (number, value);
+ if (!new_color_palette)
+ return;
+
+ snprintf (str_number, sizeof (str_number), "%d", number);
+ ptr_color_palette = hashtable_get (gui_color_hash_palette_color,
+ str_number);
+ if (ptr_color_palette)
+ gui_color_palette_free (ptr_color_palette);
+ hashtable_set (gui_color_hash_palette_color,
+ str_number, new_color_palette);
+ gui_color_palette_build_aliases ();
+
+ if (gui_init_ok)
+ gui_color_init_pair (number);
+}
+
+/*
+ * gui_color_palette_remove: remove a color in palette
+ */
+
+void
+gui_color_palette_remove (int number)
+{
+ struct t_gui_color_palette *ptr_color_palette;
+ char str_number[64];
+
+ gui_color_palette_alloc ();
+
+ snprintf (str_number, sizeof (str_number), "%d", number);
+ ptr_color_palette = hashtable_get (gui_color_hash_palette_color,
+ str_number);
+ if (ptr_color_palette)
+ {
+ gui_color_palette_free (ptr_color_palette);
+ hashtable_remove (gui_color_hash_palette_color, str_number);
+ gui_color_palette_build_aliases ();
+ if (gui_init_ok)
+ gui_color_init_pair (number);
+ }
+}
+
+/*
+ * gui_color_palette_change: change a color in palette
+ */
+
+void
+gui_color_palette_change (int number, const char *value)
+{
+ struct t_gui_color_palette *ptr_color_palette;
+ char str_number[64];
+
+ gui_color_palette_alloc ();
+
+ snprintf (str_number, sizeof (str_number), "%d", number);
+ ptr_color_palette = hashtable_get (gui_color_hash_palette_color,
+ str_number);
+ if (ptr_color_palette)
+ {
+ gui_color_palette_free (ptr_color_palette);
+ hashtable_remove (gui_color_hash_palette_color, str_number);
+ gui_color_palette_add (number, value);
+ }
+}
diff --git a/src/gui/gui-color.h b/src/gui/gui-color.h
index a78cefa87..a9262d782 100644
--- a/src/gui/gui-color.h
+++ b/src/gui/gui-color.h
@@ -114,6 +114,9 @@ enum t_gui_color_enum
#define GUI_COLOR_BAR_MOVE_CURSOR_CHAR '#'
#define GUI_COLOR_BAR_MOVE_CURSOR_STR "#"
+#define GUI_COLOR_PAIR_FLAG 0x10000
+#define GUI_COLOR_PAIR_MASK 0xFFFF
+
/* color structure */
struct t_gui_color
@@ -124,9 +127,22 @@ struct t_gui_color
char *string; /* WeeChat color: "\x19??", ?? is #color*/
};
+/* custom color in palette */
+
+struct t_gui_color_palette
+{
+ char *alias; /* alias name for this color pair */
+ int foreground; /* foreground color */
+ int background; /* background color */
+ int r, g, b; /* red/green/blue values for color */
+};
+
/* color variables */
extern struct t_gui_color *gui_color[];
+extern struct t_hashtable *gui_color_hash_palette_color;
+extern struct t_hashtable *gui_color_hash_palette_alias;
+extern struct t_weelist *gui_color_list_with_alias;
/* color functions */
@@ -135,15 +151,27 @@ extern const char *gui_color_get_custom (const char *color_name);
extern char *gui_color_decode (const char *string, const char *replacement);
extern char *gui_color_string_replace_colors (const char *string);
extern void gui_color_free (struct t_gui_color *color);
+extern int gui_color_palette_get_alias (const char *alias);
+extern struct t_gui_color_palette *gui_color_palette_get (int number);
+extern void gui_color_palette_add (int number, const char *value);
+extern void gui_color_palette_remove (int number);
+extern void gui_color_palette_change (int number, const char *value);
/* color functions (GUI dependent) */
extern int gui_color_search (const char *color_name);
extern int gui_color_assign (int *color, char const *color_name);
+extern int gui_color_assign_by_diff (int *color, const char *color_name,
+ int diff);
extern int gui_color_get_number ();
extern const char *gui_color_get_name (int num_color);
+extern void gui_color_init_pair (int number);
extern void gui_color_init_pairs ();
extern void gui_color_init_weechat ();
extern void gui_color_display_terminal_colors ();
+extern void gui_color_palette_build_aliases ();
+extern struct t_gui_color_palette *gui_color_palette_new (int number,
+ const char *value);
+extern void gui_color_palette_free (struct t_gui_color_palette *color_palette);
#endif /* __WEECHAT_GUI_COLOR_H */
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-30 13:32:50 +0000