summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Fourdan <ofourdan@redhat.com>2024-03-18 17:50:00 +0100
committerMarge Bot <emma+marge@anholt.net>2024-03-18 23:19:59 +0000
commit9a7fb3a1539246c9e4d03eda7639d6d0943b5a89 (patch)
treee97733b407e6b28b83ddb70fb86502fdbc3f5e9b
parentfbf5e26b5c0b96828c3b34be7be6bceac1819a23 (diff)
xwayland: Use "-decorate" if available
That allows to open new Xwayland decorated windows as needed (e.g. using the "New window" entry from the launcher) Signed-off-by: Olivier Fourdan <ofourdan@redhat.com> Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1421>
-rw-r--r--hw/xwayland/desktop/org.freedesktop.Xwayland.desktop.in2
-rw-r--r--hw/xwayland/meson.build1
2 files changed, 2 insertions, 1 deletions
diff --git a/hw/xwayland/desktop/org.freedesktop.Xwayland.desktop.in b/hw/xwayland/desktop/org.freedesktop.Xwayland.desktop.in
index 6a9d9fc4b..106c8bc76 100644
--- a/hw/xwayland/desktop/org.freedesktop.Xwayland.desktop.in
+++ b/hw/xwayland/desktop/org.freedesktop.Xwayland.desktop.in
@@ -4,5 +4,5 @@ Comment=A rootful instance of the Xwayland X11 server
Terminal=false
Type=Application
Categories=System;
-Exec=@XWAYLAND@ -displayfd 1
+Exec=@XWAYLAND@ @DECORATE@ -displayfd 1
NoDisplay=true
diff --git a/hw/xwayland/meson.build b/hw/xwayland/meson.build
index 3bb7f88c0..ee05749d7 100644
--- a/hw/xwayland/meson.build
+++ b/hw/xwayland/meson.build
@@ -197,6 +197,7 @@ install_man(xwayland_manpage)
desktop_data = configuration_data()
desktop_data.set('XWAYLAND', xwayland_server.full_path())
+desktop_data.set('DECORATE', have_libdecor ? '-decorate' : '')
desktop_file = configure_file(
input: 'desktop/org.freedesktop.Xwayland.desktop.in',
output: 'org.freedesktop.Xwayland.desktop',