[X2Go-Commits] [x2gothinclient] 01/01: TCE in displaymanager mode: Don't align multiple heads next to one another if a (Wacom) touchscreen is deteced in the list of heads. (Fixes: #719).

git-admin at x2go.org git-admin at x2go.org
Thu Jan 8 16:23:42 CET 2015


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

x2go pushed a commit to branch master
in repository x2gothinclient.

commit 373c11fc7ea4550996f94ee3a69db8ac8a451c1c
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Jan 8 16:23:38 2015 +0100

    TCE in displaymanager mode: Don't align multiple heads next to one another if a (Wacom) touchscreen is deteced in the list of heads. (Fixes: #719).
---
 debian/changelog                    |    3 +++
 displaymanager/sbin/x2gothinclientd |   17 +++++++++++++++--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index baf2ce8..0ecfe84 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -63,6 +63,9 @@ x2gothinclient (1.5.0.0-0x2go1) UNRELEASED; urgency=low
     - For X2Go TCE in display manager mode, set login backgrounds of all
       screens (if more than one is used) to a blue'ish background color.
       (Fixes: #718).
+    - TCE in displaymanager mode: Don't align multiple heads next to
+      one another if a (Wacom) touchscreen is deteced in the list of heads.
+      (Fixes: #719).
   * debian/control:
     + Rename bin:package: x2gothinclient -> x2gothinclient-daemon.
     + Make sure x2gothinclient-minidesktop pulls in X11 and X2Go Client.
diff --git a/displaymanager/sbin/x2gothinclientd b/displaymanager/sbin/x2gothinclientd
index 8df9693..06d67d3 100755
--- a/displaymanager/sbin/x2gothinclientd
+++ b/displaymanager/sbin/x2gothinclientd
@@ -111,16 +111,29 @@ elsif ($pid == 0 )
 			# wait for X-Server to come up
 			sleep(3);
 
-			# align displays next to each other in order of appearance in xrandr
+			# Align displays next to each other in order of appearance in xrandr, unless touch
+			# devices are detected - in that case, clone displays so that touchable area and display
+			# stay aligned.  This fix has been introduced for a certain make of wacom touch-sensitive
+			# displays.  If you have a touch-sensitive device that isn't affected by this, or that
+			# is negatively affected by this fix, please let us know so we can add a better detection.
 			my $this_display;
 			my $next_display;
+			my $touchdevicescount=`DISPLAY=:0 xsetwacom -d :0 --list devices | wc -l`;
+
 			foreach (`DISPLAY=:0 LANG=C xrandr 2>/dev/null | grep ' connected ' | cut -d ' ' -f1`)
 			{
 				$next_display = $_;
 				$next_display =~ s/\n//;
 				if (defined($this_display))
 				{
-					`DISPLAY=:0 /usr/bin/xrandr --output $next_display --left-of $this_display`;
+					if ($touchdevicescount > 0)
+					{
+						`DISPLAY=:0 /usr/bin/xrandr --output $next_display --same-as $this_display`;
+					}
+					else
+					{
+						`DISPLAY=:0 /usr/bin/xrandr --output $next_display --left-of $this_display`;
+					}
 				}
 				$this_display = $next_display;
 			}

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gothinclient.git


More information about the x2go-commits mailing list