diff options
author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2024-10-08 16:50:25 +0400 |
---|---|---|
committer | Marc-André Lureau <marcandre.lureau@redhat.com> | 2024-10-14 17:34:09 +0400 |
commit | 48b7ef0f0fc3c3033797b67d1554987a516488f9 (patch) | |
tree | 10fc223cabc7cc6c4cba6068ce663c476f0210a4 /ui | |
parent | 4de1797ff6ceb7387cdb967ec1fa0128624ff405 (diff) |
ui/dbus: implement Unix.Map
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Akihiko Odaki <akihiko.odaki@daynix.com>
Message-ID: <20241008125028.1177932-17-marcandre.lureau@redhat.com>
Diffstat (limited to 'ui')
-rw-r--r-- | ui/dbus-listener.c | 78 |
1 files changed, 73 insertions, 5 deletions
diff --git a/ui/dbus-listener.c b/ui/dbus-listener.c index 7142afcddb..ec47946282 100644 --- a/ui/dbus-listener.c +++ b/ui/dbus-listener.c @@ -83,6 +83,8 @@ struct _DBusDisplayListener { #ifdef CONFIG_OPENGL egl_fb fb; #endif +#else /* !WIN32 */ + QemuDBusDisplay1ListenerUnixMap *map_proxy; #endif guint dbus_filter; @@ -441,6 +443,51 @@ dbus_scanout_share_d3d_texture( return true; } #endif /* CONFIG_OPENGL */ +#else /* !WIN32 */ +static bool dbus_scanout_map(DBusDisplayListener *ddl) +{ + g_autoptr(GError) err = NULL; + g_autoptr(GUnixFDList) fd_list = NULL; + + if (ddl->ds_share == SHARE_KIND_MAPPED) { + return true; + } + + if (!ddl->can_share_map || ddl->ds->shmfd == -1) { + return false; + } + + ddl_discard_display_messages(ddl); + fd_list = g_unix_fd_list_new(); + if (g_unix_fd_list_append(fd_list, ddl->ds->shmfd, &err) != 0) { + g_debug("Failed to setup scanout map fdlist: %s", err->message); + ddl->can_share_map = false; + return false; + } + + if (!qemu_dbus_display1_listener_unix_map_call_scanout_map_sync( + ddl->map_proxy, + g_variant_new_handle(0), + ddl->ds->shmfd_offset, + surface_width(ddl->ds), + surface_height(ddl->ds), + surface_stride(ddl->ds), + surface_format(ddl->ds), + G_DBUS_CALL_FLAGS_NONE, + DBUS_DEFAULT_TIMEOUT, + fd_list, + NULL, + NULL, + &err)) { + g_debug("Failed to call ScanoutMap: %s", err->message); + ddl->can_share_map = false; + return false; + } + + ddl->ds_share = SHARE_KIND_MAPPED; + + return true; +} #endif /* WIN32 */ #ifdef CONFIG_OPENGL @@ -693,16 +740,22 @@ static void dbus_gfx_update(DisplayChangeListener *dcl, trace_dbus_update(x, y, w, h); -#ifdef WIN32 if (dbus_scanout_map(ddl)) { +#ifdef WIN32 qemu_dbus_display1_listener_win32_map_call_update_map( ddl->map_proxy, x, y, w, h, G_DBUS_CALL_FLAGS_NONE, DBUS_DEFAULT_TIMEOUT, NULL, NULL, NULL); +#else + qemu_dbus_display1_listener_unix_map_call_update_map( + ddl->map_proxy, + x, y, w, h, + G_DBUS_CALL_FLAGS_NONE, + DBUS_DEFAULT_TIMEOUT, NULL, NULL, NULL); +#endif return; } -#endif if (x == 0 && y == 0 && w == surface_width(ddl->ds) && h == surface_height(ddl->ds)) { return ddl_scanout(ddl); @@ -879,7 +932,6 @@ dbus_display_listener_get_console(DBusDisplayListener *ddl) return ddl->console; } -#ifdef WIN32 static bool dbus_display_listener_implements(DBusDisplayListener *ddl, const char *iface) { @@ -894,6 +946,7 @@ dbus_display_listener_implements(DBusDisplayListener *ddl, const char *iface) return implements; } +#ifdef WIN32 static bool dbus_display_listener_setup_peer_process(DBusDisplayListener *ddl) { @@ -976,10 +1029,11 @@ dbus_display_listener_setup_d3d11(DBusDisplayListener *ddl) static void dbus_display_listener_setup_shared_map(DBusDisplayListener *ddl) { -#ifdef WIN32 g_autoptr(GError) err = NULL; - if (!dbus_display_listener_implements(ddl, "org.qemu.Display1.Listener.Win32.Map")) { +#ifdef WIN32 + if (!dbus_display_listener_implements( + ddl, "org.qemu.Display1.Listener.Win32.Map")) { return; } @@ -1000,6 +1054,20 @@ dbus_display_listener_setup_shared_map(DBusDisplayListener *ddl) } ddl->can_share_map = true; +#else /* !WIN32 */ + if (!dbus_display_listener_implements( + ddl, "org.qemu.Display1.Listener.Unix.Map")) { + return; + } + ddl->map_proxy = qemu_dbus_display1_listener_unix_map_proxy_new_sync( + ddl->conn, G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START, NULL, + "/org/qemu/Display1/Listener", NULL, &err); + if (!ddl->map_proxy) { + g_debug("Failed to setup Unix map proxy: %s", err->message); + return; + } + + ddl->can_share_map = true; #endif } |