[X2Go-Commits] [live-build-x2go] 51/59: restoring the Login Screen didn't work on xinerama displays, should be fixed now

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch feature/openbox-magic-pixel-workaround-buster
in repository live-build-x2go.

commit bb3dd3c62af0be70e9c27b27c7604cf77976bf3c
Author: Stefan Baur (BAUR-ITCS) <kontakt at baur-itcs.de>
Date:   Mon Jun 29 15:49:47 2020 +0200

    restoring the Login Screen didn't work on xinerama displays, should be
    fixed now
---
 .../etc/X11/Xsession.d/60x11-spawn-configure-slideshow-screensaver  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/config/includes.chroot/etc/X11/Xsession.d/60x11-spawn-configure-slideshow-screensaver b/config/includes.chroot/etc/X11/Xsession.d/60x11-spawn-configure-slideshow-screensaver
index 381582e..eddeb13 100644
--- a/config/includes.chroot/etc/X11/Xsession.d/60x11-spawn-configure-slideshow-screensaver
+++ b/config/includes.chroot/etc/X11/Xsession.d/60x11-spawn-configure-slideshow-screensaver
@@ -109,7 +109,11 @@ else
 					# xdotool sleep 0.1 key Num_Lock sleep 0.1 key Num_Lock
 				else
 					# if there's no nxproxy/Xephyr/Xnest window, we're likely to be in the login screen, so restore fullscreen X2GoClient Login window
-					xdotool search --onlyvisible --classname "X2GoClient" windowsize --sync 100% 100% || echo $?
+					PRIMARYSCREEN=$(xrandr -d :0 | awk '$3 == "primary" { print $4 }')
+					PRIMARYSCREENCOORD=$(echo $PRIMARYSCREEN | awk -F'+' '{ print $2 " " $3}' | tr -dc '[0-9] ')
+					PRIMARYSCREENSIZE=$(echo $PRIMARYSCREEN | awk -F'[x|+]' '{ print $1 " " $2}' | tr -dc '[0-9] ')
+					xdotool search --onlyvisible --classname "X2GoClient" windowmove --sync $PRIMARYSCREENCOORD || echo $?
+					xdotool search --onlyvisible --classname "X2GoClient" windowsize --sync $PRIMARYSCREENSIZE || echo $?
 				fi
 
 				xsetroot -solid "#$HEXCOLOR" # restore old background color

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git