[PATCH v2] evdev: Support the "Calibration" string option.

Julien Cristau jcristau at debian.org
Mon Oct 12 06:11:50 PDT 2009


On Mon, Oct 12, 2009 at 15:46:28 +0300, Oliver McFadden wrote:

> Originally based on a patch from Daniel Stone, this commit allows for
> the calibration factors to be set either from Xorg.conf or via HAL.
> 
> Previously the only way was via the properties interface.
> ---
>  man/evdev.man |    4 ++++
>  src/evdev.c   |   56 ++++++++++++++++++++++++++++++++++++--------------------
>  2 files changed, 40 insertions(+), 20 deletions(-)
> 
> diff --git a/man/evdev.man b/man/evdev.man
> index 4f15062..eb9447a 100644
> --- a/man/evdev.man
> +++ b/man/evdev.man
> @@ -150,6 +150,10 @@ be set in the configuration.
>  Number of reopen attempts after a read error occurs on the device (e.g. after
>  waking up from suspend). In between each attempt is a 100ms wait. Default: 10.
>  .TP 7
> +.BI "Option \*qCalibration\*q \*q" "N1 N2 N3 N4" \*q
> +4 32-bit values, order min-x, max-x, min-y, max-y. This feature is similar to
> +the run-time axis calibration property, except it may be set in __xconfigfile__.
> +.TP 7
>  .BI "Option \*qSwapAxes\*q \*q" Bool \*q
>  Swap x/y axes. Default: off. Property: "Evdev Axes Swap".
>  .TP 7

How about
.BI Option \*qCalibration\*q \*q" "min-x max-x min-y max-y" \*q
Calibrates the X and Y axes for devices that need to scale to a
different coordinate system than reported to the X server.
Property: "Evdev Axis Calibration".

Referring to the property using its name instead of the vague "the
run-time axis calibration property" seems better in any case.  Also, the
32/16/8 bit-ness is important for properties, much less so for xorg.conf
options.

Cheers,
Julien


More information about the xorg-devel mailing list