[X2Go-Commits] [live-build-x2go] 53/59: xdotool can't restore to fullscreen, needs wmctrl

[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 9af001e9e329cb57144fd45288d9caa571ce9bba
Author: Stefan Baur (BAUR-ITCS) <kontakt at baur-itcs.de>
Date:   Mon Jun 29 21:10:37 2020 +0200

    xdotool can't restore to fullscreen, needs wmctrl
---
 .../etc/X11/Xsession.d/60x11-spawn-configure-slideshow-screensaver | 7 ++-----
 config/package-lists/xbgandscreensaver.list.chroot                 | 1 +
 2 files changed, 3 insertions(+), 5 deletions(-)

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 796fd9c..a3cd360 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,15 +109,12 @@ 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
-					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] ')
 					# keep kicking X2GoClient into the foreground until it has focus
 					while [ "$(xdotool getwindowfocus)" != "$(xdotool search --classname "X2GoClient")" ] ; do
 						xdotool search --classname "X2GoClient" windowmap --sync windowfocus --sync;
 					done
-					xdotool search --onlyvisible --classname "X2GoClient" windowmove --sync $PRIMARYSCREENCOORD || echo $?
-					xdotool search --onlyvisible --classname "X2GoClient" windowsize --sync $PRIMARYSCREENSIZE || echo $?
+					wmctrl -R X2GoClient -b add,fullscreen
+					# wmctrl -a X2GoClient -b add,maximized_vert,maximized_horz
 				fi
 
 				xsetroot -solid "#$HEXCOLOR" # restore old background color
diff --git a/config/package-lists/xbgandscreensaver.list.chroot b/config/package-lists/xbgandscreensaver.list.chroot
index 14eecfe..011fd25 100644
--- a/config/package-lists/xbgandscreensaver.list.chroot
+++ b/config/package-lists/xbgandscreensaver.list.chroot
@@ -1,2 +1,3 @@
 feh
+wmctrl
 xprintidle

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