diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2012-09-20 05:56:39 +1000 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2012-09-23 10:38:42 -0700 |
| commit | 3d1051aecbb1955084804133cacd12c7f696833a (patch) | |
| tree | 2b39ff299600deae17e0ab362c79b2cf4b222115 | |
| parent | 1cb0261ef54b7dd6a7ef84e1c3959e424706228b (diff) | |
dix: set the device transformation matrix
The property handler is registered after setting the property, so
dev->transform remains as all-zeros. That causes pixman_f_transform_invert()
to fail (in transformAbsolute()) and invert remains as garbage. This
may then cause a cursor jump to 0,0.
Since the axes are not yet initialized here and we need to allow for drivers
changing the matrix, we cannot use the property handler for matrix
initialization, essentially duplicating the code.
Triggered by the fix to (#49347) in 749a593e49adccdf1225be28a521412ec85333f4
https://bugzilla.redhat.com/show_bug.cgi?id=852841
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@ubuntu.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
| -rw-r--r-- | dix/devices.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/dix/devices.c b/dix/devices.c index 9cf04ed3f..66d440683 100644 --- a/dix/devices.c +++ b/dix/devices.c @@ -306,6 +306,9 @@ AddInputDevice(ClientPtr client, DeviceProc deviceProc, Bool autoStart) /* unity matrix */ memset(transform, 0, sizeof(transform)); transform[0] = transform[4] = transform[8] = 1.0f; + dev->transform.m[0][0] = 1.0; + dev->transform.m[1][1] = 1.0; + dev->transform.m[2][2] = 1.0; XIChangeDeviceProperty(dev, XIGetKnownProperty(XI_PROP_TRANSFORM), XIGetKnownProperty(XATOM_FLOAT), 32, |