mirror of
https://github.com/ZoiteChat/zoitechat.git
synced 2026-07-17 00:49:25 +00:00
Compare commits
1 Commits
master
...
635301f8f3
| Author | SHA1 | Date | |
|---|---|---|---|
| 635301f8f3 |
@@ -142,7 +142,6 @@ void fe_set_away (server *serv);
|
||||
void fe_serverlist_open (session *sess);
|
||||
void fe_get_bool (char *title, char *prompt, void *callback, void *userdata);
|
||||
void fe_get_str (char *prompt, char *def, void *callback, void *ud);
|
||||
void fe_get_password (char *prompt, void *callback, void *ud);
|
||||
void fe_get_int (char *prompt, int def, void *callback, void *ud);
|
||||
#define FRF_WRITE 1 /* save file */
|
||||
#define FRF_MULTIPLE 2 /* multi-select */
|
||||
|
||||
@@ -695,15 +695,10 @@ zoitechat_gtk3_theme_service_discover (void)
|
||||
else
|
||||
user_data_themes = g_build_filename (g_get_user_data_dir (), "themes", NULL);
|
||||
}
|
||||
/* Scan the app's own themes dir first: imported themes get a symlink
|
||||
* under the XDG data themes dir so GTK can resolve gtk-theme-name, and
|
||||
* scanning that link first would make the canonical-root dedup keep
|
||||
* the symlink path - changing the theme's path-derived id and breaking
|
||||
* the saved gui_gtk3_theme reference on the next start. */
|
||||
add_theme_root (user_roots, seen_user_roots, user_dir);
|
||||
add_theme_root (user_roots, seen_user_roots, user_data_themes);
|
||||
g_free (user_data_themes);
|
||||
add_theme_root (user_roots, seen_user_roots, home_themes);
|
||||
add_theme_root (user_roots, seen_user_roots, user_dir);
|
||||
|
||||
{
|
||||
const char *xdg_data_dirs = g_getenv ("XDG_DATA_DIRS");
|
||||
|
||||
@@ -109,58 +109,6 @@ static void server_disconnect (session * sess, int sendquit, int err);
|
||||
static int server_cleanup (server * serv);
|
||||
static void server_connect (server *serv, char *hostname, int port, int no_login);
|
||||
|
||||
typedef struct
|
||||
{
|
||||
server *serv;
|
||||
char hostname[128];
|
||||
int port;
|
||||
} reconnect_password_prompt;
|
||||
|
||||
static gboolean
|
||||
server_login_uses_password_sasl (int logintype)
|
||||
{
|
||||
return logintype == LOGIN_SASL ||
|
||||
logintype == LOGIN_SASL_SCRAM_SHA_1 ||
|
||||
logintype == LOGIN_SASL_SCRAM_SHA_256 ||
|
||||
logintype == LOGIN_SASL_SCRAM_SHA_512;
|
||||
}
|
||||
|
||||
static void
|
||||
server_reconnect_password_cb (int cancel, char *text, void *userdata)
|
||||
{
|
||||
reconnect_password_prompt *prompt = userdata;
|
||||
|
||||
if (!cancel && is_server (prompt->serv) && !prompt->serv->connected && !prompt->serv->connecting && prompt->serv->server_session)
|
||||
{
|
||||
prompt->serv->password[0] = 0;
|
||||
if (text && *text)
|
||||
safe_strcpy (prompt->serv->password, text, sizeof (prompt->serv->password));
|
||||
server_connect (prompt->serv, prompt->hostname, prompt->port, FALSE);
|
||||
}
|
||||
|
||||
g_free (prompt);
|
||||
}
|
||||
|
||||
static gboolean
|
||||
server_prompt_reconnect_password (server *serv)
|
||||
{
|
||||
reconnect_password_prompt *prompt;
|
||||
char *msg;
|
||||
ircnet *net = serv->network;
|
||||
|
||||
if (!net || !(net->flags & FLAG_PROMPT_PASSWORD) || !server_login_uses_password_sasl (serv->loginmethod))
|
||||
return FALSE;
|
||||
|
||||
prompt = g_new0 (reconnect_password_prompt, 1);
|
||||
prompt->serv = serv;
|
||||
safe_strcpy (prompt->hostname, serv->hostname, sizeof (prompt->hostname));
|
||||
prompt->port = serv->port;
|
||||
msg = g_strdup_printf (_("Enter SASL password for %s:"), net->name ? net->name : _("this network"));
|
||||
fe_get_password (msg, server_reconnect_password_cb, prompt);
|
||||
g_free (msg);
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
static void
|
||||
write_error (char *message, GError **error)
|
||||
{
|
||||
@@ -786,8 +734,7 @@ timeout_auto_reconnect (server *serv)
|
||||
serv->recondelay_tag = 0;
|
||||
if (!serv->connected && !serv->connecting && serv->server_session)
|
||||
{
|
||||
if (!server_prompt_reconnect_password (serv))
|
||||
server_connect (serv, serv->hostname, serv->port, FALSE);
|
||||
server_connect (serv, serv->hostname, serv->port, FALSE);
|
||||
}
|
||||
}
|
||||
return 0; /* returning 0 should remove the timeout handler */
|
||||
|
||||
@@ -439,99 +439,8 @@ servlist_favchan_copy (favchannel *fav)
|
||||
return newfav;
|
||||
}
|
||||
|
||||
static void servlist_connect_with_password (session *sess, ircnet *net, gboolean join, const char *password);
|
||||
|
||||
typedef struct
|
||||
{
|
||||
session *sess;
|
||||
ircnet *net;
|
||||
gboolean join;
|
||||
} servlist_password_prompt;
|
||||
|
||||
static gboolean
|
||||
servlist_login_uses_password_sasl (int logintype)
|
||||
{
|
||||
return logintype == LOGIN_SASL ||
|
||||
logintype == LOGIN_SASL_SCRAM_SHA_1 ||
|
||||
logintype == LOGIN_SASL_SCRAM_SHA_256 ||
|
||||
logintype == LOGIN_SASL_SCRAM_SHA_512;
|
||||
}
|
||||
|
||||
static void servlist_prompt_sasl_password (servlist_password_prompt *prompt);
|
||||
|
||||
static void
|
||||
servlist_connect_without_password_cb (int value, void *userdata)
|
||||
{
|
||||
servlist_password_prompt *prompt = userdata;
|
||||
|
||||
if (value)
|
||||
{
|
||||
servlist_connect_with_password (prompt->sess, prompt->net, prompt->join, NULL);
|
||||
g_free (prompt);
|
||||
}
|
||||
else
|
||||
{
|
||||
servlist_prompt_sasl_password (prompt);
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
servlist_connect_password_cb (int cancel, char *text, void *userdata)
|
||||
{
|
||||
servlist_password_prompt *prompt = userdata;
|
||||
char *msg;
|
||||
|
||||
if (cancel)
|
||||
{
|
||||
fe_serverlist_open (prompt->sess);
|
||||
g_free (prompt);
|
||||
return;
|
||||
}
|
||||
|
||||
if (text && *text)
|
||||
{
|
||||
servlist_connect_with_password (prompt->sess, prompt->net, prompt->join, text);
|
||||
g_free (prompt);
|
||||
return;
|
||||
}
|
||||
|
||||
msg = g_strdup_printf (_("Continue connecting to %s without a SASL password?"), prompt->net->name ? prompt->net->name : _("this network"));
|
||||
fe_get_bool (_("No SASL password"), msg, servlist_connect_without_password_cb, prompt);
|
||||
g_free (msg);
|
||||
}
|
||||
|
||||
static void
|
||||
servlist_prompt_sasl_password (servlist_password_prompt *prompt)
|
||||
{
|
||||
char *msg;
|
||||
|
||||
msg = g_strdup_printf (_("Enter SASL password for %s:"), prompt->net->name ? prompt->net->name : _("this network"));
|
||||
fe_get_password (msg, servlist_connect_password_cb, prompt);
|
||||
g_free (msg);
|
||||
}
|
||||
|
||||
void
|
||||
servlist_connect (session *sess, ircnet *net, gboolean join)
|
||||
{
|
||||
int logintype;
|
||||
servlist_password_prompt *prompt;
|
||||
|
||||
logintype = net && net->logintype ? net->logintype : LOGIN_DEFAULT_REAL;
|
||||
if (net && (net->flags & FLAG_PROMPT_PASSWORD) && servlist_login_uses_password_sasl (logintype))
|
||||
{
|
||||
prompt = g_new0 (servlist_password_prompt, 1);
|
||||
prompt->sess = sess;
|
||||
prompt->net = net;
|
||||
prompt->join = join;
|
||||
servlist_prompt_sasl_password (prompt);
|
||||
return;
|
||||
}
|
||||
|
||||
servlist_connect_with_password (sess, net, join, NULL);
|
||||
}
|
||||
|
||||
static void
|
||||
servlist_connect_with_password (session *sess, ircnet *net, gboolean join, const char *password)
|
||||
{
|
||||
ircserver *ircserv;
|
||||
GSList *list;
|
||||
@@ -578,11 +487,7 @@ servlist_connect_with_password (session *sess, ircnet *net, gboolean join, const
|
||||
}
|
||||
|
||||
serv->password[0] = 0;
|
||||
if (password && *password)
|
||||
{
|
||||
safe_strcpy (serv->password, password, sizeof (serv->password));
|
||||
}
|
||||
else if ((net->flags & FLAG_USE_KEYRING) && net->name)
|
||||
if ((net->flags & FLAG_USE_KEYRING) && net->name)
|
||||
{
|
||||
char *stored_pass = secretstore_get_network_password (net->name);
|
||||
if (stored_pass && *stored_pass)
|
||||
|
||||
@@ -63,8 +63,7 @@ extern GSList *network_list;
|
||||
#define FLAG_ALLOW_INVALID 32
|
||||
#define FLAG_FAVORITE 64
|
||||
#define FLAG_USE_KEYRING 128
|
||||
#define FLAG_PROMPT_PASSWORD 256
|
||||
#define FLAG_COUNT 9
|
||||
#define FLAG_COUNT 8
|
||||
|
||||
/* Login methods. Use server password by default - if we had a NickServ password, it'd be set to 2 already by servlist_load() */
|
||||
#define LOGIN_DEFAULT_REAL LOGIN_PASS /* this is to set the default login method for unknown servers */
|
||||
|
||||
@@ -527,43 +527,6 @@ gtkutil_destroy (GtkWidget * igad, GtkWidget * dgad)
|
||||
gtk_widget_destroy (dgad);
|
||||
}
|
||||
|
||||
static void
|
||||
gtkutil_place_dialog (GtkWidget *dialog)
|
||||
{
|
||||
GList *list;
|
||||
GList *item;
|
||||
GtkWindow *anchor = NULL;
|
||||
gint x;
|
||||
gint y;
|
||||
extern GtkWidget *parent_window;
|
||||
|
||||
list = gtk_window_list_toplevels ();
|
||||
for (item = list; item; item = item->next)
|
||||
{
|
||||
if (item->data != dialog && GTK_IS_WINDOW (item->data) &&
|
||||
gtk_widget_get_visible (GTK_WIDGET (item->data)) &&
|
||||
gtk_window_is_active (GTK_WINDOW (item->data)))
|
||||
{
|
||||
anchor = GTK_WINDOW (item->data);
|
||||
break;
|
||||
}
|
||||
}
|
||||
g_list_free (list);
|
||||
|
||||
if (!anchor && parent_window && parent_window != dialog && GTK_IS_WINDOW (parent_window))
|
||||
anchor = GTK_WINDOW (parent_window);
|
||||
|
||||
if (anchor)
|
||||
{
|
||||
gtk_window_get_position (anchor, &x, &y);
|
||||
gtk_window_move (GTK_WINDOW (dialog), x, y);
|
||||
}
|
||||
else
|
||||
{
|
||||
gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_MOUSE);
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
gtkutil_get_str_response (GtkDialog *dialog, gint arg1, gpointer entry)
|
||||
{
|
||||
@@ -577,15 +540,15 @@ gtkutil_get_str_response (GtkDialog *dialog, gint arg1, gpointer entry)
|
||||
|
||||
switch (arg1)
|
||||
{
|
||||
case GTK_RESPONSE_REJECT:
|
||||
callback (TRUE, text, user_data);
|
||||
gtk_widget_destroy (GTK_WIDGET (dialog));
|
||||
break;
|
||||
case GTK_RESPONSE_ACCEPT:
|
||||
callback (FALSE, text, user_data);
|
||||
break;
|
||||
default:
|
||||
callback (TRUE, text, user_data);
|
||||
gtk_widget_destroy (GTK_WIDGET (dialog));
|
||||
break;
|
||||
}
|
||||
|
||||
gtk_widget_destroy (GTK_WIDGET (dialog));
|
||||
}
|
||||
|
||||
static void
|
||||
@@ -594,8 +557,8 @@ gtkutil_str_enter (GtkWidget *entry, GtkWidget *dialog)
|
||||
gtk_dialog_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT);
|
||||
}
|
||||
|
||||
static void
|
||||
gtkutil_get_str (char *msg, char *def, void *callback, void *userdata, gboolean visible)
|
||||
void
|
||||
fe_get_str (char *msg, char *def, void *callback, void *userdata)
|
||||
{
|
||||
GtkWidget *dialog;
|
||||
GtkWidget *entry;
|
||||
@@ -609,11 +572,18 @@ gtkutil_get_str (char *msg, char *def, void *callback, void *userdata, gboolean
|
||||
NULL);
|
||||
theme_manager_attach_window (dialog);
|
||||
|
||||
if (parent_window && GTK_IS_WINDOW (parent_window))
|
||||
gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (parent_window));
|
||||
gtkutil_place_dialog (dialog);
|
||||
gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (parent_window));
|
||||
gtk_box_set_homogeneous (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), TRUE);
|
||||
|
||||
if (userdata == (void *)1) /* nick box is usually on the very bottom, make it centered */
|
||||
{
|
||||
gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER);
|
||||
}
|
||||
else
|
||||
{
|
||||
gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_MOUSE);
|
||||
}
|
||||
|
||||
hbox = gtkutil_box_new (GTK_ORIENTATION_HORIZONTAL, TRUE, 0);
|
||||
|
||||
g_object_set_data (G_OBJECT (dialog), "cb", callback);
|
||||
@@ -622,8 +592,7 @@ gtkutil_get_str (char *msg, char *def, void *callback, void *userdata, gboolean
|
||||
entry = gtk_entry_new ();
|
||||
g_signal_connect (G_OBJECT (entry), "activate",
|
||||
G_CALLBACK (gtkutil_str_enter), dialog);
|
||||
gtk_entry_set_text (GTK_ENTRY (entry), def ? def : "");
|
||||
gtk_entry_set_visibility (GTK_ENTRY (entry), visible);
|
||||
gtk_entry_set_text (GTK_ENTRY (entry), def);
|
||||
gtk_box_pack_end (GTK_BOX (hbox), entry, 0, 0, 0);
|
||||
|
||||
label = gtk_label_new (msg);
|
||||
@@ -637,18 +606,6 @@ gtkutil_get_str (char *msg, char *def, void *callback, void *userdata, gboolean
|
||||
gtk_widget_show_all (dialog);
|
||||
}
|
||||
|
||||
void
|
||||
fe_get_str (char *msg, char *def, void *callback, void *userdata)
|
||||
{
|
||||
gtkutil_get_str (msg, def, callback, userdata, TRUE);
|
||||
}
|
||||
|
||||
void
|
||||
fe_get_password (char *msg, void *callback, void *userdata)
|
||||
{
|
||||
gtkutil_get_str (msg, "", callback, userdata, FALSE);
|
||||
}
|
||||
|
||||
static void
|
||||
gtkutil_get_number_response (GtkDialog *dialog, gint arg1, gpointer spin)
|
||||
{
|
||||
@@ -684,15 +641,15 @@ gtkutil_get_bool_response (GtkDialog *dialog, gint arg1, gpointer spin)
|
||||
|
||||
switch (arg1)
|
||||
{
|
||||
case GTK_RESPONSE_REJECT:
|
||||
callback (0, user_data);
|
||||
gtk_widget_destroy (GTK_WIDGET (dialog));
|
||||
break;
|
||||
case GTK_RESPONSE_ACCEPT:
|
||||
callback (1, user_data);
|
||||
break;
|
||||
default:
|
||||
callback (0, user_data);
|
||||
gtk_widget_destroy (GTK_WIDGET (dialog));
|
||||
break;
|
||||
}
|
||||
|
||||
gtk_widget_destroy (GTK_WIDGET (dialog));
|
||||
}
|
||||
|
||||
void
|
||||
@@ -710,10 +667,9 @@ fe_get_int (char *msg, int def, void *callback, void *userdata)
|
||||
_("_OK"), GTK_RESPONSE_ACCEPT,
|
||||
NULL);
|
||||
theme_manager_attach_window (dialog);
|
||||
if (parent_window && GTK_IS_WINDOW (parent_window))
|
||||
gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (parent_window));
|
||||
gtkutil_place_dialog (dialog);
|
||||
gtk_box_set_homogeneous (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), TRUE);
|
||||
gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_MOUSE);
|
||||
gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (parent_window));
|
||||
|
||||
hbox = gtkutil_box_new (GTK_ORIENTATION_HORIZONTAL, TRUE, 0);
|
||||
|
||||
@@ -751,10 +707,10 @@ fe_get_bool (char *title, char *prompt, void *callback, void *userdata)
|
||||
_("_Yes"), GTK_RESPONSE_ACCEPT,
|
||||
NULL);
|
||||
theme_manager_attach_window (dialog);
|
||||
if (parent_window && GTK_IS_WINDOW (parent_window))
|
||||
gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (parent_window));
|
||||
gtkutil_place_dialog (dialog);
|
||||
gtk_box_set_homogeneous (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), TRUE);
|
||||
gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_MOUSE);
|
||||
gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (parent_window));
|
||||
|
||||
|
||||
g_object_set_data (G_OBJECT (dialog), "cb", callback);
|
||||
g_object_set_data (G_OBJECT (dialog), "ud", userdata);
|
||||
|
||||
@@ -4904,11 +4904,7 @@ mg_create_menu (session_gui *gui, GtkWidget *table, int away_state)
|
||||
gui->menu_item);
|
||||
gtk_widget_set_hexpand (gui->menu, TRUE);
|
||||
gtk_widget_set_vexpand (gui->menu, FALSE);
|
||||
/* Fill the row: with GTK_ALIGN_START the menu bar stops after its
|
||||
* last item and the rest of the row shows bare window background,
|
||||
* which reads as a two-colored menu bar whenever the theme styles
|
||||
* menubar and window differently. */
|
||||
gtk_widget_set_halign (gui->menu, GTK_ALIGN_FILL);
|
||||
gtk_widget_set_halign (gui->menu, GTK_ALIGN_START);
|
||||
gtk_widget_set_valign (gui->menu, GTK_ALIGN_FILL);
|
||||
gtk_grid_attach (GTK_GRID (table), gui->menu, 0, 0, 3, 1);
|
||||
}
|
||||
|
||||
@@ -227,20 +227,6 @@ test('Theme Access Routing Tests', theme_access_tests,
|
||||
timeout: 120,
|
||||
)
|
||||
|
||||
theme_gtk3_settings_tests = executable('theme_gtk3_settings_tests',
|
||||
[
|
||||
'theme/tests/test-theme-gtk3-settings.c',
|
||||
'theme/theme-gtk3.c',
|
||||
],
|
||||
include_directories: [config_h_include],
|
||||
dependencies: [gtk_dep],
|
||||
)
|
||||
|
||||
test('Theme GTK3 Settings Tests', theme_gtk3_settings_tests,
|
||||
protocol: 'tap',
|
||||
timeout: 120,
|
||||
)
|
||||
|
||||
theme_preferences_gtk3_populate_tests = executable('theme_preferences_gtk3_populate_tests',
|
||||
'theme/tests/test-theme-preferences-gtk3-populate.c',
|
||||
include_directories: [config_h_include],
|
||||
|
||||
@@ -88,7 +88,6 @@ static GtkWidget *edit_entry_real;
|
||||
static GtkWidget *edit_entry_pass;
|
||||
static GtkWidget *edit_check_show_pass;
|
||||
static GtkWidget *edit_check_use_keyring;
|
||||
static GtkWidget *edit_check_ask_pass;
|
||||
static GtkWidget *edit_button_encrypt_pass;
|
||||
static GtkWidget *edit_button_import_pass;
|
||||
static int edit_pass_changed;
|
||||
@@ -123,11 +122,7 @@ servlist_update_password_tools (ircnet *net)
|
||||
return;
|
||||
|
||||
use_keyring = net && (net->flags & FLAG_USE_KEYRING);
|
||||
if ((net && (net->flags & FLAG_PROMPT_PASSWORD)) ||
|
||||
(edit_check_ask_pass && gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (edit_check_ask_pass))))
|
||||
use_keyring = FALSE;
|
||||
has_local = net && net->pass && *net->pass && !use_keyring && !edit_pass_changed &&
|
||||
(!edit_check_ask_pass || !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (edit_check_ask_pass)));
|
||||
has_local = net && net->pass && *net->pass && !use_keyring && !edit_pass_changed;
|
||||
gtk_widget_set_sensitive (edit_button_encrypt_pass, has_local && !servlist_password_is_encrypted (net->pass));
|
||||
gtk_widget_set_sensitive (edit_button_import_pass, has_local);
|
||||
}
|
||||
@@ -140,17 +135,6 @@ servlist_entry_set_text_silent (GtkWidget *entry, const char *text)
|
||||
g_signal_handlers_unblock_by_func (G_OBJECT (entry), G_CALLBACK (servlist_password_changed_cb), NULL);
|
||||
}
|
||||
|
||||
static void
|
||||
servlist_toggle_ask_pass_cb (GtkToggleButton *toggle, gpointer userdata)
|
||||
{
|
||||
gboolean active = gtk_toggle_button_get_active (toggle);
|
||||
|
||||
gtk_widget_set_sensitive (edit_check_use_keyring, !active);
|
||||
gtk_widget_set_sensitive (edit_entry_pass, !active && (!selected_net || selected_net->logintype != LOGIN_SASLEXTERNAL));
|
||||
gtk_widget_set_sensitive (edit_check_show_pass, !active);
|
||||
servlist_update_password_tools (selected_net);
|
||||
}
|
||||
|
||||
static char *
|
||||
servlist_display_password (ircnet *net)
|
||||
{
|
||||
@@ -1277,7 +1261,6 @@ static void
|
||||
servlist_edit_update (ircnet *net)
|
||||
{
|
||||
gboolean use_keyring;
|
||||
gboolean ask_pass;
|
||||
gboolean keyring_changed;
|
||||
char *password = NULL;
|
||||
servlist_update_from_entry (&net->nick, edit_entry_nick);
|
||||
@@ -1286,23 +1269,8 @@ servlist_edit_update (ircnet *net)
|
||||
servlist_update_from_entry (&net->real, edit_entry_real);
|
||||
if (net && net->name)
|
||||
{
|
||||
ask_pass = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (edit_check_ask_pass));
|
||||
use_keyring = !ask_pass && gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (edit_check_use_keyring));
|
||||
use_keyring = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (edit_check_use_keyring));
|
||||
keyring_changed = !!(net->flags & FLAG_USE_KEYRING) != !!use_keyring;
|
||||
if (ask_pass)
|
||||
{
|
||||
secretstore_delete_network_password (net->name);
|
||||
if (net->pass)
|
||||
{
|
||||
memset (net->pass, 0, strlen (net->pass));
|
||||
g_free (net->pass);
|
||||
net->pass = NULL;
|
||||
}
|
||||
net->flags &= ~FLAG_USE_KEYRING;
|
||||
net->flags |= FLAG_PROMPT_PASSWORD;
|
||||
return;
|
||||
}
|
||||
net->flags &= ~FLAG_PROMPT_PASSWORD;
|
||||
if (!edit_pass_changed && !keyring_changed)
|
||||
return;
|
||||
if (edit_pass_changed)
|
||||
@@ -1370,7 +1338,6 @@ servlist_edit_close_cb (GtkWidget *button, gpointer userdata)
|
||||
edit_win = NULL;
|
||||
edit_entry_pass = NULL;
|
||||
edit_check_show_pass = NULL;
|
||||
edit_check_ask_pass = NULL;
|
||||
edit_button_encrypt_pass = NULL;
|
||||
edit_button_import_pass = NULL;
|
||||
}
|
||||
@@ -2598,7 +2565,7 @@ servlist_open_edit (GtkWidget *parent, ircnet *net)
|
||||
|
||||
|
||||
/* Checkboxes and entries */
|
||||
table3 = gtkutil_grid_new (19, 2, FALSE);
|
||||
table3 = gtkutil_grid_new (17, 2, FALSE);
|
||||
gtk_box_pack_start (GTK_BOX (vbox5), table3, FALSE, FALSE, 0);
|
||||
gtk_grid_set_row_spacing (GTK_GRID (table3), 2);
|
||||
gtk_grid_set_column_spacing (GTK_GRID (table3), 8);
|
||||
@@ -2617,43 +2584,34 @@ servlist_open_edit (GtkWidget *parent, ircnet *net)
|
||||
#endif
|
||||
servlist_create_check (1, net->flags & FLAG_USE_GLOBAL, table3, 5, 0, _("Use global user information"));
|
||||
|
||||
edit_check_ask_pass = gtk_check_button_new_with_mnemonic (_("Ask for password on connect"));
|
||||
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (edit_check_ask_pass), net->flags & FLAG_PROMPT_PASSWORD);
|
||||
servlist_table_attach (table3, edit_check_ask_pass, 0, 2, 6, 7,
|
||||
FALSE, FALSE,
|
||||
SERVLIST_ALIGN_START, SERVLIST_ALIGN_CENTER,
|
||||
SERVLIST_X_PADDING, SERVLIST_Y_PADDING);
|
||||
g_signal_connect (G_OBJECT (edit_check_ask_pass), "toggled",
|
||||
G_CALLBACK (servlist_toggle_ask_pass_cb), NULL);
|
||||
|
||||
edit_check_use_keyring = gtk_check_button_new_with_mnemonic (_("Use system keyring"));
|
||||
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (edit_check_use_keyring), net->flags & FLAG_USE_KEYRING);
|
||||
servlist_table_attach (table3, edit_check_use_keyring, 0, 2, 7, 8,
|
||||
servlist_table_attach (table3, edit_check_use_keyring, 0, 2, 6, 7,
|
||||
FALSE, FALSE,
|
||||
SERVLIST_ALIGN_START, SERVLIST_ALIGN_CENTER,
|
||||
SERVLIST_X_PADDING, SERVLIST_Y_PADDING);
|
||||
g_signal_connect (G_OBJECT (edit_check_use_keyring), "toggled",
|
||||
G_CALLBACK (servlist_toggle_keyring_cb), NULL);
|
||||
|
||||
edit_entry_nick = servlist_create_entry (table3, _("_Nick name:"), 8, net->nick, &edit_label_nick, 0);
|
||||
edit_entry_nick2 = servlist_create_entry (table3, _("Second choice:"), 9, net->nick2, &edit_label_nick2, 0);
|
||||
edit_entry_real = servlist_create_entry (table3, _("Rea_l name:"), 10, net->real, &edit_label_real, 0);
|
||||
edit_entry_user = servlist_create_entry (table3, _("_User name:"), 11, net->user, &edit_label_user, 0);
|
||||
edit_entry_nick = servlist_create_entry (table3, _("_Nick name:"), 7, net->nick, &edit_label_nick, 0);
|
||||
edit_entry_nick2 = servlist_create_entry (table3, _("Second choice:"), 8, net->nick2, &edit_label_nick2, 0);
|
||||
edit_entry_real = servlist_create_entry (table3, _("Rea_l name:"), 9, net->real, &edit_label_real, 0);
|
||||
edit_entry_user = servlist_create_entry (table3, _("_User name:"), 10, net->user, &edit_label_user, 0);
|
||||
|
||||
label_logintype = gtk_label_new (_("Login method:"));
|
||||
servlist_table_attach (table3, label_logintype, 0, 1, 12, 13,
|
||||
servlist_table_attach (table3, label_logintype, 0, 1, 11, 12,
|
||||
FALSE, FALSE,
|
||||
SERVLIST_ALIGN_START, SERVLIST_ALIGN_CENTER,
|
||||
SERVLIST_X_PADDING, SERVLIST_Y_PADDING);
|
||||
gtk_widget_set_halign (label_logintype, GTK_ALIGN_START);
|
||||
gtk_widget_set_valign (label_logintype, GTK_ALIGN_CENTER);
|
||||
combobox_logintypes = servlist_create_logintypecombo (notebook);
|
||||
servlist_table_attach (table3, combobox_logintypes, 1, 2, 12, 13,
|
||||
servlist_table_attach (table3, combobox_logintypes, 1, 2, 11, 12,
|
||||
FALSE, FALSE,
|
||||
SERVLIST_ALIGN_FILL, SERVLIST_ALIGN_FILL,
|
||||
4, 2);
|
||||
|
||||
edit_entry_pass = servlist_create_entry (table3, _("Password:"), 13, NULL, 0, _("Password used for login. If in doubt, leave blank."));
|
||||
edit_entry_pass = servlist_create_entry (table3, _("Password:"), 12, NULL, 0, _("Password used for login. If in doubt, leave blank."));
|
||||
if (edit_loaded_password)
|
||||
{
|
||||
memset (edit_loaded_password, 0, strlen (edit_loaded_password));
|
||||
@@ -2686,7 +2644,7 @@ servlist_open_edit (GtkWidget *parent, ircnet *net)
|
||||
if (selected_net && selected_net->logintype == LOGIN_SASLEXTERNAL)
|
||||
gtk_widget_set_sensitive (edit_entry_pass, FALSE);
|
||||
edit_check_show_pass = gtk_check_button_new_with_mnemonic (_("Show password"));
|
||||
servlist_table_attach (table3, edit_check_show_pass, 0, 2, 14, 15,
|
||||
servlist_table_attach (table3, edit_check_show_pass, 0, 2, 13, 14,
|
||||
FALSE, FALSE,
|
||||
SERVLIST_ALIGN_START, SERVLIST_ALIGN_CENTER,
|
||||
4, 2);
|
||||
@@ -2694,14 +2652,14 @@ servlist_open_edit (GtkWidget *parent, ircnet *net)
|
||||
G_CALLBACK (servlist_toggle_show_password_cb), edit_entry_pass);
|
||||
|
||||
edit_button_encrypt_pass = gtk_button_new_with_mnemonic (_("Encrypt saved password"));
|
||||
servlist_table_attach (table3, edit_button_encrypt_pass, 0, 1, 15, 16,
|
||||
servlist_table_attach (table3, edit_button_encrypt_pass, 0, 1, 14, 15,
|
||||
FALSE, FALSE,
|
||||
SERVLIST_ALIGN_START, SERVLIST_ALIGN_CENTER,
|
||||
SERVLIST_X_PADDING, SERVLIST_Y_PADDING);
|
||||
g_signal_connect (G_OBJECT (edit_button_encrypt_pass), "clicked",
|
||||
G_CALLBACK (servlist_encrypt_password_cb), net);
|
||||
edit_button_import_pass = gtk_button_new_with_mnemonic (_("Move password to keyring"));
|
||||
servlist_table_attach (table3, edit_button_import_pass, 1, 2, 15, 16,
|
||||
servlist_table_attach (table3, edit_button_import_pass, 1, 2, 14, 15,
|
||||
FALSE, FALSE,
|
||||
SERVLIST_ALIGN_START, SERVLIST_ALIGN_CENTER,
|
||||
4, 2);
|
||||
@@ -2709,14 +2667,14 @@ servlist_open_edit (GtkWidget *parent, ircnet *net)
|
||||
G_CALLBACK (servlist_import_password_cb), net);
|
||||
|
||||
label34 = gtk_label_new (_("Character set:"));
|
||||
servlist_table_attach (table3, label34, 0, 1, 16, 17,
|
||||
servlist_table_attach (table3, label34, 0, 1, 15, 16,
|
||||
FALSE, FALSE,
|
||||
SERVLIST_ALIGN_START, SERVLIST_ALIGN_CENTER,
|
||||
SERVLIST_X_PADDING, SERVLIST_Y_PADDING);
|
||||
gtk_widget_set_halign (label34, GTK_ALIGN_START);
|
||||
gtk_widget_set_valign (label34, GTK_ALIGN_CENTER);
|
||||
comboboxentry_charset = servlist_create_charsetcombo ();
|
||||
servlist_table_attach (table3, comboboxentry_charset, 1, 2, 16, 17,
|
||||
servlist_table_attach (table3, comboboxentry_charset, 1, 2, 15, 16,
|
||||
FALSE, FALSE,
|
||||
SERVLIST_ALIGN_FILL, SERVLIST_ALIGN_FILL,
|
||||
4, 2);
|
||||
@@ -2742,7 +2700,7 @@ servlist_open_edit (GtkWidget *parent, ircnet *net)
|
||||
G_CALLBACK (servlist_delete_client_cert_cb), net);
|
||||
gtk_box_pack_start (GTK_BOX (hbox_cert_buttons), edit_button_cert_delete, FALSE, FALSE, 0);
|
||||
|
||||
servlist_table_attach (table3, hbox_cert_buttons, 0, 2, 17, 18,
|
||||
servlist_table_attach (table3, hbox_cert_buttons, 0, 2, 16, 17,
|
||||
FALSE, FALSE,
|
||||
SERVLIST_ALIGN_START, SERVLIST_ALIGN_CENTER,
|
||||
SERVLIST_X_PADDING, SERVLIST_Y_PADDING);
|
||||
|
||||
@@ -23,7 +23,6 @@
|
||||
#include <math.h>
|
||||
|
||||
#include "../theme-access.h"
|
||||
#include "../theme-css.h"
|
||||
#include "../theme-manager.h"
|
||||
#include "../theme-runtime.h"
|
||||
#include "../../xtext-color.h"
|
||||
@@ -55,13 +54,6 @@ setup_apply_real (const ThemeChangedEvent *event)
|
||||
(void) event;
|
||||
}
|
||||
|
||||
void
|
||||
gtkutil_append_font_css (GString *css, const PangoFontDescription *font_desc)
|
||||
{
|
||||
(void) css;
|
||||
(void) font_desc;
|
||||
}
|
||||
|
||||
gboolean
|
||||
fe_dark_mode_is_enabled_for (unsigned int mode)
|
||||
{
|
||||
@@ -181,14 +173,6 @@ theme_gtk3_is_active (void)
|
||||
return stub_gtk3_active;
|
||||
}
|
||||
|
||||
gboolean
|
||||
theme_gtk3_lookup_theme_color (const char *name, GdkRGBA *out_color)
|
||||
{
|
||||
(void) name;
|
||||
(void) out_color;
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
static gboolean
|
||||
rgba_equal (const GdkRGBA *a, const GdkRGBA *b)
|
||||
{
|
||||
@@ -352,79 +336,6 @@ test_access_xtext_palette_widget_mapping_when_gtk3_active (void)
|
||||
g_object_unref (provider);
|
||||
}
|
||||
|
||||
static void
|
||||
test_access_palette_css_does_not_feed_back_into_sampling (void)
|
||||
{
|
||||
GtkWidget *window;
|
||||
GtkWidget *label;
|
||||
GtkCssProvider *theme1;
|
||||
GtkCssProvider *theme2;
|
||||
GdkScreen *screen;
|
||||
XTextColor palette[2] = { 0 };
|
||||
GdkRGBA old_bg;
|
||||
GdkRGBA old_fg;
|
||||
GdkRGBA expected;
|
||||
|
||||
if (!gtk_available)
|
||||
{
|
||||
g_test_message ("GTK display not available");
|
||||
return;
|
||||
}
|
||||
|
||||
reset_stubs ();
|
||||
stub_gtk3_active = TRUE;
|
||||
screen = gdk_screen_get_default ();
|
||||
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
|
||||
label = gtk_label_new ("mapped");
|
||||
gtk_container_add (GTK_CONTAINER (window), label);
|
||||
gtk_widget_realize (window);
|
||||
|
||||
/* Old GTK3 theme active at screen level. */
|
||||
theme1 = gtk_css_provider_new ();
|
||||
gtk_css_provider_load_from_data (theme1,
|
||||
"label { color: #112233; background-color: #445566; }"
|
||||
"label:selected { color: #778899; background-color: #aabbcc; }",
|
||||
-1, NULL);
|
||||
gtk_style_context_add_provider_for_screen (screen,
|
||||
GTK_STYLE_PROVIDER (theme1), GTK_STYLE_PROVIDER_PRIORITY_USER);
|
||||
|
||||
/* The app paints the sampled theme colors onto the widget, like the
|
||||
* user list / channel tree / input box palette provider does. */
|
||||
g_assert_true (gdk_rgba_parse (&old_bg, "#445566"));
|
||||
g_assert_true (gdk_rgba_parse (&old_fg, "#112233"));
|
||||
theme_css_apply_palette_widget (label, &old_bg, &old_fg, NULL);
|
||||
|
||||
/* The user switches to a new GTK3 theme. */
|
||||
gtk_style_context_remove_provider_for_screen (screen, GTK_STYLE_PROVIDER (theme1));
|
||||
theme2 = gtk_css_provider_new ();
|
||||
gtk_css_provider_load_from_data (theme2,
|
||||
"label { color: #00ff00; background-color: #ff0000; }"
|
||||
"label:selected { color: #0000ff; background-color: #ffff00; }",
|
||||
-1, NULL);
|
||||
gtk_style_context_add_provider_for_screen (screen,
|
||||
GTK_STYLE_PROVIDER (theme2), GTK_STYLE_PROVIDER_PRIORITY_USER);
|
||||
gtk_style_context_reset_widgets (screen);
|
||||
|
||||
/* Re-sampling must see the new theme, not the palette colors the
|
||||
* app applied for the old theme. */
|
||||
theme_get_xtext_colors_for_widget (label, palette, G_N_ELEMENTS (palette));
|
||||
|
||||
g_assert_true (stub_last_gtk_map_valid);
|
||||
g_assert_true (gdk_rgba_parse (&expected, "#00ff00"));
|
||||
g_assert_true (rgba_close (&stub_last_gtk_map.text_foreground, &expected));
|
||||
g_assert_true (gdk_rgba_parse (&expected, "#ff0000"));
|
||||
g_assert_true (rgba_close (&stub_last_gtk_map.text_background, &expected));
|
||||
|
||||
/* Sampling must not permanently strip the palette class. */
|
||||
g_assert_true (gtk_style_context_has_class (gtk_widget_get_style_context (label),
|
||||
theme_css_palette_class_name ()));
|
||||
|
||||
gtk_style_context_remove_provider_for_screen (screen, GTK_STYLE_PROVIDER (theme2));
|
||||
gtk_widget_destroy (window);
|
||||
g_object_unref (theme1);
|
||||
g_object_unref (theme2);
|
||||
}
|
||||
|
||||
static void
|
||||
test_access_dark_light_switch_affects_token_consumers (void)
|
||||
{
|
||||
@@ -452,8 +363,6 @@ main (int argc, char **argv)
|
||||
g_test_add_func ("/theme/access/xtext_palette_forwarding", test_access_xtext_palette_forwarding);
|
||||
g_test_add_func ("/theme/access/xtext_palette_widget_mapping_when_gtk3_active",
|
||||
test_access_xtext_palette_widget_mapping_when_gtk3_active);
|
||||
g_test_add_func ("/theme/access/palette_css_does_not_feed_back_into_sampling",
|
||||
test_access_palette_css_does_not_feed_back_into_sampling);
|
||||
g_test_add_func ("/theme/access/widget_style_forwarding", test_access_widget_style_forwarding);
|
||||
g_test_add_func ("/theme/access/dark_light_switch_affects_token_consumers",
|
||||
test_access_dark_light_switch_affects_token_consumers);
|
||||
|
||||
@@ -24,7 +24,6 @@
|
||||
#include <glib.h>
|
||||
#include <glib/gstdio.h>
|
||||
#include <gtk/gtk.h>
|
||||
#include <gio/gio.h>
|
||||
|
||||
#include "../theme-gtk3.h"
|
||||
#include "../../../common/gtk3-theme-service.h"
|
||||
@@ -40,14 +39,11 @@ static char *xdg_data_home;
|
||||
static char *theme_parent_root;
|
||||
static char *theme_child_root;
|
||||
static char *theme_switch_root;
|
||||
static char *theme_chrome_root;
|
||||
|
||||
static gboolean stub_system_prefers_dark;
|
||||
|
||||
gboolean
|
||||
theme_policy_system_prefers_dark (void)
|
||||
{
|
||||
return stub_system_prefers_dark;
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
static void
|
||||
@@ -135,8 +131,6 @@ zoitechat_gtk3_theme_find_by_id (const char *theme_id)
|
||||
return make_theme (theme_id, theme_child_root);
|
||||
if (g_strcmp0 (theme_id, "switch") == 0)
|
||||
return make_theme (theme_id, theme_switch_root);
|
||||
if (g_strcmp0 (theme_id, "chrome") == 0)
|
||||
return make_theme (theme_id, theme_chrome_root);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@@ -183,11 +177,6 @@ zoitechat_gtk3_theme_build_inheritance_chain (const char *theme_root)
|
||||
g_ptr_array_add (chain, g_strdup (theme_switch_root));
|
||||
return chain;
|
||||
}
|
||||
if (g_strcmp0 (theme_root, theme_chrome_root) == 0)
|
||||
{
|
||||
g_ptr_array_add (chain, g_strdup (theme_chrome_root));
|
||||
return chain;
|
||||
}
|
||||
g_ptr_array_unref (chain);
|
||||
return NULL;
|
||||
}
|
||||
@@ -258,22 +247,6 @@ setup_themes (void)
|
||||
"gtk-enable-animations=false\n"
|
||||
"gtk-cursor-blink-time=444\n");
|
||||
|
||||
theme_chrome_root = g_build_filename (temp_root, "chrome", NULL);
|
||||
g_assert_cmpint (g_mkdir_with_parents (theme_chrome_root, 0700), ==, 0);
|
||||
ensure_css_dir (theme_chrome_root, "gtk-3.24");
|
||||
/* Defines named colors but no window/menubar/menu rules of its own,
|
||||
* so all chrome styling must come from the backfill provider. */
|
||||
{
|
||||
char *css = g_build_filename (theme_chrome_root, "gtk-3.24", "gtk.css", NULL);
|
||||
write_file (css,
|
||||
"@define-color theme_bg_color #e8f4e8;\n"
|
||||
"@define-color theme_fg_color #102010;\n"
|
||||
"@define-color theme_selected_bg_color #3465a4;\n"
|
||||
"@define-color theme_selected_fg_color #ffffff;\n"
|
||||
"label { color: #102010; }\n");
|
||||
g_free (css);
|
||||
}
|
||||
|
||||
path = g_build_filename (theme_parent_root, "index.theme", NULL);
|
||||
write_file (path, "[Desktop Entry]\nName=parent\n");
|
||||
g_free (path);
|
||||
@@ -293,13 +266,11 @@ teardown_themes (void)
|
||||
g_free (theme_parent_root);
|
||||
g_free (theme_child_root);
|
||||
g_free (theme_switch_root);
|
||||
g_free (theme_chrome_root);
|
||||
g_free (xdg_data_home);
|
||||
g_free (temp_root);
|
||||
theme_parent_root = NULL;
|
||||
theme_child_root = NULL;
|
||||
theme_switch_root = NULL;
|
||||
theme_chrome_root = NULL;
|
||||
xdg_data_home = NULL;
|
||||
temp_root = NULL;
|
||||
}
|
||||
@@ -372,205 +343,6 @@ test_settings_restored_on_disable_and_switch (void)
|
||||
g_assert_false (theme_gtk3_is_active ());
|
||||
}
|
||||
|
||||
static void
|
||||
test_follow_system_variant_resolves_to_theme_variant (void)
|
||||
{
|
||||
GError *error = NULL;
|
||||
|
||||
if (!gtk_available)
|
||||
{
|
||||
g_test_message ("GTK display not available");
|
||||
return;
|
||||
}
|
||||
|
||||
/* An explicitly selected in-app theme must not follow the OS
|
||||
* light/dark preference: the legacy FOLLOW_SYSTEM variant resolves
|
||||
* to the variant the theme itself provides, so the window chrome
|
||||
* (menu bar) stays on the theme even when the system prefers dark. */
|
||||
stub_system_prefers_dark = TRUE;
|
||||
g_assert_true (theme_gtk3_apply ("switch", THEME_GTK3_VARIANT_FOLLOW_SYSTEM, &error));
|
||||
g_assert_no_error (error);
|
||||
g_assert_true (theme_gtk3_is_active ());
|
||||
g_assert_cmpint (theme_gtk3_active_variant (), ==, THEME_GTK3_VARIANT_PREFER_LIGHT);
|
||||
g_assert_false (get_bool_setting ("gtk-application-prefer-dark-theme"));
|
||||
|
||||
stub_system_prefers_dark = FALSE;
|
||||
theme_gtk3_disable ();
|
||||
}
|
||||
|
||||
static void
|
||||
test_menu_bar_follows_active_theme_colors (void)
|
||||
{
|
||||
GError *error = NULL;
|
||||
GtkWidget *window;
|
||||
GtkWidget *menubar;
|
||||
GtkStyleContext *context;
|
||||
GdkRGBA bg;
|
||||
GdkRGBA expected;
|
||||
|
||||
if (!gtk_available)
|
||||
{
|
||||
g_test_message ("GTK display not available");
|
||||
return;
|
||||
}
|
||||
|
||||
/* The chrome theme defines no menubar rules; without the backfill
|
||||
* provider the menu bar would fall through to the base (OS) theme
|
||||
* and follow the OS dark/light mode instead of the selected theme. */
|
||||
g_assert_true (theme_gtk3_apply ("chrome", THEME_GTK3_VARIANT_PREFER_LIGHT, &error));
|
||||
g_assert_no_error (error);
|
||||
|
||||
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
|
||||
menubar = gtk_menu_bar_new ();
|
||||
gtk_container_add (GTK_CONTAINER (window), menubar);
|
||||
gtk_widget_show_all (window);
|
||||
|
||||
context = gtk_widget_get_style_context (menubar);
|
||||
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
|
||||
gtk_style_context_get_background_color (context, GTK_STATE_FLAG_NORMAL, &bg);
|
||||
G_GNUC_END_IGNORE_DEPRECATIONS
|
||||
g_assert_true (gdk_rgba_parse (&expected, "#e8f4e8"));
|
||||
g_assert_cmpfloat (ABS (bg.red - expected.red), <, 0.01);
|
||||
g_assert_cmpfloat (ABS (bg.green - expected.green), <, 0.01);
|
||||
g_assert_cmpfloat (ABS (bg.blue - expected.blue), <, 0.01);
|
||||
|
||||
/* The window background must follow the theme too, or the space
|
||||
* around and beside the menu bar keeps the OS theme's colors. */
|
||||
context = gtk_widget_get_style_context (window);
|
||||
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
|
||||
gtk_style_context_get_background_color (context, GTK_STATE_FLAG_NORMAL, &bg);
|
||||
G_GNUC_END_IGNORE_DEPRECATIONS
|
||||
g_assert_cmpfloat (ABS (bg.red - expected.red), <, 0.01);
|
||||
g_assert_cmpfloat (ABS (bg.green - expected.green), <, 0.01);
|
||||
g_assert_cmpfloat (ABS (bg.blue - expected.blue), <, 0.01);
|
||||
|
||||
gtk_widget_destroy (window);
|
||||
theme_gtk3_disable ();
|
||||
}
|
||||
|
||||
static void
|
||||
test_desktop_color_sync_does_not_leak_into_chrome (void)
|
||||
{
|
||||
GError *error = NULL;
|
||||
GtkWidget *window;
|
||||
GtkWidget *menubar;
|
||||
GtkStyleContext *context;
|
||||
GtkCssProvider *desktop_css;
|
||||
GdkScreen *screen;
|
||||
GdkRGBA bg;
|
||||
GdkRGBA expected;
|
||||
GdkRGBA injected;
|
||||
|
||||
if (!gtk_available)
|
||||
{
|
||||
g_test_message ("GTK display not available");
|
||||
return;
|
||||
}
|
||||
|
||||
/* KDE's GTK color-scheme sync (~/.config/gtk-3.0/gtk.css) redefines
|
||||
* the standard named colors with the OS palette at USER priority.
|
||||
* The switch theme defines no named colors of its own, so a naive
|
||||
* @theme_bg_color reference in the chrome backfill would resolve to
|
||||
* the injected OS dark palette; the backfill must use its neutral
|
||||
* variant fallback instead. */
|
||||
screen = gdk_screen_get_default ();
|
||||
desktop_css = gtk_css_provider_new ();
|
||||
gtk_css_provider_load_from_data (desktop_css,
|
||||
"@define-color theme_bg_color #1e1e1e;\n"
|
||||
"@define-color theme_fg_color #eeeeee;\n"
|
||||
"menubar { background-color: #1e1e1e; }\n",
|
||||
-1, NULL);
|
||||
gtk_style_context_add_provider_for_screen (screen,
|
||||
GTK_STYLE_PROVIDER (desktop_css), GTK_STYLE_PROVIDER_PRIORITY_USER);
|
||||
|
||||
g_assert_true (theme_gtk3_apply ("switch", THEME_GTK3_VARIANT_PREFER_LIGHT, &error));
|
||||
g_assert_no_error (error);
|
||||
|
||||
{
|
||||
GtkWidget *item;
|
||||
GdkRGBA item_bg;
|
||||
|
||||
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
|
||||
menubar = gtk_menu_bar_new ();
|
||||
item = gtk_menu_item_new_with_label ("File");
|
||||
gtk_menu_shell_append (GTK_MENU_SHELL (menubar), item);
|
||||
gtk_container_add (GTK_CONTAINER (window), menubar);
|
||||
gtk_widget_show_all (window);
|
||||
|
||||
context = gtk_widget_get_style_context (menubar);
|
||||
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
|
||||
gtk_style_context_get_background_color (context, GTK_STATE_FLAG_NORMAL, &bg);
|
||||
G_GNUC_END_IGNORE_DEPRECATIONS
|
||||
g_assert_true (gdk_rgba_parse (&expected, "#f6f5f4"));
|
||||
g_assert_true (gdk_rgba_parse (&injected, "#1e1e1e"));
|
||||
g_assert_cmpfloat (ABS (bg.red - injected.red), >, 0.1);
|
||||
g_assert_cmpfloat (ABS (bg.red - expected.red), <, 0.01);
|
||||
g_assert_cmpfloat (ABS (bg.green - expected.green), <, 0.01);
|
||||
g_assert_cmpfloat (ABS (bg.blue - expected.blue), <, 0.01);
|
||||
|
||||
/* The menu bar body and the menu items must be one surface. */
|
||||
context = gtk_widget_get_style_context (item);
|
||||
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
|
||||
gtk_style_context_get_background_color (context, GTK_STATE_FLAG_NORMAL, &item_bg);
|
||||
G_GNUC_END_IGNORE_DEPRECATIONS
|
||||
g_assert_cmpfloat (ABS (item_bg.red - bg.red), <, 0.01);
|
||||
g_assert_cmpfloat (ABS (item_bg.green - bg.green), <, 0.01);
|
||||
g_assert_cmpfloat (ABS (item_bg.blue - bg.blue), <, 0.01);
|
||||
}
|
||||
|
||||
gtk_widget_destroy (window);
|
||||
theme_gtk3_disable ();
|
||||
gtk_style_context_remove_provider_for_screen (screen, GTK_STYLE_PROVIDER (desktop_css));
|
||||
g_object_unref (desktop_css);
|
||||
}
|
||||
|
||||
static void
|
||||
test_stale_theme_symlink_is_replaced (void)
|
||||
{
|
||||
GError *error = NULL;
|
||||
char *themes_dir;
|
||||
char *link_path;
|
||||
char *target;
|
||||
char *active_theme_name = NULL;
|
||||
|
||||
if (!gtk_available)
|
||||
{
|
||||
g_test_message ("GTK display not available");
|
||||
return;
|
||||
}
|
||||
if (!has_default_seat ())
|
||||
{
|
||||
g_test_message ("No default seat available");
|
||||
return;
|
||||
}
|
||||
|
||||
/* A dangling symlink left behind by a removed theme must not block
|
||||
* pinning gtk-theme-name to the newly applied theme. */
|
||||
themes_dir = g_build_filename (xdg_data_home, "themes", NULL);
|
||||
g_assert_cmpint (g_mkdir_with_parents (themes_dir, 0700), ==, 0);
|
||||
link_path = g_build_filename (themes_dir, "switch", NULL);
|
||||
g_unlink (link_path);
|
||||
{
|
||||
GFile *link_file = g_file_new_for_path (link_path);
|
||||
g_assert_true (g_file_make_symbolic_link (link_file, "/nonexistent/switch", NULL, NULL));
|
||||
g_object_unref (link_file);
|
||||
}
|
||||
|
||||
g_assert_true (theme_gtk3_apply ("switch", THEME_GTK3_VARIANT_PREFER_LIGHT, &error));
|
||||
g_assert_no_error (error);
|
||||
|
||||
target = g_file_read_link (link_path, NULL);
|
||||
g_assert_cmpstr (target, ==, theme_switch_root);
|
||||
g_object_get (gtk_settings_get_default (), "gtk-theme-name", &active_theme_name, NULL);
|
||||
g_assert_cmpstr (active_theme_name, ==, "switch");
|
||||
|
||||
g_free (active_theme_name);
|
||||
g_free (target);
|
||||
g_free (link_path);
|
||||
g_free (themes_dir);
|
||||
theme_gtk3_disable ();
|
||||
}
|
||||
|
||||
int
|
||||
main (int argc, char **argv)
|
||||
{
|
||||
@@ -582,14 +354,6 @@ main (int argc, char **argv)
|
||||
|
||||
g_test_add_func ("/theme/gtk3/settings_layer_precedence", test_settings_layer_precedence);
|
||||
g_test_add_func ("/theme/gtk3/settings_restored_on_disable_and_switch", test_settings_restored_on_disable_and_switch);
|
||||
g_test_add_func ("/theme/gtk3/follow_system_variant_resolves_to_theme_variant",
|
||||
test_follow_system_variant_resolves_to_theme_variant);
|
||||
g_test_add_func ("/theme/gtk3/menu_bar_follows_active_theme_colors",
|
||||
test_menu_bar_follows_active_theme_colors);
|
||||
g_test_add_func ("/theme/gtk3/desktop_color_sync_does_not_leak_into_chrome",
|
||||
test_desktop_color_sync_does_not_leak_into_chrome);
|
||||
g_test_add_func ("/theme/gtk3/stale_theme_symlink_is_replaced",
|
||||
test_stale_theme_symlink_is_replaced);
|
||||
|
||||
prefs.hex_gui_gtk3_variant = THEME_GTK3_VARIANT_PREFER_LIGHT;
|
||||
|
||||
|
||||
@@ -89,9 +89,3 @@ theme_gtk3_is_active (void)
|
||||
{
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
ThemeGtk3Variant
|
||||
theme_gtk3_active_variant (void)
|
||||
{
|
||||
return THEME_GTK3_VARIANT_FOLLOW_SYSTEM;
|
||||
}
|
||||
|
||||
@@ -33,7 +33,6 @@ InputStyle *input_style;
|
||||
|
||||
static gboolean gtk_available;
|
||||
static int apply_current_calls;
|
||||
static int set_token_color_calls;
|
||||
static char applied_theme_id[256];
|
||||
static ThemeGtk3Variant applied_variant;
|
||||
static gboolean removed_selected;
|
||||
@@ -105,7 +104,6 @@ theme_manager_set_token_color (unsigned int dark_mode, ThemeSemanticToken token,
|
||||
(void)dark_mode;
|
||||
(void)token;
|
||||
(void)color;
|
||||
set_token_color_calls++;
|
||||
if (changed)
|
||||
*changed = FALSE;
|
||||
}
|
||||
@@ -421,43 +419,6 @@ test_select_none_resets_theme_and_applies (void)
|
||||
gtk_widget_destroy (page);
|
||||
}
|
||||
|
||||
static void
|
||||
test_select_theme_does_not_pin_palette_tokens (void)
|
||||
{
|
||||
GtkWidget *page;
|
||||
theme_preferences_ui *ui;
|
||||
struct zoitechatprefs setup_prefs;
|
||||
|
||||
if (!gtk_available)
|
||||
{
|
||||
g_test_message ("GTK display not available");
|
||||
return;
|
||||
}
|
||||
|
||||
memset (&setup_prefs, 0, sizeof (setup_prefs));
|
||||
memset (&prefs, 0, sizeof (prefs));
|
||||
removed_selected = FALSE;
|
||||
apply_current_calls = 0;
|
||||
set_token_color_calls = 0;
|
||||
|
||||
page = theme_preferences_create_page (NULL, &setup_prefs, NULL);
|
||||
ui = g_object_get_data (G_OBJECT (page), "theme-preferences-ui");
|
||||
g_assert_nonnull (ui);
|
||||
|
||||
/* 0 = None, 1 = removed-theme, 2 = fallback-theme */
|
||||
gtk_combo_box_set_active (GTK_COMBO_BOX (ui->gtk3_combo), 2);
|
||||
|
||||
g_assert_cmpstr (prefs.hex_gui_gtk3_theme, ==, "fallback-theme");
|
||||
g_assert_cmpint (apply_current_calls, ==, 1);
|
||||
/* Selecting a GTK3 theme must leave the mapped palette tokens
|
||||
* unpinned so the user list, channel tree and input box keep
|
||||
* resolving their colors from the active theme instead of being
|
||||
* frozen until the next restart. */
|
||||
g_assert_cmpint (set_token_color_calls, ==, 0);
|
||||
|
||||
gtk_widget_destroy (page);
|
||||
}
|
||||
|
||||
int
|
||||
main (int argc, char **argv)
|
||||
{
|
||||
@@ -469,7 +430,5 @@ main (int argc, char **argv)
|
||||
test_unset_theme_keeps_system_default_without_apply);
|
||||
g_test_add_func ("/theme/preferences/gtk3_select_none_resets_theme",
|
||||
test_select_none_resets_theme_and_applies);
|
||||
g_test_add_func ("/theme/preferences/gtk3_select_theme_does_not_pin_palette_tokens",
|
||||
test_select_theme_does_not_pin_palette_tokens);
|
||||
return g_test_run ();
|
||||
}
|
||||
|
||||
@@ -20,8 +20,6 @@
|
||||
|
||||
#include "theme-access.h"
|
||||
|
||||
#include "theme-css.h"
|
||||
#include "theme-gtk3.h"
|
||||
#include "theme-runtime.h"
|
||||
|
||||
|
||||
@@ -118,17 +116,6 @@ theme_access_lookup_named_color (GtkStyleContext *context, const char *const *na
|
||||
{
|
||||
size_t i;
|
||||
|
||||
/* With an in-app GTK3 theme selected, prefer the colors resolved from
|
||||
* the theme itself: desktop integration CSS (e.g. KDE's color-scheme
|
||||
* sync) redefines the same named colors with the OS palette in the
|
||||
* widget cascade, which would drag OS dark/light colors into the
|
||||
* mapped palette. */
|
||||
for (i = 0; names[i] != NULL; i++)
|
||||
{
|
||||
if (theme_gtk3_lookup_theme_color (names[i], out_color))
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
for (i = 0; names[i] != NULL; i++)
|
||||
{
|
||||
if (gtk_style_context_lookup_color (context, names[i], out_color))
|
||||
@@ -162,8 +149,6 @@ theme_access_get_gtk_palette_map (GtkWidget *widget, ThemeGtkPaletteMap *out_map
|
||||
static const char *const selected_bg_fallbacks[] = { "theme_selected_bg_color", NULL };
|
||||
static const char *const selected_fg_fallbacks[] = { "theme_selected_fg_color", NULL };
|
||||
GtkStyleContext *context;
|
||||
const char *palette_class;
|
||||
gboolean had_palette_class;
|
||||
GdkRGBA named;
|
||||
GdkRGBA accent;
|
||||
|
||||
@@ -175,16 +160,6 @@ theme_access_get_gtk_palette_map (GtkWidget *widget, ThemeGtkPaletteMap *out_map
|
||||
if (context == NULL)
|
||||
return FALSE;
|
||||
|
||||
/* The application paints these widgets with fixed colors through the
|
||||
* zoitechat-palette provider. Sampling must see the underlying GTK3
|
||||
* theme, not the colors we applied earlier: otherwise every theme
|
||||
* change reads back the previous palette and the user list, channel
|
||||
* tree and input box keep their stale colors until a restart. */
|
||||
palette_class = theme_css_palette_class_name ();
|
||||
had_palette_class = gtk_style_context_has_class (context, palette_class);
|
||||
if (had_palette_class)
|
||||
gtk_style_context_remove_class (context, palette_class);
|
||||
|
||||
theme_access_context_get_color (context, GTK_STATE_FLAG_NORMAL, &out_map->text_foreground);
|
||||
theme_access_resolve_map_background (context, GTK_STATE_FLAG_NORMAL, base_fallbacks,
|
||||
&out_map->text_background);
|
||||
@@ -198,10 +173,6 @@ theme_access_get_gtk_palette_map (GtkWidget *widget, ThemeGtkPaletteMap *out_map
|
||||
if (accent.alpha <= 0.0)
|
||||
accent = out_map->selection_background;
|
||||
out_map->accent = accent;
|
||||
|
||||
if (had_palette_class)
|
||||
gtk_style_context_add_class (context, palette_class);
|
||||
|
||||
out_map->enabled = TRUE;
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
@@ -56,11 +56,12 @@ theme_application_apply_toplevel_theme (gboolean dark)
|
||||
|
||||
if (theme_gtk3_is_active ())
|
||||
{
|
||||
/* An explicitly selected in-app theme controls its own
|
||||
* variant; the OS light/dark preference must not leak into
|
||||
* the window chrome (menu bar, dialogs). The active variant
|
||||
* is always resolved to light or dark. */
|
||||
prefer_dark = theme_gtk3_active_variant () == THEME_GTK3_VARIANT_PREFER_DARK;
|
||||
if (prefs.hex_gui_gtk3_variant == THEME_GTK3_VARIANT_PREFER_DARK)
|
||||
prefer_dark = TRUE;
|
||||
else if (prefs.hex_gui_gtk3_variant == THEME_GTK3_VARIANT_PREFER_LIGHT)
|
||||
prefer_dark = FALSE;
|
||||
else
|
||||
prefer_dark = theme_policy_system_prefers_dark ();
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
@@ -60,12 +60,6 @@ typedef struct
|
||||
static GtkCssProvider *theme_css_input_provider;
|
||||
static ThemeCssInputFingerprint theme_css_input_fp;
|
||||
|
||||
const char *
|
||||
theme_css_palette_class_name (void)
|
||||
{
|
||||
return theme_css_selector_palette_class;
|
||||
}
|
||||
|
||||
void
|
||||
theme_css_apply_app_provider (GtkStyleProvider *provider)
|
||||
{
|
||||
|
||||
@@ -30,7 +30,6 @@
|
||||
* theme_css_apply_widget_provider:
|
||||
* Use for widget-local CSS providers attached to a specific widget context.
|
||||
*/
|
||||
const char *theme_css_palette_class_name (void);
|
||||
void theme_css_apply_app_provider (GtkStyleProvider *provider);
|
||||
void theme_css_remove_app_provider (GtkStyleProvider *provider);
|
||||
void theme_css_apply_widget_provider (GtkWidget *widget, GtkStyleProvider *provider);
|
||||
|
||||
@@ -33,60 +33,11 @@
|
||||
|
||||
static GPtrArray *theme_gtk3_providers_base;
|
||||
static GPtrArray *theme_gtk3_providers_variant;
|
||||
static GtkCssProvider *theme_gtk3_chrome_provider;
|
||||
static GHashTable *theme_gtk3_theme_colors;
|
||||
static GHashTable *theme_gtk3_provider_cache;
|
||||
static gboolean theme_gtk3_active;
|
||||
static char *theme_gtk3_current_id;
|
||||
static ThemeGtk3Variant theme_gtk3_current_variant;
|
||||
|
||||
/* Menu bar and menus fall back to the base gtk-theme-name theme (the OS
|
||||
* theme) for any property the selected in-app theme's CSS does not define,
|
||||
* which mixes OS dark/light colors into the chrome (issue: dark menu bar on
|
||||
* a light in-app theme when the OS is in dark mode). While an in-app theme
|
||||
* is active, backfill those widgets with the theme's own named colors. The
|
||||
* provider sits just below the theme providers, so a theme that styles its
|
||||
* menus keeps full control. */
|
||||
#define THEME_GTK3_CHROME_PRIORITY (GTK_STYLE_PROVIDER_PRIORITY_USER - 1)
|
||||
/* Concrete color values are formatted in: desktop integration CSS (e.g.
|
||||
* KDE's color-scheme sync in ~/.config/gtk-3.0/gtk.css) redefines the
|
||||
* standard named colors with the OS palette at USER priority, so a
|
||||
* "@theme_bg_color" reference here would resolve to the OS dark/light
|
||||
* colors instead of the selected theme's. */
|
||||
static const char theme_gtk3_chrome_css_template[] =
|
||||
".background, .background:backdrop {"
|
||||
" background-color: %s;"
|
||||
" color: %s;"
|
||||
"}"
|
||||
"headerbar, headerbar:backdrop, .titlebar, .titlebar:backdrop {"
|
||||
" background-color: %s;"
|
||||
" background-image: none;"
|
||||
" color: %s;"
|
||||
"}";
|
||||
|
||||
/* The menu bar body and the menu items are separate CSS surfaces; desktop
|
||||
* integration CSS or a theme can style one but not the other, splitting
|
||||
* the menu bar row into two colors. These rules sit above the theme and
|
||||
* the desktop CSS so body and items always render as one surface. */
|
||||
#define THEME_GTK3_MENU_UNIFORM_PRIORITY (GTK_STYLE_PROVIDER_PRIORITY_USER + 40)
|
||||
static const char theme_gtk3_menu_uniform_template[] =
|
||||
"menubar, menubar:backdrop, menubar > menuitem, menubar > menuitem:backdrop,"
|
||||
"menu, menu:backdrop, .menu, .menu:backdrop, menu > menuitem, menu > menuitem:backdrop {"
|
||||
" background-color: %s;"
|
||||
" background-image: none;"
|
||||
" color: %s;"
|
||||
"}"
|
||||
"menubar > menuitem:hover, menubar > menuitem:selected,"
|
||||
"menu > menuitem:hover, menu > menuitem:selected,"
|
||||
".menu menuitem:hover, .menu menuitem:selected {"
|
||||
" background-color: %s;"
|
||||
" background-image: none;"
|
||||
" color: %s;"
|
||||
"}"
|
||||
"menubar > menuitem:disabled, menu > menuitem:disabled {"
|
||||
" color: alpha(%s, 0.5);"
|
||||
"}";
|
||||
|
||||
typedef struct
|
||||
{
|
||||
GHashTable *defaults;
|
||||
@@ -98,7 +49,6 @@ typedef struct
|
||||
static ThemeGtk3SettingsState theme_gtk3_settings_state;
|
||||
|
||||
static gboolean settings_apply_property (GtkSettings *settings, const char *property_name, const char *raw_value);
|
||||
static void theme_gtk3_menu_uniform_apply (const char *bg, const char *fg, const char *sel_bg, const char *sel_fg);
|
||||
|
||||
static gboolean
|
||||
theme_gtk3_theme_name_is_dark (const char *name)
|
||||
@@ -449,21 +399,6 @@ settings_theme_link_search_path (const char *theme_root, const char *theme_name)
|
||||
}
|
||||
|
||||
link_path = g_build_filename (themes_root, theme_name, NULL);
|
||||
|
||||
/* A leftover symlink from a removed or relocated theme would satisfy
|
||||
* the EXISTS check while pointing at the wrong (or no) theme, leaving
|
||||
* the base gtk-theme-name on the OS theme. Replace it. */
|
||||
{
|
||||
char *link_target = g_file_read_link (link_path, NULL);
|
||||
if (link_target)
|
||||
{
|
||||
if (g_strcmp0 (link_target, theme_root) != 0 ||
|
||||
!g_file_test (link_path, G_FILE_TEST_IS_DIR))
|
||||
g_unlink (link_path);
|
||||
g_free (link_target);
|
||||
}
|
||||
}
|
||||
|
||||
if (!g_file_test (link_path, G_FILE_TEST_EXISTS))
|
||||
{
|
||||
GFile *link_file = g_file_new_for_path (link_path);
|
||||
@@ -822,176 +757,12 @@ settings_apply_from_file (const char *theme_root, const char *css_dir)
|
||||
g_ptr_array_unref (settings_paths);
|
||||
}
|
||||
|
||||
static gboolean
|
||||
theme_gtk3_providers_define_color (const char *name)
|
||||
{
|
||||
char *needle = g_strdup_printf ("@define-color %s ", name);
|
||||
gboolean found = FALSE;
|
||||
guint i;
|
||||
|
||||
for (i = 0; !found && theme_gtk3_providers_base && i < theme_gtk3_providers_base->len; i++)
|
||||
{
|
||||
char *dump = gtk_css_provider_to_string (g_ptr_array_index (theme_gtk3_providers_base, i));
|
||||
found = dump && strstr (dump, needle) != NULL;
|
||||
g_free (dump);
|
||||
}
|
||||
for (i = 0; !found && theme_gtk3_providers_variant && i < theme_gtk3_providers_variant->len; i++)
|
||||
{
|
||||
char *dump = gtk_css_provider_to_string (g_ptr_array_index (theme_gtk3_providers_variant, i));
|
||||
found = dump && strstr (dump, needle) != NULL;
|
||||
g_free (dump);
|
||||
}
|
||||
|
||||
g_free (needle);
|
||||
return found;
|
||||
}
|
||||
|
||||
/* Resolve a named color from the selected theme itself. The lookup
|
||||
* context layers the theme's providers over the screen cascade, so the
|
||||
* theme's own @define-color wins; when the theme does not define the
|
||||
* name at all, fall back to a neutral palette matching the theme's
|
||||
* variant instead of whatever the desktop injected into the cascade. */
|
||||
static char *
|
||||
theme_gtk3_chrome_resolve_color (GtkStyleContext *lookup, const char *name, const char *fallback)
|
||||
{
|
||||
GdkRGBA color;
|
||||
|
||||
if (!theme_gtk3_providers_define_color (name) ||
|
||||
!gtk_style_context_lookup_color (lookup, name, &color))
|
||||
g_assert (gdk_rgba_parse (&color, fallback));
|
||||
|
||||
if (!theme_gtk3_theme_colors)
|
||||
theme_gtk3_theme_colors = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
|
||||
{
|
||||
GdkRGBA *stored = g_new (GdkRGBA, 1);
|
||||
*stored = color;
|
||||
g_hash_table_insert (theme_gtk3_theme_colors, g_strdup (name), stored);
|
||||
}
|
||||
|
||||
return gdk_rgba_to_string (&color);
|
||||
}
|
||||
|
||||
gboolean
|
||||
theme_gtk3_lookup_theme_color (const char *name, GdkRGBA *out_color)
|
||||
{
|
||||
GdkRGBA *stored;
|
||||
|
||||
if (!theme_gtk3_active || !theme_gtk3_theme_colors || !name || !out_color)
|
||||
return FALSE;
|
||||
|
||||
stored = g_hash_table_lookup (theme_gtk3_theme_colors, name);
|
||||
if (!stored)
|
||||
return FALSE;
|
||||
|
||||
*out_color = *stored;
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
static void
|
||||
theme_gtk3_chrome_provider_apply (gboolean prefer_dark)
|
||||
{
|
||||
GdkScreen *screen = gdk_screen_get_default ();
|
||||
GtkStyleContext *lookup;
|
||||
char *bg;
|
||||
char *fg;
|
||||
char *sel_bg;
|
||||
char *sel_fg;
|
||||
char *css;
|
||||
guint i;
|
||||
|
||||
if (!screen)
|
||||
return;
|
||||
|
||||
lookup = gtk_style_context_new ();
|
||||
for (i = 0; theme_gtk3_providers_base && i < theme_gtk3_providers_base->len; i++)
|
||||
gtk_style_context_add_provider (lookup,
|
||||
GTK_STYLE_PROVIDER (g_ptr_array_index (theme_gtk3_providers_base, i)),
|
||||
GTK_STYLE_PROVIDER_PRIORITY_USER);
|
||||
for (i = 0; theme_gtk3_providers_variant && i < theme_gtk3_providers_variant->len; i++)
|
||||
gtk_style_context_add_provider (lookup,
|
||||
GTK_STYLE_PROVIDER (g_ptr_array_index (theme_gtk3_providers_variant, i)),
|
||||
GTK_STYLE_PROVIDER_PRIORITY_USER);
|
||||
|
||||
if (theme_gtk3_theme_colors)
|
||||
g_hash_table_remove_all (theme_gtk3_theme_colors);
|
||||
|
||||
bg = theme_gtk3_chrome_resolve_color (lookup, "theme_bg_color",
|
||||
prefer_dark ? "#242424" : "#f6f5f4");
|
||||
fg = theme_gtk3_chrome_resolve_color (lookup, "theme_fg_color",
|
||||
prefer_dark ? "#eeeeee" : "#2e3436");
|
||||
sel_bg = theme_gtk3_chrome_resolve_color (lookup, "theme_selected_bg_color", "#3584e4");
|
||||
sel_fg = theme_gtk3_chrome_resolve_color (lookup, "theme_selected_fg_color", "#ffffff");
|
||||
/* Not used by the chrome CSS itself, but resolved and stored for the
|
||||
* mapped-palette sampling fallback (chat area and friends). */
|
||||
g_free (theme_gtk3_chrome_resolve_color (lookup, "theme_base_color",
|
||||
prefer_dark ? "#1e1e1e" : "#ffffff"));
|
||||
g_object_unref (lookup);
|
||||
|
||||
css = g_strdup_printf (theme_gtk3_chrome_css_template,
|
||||
bg, fg,
|
||||
bg, fg);
|
||||
|
||||
if (!theme_gtk3_chrome_provider)
|
||||
theme_gtk3_chrome_provider = gtk_css_provider_new ();
|
||||
gtk_css_provider_load_from_data (theme_gtk3_chrome_provider, css, -1, NULL);
|
||||
|
||||
gtk_style_context_add_provider_for_screen (screen,
|
||||
GTK_STYLE_PROVIDER (theme_gtk3_chrome_provider),
|
||||
THEME_GTK3_CHROME_PRIORITY);
|
||||
|
||||
theme_gtk3_menu_uniform_apply (bg, fg, sel_bg, sel_fg);
|
||||
|
||||
g_free (css);
|
||||
g_free (sel_fg);
|
||||
g_free (sel_bg);
|
||||
g_free (fg);
|
||||
g_free (bg);
|
||||
}
|
||||
|
||||
static GtkCssProvider *theme_gtk3_menu_uniform_provider;
|
||||
|
||||
static void
|
||||
theme_gtk3_menu_uniform_apply (const char *bg, const char *fg, const char *sel_bg, const char *sel_fg)
|
||||
{
|
||||
GdkScreen *screen = gdk_screen_get_default ();
|
||||
char *css;
|
||||
|
||||
if (!screen)
|
||||
return;
|
||||
|
||||
css = g_strdup_printf (theme_gtk3_menu_uniform_template, bg, fg, sel_bg, sel_fg, fg);
|
||||
if (!theme_gtk3_menu_uniform_provider)
|
||||
theme_gtk3_menu_uniform_provider = gtk_css_provider_new ();
|
||||
gtk_css_provider_load_from_data (theme_gtk3_menu_uniform_provider, css, -1, NULL);
|
||||
gtk_style_context_add_provider_for_screen (screen,
|
||||
GTK_STYLE_PROVIDER (theme_gtk3_menu_uniform_provider),
|
||||
THEME_GTK3_MENU_UNIFORM_PRIORITY);
|
||||
g_free (css);
|
||||
}
|
||||
|
||||
static void
|
||||
theme_gtk3_chrome_provider_remove (void)
|
||||
{
|
||||
GdkScreen *screen = gdk_screen_get_default ();
|
||||
|
||||
if (!screen)
|
||||
return;
|
||||
|
||||
if (theme_gtk3_chrome_provider)
|
||||
gtk_style_context_remove_provider_for_screen (screen,
|
||||
GTK_STYLE_PROVIDER (theme_gtk3_chrome_provider));
|
||||
if (theme_gtk3_menu_uniform_provider)
|
||||
gtk_style_context_remove_provider_for_screen (screen,
|
||||
GTK_STYLE_PROVIDER (theme_gtk3_menu_uniform_provider));
|
||||
}
|
||||
|
||||
static void
|
||||
theme_gtk3_remove_provider (void)
|
||||
{
|
||||
GdkScreen *screen = gdk_screen_get_default ();
|
||||
guint i;
|
||||
|
||||
theme_gtk3_chrome_provider_remove ();
|
||||
if (screen && theme_gtk3_providers_variant)
|
||||
{
|
||||
for (i = 0; i < theme_gtk3_providers_variant->len; i++)
|
||||
@@ -1095,7 +866,6 @@ load_css_with_variant (ZoitechatGtk3Theme *theme, ThemeGtk3Variant variant, GErr
|
||||
}
|
||||
|
||||
g_ptr_array_unref (chain);
|
||||
theme_gtk3_chrome_provider_apply (prefer_dark);
|
||||
settings_apply_for_variant (variant);
|
||||
theme_gtk3_reset_widgets ();
|
||||
theme_gtk3_active = TRUE;
|
||||
@@ -1106,34 +876,23 @@ static gboolean
|
||||
theme_gtk3_apply_internal (const char *theme_id, ThemeGtk3Variant variant, gboolean force_reload, GError **error)
|
||||
{
|
||||
ZoitechatGtk3Theme *theme;
|
||||
char *previous_id;
|
||||
ThemeGtk3Variant previous_variant;
|
||||
gboolean had_previous;
|
||||
char *previous_id = g_strdup (theme_gtk3_current_id);
|
||||
ThemeGtk3Variant previous_variant = theme_gtk3_current_variant;
|
||||
gboolean had_previous = theme_gtk3_active && previous_id && previous_id[0];
|
||||
gboolean ok;
|
||||
|
||||
theme = zoitechat_gtk3_theme_find_by_id (theme_id);
|
||||
if (!theme)
|
||||
return g_set_error_literal (error, G_FILE_ERROR, G_FILE_ERROR_NOENT, "GTK3 theme not found."), FALSE;
|
||||
|
||||
/* An explicitly selected in-app theme pins the rendering to that
|
||||
* theme: it must not flip with the OS light/dark preference. Legacy
|
||||
* configs still carry FOLLOW_SYSTEM (the pre-inference default), so
|
||||
* resolve it to the variant the theme itself provides. */
|
||||
if (variant == THEME_GTK3_VARIANT_FOLLOW_SYSTEM)
|
||||
variant = theme_gtk3_infer_variant (theme);
|
||||
|
||||
if (!force_reload &&
|
||||
theme_gtk3_active &&
|
||||
g_strcmp0 (theme_gtk3_current_id, theme_id) == 0 &&
|
||||
theme_gtk3_current_variant == variant)
|
||||
{
|
||||
zoitechat_gtk3_theme_free (theme);
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
previous_id = g_strdup (theme_gtk3_current_id);
|
||||
previous_variant = theme_gtk3_current_variant;
|
||||
had_previous = theme_gtk3_active && previous_id && previous_id[0];
|
||||
theme = zoitechat_gtk3_theme_find_by_id (theme_id);
|
||||
if (!theme)
|
||||
{
|
||||
g_free (previous_id);
|
||||
return g_set_error_literal (error, G_FILE_ERROR, G_FILE_ERROR_NOENT, "GTK3 theme not found."), FALSE;
|
||||
}
|
||||
|
||||
theme_gtk3_remove_provider ();
|
||||
if (force_reload)
|
||||
@@ -1202,12 +961,6 @@ void
|
||||
theme_gtk3_disable (void)
|
||||
{
|
||||
theme_gtk3_remove_provider ();
|
||||
g_clear_object (&theme_gtk3_chrome_provider);
|
||||
g_clear_pointer (&theme_gtk3_theme_colors, g_hash_table_destroy);
|
||||
/* Following the system theme: keep the menu bar body and the menu
|
||||
* items on one surface too, using the system's own colors. */
|
||||
theme_gtk3_menu_uniform_apply ("@theme_bg_color", "@theme_fg_color",
|
||||
"@theme_selected_bg_color", "@theme_selected_fg_color");
|
||||
g_clear_pointer (&theme_gtk3_current_id, g_free);
|
||||
theme_gtk3_invalidate_provider_cache ();
|
||||
g_clear_pointer (&theme_gtk3_provider_cache, g_hash_table_destroy);
|
||||
@@ -1237,13 +990,3 @@ theme_gtk3_is_active (void)
|
||||
{
|
||||
return theme_gtk3_active;
|
||||
}
|
||||
|
||||
ThemeGtk3Variant
|
||||
theme_gtk3_active_variant (void)
|
||||
{
|
||||
/* Always resolved to PREFER_LIGHT or PREFER_DARK while a theme is
|
||||
* active; FOLLOW_SYSTEM only when no in-app theme is applied. */
|
||||
if (!theme_gtk3_active)
|
||||
return THEME_GTK3_VARIANT_FOLLOW_SYSTEM;
|
||||
return theme_gtk3_current_variant;
|
||||
}
|
||||
|
||||
@@ -22,7 +22,6 @@
|
||||
#define ZOITECHAT_THEME_GTK3_H
|
||||
|
||||
#include <glib.h>
|
||||
#include <gdk/gdk.h>
|
||||
|
||||
typedef enum
|
||||
{
|
||||
@@ -39,7 +38,5 @@ ThemeGtk3Variant theme_gtk3_variant_for_theme (const char *theme_id);
|
||||
void theme_gtk3_invalidate_provider_cache (void);
|
||||
void theme_gtk3_disable (void);
|
||||
gboolean theme_gtk3_is_active (void);
|
||||
ThemeGtk3Variant theme_gtk3_active_variant (void);
|
||||
gboolean theme_gtk3_lookup_theme_color (const char *name, GdkRGBA *out_color);
|
||||
|
||||
#endif
|
||||
|
||||
@@ -590,7 +590,11 @@ theme_manager_apply_platform_window_theme (GtkWidget *window)
|
||||
|
||||
context = gtk_widget_get_style_context (window);
|
||||
if (theme_gtk3_is_active ())
|
||||
dark = theme_gtk3_active_variant () == THEME_GTK3_VARIANT_PREFER_DARK;
|
||||
{
|
||||
dark = prefs.hex_gui_gtk3_variant == THEME_GTK3_VARIANT_PREFER_DARK;
|
||||
if (prefs.hex_gui_gtk3_variant == THEME_GTK3_VARIANT_FOLLOW_SYSTEM)
|
||||
dark = theme_policy_system_prefers_dark ();
|
||||
}
|
||||
else
|
||||
dark = theme_policy_is_dark_mode_active (prefs.hex_gui_dark_mode);
|
||||
if (context)
|
||||
|
||||
@@ -1567,6 +1567,7 @@ theme_preferences_gtk3_sync_runtime_palette (theme_preferences_ui *ui)
|
||||
{
|
||||
ThemeWidgetStyleValues style_values;
|
||||
GtkWidget *style_source = NULL;
|
||||
gboolean follows_system_theme = prefs.hex_gui_gtk3_theme[0] == '\0';
|
||||
|
||||
if (ui && ui->parent)
|
||||
style_source = GTK_WIDGET (ui->parent);
|
||||
@@ -1577,16 +1578,34 @@ theme_preferences_gtk3_sync_runtime_palette (theme_preferences_ui *ui)
|
||||
|
||||
theme_get_widget_style_values_for_widget (style_source, &style_values);
|
||||
|
||||
/* Leave the mapped tokens unpinned so the user list, channel tree and
|
||||
* input box keep resolving their colors from whatever GTK3 theme is
|
||||
* active (system or in-app selected), and only refresh what the
|
||||
* dialog shows. Pinning theme-derived values here freezes them into
|
||||
* the runtime palette (and colors.conf), which left those widgets
|
||||
* with stale colors until the next restart. */
|
||||
theme_preferences_stage_rebase_color (THEME_TOKEN_TEXT_FOREGROUND, &style_values.foreground);
|
||||
theme_preferences_stage_rebase_color (THEME_TOKEN_TEXT_BACKGROUND, &style_values.background);
|
||||
theme_preferences_stage_rebase_color (THEME_TOKEN_SELECTION_FOREGROUND, &style_values.selection_foreground);
|
||||
theme_preferences_stage_rebase_color (THEME_TOKEN_SELECTION_BACKGROUND, &style_values.selection_background);
|
||||
if (follows_system_theme)
|
||||
{
|
||||
/* Following the system GTK3 theme: leave the mapped tokens
|
||||
* unpinned so they keep tracking the theme, and only refresh
|
||||
* what the dialog shows. */
|
||||
theme_preferences_stage_rebase_color (THEME_TOKEN_TEXT_FOREGROUND, &style_values.foreground);
|
||||
theme_preferences_stage_rebase_color (THEME_TOKEN_TEXT_BACKGROUND, &style_values.background);
|
||||
theme_preferences_stage_rebase_color (THEME_TOKEN_SELECTION_FOREGROUND, &style_values.selection_foreground);
|
||||
theme_preferences_stage_rebase_color (THEME_TOKEN_SELECTION_BACKGROUND, &style_values.selection_background);
|
||||
return;
|
||||
}
|
||||
|
||||
theme_preferences_staged_set_color (THEME_TOKEN_TEXT_FOREGROUND,
|
||||
&style_values.foreground,
|
||||
NULL,
|
||||
TRUE);
|
||||
theme_preferences_staged_set_color (THEME_TOKEN_TEXT_BACKGROUND,
|
||||
&style_values.background,
|
||||
NULL,
|
||||
TRUE);
|
||||
theme_preferences_staged_set_color (THEME_TOKEN_SELECTION_FOREGROUND,
|
||||
&style_values.selection_foreground,
|
||||
NULL,
|
||||
TRUE);
|
||||
theme_preferences_staged_set_color (THEME_TOKEN_SELECTION_BACKGROUND,
|
||||
&style_values.selection_background,
|
||||
NULL,
|
||||
TRUE);
|
||||
}
|
||||
|
||||
static gboolean
|
||||
|
||||
@@ -857,10 +857,6 @@ fe_get_str (char *prompt, char *def, void *callback, void *ud)
|
||||
{
|
||||
}
|
||||
void
|
||||
fe_get_password (char *prompt, void *callback, void *ud)
|
||||
{
|
||||
}
|
||||
void
|
||||
fe_get_int (char *prompt, int def, void *callback, void *ud)
|
||||
{
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user