diff options
| author | marha <marha@users.sourceforge.net> | 2012-09-24 08:40:01 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-09-24 08:50:12 +0200 |
| commit | c24a0fccb18e611b2879e68565ab8f1c5c5dbd62 (patch) | |
| tree | 8b2070725227ae6c92ded43789f80347fabac306 /xorg-server/dix/devices.c | |
| parent | 210f44f785e5b0da1bfe6ea68ad8f31c4ad2e282 (diff) | |
| parent | 0ebcd32e91486caccc041c8ca23e39e160b24702 (diff) | |
| download | vcxsrv-c24a0fccb18e611b2879e68565ab8f1c5c5dbd62.tar.gz vcxsrv-c24a0fccb18e611b2879e68565ab8f1c5c5dbd62.tar.bz2 vcxsrv-c24a0fccb18e611b2879e68565ab8f1c5c5dbd62.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
mesa pixman xserver git update 24 sep 2012
Conflicts:
pixman/pixman/pixman-sse2.c
xorg-server/dix/window.c
Diffstat (limited to 'xorg-server/dix/devices.c')
| -rw-r--r-- | xorg-server/dix/devices.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/xorg-server/dix/devices.c b/xorg-server/dix/devices.c index 2d5f6150e..8f208933b 100644 --- a/xorg-server/dix/devices.c +++ b/xorg-server/dix/devices.c @@ -310,6 +310,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, |