[X2Go-Commits] [live-build-x2go] 26/42: Revert "improved code to fix blank screen happening with DisplayPort and some buggy TFTs (xset q reports "Monitor is on" even though it is pitch black) - second attempt"

[git-admin at x2go.org]

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

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

commit c7abe5da7950704f13f2121a0b32603482fc0fcf
Author: Stefan Baur (BAUR-ITCS) <kontakt at baur-itcs.de>
Date:   Tue Jan 16 02:47:26 2018 +0100

    Revert "improved code to fix blank screen happening with DisplayPort and some buggy TFTs (xset q reports "Monitor is on" even though it is pitch black) - second attempt"
    
    This reverts commit 5258aff8f686e2483b0e2bec07fb4dc5f66a2fe4.
---
 .../lib/live/config/2900-x2go-thinclientconfig     | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig b/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig
index 4dd16d8..40342ad 100755
--- a/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig
+++ b/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig
@@ -86,9 +86,25 @@ done
 openbox &
 
 # code to fix blank screen happening with DisplayPort and some buggy TFTs (xset q reports "Monitor is on" even though it is pitch black)
-CURRENTRES=\$(xrandr | awk '$0 ~/\*/ { print \$1}') # determine current resolution
-xrandr -s 640x480 # set low resolution to trigger TFT wakeup
-xrandr -s \$CURRENTRES # restore original resolution
+# it seems that a simple 
+# xset dpms force standby ; xset dpms force on
+# isn't enough (doesn't always help),
+# so let's add some resiliency and logging
+
+if grep -q '\W*blankdpmsfix\W*' /proc/cmdline; then
+	while xset q | grep -q "Monitor is On" ; do
+		while ! xset q | grep -q "Monitor is in Standby" ; do
+			echo -en "\n\$(date +'%F | %T | ')'\$0' Attempting to force TFT into 'standby'." | tee -a /dev/tty8
+			xset dpms force standby
+			echo -en "\n\$(date +'%F | %T | ')'\$0' \$(xset q | grep "Monitor is")" | tee -a /dev/tty8
+		done
+	done
+	while ! xset q | grep -q "Monitor is On" ; do
+		echo -en "\n\$(date +'%F | %T | ')'\$0' Attempting to force TFT to 'on'." | tee -a /dev/tty8
+		xset dpms force on
+		echo -en "\n\$(date +'%F | %T | ')'\$0' \$(xset q | grep "Monitor is")" | tee -a /dev/tty8
+	done
+fi
 
 # set screen background to X2Go default blue on all detected screens
 xsetroot -solid "#246ed8"

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