[X2Go-Commits] [live-build-x2go] 07/26: Parameter nomagicpixel=1 or nomagicpixel=2 must now be set as kernel boot parameter to enable the magic-pixel-workaround. Also added alternative method to disable magic pixel. Old method is now option 2.

git-admin at x2go.org git-admin at x2go.org
Wed Jan 24 18:31:48 CET 2018


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

x2go pushed a commit to branch feature/openbox-stretch
in repository live-build-x2go.

commit 56de879ed634b6e4a06c58b347df05d7d25d641d
Author: Stefan Baur <kontakt at baur-itcs.de>
Date:   Mon Nov 13 21:54:48 2017 +0100

    Parameter nomagicpixel=1 or nomagicpixel=2 must now be set as kernel boot parameter to enable the magic-pixel-workaround. Also added alternative method to disable magic pixel. Old method is now option 2.
---
 .../lib/live/config/2900-x2go-thinclientconfig     | 25 ++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig b/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig
index 8c0f468..d2aeb1a 100755
--- a/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig
+++ b/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig
@@ -233,12 +233,25 @@ if [ -n "\$BLANKINGTIME" ]; then
 fi
 
 # workaround for NX "magic pixel" being active in --thinclient mode
-while ! ps -C xdotool >/dev/null ; do
-        while [ \$(xdotool search --name . | wc -l) -lt 3 ] ; do
-                sleep 1
-        done ;
-        xdotool search . behave %@ blur windowmap
-done &
+if grep 'nomagicpixel=2' /proc/cmdline ; then
+	while ! ps -C xdotool >/dev/null ; do
+	        while [ \$(xdotool search --name . | wc -l) -lt 3 ] ; do
+	                sleep 1
+	        done ;
+	        xdotool search . behave %@ blur windowmap
+	done &
+elif grep 'nomagicpixel=1' /proc/cmdline ; then
+       while true ; do
+               while [ $(xdotool search --name . | wc -l) -lt 3 ] && ! ps -C openbox >/dev/null ; do
+                       openbox &
+               done
+               while [ $(xdotool search --name . | wc -l) -gt 2 ] && ps -C openbox >/dev/null ; do
+                       killall openbox
+               done
+       done &
+else
+	: # NOP
+fi
 
 eval \$THROTTLINGCOMMAND x2goclient --thinclient --no-session-edit --no-menu --maximize --add-to-known-hosts --haltbt --read-exports-from=/home/user/export \$LDAPPARAMS \$SESSIONFROM \$BACKGROUND \$BRANDING \$STARTSESSION
 XSESSION

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


More information about the x2go-commits mailing list