diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2011-02-23 08:44:42 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2011-02-23 08:44:42 +1000 |
| commit | 579ee8f5d84c3a523b7b3e3941eabb226d1d19e2 (patch) | |
| tree | a822eae1c534e6616aafad8e0139828c2d2b1fc1 /include | |
| parent | b636893137da1695e235e3a9354bfd9243fdddc2 (diff) | |
| parent | 17265ccb027e3f956bf7409106174f44621d1cb8 (diff) | |
Merge branch 'mi-cleanup' into next
Diffstat (limited to 'include')
| -rw-r--r-- | include/dix.h | 1 | ||||
| -rw-r--r-- | include/exevents.h | 2 | ||||
| -rw-r--r-- | include/inputstr.h | 7 |
3 files changed, 5 insertions, 5 deletions
diff --git a/include/dix.h b/include/dix.h index 12e4b5977..3f99098a2 100644 --- a/include/dix.h +++ b/include/dix.h @@ -570,6 +570,7 @@ extern Bool _X_EXPORT IsPointerDevice( DeviceIntPtr dev); extern Bool _X_EXPORT IsKeyboardDevice(DeviceIntPtr dev); extern Bool IsPointerEvent(InternalEvent *event); extern _X_EXPORT Bool IsMaster(DeviceIntPtr dev); +extern _X_EXPORT Bool IsFloating(DeviceIntPtr dev); extern _X_HIDDEN void CopyKeyClass(DeviceIntPtr device, DeviceIntPtr master); extern _X_HIDDEN int CorePointerProc(DeviceIntPtr dev, int what); diff --git a/include/exevents.h b/include/exevents.h index dc594304f..2b226986b 100644 --- a/include/exevents.h +++ b/include/exevents.h @@ -69,7 +69,7 @@ extern _X_EXPORT int XIChangeDeviceProperty( int /* format*/, int /* mode*/, unsigned long /* len*/, - pointer /* value*/, + const pointer /* value*/, Bool /* sendevent*/ ); diff --git a/include/inputstr.h b/include/inputstr.h index 65b9ef9f4..8509eb024 100644 --- a/include/inputstr.h +++ b/include/inputstr.h @@ -494,6 +494,7 @@ typedef struct _SpriteInfoRec { #define MASTER_POINTER 1 #define MASTER_KEYBOARD 2 #define SLAVE 3 +#define MASTER_ATTACHED 4 /* special type for GetMaster */ typedef struct _DeviceIntRec { DeviceRec public; @@ -530,10 +531,8 @@ typedef struct _DeviceIntRec { PrivateRec *devPrivates; DeviceUnwrapProc unwrapProc; SpriteInfoPtr spriteInfo; - union { - DeviceIntPtr master; /* master device */ - DeviceIntPtr lastSlave; /* last slave device used */ - } u; + DeviceIntPtr master; /* master device */ + DeviceIntPtr lastSlave; /* last slave device used */ /* last valuator values recorded, not posted to client; * for slave devices, valuators is in device coordinates |