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

wayland: Flush cached themes on a theme change

Browse Source 
Flush the cached themes when the system cursor theme changes so that the stale cached value won't be used.
This commit is contained in:
Frank Praznik
2023-06-28 14:53:11 -04:00
parent 8315a00a01
commit e7327b6c73
1 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/video/wayland/SDL_waylandmouse.c
View File

@@ -61,6 +61,16 @@ typedef struct
static int dbus_cursor_size; static int dbus_cursor_size;
static char *dbus_cursor_theme; static char *dbus_cursor_theme;
static void Wayland_FreeCursorThemes(SDL_VideoData *vdata)
{
for (int i = 0; i < vdata->num_cursor_themes; i += 1) {
WAYLAND_wl_cursor_theme_destroy(vdata->cursor_themes[i].theme);
}
vdata->num_cursor_themes = 0;
SDL_free(vdata->cursor_themes);
vdata->cursor_themes = NULL;
}
#ifdef SDL_USE_LIBDBUS #ifdef SDL_USE_LIBDBUS
#include "../../core/linux/SDL_dbus.h" #include "../../core/linux/SDL_dbus.h"
@@ -120,6 +130,7 @@ static SDL_bool Wayland_ParseDBusReply(SDL_DBusContext *dbus, DBusMessage *reply
static DBusHandlerResult Wayland_DBusCursorMessageFilter(DBusConnection *conn, DBusMessage *msg, void *data) static DBusHandlerResult Wayland_DBusCursorMessageFilter(DBusConnection *conn, DBusMessage *msg, void *data)
{ {
SDL_DBusContext *dbus = SDL_DBus_GetContext(); SDL_DBusContext *dbus = SDL_DBus_GetContext();
SDL_VideoData *vdata = (SDL_VideoData *)data;
if (dbus->message_is_signal(msg, CURSOR_INTERFACE, CURSOR_SIGNAL_NAME)) { if (dbus->message_is_signal(msg, CURSOR_INTERFACE, CURSOR_SIGNAL_NAME)) {
DBusMessageIter signal_iter, variant_iter; DBusMessageIter signal_iter, variant_iter;
@@ -179,10 +190,13 @@ static DBusHandlerResult Wayland_DBusCursorMessageFilter(DBusConnection *conn, D
SDL_free(dbus_cursor_theme); SDL_free(dbus_cursor_theme);
if (new_cursor_theme) { if (new_cursor_theme) {
dbus_cursor_theme = SDL_strdup(new_cursor_theme); dbus_cursor_theme = SDL_strdup(new_cursor_theme);
SDL_SetCursor(NULL); /* Force cursor update */
} else { } else {
dbus_cursor_theme = NULL; dbus_cursor_theme = NULL;
} }
/* Purge the current cached themes and force a cursor refresh. */
Wayland_FreeCursorThemes(vdata);
SDL_SetCursor(NULL);
} }
} else { } else {
goto not_our_signal; goto not_our_signal;
@@ -195,7 +209,7 @@ not_our_signal:
return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
} }
static void Wayland_DBusInitCursorProperties() static void Wayland_DBusInitCursorProperties(SDL_VideoData *vdata)
{ {
DBusMessage *reply; DBusMessage *reply;
SDL_DBusContext *dbus = SDL_DBus_GetContext(); SDL_DBusContext *dbus = SDL_DBus_GetContext();
@@ -229,7 +243,7 @@ static void Wayland_DBusInitCursorProperties()
dbus->bus_add_match(dbus->session_conn, dbus->bus_add_match(dbus->session_conn,
"type='signal', interface='"CURSOR_INTERFACE"'," "type='signal', interface='"CURSOR_INTERFACE"',"
"member='"CURSOR_SIGNAL_NAME"', arg0='"CURSOR_NAMESPACE"'", NULL); "member='"CURSOR_SIGNAL_NAME"', arg0='"CURSOR_NAMESPACE"'", NULL);
dbus->connection_add_filter(dbus->session_conn, &Wayland_DBusCursorMessageFilter, NULL, NULL); dbus->connection_add_filter(dbus->session_conn, &Wayland_DBusCursorMessageFilter, vdata, NULL);
dbus->connection_flush(dbus->session_conn); dbus->connection_flush(dbus->session_conn);
} }
} }
@@ -757,7 +771,7 @@ void Wayland_InitMouse(void)
input->cursor_visible = SDL_TRUE; input->cursor_visible = SDL_TRUE;
#ifdef SDL_USE_LIBDBUS #ifdef SDL_USE_LIBDBUS
Wayland_DBusInitCursorProperties(); Wayland_DBusInitCursorProperties(d);
#endif #endif
SDL_SetDefaultCursor(Wayland_CreateDefaultCursor()); SDL_SetDefaultCursor(Wayland_CreateDefaultCursor());
@@ -769,13 +783,8 @@ void Wayland_InitMouse(void)
void Wayland_FiniMouse(SDL_VideoData *data) void Wayland_FiniMouse(SDL_VideoData *data)
{ {
struct SDL_WaylandInput *input = data->input; struct SDL_WaylandInput *input = data->input;
int i;
for (i = 0; i < data->num_cursor_themes; i += 1) { Wayland_FreeCursorThemes(data);
WAYLAND_wl_cursor_theme_destroy(data->cursor_themes[i].theme);
}
data->num_cursor_themes = 0;
SDL_free(data->cursor_themes);
data->cursor_themes = NULL;
#ifdef SDL_USE_LIBDBUS #ifdef SDL_USE_LIBDBUS
Wayland_DBusFinishCursorProperties(); Wayland_DBusFinishCursorProperties();