From ae6d5ebeef4bfc8e79327d99c4eb689ca5887473 Mon Sep 17 00:00:00 2001 From: deepend-tildeclub Date: Tue, 7 Jul 2026 09:08:00 -0600 Subject: [PATCH 1/3] Add mouse over tooltips for each color selection. --- src/common/text.c | 111 ++++++++++++++++++ src/common/text.h | 1 + src/fe-gtk/meson.build | 2 +- .../test-theme-preferences-gtk3-populate.c | 7 ++ src/fe-gtk/theme/theme-preferences.c | 33 ++++++ 5 files changed, 153 insertions(+), 1 deletion(-) diff --git a/src/common/text.c b/src/common/text.c index 3e1e758c..fc16578e 100644 --- a/src/common/text.c +++ b/src/common/text.c @@ -1695,6 +1695,117 @@ pevent_load (char *filename) return 0; } + +static gboolean +text_event_uses_color (const char *text, int color) +{ + const char *p; + + if (!text || color < 0 || color > 31) + return FALSE; + + for (p = text; *p; p++) + { + int value; + int digits; + + if ((unsigned char) *p == 3) + p++; + else if (*p == '%' && p[1] == 'C') + p += 2; + else + continue; + + if (!g_ascii_isdigit (*p)) + { + p--; + continue; + } + + value = *p - '0'; + digits = 1; + if (g_ascii_isdigit (p[1])) + { + value = value * 10 + p[1] - '0'; + digits = 2; + } + + if (value == color) + return TRUE; + + p += digits - 1; + if (*p == ',' && g_ascii_isdigit (p[1])) + { + p++; + value = *p - '0'; + if (g_ascii_isdigit (p[1])) + { + value = value * 10 + p[1] - '0'; + p++; + } + if (value == color) + return TRUE; + } + } + + return FALSE; +} + +char * +text_color_event_list (int color) +{ + GString *events; + GString *tip; + int count = 0; + int line_len = 0; + int i; + + events = g_string_new (NULL); + + for (i = 0; i < NUM_XP; i++) + { + const char *name; + const char *text = pntevts_text[i] ? pntevts_text[i] : te[i].def; + int name_len; + + if (!text_event_uses_color (text, color)) + continue; + + name = _(te[i].name); + name_len = strlen (name); + if (count) + { + if (line_len + name_len + 2 > 76) + { + g_string_append_c (events, '\n'); + line_len = 0; + } + else + { + g_string_append (events, ", "); + line_len += 2; + } + } + + g_string_append (events, name); + line_len += name_len; + count++; + } + + if (!count) + { + g_string_free (events, TRUE); + return g_strdup (_("No text events use this color.")); + } + + tip = g_string_new (NULL); + g_string_append_printf (tip, _("Text events using this color (%d):"), count); + g_string_append_c (tip, '\n'); + g_string_append (tip, events->str); + g_string_free (events, TRUE); + return g_string_free (tip, FALSE); +} + static void pevent_check_all_loaded (void) { diff --git a/src/common/text.h b/src/common/text.h index 3c287433..32d58c30 100644 --- a/src/common/text.h +++ b/src/common/text.h @@ -53,6 +53,7 @@ int pevt_build_string (const char *input, char **output, int *max_arg); int pevent_load (char *filename); void pevent_make_pntevts (void); int text_color_of (char *name); +char *text_color_event_list (int color); void text_emit (int index, session *sess, char *a, char *b, char *c, char *d, time_t timestamp); int text_emit_by_name (char *name, session *sess, time_t timestamp, diff --git a/src/fe-gtk/meson.build b/src/fe-gtk/meson.build index 1454ba82..269705ba 100644 --- a/src/fe-gtk/meson.build +++ b/src/fe-gtk/meson.build @@ -50,7 +50,7 @@ zoitechat_gtk_deps = [ gtk_dep = dependency('gtk+-3.0', version: '>= 3.22') -zoitechat_theme_deps = [gtk_dep] +zoitechat_theme_deps = [gtk_dep, zoitechat_common_dep] if host_machine.system() != 'windows' appindicator_opt = get_option('appindicator') diff --git a/src/fe-gtk/theme/tests/test-theme-preferences-gtk3-populate.c b/src/fe-gtk/theme/tests/test-theme-preferences-gtk3-populate.c index 78f94e3d..38962b2b 100644 --- a/src/fe-gtk/theme/tests/test-theme-preferences-gtk3-populate.c +++ b/src/fe-gtk/theme/tests/test-theme-preferences-gtk3-populate.c @@ -70,6 +70,13 @@ load_text_events (void) { } +char * +text_color_event_list (int color) +{ + (void)color; + return g_strdup ("No text events use this color."); +} + gboolean theme_get_color (ThemeSemanticToken token, GdkRGBA *color) { diff --git a/src/fe-gtk/theme/theme-preferences.c b/src/fe-gtk/theme/theme-preferences.c index efcc9975..3ddc7d6e 100644 --- a/src/fe-gtk/theme/theme-preferences.c +++ b/src/fe-gtk/theme/theme-preferences.c @@ -38,6 +38,7 @@ #include "theme-runtime.h" extern void load_text_events (void); +extern char *text_color_event_list (int color); typedef struct { @@ -268,6 +269,15 @@ theme_preferences_manager_ui_free (gpointer data) g_free (ui); } +static char * +theme_preferences_color_events_tooltip (ThemeSemanticToken token) +{ + if (token < THEME_TOKEN_MIRC_0 || token > THEME_TOKEN_MIRC_31) + return NULL; + + return text_color_event_list (token - THEME_TOKEN_MIRC_0); +} + static void theme_preferences_manager_update_preview (theme_color_manager_ui *ui) { @@ -884,6 +894,20 @@ theme_preferences_create_color_manager_dialog (GtkWindow *parent, gboolean *colo if (theme_preferences_staged_get_color (token, &rgba)) theme_preferences_manager_row_apply (row, &rgba); + { + char *tip = theme_preferences_color_events_tooltip (token); + if (tip) + { + gtk_widget_set_tooltip_text (list_row, tip); + gtk_widget_set_tooltip_text (hbox, tip); + gtk_widget_set_tooltip_text (name, tip); + gtk_widget_set_tooltip_text (preview, tip); + gtk_widget_set_tooltip_text (button, tip); + gtk_widget_set_tooltip_text (entry, tip); + g_free (tip); + } + } + g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (theme_preferences_manager_pick_cb), row); g_object_set_data (G_OBJECT (button), "zoitechat-theme-color-manager-ui", ui); @@ -1198,6 +1222,15 @@ theme_preferences_create_color_button (GtkWidget *table, g_object_set_data (G_OBJECT (but), "zoitechat-color-box", box); g_object_set_data (G_OBJECT (but), "zoitechat-theme-token", GINT_TO_POINTER (token)); g_object_set_data (G_OBJECT (but), "zoitechat-theme-color-change", color_change_flag); + { + char *tip = theme_preferences_color_events_tooltip (token); + if (tip) + { + gtk_widget_set_tooltip_text (but, tip); + gtk_widget_set_tooltip_text (box, tip); + g_free (tip); + } + } gtk_grid_attach (GTK_GRID (table), but, col, row, 1, 1); g_signal_connect (G_OBJECT (but), "clicked", G_CALLBACK (theme_preferences_color_cb), parent); if (theme_preferences_staged_get_color (token, &color)) From d0034cd1124483766af7da278e1719613fecc135 Mon Sep 17 00:00:00 2001 From: deepend-tildeclub Date: Tue, 7 Jul 2026 14:14:36 -0600 Subject: [PATCH 2/3] Fixed missing comma in color tooltips --- src/common/text.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/text.c b/src/common/text.c index fc16578e..4fb653e7 100644 --- a/src/common/text.c +++ b/src/common/text.c @@ -1777,7 +1777,7 @@ text_color_event_list (int color) { if (line_len + name_len + 2 > 76) { - g_string_append_c (events, '\n'); + g_string_append (events, ",\n"); line_len = 0; } else From 2caec91a0fa9c2d82c53e8f3937dfe99b6050114 Mon Sep 17 00:00:00 2001 From: deepend-tildeclub Date: Wed, 8 Jul 2026 00:58:34 -0600 Subject: [PATCH 3/3] Improve color tooltip design --- src/common/text.c | 54 ++----- src/common/text.h | 2 +- .../test-theme-preferences-gtk3-populate.c | 8 +- src/fe-gtk/theme/theme-preferences.c | 147 ++++++++++++++---- 4 files changed, 138 insertions(+), 73 deletions(-) diff --git a/src/common/text.c b/src/common/text.c index 4fb653e7..e22ceedf 100644 --- a/src/common/text.c +++ b/src/common/text.c @@ -1751,59 +1751,39 @@ text_event_uses_color (const char *text, int color) return FALSE; } -char * -text_color_event_list (int color) +char ** +text_color_event_names (int color, int *count) { - GString *events; - GString *tip; - int count = 0; - int line_len = 0; + GPtrArray *names; + int found = 0; int i; - events = g_string_new (NULL); + if (count) + *count = 0; + + names = g_ptr_array_new (); for (i = 0; i < NUM_XP; i++) { - const char *name; const char *text = pntevts_text[i] ? pntevts_text[i] : te[i].def; - int name_len; if (!text_event_uses_color (text, color)) continue; - name = _(te[i].name); - name_len = strlen (name); - if (count) - { - if (line_len + name_len + 2 > 76) - { - g_string_append (events, ",\n"); - line_len = 0; - } - else - { - g_string_append (events, ", "); - line_len += 2; - } - } - - g_string_append (events, name); - line_len += name_len; - count++; + g_ptr_array_add (names, g_strdup (_(te[i].name))); + found++; } - if (!count) + if (!found) { - g_string_free (events, TRUE); - return g_strdup (_("No text events use this color.")); + g_ptr_array_free (names, TRUE); + return NULL; } - tip = g_string_new (NULL); - g_string_append_printf (tip, _("Text events using this color (%d):"), count); - g_string_append_c (tip, '\n'); - g_string_append (tip, events->str); - g_string_free (events, TRUE); - return g_string_free (tip, FALSE); + g_ptr_array_add (names, NULL); + if (count) + *count = found; + return (char **) g_ptr_array_free (names, FALSE); } static void diff --git a/src/common/text.h b/src/common/text.h index 32d58c30..f164263e 100644 --- a/src/common/text.h +++ b/src/common/text.h @@ -53,7 +53,7 @@ int pevt_build_string (const char *input, char **output, int *max_arg); int pevent_load (char *filename); void pevent_make_pntevts (void); int text_color_of (char *name); -char *text_color_event_list (int color); +char **text_color_event_names (int color, int *count); void text_emit (int index, session *sess, char *a, char *b, char *c, char *d, time_t timestamp); int text_emit_by_name (char *name, session *sess, time_t timestamp, diff --git a/src/fe-gtk/theme/tests/test-theme-preferences-gtk3-populate.c b/src/fe-gtk/theme/tests/test-theme-preferences-gtk3-populate.c index 38962b2b..00875c1e 100644 --- a/src/fe-gtk/theme/tests/test-theme-preferences-gtk3-populate.c +++ b/src/fe-gtk/theme/tests/test-theme-preferences-gtk3-populate.c @@ -70,11 +70,13 @@ load_text_events (void) { } -char * -text_color_event_list (int color) +char ** +text_color_event_names (int color, int *count) { (void)color; - return g_strdup ("No text events use this color."); + if (count) + *count = 0; + return NULL; } gboolean diff --git a/src/fe-gtk/theme/theme-preferences.c b/src/fe-gtk/theme/theme-preferences.c index 3ddc7d6e..e6e925ef 100644 --- a/src/fe-gtk/theme/theme-preferences.c +++ b/src/fe-gtk/theme/theme-preferences.c @@ -38,7 +38,7 @@ #include "theme-runtime.h" extern void load_text_events (void); -extern char *text_color_event_list (int color); +extern char **text_color_event_names (int color, int *count); typedef struct { @@ -244,6 +244,9 @@ theme_preferences_stage_discard (void) static void theme_preferences_show_import_error (GtkWidget *button, const char *message); +static void +theme_preferences_color_set_tooltip (GtkWidget *widget, ThemeSemanticToken token); + static void theme_preferences_manager_row_free (gpointer data) { @@ -269,15 +272,6 @@ theme_preferences_manager_ui_free (gpointer data) g_free (ui); } -static char * -theme_preferences_color_events_tooltip (ThemeSemanticToken token) -{ - if (token < THEME_TOKEN_MIRC_0 || token > THEME_TOKEN_MIRC_31) - return NULL; - - return text_color_event_list (token - THEME_TOKEN_MIRC_0); -} - static void theme_preferences_manager_update_preview (theme_color_manager_ui *ui) { @@ -491,6 +485,7 @@ theme_preferences_color_response_cb (GtkDialog *dialog, gint response_id, gpoint data->color_change_flag, TRUE); theme_preferences_color_button_apply (data->button, &rgba); + theme_preferences_color_set_tooltip (data->button, data->token); theme_preferences_manager_update_preview ((theme_color_manager_ui *) data->manager_ui); } @@ -569,6 +564,113 @@ theme_preferences_token_display_name (ThemeSemanticToken token) } } +static char * +theme_preferences_color_tooltip_markup (ThemeSemanticToken token) +{ + GString *tip; + GdkRGBA rgba; + char *display; + char *hex; + char *escaped; + char **names; + int count = 0; + + if (token < THEME_TOKEN_MIRC_0 || token > THEME_TOKEN_MIRC_31) + return NULL; + + if (!theme_preferences_staged_get_color (token, &rgba)) + return NULL; + + tip = g_string_new (NULL); + + display = theme_preferences_token_display_name (token); + hex = theme_preferences_format_hex (&rgba); + escaped = g_markup_escape_text (display, -1); + g_string_append_printf (tip, + "\xe2\x80\x83\xe2\x80\x83 %s %s", + hex, escaped, hex); + g_free (escaped); + g_free (display); + + names = text_color_event_names (token - THEME_TOKEN_MIRC_0, &count); + if (names) + { + int line_target; + int line_len = 0; + int i; + + display = g_strdup_printf (ngettext ("Used by %d text event", + "Used by %d text events", count), count); + escaped = g_markup_escape_text (display, -1); + g_string_append_printf (tip, + "\n%s\n\n", + escaped); + g_free (escaped); + g_free (display); + + /* Explicit line breaks keep the tooltip geometry stable; + * heavily-used colors get wider lines so the full list + * stays on screen. */ + if (count <= 12) + line_target = 44; + else if (count <= 40) + line_target = 60; + else + line_target = 76; + + for (i = 0; i < count; i++) + { + int name_len = (int) g_utf8_strlen (names[i], -1); + + if (i) + { + if (line_len + name_len + 5 > line_target) + { + g_string_append_c (tip, '\n'); + line_len = 0; + } + else + { + g_string_append (tip, " \xc2\xb7 "); + line_len += 5; + } + } + escaped = g_markup_escape_text (names[i], -1); + g_string_append (tip, escaped); + line_len += name_len; + g_free (escaped); + } + g_string_append (tip, ""); + g_strfreev (names); + } + else + { + escaped = g_markup_escape_text (_("Not used by any text events"), -1); + g_string_append_printf (tip, + "\n%s", + escaped); + g_free (escaped); + } + + g_free (hex); + return g_string_free (tip, FALSE); +} + +/* Static markup tooltips only: building tooltip widgets from a + * query-tooltip handler makes GtkTooltip flicker on some setups, so the + * markup is set once and refreshed whenever the color changes. */ +static void +theme_preferences_color_set_tooltip (GtkWidget *widget, ThemeSemanticToken token) +{ + char *markup = theme_preferences_color_tooltip_markup (token); + + if (!markup) + return; + + gtk_widget_set_tooltip_markup (widget, markup); + g_free (markup); +} + static void theme_preferences_manager_row_apply (theme_color_manager_row *row, const GdkRGBA *rgba) { @@ -579,6 +681,7 @@ theme_preferences_manager_row_apply (theme_color_manager_row *row, const GdkRGBA hex = theme_preferences_format_hex (rgba); gtk_entry_set_text (GTK_ENTRY (row->entry), hex); g_free (hex); + theme_preferences_color_set_tooltip (row->row, row->token); } static void @@ -894,19 +997,7 @@ theme_preferences_create_color_manager_dialog (GtkWindow *parent, gboolean *colo if (theme_preferences_staged_get_color (token, &rgba)) theme_preferences_manager_row_apply (row, &rgba); - { - char *tip = theme_preferences_color_events_tooltip (token); - if (tip) - { - gtk_widget_set_tooltip_text (list_row, tip); - gtk_widget_set_tooltip_text (hbox, tip); - gtk_widget_set_tooltip_text (name, tip); - gtk_widget_set_tooltip_text (preview, tip); - gtk_widget_set_tooltip_text (button, tip); - gtk_widget_set_tooltip_text (entry, tip); - g_free (tip); - } - } + theme_preferences_color_set_tooltip (list_row, token); g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (theme_preferences_manager_pick_cb), row); @@ -1222,15 +1313,7 @@ theme_preferences_create_color_button (GtkWidget *table, g_object_set_data (G_OBJECT (but), "zoitechat-color-box", box); g_object_set_data (G_OBJECT (but), "zoitechat-theme-token", GINT_TO_POINTER (token)); g_object_set_data (G_OBJECT (but), "zoitechat-theme-color-change", color_change_flag); - { - char *tip = theme_preferences_color_events_tooltip (token); - if (tip) - { - gtk_widget_set_tooltip_text (but, tip); - gtk_widget_set_tooltip_text (box, tip); - g_free (tip); - } - } + theme_preferences_color_set_tooltip (but, token); gtk_grid_attach (GTK_GRID (table), but, col, row, 1, 1); g_signal_connect (G_OBJECT (but), "clicked", G_CALLBACK (theme_preferences_color_cb), parent); if (theme_preferences_staged_get_color (token, &color))