mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-09 02:02:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

xinput-calibrator: get screen geometry when calibrating

Browse Source 
Calibration acquires a default resolution of 1280x1024 when running
xinput_calibrator_pointercal.sh, obtain correct screen resolution by
using xrandr to grab user-specified geometry and pass to script

(From OE-Core rev: ce6f15dc3905ab0b061b20cc35fd179fdd9e070f)

Signed-off-by: Jonathan David <jonathan.david@ni.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Jonathan David
2015-11-30 15:59:50 -06:00
committed by Richard Purdie
parent e8d36f4886
commit 8dd27efecf
2 changed files with 35 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
meta/recipes-graphics/xinput-calibrator/xinput-calibrator/add-geometry-input-when-calibrating.patch Normal file
View File

@@ -0,0 +1,33 @@
Upstream-Status: Inappropriate [no longer maintained]
From 93abf28d602da637376b78de8c88b7ab5cf13b4f Mon Sep 17 00:00:00 2001
From: Jonathan David <jonathan.david@ni.com>
Date: Mon, 30 Nov 2015 12:12:20 -0600
Subject: [PATCH] add geometry input when calibrating
Send monitor geometry to xinput_calibrator when running the script
Signed-off-by: Jonathan David <jonathan.david@ni.com>
---
scripts/xinput_calibrator_pointercal.sh | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/scripts/xinput_calibrator_pointercal.sh b/scripts/xinput_calibrator_pointercal.sh
index 0ada7da..6a3aded 100755
--- a/scripts/xinput_calibrator_pointercal.sh
+++ b/scripts/xinput_calibrator_pointercal.sh
@@ -37,7 +37,10 @@ done
[ "$USER" != "root" ] && CALFILE=$USER_CALFILE
-CALDATA=`$BINARY --output-type xinput -v | tee $LOGFILE | grep ' xinput set' | sed 's/^ //g; s/$/;/g'`
+read RESOLUTION <<< $(xrandr | awk -F '[[:space:]+]' '/ connected/ \
+ { if ($3 != "primary") print $3; if ($3 == "primary") print $4 }')
+
+CALDATA=`$BINARY --geometry $RESOLUTION --output-type xinput -v | tee $LOGFILE | grep ' xinput set' | sed 's/^ //g; s/$/;/g'`
if [ ! -z "$CALDATA" ] ; then
echo $CALDATA > $CALFILE
echo "Calibration data stored in $CALFILE (log in $LOGFILE)"
--
1.9.1

3
meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb
View File

@@ -14,7 +14,8 @@ REQUIRED_DISTRO_FEATURES = "x11"
SRCREV = "c01c5af807cb4b0157b882ab07a893df9a810111"
SRC_URI = "git://github.com/tias/xinput_calibrator.git \
file://30xinput_calibrate.sh \
file://Allow-xinput_calibrator_pointercal.sh-to-be-run-as-n.patch"
file://Allow-xinput_calibrator_pointercal.sh-to-be-run-as-n.patch \
file://add-geometry-input-when-calibrating.patch"
S = "${WORKDIR}/git"