diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2011-04-12 10:17:07 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2011-05-04 09:32:36 +1000 |
| commit | d6328c6bfe49958f68abbb6ddbc1f1514de6831f (patch) | |
| tree | 6c11838e80b45e1515c30a2a136127b9a3b58f23 /include | |
| parent | b4455b119cb55cc5f61add0c25863afe8cb06484 (diff) | |
Xi: fix valuator alignment in DeepCopyDeviceClasses (#36119)
commit 678f5396c91b3d0c7572ed579b0a4fb62b2b4655 only fixed the
initialization, not the copy. After a slave device change, the valuator
were out of alignment again.
X.Org Bug 36119 <http://bugs.freedesktop.org/show_bug.cgi?id=36119>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
(cherry picked from commit 419a27b5219a739f2fbd50cc96a1b54c469e4a88)
Diffstat (limited to 'include')
| -rw-r--r-- | include/input.h | 5 | ||||
| -rw-r--r-- | include/inputstr.h | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/include/input.h b/include/input.h index f96a0a988..908e595e5 100644 --- a/include/input.h +++ b/include/input.h @@ -102,6 +102,7 @@ typedef unsigned long Leds; typedef struct _OtherClients *OtherClientsPtr; typedef struct _InputClients *InputClientsPtr; typedef struct _DeviceIntRec *DeviceIntPtr; +typedef struct _ValuatorClassRec *ValuatorClassPtr; typedef struct _ClassesRec *ClassesPtr; typedef struct _SpriteRec *SpritePtr; typedef union _GrabMask GrabMask; @@ -297,6 +298,10 @@ extern _X_EXPORT Bool InitButtonClassDeviceStruct( Atom* /* labels */, CARD8* /*map*/); +extern _X_INTERNAL ValuatorClassPtr AllocValuatorClass( + ValuatorClassPtr src, + int numAxes); + extern _X_EXPORT Bool InitValuatorClassDeviceStruct( DeviceIntPtr /*device*/, int /*numAxes*/, diff --git a/include/inputstr.h b/include/inputstr.h index b74ee0454..2ee2fd835 100644 --- a/include/inputstr.h +++ b/include/inputstr.h @@ -282,7 +282,7 @@ typedef struct _ValuatorClassRec { unsigned short numAxes; double *axisVal; /* always absolute, but device-coord system */ ValuatorAccelerationRec accelScheme; -} ValuatorClassRec, *ValuatorClassPtr; +} ValuatorClassRec; typedef struct _ButtonClassRec { int sourceid; |