gitea/SDL3_fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

unix: Refactor GTK bindings from SDL_tray to separate SDL_gtk module to allow shared usage

Browse Source 
- SDL creates and requires usage of a specific glib context. This context is set as the global
  glib context with SDL_Gtk_EnterContext and the previous context is restored with
  SDL_Gtk_ExitContext.

- To avoid changing the behavior of SDL_tray, which is the only consumer of SDL_gtk currently,
  the SDL_UpdateTray function now unconditionally runs a single glib frame iteration and is
  responsible for dispatching glib events for all consumers in SDL_PumpEvents.

- Cleaned up some error handling in SDL_tray.
This commit is contained in:
Sam Lantinga
2025-07-31 08:49:31 -07:00
parent d8ac51859e
commit 3c369aa8b4
3 changed files with 165 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/SDL.c
View File

@@ -30,6 +30,10 @@
// this checks for HAVE_DBUS_DBUS_H internally. // this checks for HAVE_DBUS_DBUS_H internally.
#include "core/linux/SDL_dbus.h" #include "core/linux/SDL_dbus.h"
#ifdef SDL_PLATFORM_UNIX
#include "core/unix/SDL_gtk.h"
#endif
#ifdef SDL_PLATFORM_EMSCRIPTEN #ifdef SDL_PLATFORM_EMSCRIPTEN
#include <emscripten.h> #include <emscripten.h>
#endif #endif
@@ -663,6 +667,10 @@ void SDL_Quit(void)
SDL_DBus_Quit(); SDL_DBus_Quit();
#endif #endif
#ifdef SDL_PLATFORM_UNIX
SDL_Gtk_Quit();
#endif
SDL_QuitTimers(); SDL_QuitTimers();
SDL_QuitAsyncIO(); SDL_QuitAsyncIO();

5
src/events/SDL_events.c
View File

@@ -42,6 +42,10 @@
#include "../video/android/SDL_androidevents.h" #include "../video/android/SDL_androidevents.h"
#endif #endif
#ifdef SDL_PLATFORM_UNIX
#include "../core/unix/SDL_gtk.h"
#endif
// An arbitrary limit so we don't have unbounded growth // An arbitrary limit so we don't have unbounded growth
#define SDL_MAX_QUEUED_EVENTS 65535 #define SDL_MAX_QUEUED_EVENTS 65535
@@ -1445,6 +1449,7 @@ void SDL_PumpEventMaintenance(void)
} }
#endif #endif
// SDL_UpdateTrays will also pump GTK events if needed
SDL_UpdateTrays(); SDL_UpdateTrays();
SDL_SendPendingSignalEvents(); // in case we had a signal handler fire, etc. SDL_SendPendingSignalEvents(); // in case we had a signal handler fire, etc.

383
src/tray/unix/SDL_tray.c
View File

@@ -34,81 +34,11 @@
#ifdef APPINDICATOR_HEADER #ifdef APPINDICATOR_HEADER
#include APPINDICATOR_HEADER #include APPINDICATOR_HEADER
#else #else
#include "../../core/unix/SDL_gtk.h"
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */
/* BEGIN THIRD-PARTY HEADER CONTENT */ /* BEGIN THIRD-PARTY HEADER CONTENT */
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */
/* Glib 2.0 */
typedef unsigned long gulong;
typedef void *gpointer;
typedef char gchar;
typedef int gint;
typedef unsigned int guint;
typedef gint gboolean;
typedef void (*GCallback)(void);
typedef struct _GClosure GClosure;
typedef void (*GClosureNotify) (gpointer data, GClosure *closure);
typedef gboolean (*GSourceFunc) (gpointer user_data);
typedef enum
{
G_CONNECT_AFTER = 1 << 0,
G_CONNECT_SWAPPED = 1 << 1
} GConnectFlags;
static gulong (*g_signal_connect_data)(gpointer instance, const gchar *detailed_signal, GCallback c_handler, gpointer data, GClosureNotify destroy_data, GConnectFlags connect_flags);
static void (*g_object_unref)(gpointer object);
static gchar *(*g_mkdtemp)(gchar *template);
static gpointer (*g_object_ref_sink)(gpointer object);
static gpointer (*g_object_ref)(gpointer object);
// glib_typeof requires compiler-specific code and includes that are too complex
// to be worth copy-pasting here
//#define g_object_ref(Obj) ((glib_typeof (Obj)) (g_object_ref) (Obj))
//#define g_object_ref_sink(Obj) ((glib_typeof (Obj)) (g_object_ref_sink) (Obj))
#define g_signal_connect(instance, detailed_signal, c_handler, data) \
g_signal_connect_data ((instance), (detailed_signal), (c_handler), (data), NULL, (GConnectFlags) 0)
#define _G_TYPE_CIC(ip, gt, ct) ((ct*) ip)
#define G_TYPE_CHECK_INSTANCE_CAST(instance, g_type, c_type) (_G_TYPE_CIC ((instance), (g_type), c_type))
#define G_CALLBACK(f) ((GCallback) (f))
#define FALSE 0
#define TRUE 1
/* GTK 3.0 */
typedef struct _GtkMenu GtkMenu;
typedef struct _GtkMenuItem GtkMenuItem;
typedef struct _GtkMenuShell GtkMenuShell;
typedef struct _GtkWidget GtkWidget;
typedef struct _GtkCheckMenuItem GtkCheckMenuItem;
static gboolean (*gtk_init_check)(int *argc, char ***argv);
static gboolean (*gtk_main_iteration_do)(gboolean blocking);
static GtkWidget *(*gtk_menu_new)(void);
static GtkWidget *(*gtk_separator_menu_item_new)(void);
static GtkWidget *(*gtk_menu_item_new_with_label)(const gchar *label);
static void (*gtk_menu_item_set_submenu)(GtkMenuItem *menu_item, GtkWidget *submenu);
static GtkWidget *(*gtk_check_menu_item_new_with_label)(const gchar *label);
static void (*gtk_check_menu_item_set_active)(GtkCheckMenuItem *check_menu_item, gboolean is_active);
static void (*gtk_widget_set_sensitive)(GtkWidget *widget, gboolean sensitive);
static void (*gtk_widget_show)(GtkWidget *widget);
static void (*gtk_menu_shell_append)(GtkMenuShell *menu_shell, GtkWidget *child);
static void (*gtk_menu_shell_insert)(GtkMenuShell *menu_shell, GtkWidget *child, gint position);
static void (*gtk_widget_destroy)(GtkWidget *widget);
static const gchar *(*gtk_menu_item_get_label)(GtkMenuItem *menu_item);
static void (*gtk_menu_item_set_label)(GtkMenuItem *menu_item, const gchar *label);
static gboolean (*gtk_check_menu_item_get_active)(GtkCheckMenuItem *check_menu_item);
static gboolean (*gtk_widget_get_sensitive)(GtkWidget *widget);
#define GTK_MENU_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_MENU_ITEM, GtkMenuItem))
#define GTK_WIDGET(widget) (G_TYPE_CHECK_INSTANCE_CAST ((widget), GTK_TYPE_WIDGET, GtkWidget))
#define GTK_CHECK_MENU_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CHECK_MENU_ITEM, GtkCheckMenuItem))
#define GTK_MENU(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_MENU, GtkMenu))
/* AppIndicator */ /* AppIndicator */
typedef enum { typedef enum {
@@ -137,43 +67,16 @@ static void (*app_indicator_set_menu)(AppIndicator *self, GtkMenu *menu);
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */
#endif #endif
#ifdef APPINDICATOR_HEADER #ifndef APPINDICATOR_HEADER
static void quit_gtk(void)
{
}
static bool init_gtk(void)
{
return true;
}
#else
static bool gtk_is_init = false;
static void *libappindicator = NULL; static void *libappindicator = NULL;
static void *libgtk = NULL;
static void *libgdk = NULL;
static void quit_gtk(void) static void quit_appindicator(void)
{ {
if (libappindicator) { if (libappindicator) {
dlclose(libappindicator); dlclose(libappindicator);
libappindicator = NULL; libappindicator = NULL;
} }
if (libgtk) {
dlclose(libgtk);
libgtk = NULL;
}
if (libgdk) {
dlclose(libgdk);
libgdk = NULL;
}
gtk_is_init = false;
} }
const char *appindicator_names[] = { const char *appindicator_names[] = {
@@ -187,24 +90,6 @@ const char *appindicator_names[] = {
NULL NULL
}; };
const char *gtk_names[] = {
#ifdef SDL_PLATFORM_OPENBSD
"libgtk-3.so",
#else
"libgtk-3.so.0",
#endif
NULL
};
const char *gdk_names[] = {
#ifdef SDL_PLATFORM_OPENBSD
"libgdk-3.so",
#else
"libgdk-3.so.0",
#endif
NULL
};
static void *find_lib(const char **names) static void *find_lib(const char **names)
{ {
const char **name_ptr = names; const char **name_ptr = names;
@@ -217,89 +102,32 @@ static void *find_lib(const char **names)
return handle; return handle;
} }
static bool init_gtk(void) static bool init_appindicator(void)
{ {
if (gtk_is_init) { if (libappindicator) {
return true; return true;
} }
libappindicator = find_lib(appindicator_names); libappindicator = find_lib(appindicator_names);
libgtk = find_lib(gtk_names);
libgdk = find_lib(gdk_names);
if (!libappindicator || !libgtk || !libgdk) { if (!libappindicator) {
quit_gtk(); quit_appindicator();
return SDL_SetError("Could not load GTK/AppIndicator libraries"); return SDL_SetError("Could not load AppIndicator libraries");
} }
gtk_init_check = dlsym(libgtk, "gtk_init_check");
gtk_main_iteration_do = dlsym(libgtk, "gtk_main_iteration_do");
gtk_menu_new = dlsym(libgtk, "gtk_menu_new");
gtk_separator_menu_item_new = dlsym(libgtk, "gtk_separator_menu_item_new");
gtk_menu_item_new_with_label = dlsym(libgtk, "gtk_menu_item_new_with_label");
gtk_menu_item_set_submenu = dlsym(libgtk, "gtk_menu_item_set_submenu");
gtk_check_menu_item_new_with_label = dlsym(libgtk, "gtk_check_menu_item_new_with_label");
gtk_check_menu_item_set_active = dlsym(libgtk, "gtk_check_menu_item_set_active");
gtk_widget_set_sensitive = dlsym(libgtk, "gtk_widget_set_sensitive");
gtk_widget_show = dlsym(libgtk, "gtk_widget_show");
gtk_menu_shell_append = dlsym(libgtk, "gtk_menu_shell_append");
gtk_menu_shell_insert = dlsym(libgtk, "gtk_menu_shell_insert");
gtk_widget_destroy = dlsym(libgtk, "gtk_widget_destroy");
gtk_menu_item_get_label = dlsym(libgtk, "gtk_menu_item_get_label");
gtk_menu_item_set_label = dlsym(libgtk, "gtk_menu_item_set_label");
gtk_check_menu_item_get_active = dlsym(libgtk, "gtk_check_menu_item_get_active");
gtk_widget_get_sensitive = dlsym(libgtk, "gtk_widget_get_sensitive");
/* Technically these are GLib or GObject functions, but we can find
* them via GDK */
g_mkdtemp = dlsym(libgdk, "g_mkdtemp");
g_signal_connect_data = dlsym(libgdk, "g_signal_connect_data");
g_object_unref = dlsym(libgdk, "g_object_unref");
g_object_ref_sink = dlsym(libgdk, "g_object_ref_sink");
g_object_ref = dlsym(libgdk, "g_object_ref");
app_indicator_new = dlsym(libappindicator, "app_indicator_new"); app_indicator_new = dlsym(libappindicator, "app_indicator_new");
app_indicator_set_status = dlsym(libappindicator, "app_indicator_set_status"); app_indicator_set_status = dlsym(libappindicator, "app_indicator_set_status");
app_indicator_set_icon = dlsym(libappindicator, "app_indicator_set_icon"); app_indicator_set_icon = dlsym(libappindicator, "app_indicator_set_icon");
app_indicator_set_menu = dlsym(libappindicator, "app_indicator_set_menu"); app_indicator_set_menu = dlsym(libappindicator, "app_indicator_set_menu");
if (!gtk_init_check || if (!app_indicator_new ||
!gtk_main_iteration_do ||
!gtk_menu_new ||
!gtk_separator_menu_item_new ||
!gtk_menu_item_new_with_label ||
!gtk_menu_item_set_submenu ||
!gtk_check_menu_item_new_with_label ||
!gtk_check_menu_item_set_active ||
!gtk_widget_set_sensitive ||
!gtk_widget_show ||
!gtk_menu_shell_append ||
!gtk_menu_shell_insert ||
!gtk_widget_destroy ||
!g_mkdtemp ||
!g_object_ref_sink ||
!g_object_ref ||
!g_signal_connect_data ||
!g_object_unref ||
!app_indicator_new ||
!app_indicator_set_status || !app_indicator_set_status ||
!app_indicator_set_icon || !app_indicator_set_icon ||
!app_indicator_set_menu || !app_indicator_set_menu) {
!gtk_menu_item_get_label || quit_appindicator();
!gtk_menu_item_set_label || return SDL_SetError("Could not load AppIndicator functions");
!gtk_check_menu_item_get_active ||
!gtk_widget_get_sensitive) {
quit_gtk();
return SDL_SetError("Could not load GTK/AppIndicator functions");
} }
if (gtk_init_check(0, NULL) == FALSE) {
quit_gtk();
return SDL_SetError("Could not init GTK");
}
gtk_is_init = true;
return true; return true;
} }
#endif #endif
@@ -341,7 +169,7 @@ struct SDL_Tray {
GtkMenuShell *menu_cached; GtkMenuShell *menu_cached;
}; };
static void call_callback(GtkMenuItem *item, gpointer ptr) static void call_callback(GtkMenuItem *item, GParamSpec *pspec, gpointer ptr)
{ {
SDL_TrayEntry *entry = ptr; SDL_TrayEntry *entry = ptr;
@@ -399,7 +227,11 @@ static void DestroySDLMenu(SDL_TrayMenu *menu)
} }
if (menu->menu) { if (menu->menu) {
g_object_unref(menu->menu); SDL_GtkContext *gtk = SDL_Gtk_EnterContext();
if (gtk) {
gtk->g.object_unref(menu->menu);
SDL_Gtk_ExitContext(gtk);
}
} }
SDL_free(menu->entries); SDL_free(menu->entries);
@@ -408,9 +240,7 @@ static void DestroySDLMenu(SDL_TrayMenu *menu)
void SDL_UpdateTrays(void) void SDL_UpdateTrays(void)
{ {
if (SDL_HasActiveTrays()) { SDL_UpdateGtk();
gtk_main_iteration_do(FALSE);
}
} }
bool SDL_IsTraySupported(void) bool SDL_IsTraySupported(void)
@@ -424,7 +254,7 @@ bool SDL_IsTraySupported(void)
static bool has_been_detected_once = false; static bool has_been_detected_once = false;
if (!has_been_detected_once) { if (!has_been_detected_once) {
has_trays = init_gtk(); has_trays = SDL_Gtk_Init();
has_been_detected_once = true; has_been_detected_once = true;
} }
@@ -438,29 +268,28 @@ SDL_Tray *SDL_CreateTray(SDL_Surface *icon, const char *tooltip)
return NULL; return NULL;
} }
if (init_gtk() != true) { SDL_GtkContext *gtk = SDL_Gtk_EnterContext();
return NULL; if (!gtk) {
goto error;
} }
SDL_Tray *tray = (SDL_Tray *)SDL_calloc(1, sizeof(*tray)); SDL_Tray *tray = (SDL_Tray *)SDL_calloc(1, sizeof(*tray));
if (!tray) { if (!tray) {
return NULL; goto error;
} }
/* On success, g_mkdtemp edits its argument in-place to replace the Xs /* On success, g_mkdtemp edits its argument in-place to replace the Xs
* with a random directory name, which it creates safely and atomically. * with a random directory name, which it creates safely and atomically.
* On failure, it sets errno. */ * On failure, it sets errno. */
SDL_strlcpy(tray->icon_dir, ICON_DIR_TEMPLATE, sizeof(tray->icon_dir)); SDL_strlcpy(tray->icon_dir, ICON_DIR_TEMPLATE, sizeof(tray->icon_dir));
if (!g_mkdtemp(tray->icon_dir)) { if (!gtk->g.mkdtemp(tray->icon_dir)) {
SDL_SetError("Cannot create directory for tray icon: %s", strerror(errno)); SDL_SetError("Cannot create directory for tray icon: %s", strerror(errno));
SDL_free(tray); goto error;
return NULL;
} }
if (icon) { if (icon) {
if (!new_tmp_filename(tray)) { if (!new_tmp_filename(tray)) {
SDL_free(tray); goto error;
return NULL;
} }
SDL_SaveBMP(icon, tray->icon_path); SDL_SaveBMP(icon, tray->icon_path);
@@ -472,12 +301,24 @@ SDL_Tray *SDL_CreateTray(SDL_Surface *icon, const char *tooltip)
app_indicator_set_status(tray->indicator, APP_INDICATOR_STATUS_ACTIVE); app_indicator_set_status(tray->indicator, APP_INDICATOR_STATUS_ACTIVE);
// The tray icon isn't shown before a menu is created; create one early. // The tray icon isn't shown before a menu is created; create one early.
tray->menu_cached = (GtkMenuShell *) g_object_ref_sink(gtk_menu_new()); tray->menu_cached = (GtkMenuShell *)gtk->g.object_ref_sink(gtk->gtk.menu_new());
app_indicator_set_menu(tray->indicator, GTK_MENU(tray->menu_cached)); app_indicator_set_menu(tray->indicator, GTK_MENU(tray->menu_cached));
SDL_RegisterTray(tray); SDL_RegisterTray(tray);
SDL_Gtk_ExitContext(gtk);
return tray; return tray;
error:
if (tray) {
SDL_free(tray);
}
if (gtk) {
SDL_Gtk_ExitContext(gtk);
}
return NULL;
} }
void SDL_SetTrayIcon(SDL_Tray *tray, SDL_Surface *icon) void SDL_SetTrayIcon(SDL_Tray *tray, SDL_Surface *icon)
@@ -513,17 +354,25 @@ SDL_TrayMenu *SDL_CreateTrayMenu(SDL_Tray *tray)
return NULL; return NULL;
} }
tray->menu = (SDL_TrayMenu *)SDL_calloc(1, sizeof(*tray->menu)); SDL_GtkContext *gtk = SDL_Gtk_EnterContext();
if (!tray->menu) { if (!gtk) {
return NULL; return NULL;
} }
tray->menu->menu = g_object_ref(tray->menu_cached); tray->menu = (SDL_TrayMenu *)SDL_calloc(1, sizeof(*tray->menu));
if (!tray->menu) {
SDL_Gtk_ExitContext(gtk);
return NULL;
}
tray->menu->menu = gtk->g.object_ref(tray->menu_cached);
tray->menu->parent_tray = tray; tray->menu->parent_tray = tray;
tray->menu->parent_entry = NULL; tray->menu->parent_entry = NULL;
tray->menu->nEntries = 0; tray->menu->nEntries = 0;
tray->menu->entries = NULL; tray->menu->entries = NULL;
SDL_Gtk_ExitContext(gtk);
return tray->menu; return tray->menu;
} }
@@ -554,18 +403,26 @@ SDL_TrayMenu *SDL_CreateTraySubmenu(SDL_TrayEntry *entry)
return NULL; return NULL;
} }
entry->submenu = (SDL_TrayMenu *)SDL_calloc(1, sizeof(*entry->submenu)); SDL_GtkContext *gtk = SDL_Gtk_EnterContext();
if (!entry->submenu) { if (!gtk) {
return NULL; return NULL;
} }
entry->submenu->menu = g_object_ref_sink(gtk_menu_new()); entry->submenu = (SDL_TrayMenu *)SDL_calloc(1, sizeof(*entry->submenu));
if (!entry->submenu) {
SDL_Gtk_ExitContext(gtk);
return NULL;
}
entry->submenu->menu = gtk->g.object_ref_sink(gtk->gtk.menu_new());
entry->submenu->parent_tray = NULL; entry->submenu->parent_tray = NULL;
entry->submenu->parent_entry = entry; entry->submenu->parent_entry = entry;
entry->submenu->nEntries = 0; entry->submenu->nEntries = 0;
entry->submenu->entries = NULL; entry->submenu->entries = NULL;
gtk_menu_item_set_submenu(GTK_MENU_ITEM(entry->item), GTK_WIDGET(entry->submenu->menu)); gtk->gtk.menu_item_set_submenu(GTK_MENU_ITEM(entry->item), GTK_WIDGET(entry->submenu->menu));
SDL_Gtk_ExitContext(gtk);
return entry->submenu; return entry->submenu;
} }
@@ -625,7 +482,11 @@ void SDL_RemoveTrayEntry(SDL_TrayEntry *entry)
menu->entries[menu->nEntries] = NULL; menu->entries[menu->nEntries] = NULL;
} }
gtk_widget_destroy(entry->item); SDL_GtkContext *gtk = SDL_Gtk_EnterContext();
if (gtk) {
gtk->gtk.widget_destroy(entry->item);
SDL_Gtk_ExitContext(gtk);
}
SDL_free(entry); SDL_free(entry);
} }
@@ -645,9 +506,14 @@ SDL_TrayEntry *SDL_InsertTrayEntryAt(SDL_TrayMenu *menu, int pos, const char *la
pos = menu->nEntries; pos = menu->nEntries;
} }
SDL_GtkContext *gtk = SDL_Gtk_EnterContext();
if (!gtk) {
goto error;
}
SDL_TrayEntry *entry = (SDL_TrayEntry *)SDL_calloc(1, sizeof(*entry)); SDL_TrayEntry *entry = (SDL_TrayEntry *)SDL_calloc(1, sizeof(*entry));
if (!entry) { if (!entry) {
return NULL; goto error;
} }
entry->parent = menu; entry->parent = menu;
@@ -659,23 +525,22 @@ SDL_TrayEntry *SDL_InsertTrayEntryAt(SDL_TrayMenu *menu, int pos, const char *la
entry->submenu = NULL; entry->submenu = NULL;
if (label == NULL) { if (label == NULL) {
entry->item = gtk_separator_menu_item_new(); entry->item = gtk->gtk.separator_menu_item_new();
} else if (flags & SDL_TRAYENTRY_CHECKBOX) { } else if (flags & SDL_TRAYENTRY_CHECKBOX) {
entry->item = gtk_check_menu_item_new_with_label(label); entry->item = gtk->gtk.check_menu_item_new_with_label(label);
gboolean active = ((flags & SDL_TRAYENTRY_CHECKED) != 0); gboolean active = ((flags & SDL_TRAYENTRY_CHECKED) != 0);
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(entry->item), active); gtk->gtk.check_menu_item_set_active(GTK_CHECK_MENU_ITEM(entry->item), active);
} else { } else {
entry->item = gtk_menu_item_new_with_label(label); entry->item = gtk->gtk.menu_item_new_with_label(label);
} }
gboolean sensitive = ((flags & SDL_TRAYENTRY_DISABLED) == 0); gboolean sensitive = ((flags & SDL_TRAYENTRY_DISABLED) == 0);
gtk_widget_set_sensitive(entry->item, sensitive); gtk->gtk.widget_set_sensitive(entry->item, sensitive);
SDL_TrayEntry **new_entries = (SDL_TrayEntry **)SDL_realloc(menu->entries, (menu->nEntries + 2) * sizeof(*new_entries)); SDL_TrayEntry **new_entries = (SDL_TrayEntry **)SDL_realloc(menu->entries, (menu->nEntries + 2) * sizeof(*new_entries));
if (!new_entries) { if (!new_entries) {
SDL_free(entry); goto error;
return NULL;
} }
menu->entries = new_entries; menu->entries = new_entries;
@@ -688,12 +553,25 @@ SDL_TrayEntry *SDL_InsertTrayEntryAt(SDL_TrayMenu *menu, int pos, const char *la
new_entries[pos] = entry; new_entries[pos] = entry;
new_entries[menu->nEntries] = NULL; new_entries[menu->nEntries] = NULL;
gtk_widget_show(entry->item); gtk->gtk.widget_show(entry->item);
gtk_menu_shell_insert(menu->menu, entry->item, (pos == menu->nEntries) ? -1 : pos); gtk->gtk.menu_shell_insert(menu->menu, entry->item, (pos == menu->nEntries) ? -1 : pos);
g_signal_connect(entry->item, "activate", G_CALLBACK(call_callback), entry); gtk->g.signal_connect(entry->item, "activate", call_callback, entry);
SDL_Gtk_ExitContext(gtk);
return entry; return entry;
error:
if (entry) {
SDL_free(entry);
}
if (gtk) {
SDL_Gtk_ExitContext(gtk);
}
return NULL;
} }
void SDL_SetTrayEntryLabel(SDL_TrayEntry *entry, const char *label) void SDL_SetTrayEntryLabel(SDL_TrayEntry *entry, const char *label)
@@ -702,7 +580,11 @@ void SDL_SetTrayEntryLabel(SDL_TrayEntry *entry, const char *label)
return; return;
} }
gtk_menu_item_set_label(GTK_MENU_ITEM(entry->item), label); SDL_GtkContext *gtk = SDL_Gtk_EnterContext();
if (gtk) {
gtk->gtk.menu_item_set_label(GTK_MENU_ITEM(entry->item), label);
SDL_Gtk_ExitContext(gtk);
}
} }
const char *SDL_GetTrayEntryLabel(SDL_TrayEntry *entry) const char *SDL_GetTrayEntryLabel(SDL_TrayEntry *entry)
@@ -712,7 +594,15 @@ const char *SDL_GetTrayEntryLabel(SDL_TrayEntry *entry)
return NULL; return NULL;
} }
return gtk_menu_item_get_label(GTK_MENU_ITEM(entry->item)); const char *label = NULL;
SDL_GtkContext *gtk = SDL_Gtk_EnterContext();
if (gtk) {
label = gtk->gtk.menu_item_get_label(GTK_MENU_ITEM(entry->item));
SDL_Gtk_ExitContext(gtk);
}
return label;
} }
void SDL_SetTrayEntryChecked(SDL_TrayEntry *entry, bool checked) void SDL_SetTrayEntryChecked(SDL_TrayEntry *entry, bool checked)
@@ -721,9 +611,13 @@ void SDL_SetTrayEntryChecked(SDL_TrayEntry *entry, bool checked)
return; return;
} }
entry->ignore_signal = true; SDL_GtkContext *gtk = SDL_Gtk_EnterContext();
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(entry->item), checked); if (gtk) {
entry->ignore_signal = false; entry->ignore_signal = true;
gtk->gtk.check_menu_item_set_active(GTK_CHECK_MENU_ITEM(entry->item), checked);
entry->ignore_signal = false;
SDL_Gtk_ExitContext(gtk);
}
} }
bool SDL_GetTrayEntryChecked(SDL_TrayEntry *entry) bool SDL_GetTrayEntryChecked(SDL_TrayEntry *entry)
@@ -732,7 +626,15 @@ bool SDL_GetTrayEntryChecked(SDL_TrayEntry *entry)
return false; return false;
} }
return gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(entry->item)); bool checked = false;
SDL_GtkContext *gtk = SDL_Gtk_EnterContext();
if (gtk) {
checked = gtk->gtk.check_menu_item_get_active(GTK_CHECK_MENU_ITEM(entry->item));
SDL_Gtk_ExitContext(gtk);
}
return checked;
} }
void SDL_SetTrayEntryEnabled(SDL_TrayEntry *entry, bool enabled) void SDL_SetTrayEntryEnabled(SDL_TrayEntry *entry, bool enabled)
@@ -741,7 +643,11 @@ void SDL_SetTrayEntryEnabled(SDL_TrayEntry *entry, bool enabled)
return; return;
} }
gtk_widget_set_sensitive(entry->item, enabled); SDL_GtkContext *gtk = SDL_Gtk_EnterContext();
if (gtk) {
gtk->gtk.widget_set_sensitive(entry->item, enabled);
SDL_Gtk_ExitContext(gtk);
}
} }
bool SDL_GetTrayEntryEnabled(SDL_TrayEntry *entry) bool SDL_GetTrayEntryEnabled(SDL_TrayEntry *entry)
@@ -750,7 +656,15 @@ bool SDL_GetTrayEntryEnabled(SDL_TrayEntry *entry)
return false; return false;
} }
return gtk_widget_get_sensitive(entry->item); bool enabled = false;
SDL_GtkContext *gtk = SDL_Gtk_EnterContext();
if (gtk) {
enabled = gtk->gtk.widget_get_sensitive(entry->item);
SDL_Gtk_ExitContext(gtk);
}
return enabled;
} }
void SDL_SetTrayEntryCallback(SDL_TrayEntry *entry, SDL_TrayCallback callback, void *userdata) void SDL_SetTrayEntryCallback(SDL_TrayEntry *entry, SDL_TrayCallback callback, void *userdata)
@@ -823,12 +737,17 @@ void SDL_DestroyTray(SDL_Tray *tray)
SDL_RemovePath(tray->icon_dir); SDL_RemovePath(tray->icon_dir);
} }
if (tray->menu_cached) { SDL_GtkContext *gtk = SDL_Gtk_EnterContext();
g_object_unref(tray->menu_cached); if (gtk) {
} if (tray->menu_cached) {
gtk->g.object_unref(tray->menu_cached);
}
if (tray->indicator) { if (tray->indicator) {
g_object_unref(tray->indicator); gtk->g.object_unref(tray->indicator);
}
SDL_Gtk_ExitContext(gtk);
} }
SDL_free(tray); SDL_free(tray);