=== modified file 'xpra-skel/homedir/bin/service.xpra-xorg.run'
--- old/xpra-skel/homedir/bin/service.xpra-xorg.run	2024-07-24 14:44:33 +0000
+++ new/xpra-skel/homedir/bin/service.xpra-xorg.run	2024-04-17 00:59:47 +0000
@@ -1,9 +1,12 @@
 #!/bin/execlineb
 s6-envdir env
+importas -i UID UID
 multisubstitute {
 	importas -i XPRA_LOG_DIR XPRA_LOG_DIR
-	importas -i display_number display_number
+	importas -i DISPLAY DISPLAY
+#	importas -i PID PID
 	importas -i HOME HOME
+	importas -D /run/user/$UID XDG_RUNTIME_DIR XDG_RUNTIME_DIR
 }
 Xorg
 	-displayfd 3
@@ -13,7 +16,8 @@
 	-nolisten local
 	+extension RANDR
 	+extension RENDER
-	-auth /run/Xauthority.${display_number}
-	-logfile "${XPRA_LOG_DIR}/Xorg.${display_number}.log"
+	-auth /run/Xauthority.${DISPLAY}
+	-logfile "${XPRA_LOG_DIR}/Xorg.${DISPLAY}.log"
+#	-configdir "${XDG_RUNTIME_DIR}/xpra/xorg.conf.d/$PID"
 	-config /home/ccx/xpra.xorg.conf
-	:${display_number}
+	$DISPLAY

=== modified file 'xpra-skel/homedir/bin/start-xpra-for-container'
--- old/xpra-skel/homedir/bin/start-xpra-for-container	2024-07-24 14:44:33 +0000
+++ new/xpra-skel/homedir/bin/start-xpra-for-container	2024-07-23 21:41:52 +0000
@@ -225,7 +225,6 @@
   - sv_notification_fd 3
   - sv_link_command run service.xpra-xorg.run
   - sv_common_finish
-  - sv_env display_number $display
   - sv_end
 }
 

=== modified file 'xpra-skel/homedir/bin/xkb-all'
--- old/xpra-skel/homedir/bin/xkb-all	2024-07-24 14:44:33 +0000
+++ new/xpra-skel/homedir/bin/xkb-all	2024-05-07 20:36:32 +0000
@@ -1,8 +1,4 @@
 #!/bin/sh
 for sock in /tmp/.X11-unix/X*; do
-	if [[ -e /run/Xauthority.${sock##*/X} ]]; then
-		env XAUTHORITY=/run/Xauthority.${sock##*/X} DISPLAY=:${sock##*/X} xkb
-	else
-		DISPLAY=:${sock##*/X} xkb
-	fi
+	DISPLAY=:${sock##*/X} xkb
 done

=== modified file 'xpra-skel/homedir/bin/xpra-client'
--- old/xpra-skel/homedir/bin/xpra-client	2024-07-24 14:44:33 +0000
+++ new/xpra-skel/homedir/bin/xpra-client	2024-07-23 21:42:18 +0000
@@ -36,7 +36,7 @@
 
 # Hacky hack. Wait until xpra client resets the layout and then set the actual one.
 (
-	export DISPLAY=:$xpra_display XAUTHORITY=/run/Xauthority.$xpra_display
+	export DISPLAY=:$xpra_display
 	until xmodmap -pke | grep -q 'keycode \+37 = Control'; do
 		sleep 0.125 || break
 		kill -0 $$ || exit 1

=== modified file 'xpra-skel/homedir/bin/xpra-launch-xorg'
--- old/xpra-skel/homedir/bin/xpra-launch-xorg	2024-07-24 14:44:33 +0000
+++ new/xpra-skel/homedir/bin/xpra-launch-xorg	2024-04-17 00:59:47 +0000
@@ -1,5 +1,6 @@
 #!/bin/execlineb -s1
 if { test -d ${1}/supervise }
+if { s6-dumpenv ${1}/env }
 if { s6-svc -wU -T 5000 -o $1 }
 foreground { xkb }
 s6-svwait -d -t 15000 $1