From c4da1d552577bb46026a2664f9e8b1eaa613bfc5 Mon Sep 17 00:00:00 2001 From: vasilito Date: Thu, 9 Jul 2026 15:10:20 +0300 Subject: [PATCH] =?UTF-8?q?config/wayland.toml:=20fix=20misleading=20kwin?= =?UTF-8?q?=5Fpid=E2=86=92compositor=5Fpid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The Wayland compositor service currently launches redbear-compositor, not kwin_wayland. Renamed kwin_pid→compositor_pid and updated the error message from 'kwin_wayland failed' to 'Wayland compositor failed'. Added comment documenting that redbear-compositor is the bootstrap compositor until KWin completes its build. The transition path is documented: replace 'redbear-compositor --drm' with 'kwin_wayland --drm' when KWin is runtime-ready. --- config/wayland.toml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/config/wayland.toml b/config/wayland.toml index 98bca601c6..0c4d5d87d0 100644 --- a/config/wayland.toml +++ b/config/wayland.toml @@ -211,7 +211,7 @@ wait_for_wayland_socket() { if [ -e "$socket_path" ]; then return 0 fi - if ! kill -0 "$kwin_pid" 2>/scheme/null; then + if ! kill -0 "$compositor_pid" 2>/scheme/null; then return 1 fi attempts=$((attempts + 1)) @@ -245,11 +245,14 @@ if [ -z "${KWIN_DRM_DEVICES:-}" ] && [ -e /scheme/drm/card0 ]; then export KWIN_DRM_DEVICES=/scheme/drm/card0 fi +# Bootstrap compositor: redbear-compositor provides a bounded Wayland +# surface (DRM/KMS + core protocols) until KWin completes its build. +# When KWin is ready, replace with: kwin_wayland --drm & redbear-compositor --drm & -kwin_pid=$! +compositor_pid=$! if ! wait_for_wayland_socket; then - echo "kwin_wayland failed to expose $XDG_RUNTIME_DIR/$WAYLAND_DISPLAY" >&2 + echo "Wayland compositor failed to expose $XDG_RUNTIME_DIR/$WAYLAND_DISPLAY" >&2 exit 1 fi