mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2026-07-31 20:48:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix some DBus tray issues

Browse Source
This commit is contained in:
eafton
2026-07-30 21:12:41 +03:00
committed by Sam Lantinga
parent 09552d5bee
commit 7b7a74ebc7
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/SDL3/SDL_tray.h
View File

@@ -120,6 +120,8 @@ typedef bool (SDLCALL *SDL_TrayClickCallback)(void *userdata, SDL_Tray *tray);
* necessary feature. Avoid needlessly creating a tray icon, as the user may
* feel like it clutters their interface.
*
* You should set the SDL_PROP_APP_METADATA_IDENTIFIER_STRING property to ensure correct behaviour on some platforms like Linux.
*
* Using tray icons require the video subsystem.
*
* \param icon a surface to be used as icon. May be NULL.
@@ -145,6 +147,8 @@ extern SDL_DECLSPEC SDL_Tray * SDLCALL SDL_CreateTray(SDL_Surface *icon, const c
* necessary feature. Avoid needlessly creating a tray icon, as the user may
* feel like it clutters their interface.
*
* You should set the SDL_PROP_APP_METADATA_IDENTIFIER_STRING property to ensure correct behaviour on some platforms like Linux.
*
* Using tray icons require the video subsystem.
*
* These are the supported properties:

10
src/tray/unix/SDL_dbustray.c
View File

@@ -88,7 +88,7 @@ static DBusHandlerResult TrayHandleGetAllProps(SDL_Tray *tray, SDL_TrayDBus *tra
dbus_uint32_t uint32_val;
dbus_bool_t bool_value;
menu_dbus = (SDL_TrayMenuDBus *)tray->menu->internal;
menu_dbus = tray->menu ? (SDL_TrayMenuDBus *)tray->menu->internal : NULL;
empty = "";
driver->dbus->message_iter_init(msg, &iter);
@@ -107,10 +107,11 @@ static DBusHandlerResult TrayHandleGetAllProps(SDL_Tray *tray, SDL_TrayDBus *tra
driver->dbus->message_iter_close_container(&dict_iter, &entry_iter);
key = "Id";
value = SDL_GetAppID();
driver->dbus->message_iter_open_container(&dict_iter, DBUS_TYPE_DICT_ENTRY, NULL, &entry_iter);
driver->dbus->message_iter_append_basic(&entry_iter, DBUS_TYPE_STRING, &key);
driver->dbus->message_iter_open_container(&entry_iter, DBUS_TYPE_VARIANT, "s", &variant_iter);
driver->dbus->message_iter_append_basic(&variant_iter, DBUS_TYPE_STRING, &tray_dbus->service_name);
driver->dbus->message_iter_append_basic(&variant_iter, DBUS_TYPE_STRING, &value);
driver->dbus->message_iter_close_container(&entry_iter, &variant_iter);
driver->dbus->message_iter_close_container(&dict_iter, &entry_iter);
@@ -234,7 +235,7 @@ static DBusHandlerResult TrayHandleGetProp(SDL_Tray *tray, SDL_TrayDBus *tray_db
const char *empty;
dbus_bool_t bool_value;
menu_dbus = (SDL_TrayMenuDBus *)tray->menu->internal;
menu_dbus = tray->menu ? (SDL_TrayMenuDBus *)tray->menu->internal : NULL;
empty = "";
driver->dbus->message_iter_init(msg, &iter);
@@ -251,8 +252,9 @@ static DBusHandlerResult TrayHandleGetProp(SDL_Tray *tray, SDL_TrayDBus *tray_db
driver->dbus->message_iter_append_basic(&variant_iter, DBUS_TYPE_STRING, &value);
driver->dbus->message_iter_close_container(&iter, &variant_iter);
} else if (!SDL_strcmp(property, "Id")) {
value = SDL_GetAppID();
driver->dbus->message_iter_open_container(&iter, DBUS_TYPE_VARIANT, "s", &variant_iter);
driver->dbus->message_iter_append_basic(&variant_iter, DBUS_TYPE_STRING, &tray_dbus->service_name);
driver->dbus->message_iter_append_basic(&variant_iter, DBUS_TYPE_STRING, &value);
driver->dbus->message_iter_close_container(&iter, &variant_iter);
} else if (!SDL_strcmp(property, "Title")) {
driver->dbus->message_iter_open_container(&iter, DBUS_TYPE_VARIANT, "s", &variant_iter);