Calibration xorg.conf snippet not applied to touchscreen configuration

[Boszormenyi Zoltan]

Hi,

I am using the a touchscreen driver from https://github.com/SICOM/xf86-input-eeti-egalax
with a serial EETI Egalax touchscreen device.

The original configuration is:

# cat /etc/X11/xorg.conf.d/eeti.conf
Section "InputDevice"
    Identifier    "TOUCHSCREEN"
    Driver        "eetiegalax"
    Option        "AutoServerLayout" "on"
    Option        "Device" "/dev/ttyS3"
    Option        "SwapAxes" "true"
    Option        "Calibration" "14151 1670 2176 14368"
EndSection

and the Xorg.0.log part where it talks about my device is:

[2443488.892]
X.Org X Server 1.16.4
Release Date: 2014-12-20
[2443488.892] X Protocol Version 11, Revision 0
...
[2443488.894] (**) |-->Screen "SCREEN" (0)
[2443488.894] (**) |   |-->Monitor "<default monitor>"
[2443488.895] (==) No monitor specified for screen "SCREEN".
        Using a default monitor configuration.
[2443488.895] (**) |-->Input Device "TOUCHSCREEN"
...
[2443489.046] (II) Using input driver 'eetiegalax' for 'TOUCHSCREEN'
[2443489.046] (**) TOUCHSCREEN: always reports core events
[2443489.047] (**) Option "Device" "/dev/ttyS3"
[2443489.058] (II) TOUCHSCREEN: EETI eGalax serial device detected
[2443489.081] (II) TOUCHSCREEN: EETI eGalax firmware version: 1.13.3.HM-EX
[2443489.101] (II) TOUCHSCREEN: EETI eGalax controller type: C8051F320
[2443489.101] (**) Option "SwapAxes" "true"
[2443489.101] (II) TOUCHSCREEN: calibration set (1670,14151,2176,14368) invert (1,0) swapxy 1
[2443489.101] (II) XINPUT: Adding extended input device "TOUCHSCREEN" (type: TOUCHSCREEN,
id 6)
[2443489.101] (**) TOUCHSCREEN: (accel) keeping acceleration scheme 1
[2443489.101] (**) TOUCHSCREEN: (accel) acceleration profile 0
[2443489.101] (**) TOUCHSCREEN: (accel) acceleration factor: 2.000
[2443489.101] (**) TOUCHSCREEN: (accel) acceleration threshold: 4
...

Note the "calibration set" line.

I tried to use xinput_calibrator and use its output as a separate configuration snippet:

----8<-------8<-------8<-------8<-------8<-------8<---
# xinput_calibrator
    Setting calibration data: 0, 16383, 0, 16383
Calibrating EVDEV driver for "TOUCHSCREEN" id=6
    current calibration values (from XInput): min_x=0, max_x=16383 and min_y=0, max_y=16383
INFO: width=1024, height=768

Doing dynamic recalibration:
    Setting calibration data: 14947, 1988, 2110, 14497
    --> Making the calibration permanent <--
  copy the snippet below into '/etc/X11/xorg.conf.d/99-calibration.conf'
(/usr/share/X11/xorg.conf.d/ in some distro's)
Section "InputClass"
    Identifier    "calibration"
    MatchProduct    "!!Name_Of_TouchScreen!!"
    Option    "Calibration"    "14947 1988 2110 14497"
    Option    "SwapAxes"    "1"
EndSection

Change '!!Name_Of_TouchScreen!!' to your device's name in the snippet above.
----8<-------8<-------8<-------8<-------8<-------8<---

However, when trying to use either of these pieces as "calibration.conf"
below and commenting out the Calibration and SwapAxes line in the main
driver configuration results in the calibration values and SwapAxes not applied.

----8<-------8<-------8<-------8<-------8<-------8<---
Section "InputClass"
    Identifier    "calibration"
    MatchProduct    "TOUCHSCREEN"
    Option    "Calibration"    "14947 1988 2110 14497"
    Option    "SwapAxes"    "1"
EndSection
----8<-------8<-------8<-------8<-------8<-------8<---

----8<-------8<-------8<-------8<-------8<-------8<---
Section "InputClass"
    Identifier    "calibration"
    MatchIsTouchscreen "1"
    Option    "Calibration"    "14947 1988 2110 14497"
    Option    "SwapAxes"    "1"
EndSection
----8<-------8<-------8<-------8<-------8<-------8<---

What is the correct form of an additional MatchXXX configuration that gets used?
I am using Xorg 1.16.4 server.

Thanks in advance,
Zoltán Böszörményi