TeamHepta/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2026-04-07 09:27:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

dbus: Use OpenFile for opening local 'file://' URIs

Browse Source 
Per the spec, OpenURI can't open local paths, so OpenFile needs to be used instead.
This commit is contained in:
Frank Praznik
2026-04-06 11:11:23 -04:00
parent c98b36ff03
commit 0a54fdb862
1 changed files with 42 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/core/linux/SDL_dbus.c
View File

@@ -22,6 +22,9 @@
#include "SDL_dbus.h"
#include "../../stdlib/SDL_vacopy.h"
#include <fcntl.h>
#include <unistd.h>
#ifdef SDL_USE_LIBDBUS
// we never link directly to libdbus.
#define SDL_DRIVER_DBUS_DYNAMIC "libdbus-1.so.3"
@@ -473,11 +476,9 @@ static bool SDL_DBus_AppendDictWithKeyValue(DBusMessageIter *iterInit, const cha
bool SDL_DBus_OpenURI(const char *uri, const char *window_id, const char *activation_token)
{
const char *bus_name = "org.freedesktop.portal.Desktop";
const char *path = "/org/freedesktop/portal/desktop";
const char *interface = "org.freedesktop.portal.OpenURI";
DBusMessageIter iterInit;
bool ret = false;
static const char *bus_name = "org.freedesktop.portal.Desktop";
static const char *path = "/org/freedesktop/portal/desktop";
static const char *interface = "org.freedesktop.portal.OpenURI";
if (!dbus.session_conn) {
/* We either lost connection to the session bus or were not able to
@@ -486,20 +487,43 @@ bool SDL_DBus_OpenURI(const char *uri, const char *window_id, const char *activa
return false;
}
DBusMessage *msg = dbus.message_new_method_call(bus_name, path, interface, "OpenURI");
if (!msg) {
return false;
}
// The OpenURI method can't open local 'file://' URIs, so OpenFile must be used instead.
DBusMessageIter iterInit;
DBusMessage *msg = NULL;
int fd = -1;
bool ret = false;
if (!window_id) {
window_id = "";
if (SDL_strncasecmp(uri, "file://", 7) == 0) {
fd = open(uri + 7, O_RDWR | O_CLOEXEC);
if (fd >= 0) {
msg = dbus.message_new_method_call(bus_name, path, interface, "OpenFile");
}
} else {
msg = dbus.message_new_method_call(bus_name, path, interface, "OpenURI");
}
if (!dbus.message_append_args(msg, DBUS_TYPE_STRING, &window_id, DBUS_TYPE_STRING, &uri, DBUS_TYPE_INVALID)) {
if (!msg) {
goto done;
}
dbus.message_iter_init_append(msg, &iterInit);
if (!window_id) {
window_id = "";
}
if (!dbus.message_iter_append_basic(&iterInit, DBUS_TYPE_STRING, &window_id)) {
goto done;
}
if (fd >= 0) {
if (!dbus.message_iter_append_basic(&iterInit, DBUS_TYPE_UNIX_FD, &fd)) {
goto done;
}
} else {
if (!dbus.message_iter_append_basic(&iterInit, DBUS_TYPE_STRING, &uri)) {
goto done;
}
}
if (activation_token) {
if (!SDL_DBus_AppendDictWithKeyValue(&iterInit, "activation_token", activation_token)) {
goto done;
@@ -525,6 +549,12 @@ bool SDL_DBus_OpenURI(const char *uri, const char *window_id, const char *activa
done:
dbus.message_unref(msg);
// The file descriptor is duplicated by D-Bus, so it can be closed on this end.
if (fd >= 0) {
close(fd);
}
return ret;
}