[X2Go-Commits] [live-build-x2go] 07/09: 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
Sat Nov 18 02:45:27 CET 2017
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch feature/openbox-magic-pixel-workaround
in repository live-build-x2go.
commit a183bb6ae2c476b2386f5496860feda96bbeb5ff
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 0609975..8ce93ef 100755
--- a/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig
+++ b/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig
@@ -222,12 +222,25 @@ if [ -n "\$THROTTLEVALUES" ]; 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 /srv/git/code.x2go.org/live-build-x2go.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git
More information about the x2go-commits
mailing list