#413 link xwayland socket properly for X11 apps arch

Author: thelamer

Dockerfile

@@ -38,10 +38,6 @@ RUN \
     /usr/share/applications/chromium.desktop && \
   setcap -r \
     /usr/sbin/kwin_wayland && \
-  echo "**** kde tweaks ****" && \
-  sed -i \
-    's/applications:org.kde.discover.desktop,/applications:org.kde.konsole.desktop,/g' \
-    /usr/share/plasma/plasmoids/org.kde.plasma.taskmanager/contents/config/main.xml && \
   echo "**** cleanup ****" && \
   rm -rf \
     /config/.cache \

Dockerfile.aarch64

@@ -38,10 +38,6 @@ RUN \
     /usr/share/applications/chromium.desktop && \
   setcap -r \
     /usr/sbin/kwin_wayland && \
-  echo "**** kde tweaks ****" && \
-  sed -i \
-    's/applications:org.kde.discover.desktop,/applications:org.kde.konsole.desktop,/g' \
-    /usr/share/plasma/plasmoids/org.kde.plasma.taskmanager/contents/config/main.xml && \
   echo "**** cleanup ****" && \
   rm -rf \
     /config/.cache \

root/defaults/startwm_wayland.sh

@@ -93,15 +93,17 @@ export QT_QPA_PLATFORM=wayland
 export XDG_CURRENT_DESKTOP=KDE
 export XDG_SESSION_TYPE=wayland
 export KDE_SESSION_VERSION=6
-unset DISPLAY
+export DISPLAY=:1
+sudo mkdir -p /tmp/.X11-unix
+sudo chmod 1777 /tmp/.X11-unix
 dbus-run-session bash -c '
-    WAYLAND_DISPLAY=wayland-1 kwin_wayland --no-lockscreen &
+    WAYLAND_DISPLAY=wayland-1 python3 /kwin-xwayland.py &
     KWIN_PID=$!
     sleep 2
     if [ -f /usr/lib/libexec/polkit-kde-authentication-agent-1 ]; then
         /usr/lib/libexec/polkit-kde-authentication-agent-1 &
     elif [ -f /usr/libexec/polkit-kde-authentication-agent-1 ]; then
-        /usr/libexec/polkit-kde-authentication-agent-1
+        /usr/libexec/polkit-kde-authentication-agent-1 &
     fi
     WAYLAND_DISPLAY=wayland-0 plasmashell
     kill $KWIN_PID

root/kwin-xwayland.py

@@ -0,0 +1,26 @@
+#!/usr/bin/env python3
+import socket
+import os
+
+display_env = os.environ.get("DISPLAY", ":1")
+display_num = display_env.lstrip(":")
+path = f"/tmp/.X11-unix/X{display_num}"
+
+if os.path.exists(path):
+    os.remove(path)
+
+s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
+s.bind(path)
+s.listen(128)
+
+fd = s.fileno()
+os.set_inheritable(fd, True)
+
+os.execlp(
+    "kwin_wayland",
+    "kwin_wayland",
+    "--no-lockscreen",
+    "--xwayland",
+    f"--xwayland-display=:{display_num}",
+    f"--xwayland-fd={fd}"
+)