Skip to content

Switch xinput_calibrator_pointercal.sh to use xorg.conf.d mode #78

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
btbroot wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Switch xinput_calibrator_pointercal.sh to use xorg.conf.d mode #78

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 6 additions & 9 deletions scripts/xinput_calibrator_pointercal.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,25 +7,22 @@
# original script: Martin Jansa <Martin.Jansa@gmail.com>, 2010-01-31
# updated by Tias Guns <tias@ulyssis.org>, 2010-02-15
# updated by Koen Kooi <koen@dominion.thruhere.net>, 2012-02-28
# updated by Al Nikolov <alexey.nikolov@etteplan.com>, 2020-05-14

PATH="/usr/bin:$PATH"

BINARY="xinput_calibrator"
CALFILE="/etc/pointercal.xinput"
CALFILE="/etc/X11/xorg.conf.d/99-calibration.conf"
LOGFILE="/var/log/xinput_calibrator.pointercal.log"

if [ -e $CALFILE ] ; then
if grep replace $CALFILE ; then
echo "Empty calibration file found, removing it"
rm $CALFILE
echo "Empty calibration file found"
else
echo "Using calibration data stored in $CALFILE"
. $CALFILE && exit 0
exit 0
fi
fi

CALDATA=`$BINARY --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)"
fi
$BINARY --output-type xorg.conf.d -v --output-filename $CALFILE | tee $LOGFILE
echo "Calibration data stored in $CALFILE (log in $LOGFILE)"
⚡