From X2Go-ML-1@baur-itcs.de Tue Jan 6 19:36:08 2015 Received: (at 719) by bugs.x2go.org; 6 Jan 2015 18:36:10 +0000 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on ymir.das-netzwerkteam.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.3.2 Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.126.131]) by ymir.das-netzwerkteam.de (Postfix) with ESMTPS id 3AAE85DB53 for <719@bugs.x2go.org>; Tue, 6 Jan 2015 19:36:08 +0100 (CET) Received: from [192.168.0.3] ([78.43.170.197]) by mrelayeu.kundenserver.de (mreue001) with ESMTPSA (Nemesis) id 0MHfTA-1Y5G8J38Oq-003Ise for <719@bugs.x2go.org>; Tue, 06 Jan 2015 19:36:07 +0100 Message-ID: <54AC2B49.5070400@baur-itcs.de> Date: Tue, 06 Jan 2015 19:36:57 +0100 From: Stefan Baur User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:31.0) Gecko/20100101 Thunderbird/31.3.0 MIME-Version: 1.0 To: 719@bugs.x2go.org Subject: Re: [X2Go-Dev] Bug#719: Clone screens for touch-enabled devices References: <54ABEC61.7040006@baur-itcs.de> <54ABF5F3.1030603@baur-itcs.de> <54AC208B.4000900@baur-itcs.de> In-Reply-To: <54AC208B.4000900@baur-itcs.de> Content-Type: multipart/mixed; boundary="------------040606090805060205050300" X-Provags-ID: V03:K0:fKJvVLvQC8oKVbLWAUhgjLOS/o1t/2Ws34mEaofw1rlxwn0X28P UzmbTWXnWtJyb+xBws3Gwu8MTsIPE6P+aHKx90c5NO8tFcDfkgNuQ+SQp55GjDokUeFPo2c SbSX6RfAx+lz64mQlIlV9NrIcFsrLZ4Fl8ZiEzFBb9xc71jkn+oAYoO5+Noly7R5aum++tj DCy1NDrtHZUUdiyA3QsvQ== X-UI-Out-Filterresults: notjunk:1; This is a multi-part message in MIME format. --------------040606090805060205050300 Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 8bit -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Third time's a charm ... Again, please disregard my earlier patch and use this one instead. v2 had introduced formatting errors, also, two escape signs were missing. v3 fixes that. - -- BAUR-ITCS UG (haftungsbeschränkt) Geschäftsführer: Stefan Baur Eichenäckerweg 10, 89081 Ulm | Registergericht Ulm, HRB 724364 Fon/Fax 0731 40 34 66-36/-35 | USt-IdNr.: DE268653243 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (MingW32) iQEcBAEBAgAGBQJUrCtJAAoJEG7d9BjNvlEZUKIH/134doSYAlVMRcreOr9pSUv/ pKKxOLSnR+P7sAjlyf4UGuqIUNIVdsrRdh1zTPwygZsnlLVU0rgnXum8K7bKV/WV XcvFKrBi5ZtURvMQoqrpDiXgvM4csfO9n01i5umTxIoX7l4hrmT4q4PKX8Wncaxb 2V49BQsG4Uah5juZHWUqt/LDWkjMK8fduaMkRogp7neoO6LT8G/WEKYhAUug8Roe n8ZyuyCKjB97lFpPZu1ub3deGX/WfSlT3CbJpbRtZO4anSAoNGC2f+JMmjY1mKNd An3v4Tbr6N7pS8HAPqwhKw1uAe0eqif7fD7FY2wp+PD/BiJwQ9Ng/Ejl8xFamf4= =v2VE -----END PGP SIGNATURE----- --------------040606090805060205050300 Content-Type: text/plain; charset=windows-1252; name="clone-screens-for-touch-enabled-devices-x2gothinclientd-v3.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename*0="clone-screens-for-touch-enabled-devices-x2gothinclientd-v3.p"; filename*1="atch" --- /usr/sbin/x2gothinclientd 2014-02-27 13:27:09.000000000 +0000 +++ /usr/sbin/x2gothinclientd.new 2015-01-06 19:32:47.231326854 +0000 @@ -103,6 +103,7 @@ system("shutdown -h now"); system("chvt 7"); } + # test if XServer is running, if not launch it... if ( check_x() ==0 ) { @@ -111,17 +112,65 @@ # 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. + # The fix is bypassed if a mouse device is detected. + # Note that you can manually override the behavior by passing a kernel parameter + # xinerama=above|below|same-as|left-of|right-of to override the autodetection. + + # check if a xinerama kernel parameter is set + my $xrandrcmdtainted = `cat /proc/cmdline | tr ' ' '\n' | awk -F '=' '\$1 == "xinerama" { print \$2 }'`; + my $xrandrcmd; + if ($xrandrcmdtainted =~ /(^above$|^below$|^same-as$|^left-of$|^right-of$)/) + { + # if the parameter value matches one value of the defined set, use that + $xrandrcmd = $1; + } + else + { + # else default to "left-of", which was our standard behavior in previous versions + $xrandrcmd = "left-of"; + } + + # find out how many touch devices we have + my $touchdevicescount = `DISPLAY=:0 xsetwacom -d localhost:0.0 --list devices | wc -l`; + + # find out how many mouse devices we have + my $micecount = `find /dev/input -maxdepth 1 -name "mouse*" | wc -l`; + + # declare two variables for the upcoming loop my $this_display; my $next_display; + + # loop through the following code block for all connected display devices foreach (`DISPLAY=:0 LANG=C xrandr 2>/dev/null | grep ' connected ' | cut -d ' ' -f1`) { - $next_display = $_; - $next_display =~ s/\n//; + # assign a value to $next_display and remove newline from it + chomp ($next_display = $_); + + # $this_display won't be defined until the second time the loop is executed, which is a + # neat way of running xrandr only if there are at least two connected display devices if (defined($this_display)) { - `DISPLAY=:0 /usr/bin/xrandr --output $next_display --left-of $this_display`; + if (($touchdevicescount > 0) && ($micecount < 1) && ($xrandrcmdtainted eq "")) + { + # we have a touch device and no mice, and no xinerama parameter was set, + # so switch to clone view to make the touch device usable + `DISPLAY=:0 /usr/bin/xrandr --output $next_display --same-as $this_display`; + } + else + { + # else use whatever is in $xrandrcmd (which is either our default of "left-of", + # or a valid xinerama kernel parameter value) + `DISPLAY=:0 /usr/bin/xrandr --output $next_display --$xrandrcmd $this_display`; + } } + + # now set $this_display -> every subsequent iteration of the loop will now enter the code block + # above where (defined($this_display)) is the conditional $this_display = $next_display; } } --------------040606090805060205050300 Content-Type: application/octet-stream; name="clone-screens-for-touch-enabled-devices-x2gothinclientd-v3.patch.sig" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename*0="clone-screens-for-touch-enabled-devices-x2gothinclientd-v3.p"; filename*1="atch.sig" iQEcBAABAgAGBQJUrCtJAAoJEG7d9BjNvlEZYcYH/i9zBs2uPi5njae9cMJWOxxftyaXyUjC rfySbO9I5JKa48iHo6vUX9joyWL1IUtm7WRRPPo75jkBWn9G+BqBhvXQWIzugbb3tTZI5ZQf TUxmeL38IPMU9tZ+HLgIVEFrhJvm0diKzLNNfWnSHO13R0/3XGfM0wReLs/N0P4jq2mnDFJc 59tJmFvOlBvjt9SrPSleBNAV1FtodUpyoRyVQT3rPg8SliwTCWCNNbOoSqK46xFSUlSkfg3U rtlVK2TKtvm++LaApSr3JxcgWVqyFglmfMkkN2rzORsbNFN4vonwLvKzyDo3mMhoLSxwDHK1 BkyrEn2+8pbNSqNTRdMM8lg= --------------040606090805060205050300--