T-Gander/Sunshine
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

feat(linux/xdgportal): Add support for pipewire-serial (#5060)

Browse Source
This commit is contained in:
Kishi
2026-06-23 15:57:59 +02:00
committed by GitHub
parent 16ced8fd80
commit 2438a9bd7c
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/platform/linux/portalgrab.cpp
View File

@@ -87,7 +87,8 @@ namespace portal {
}; };
struct pipewire_streaminfo_t { struct pipewire_streaminfo_t {
int pipewire_node = -1; uint32_t pipewire_node = PW_ID_ANY;
uint64_t pipewire_object_serial = SPA_ID_INVALID;
int width = 0; int width = 0;
int height = 0; int height = 0;
int pos_x = 0; int pos_x = 0;
@@ -505,7 +506,7 @@ namespace portal {
GVariantIter iter; GVariantIter iter;
const auto wl_monitors = wl::monitors(); const auto wl_monitors = wl::monitors();
int out_pipewire_node; uint32_t out_pipewire_node;
g_autoptr(GVariant) value = nullptr; g_autoptr(GVariant) value = nullptr;
g_variant_iter_init(&iter, streams); g_variant_iter_init(&iter, streams);
while (g_variant_iter_next(&iter, "(u@a{sv})", &out_pipewire_node, &value)) { while (g_variant_iter_next(&iter, "(u@a{sv})", &out_pipewire_node, &value)) {
@@ -525,7 +526,15 @@ namespace portal {
out_pos_x = 0; out_pos_x = 0;
out_pos_y = 0; out_pos_y = 0;
} }
auto stream = pipewire_streaminfo_t {out_pipewire_node, out_width, out_height, out_pos_x, out_pos_y};
uint64_t out_pipewire_object_serial;
result = g_variant_lookup(value, "pipewire-serial", "t", &out_pipewire_object_serial);
if (!result) {
// If pipewire-serial was not present explicitly set to invalid value.
out_pipewire_object_serial = SPA_ID_INVALID;
}
auto stream = pipewire_streaminfo_t {out_pipewire_node, out_pipewire_object_serial, out_width, out_height, out_pos_x, out_pos_y};
// Try to match the stream to a monitor_name by position/resolution and update stream info // Try to match the stream to a monitor_name by position/resolution and update stream info
for (const auto &monitor : wl_monitors) { for (const auto &monitor : wl_monitors) {
@@ -659,6 +668,7 @@ namespace portal {
// Return values for pipewire init // Return values for pipewire init
out_pipewire_fd = dbus.pipewire_fd; out_pipewire_fd = dbus.pipewire_fd;
out_pipewire_node = stream.pipewire_node; out_pipewire_node = stream.pipewire_node;
out_pipewire_object_serial = stream.pipewire_object_serial;
// Set/update basic stream parameters on display_t // Set/update basic stream parameters on display_t
this->offset_x = stream.pos_x; this->offset_x = stream.pos_x;
this->offset_y = stream.pos_y; this->offset_y = stream.pos_y;