diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2011-08-01 13:52:13 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2011-08-22 15:56:51 +1000 |
| commit | 98fe735ea1d756711019c3d90ed6abd9c06abebf (patch) | |
| tree | 8ec8b4d4d49630dc1fdf10e95d01f3877a29aa0e /include | |
| parent | dbbe5735d1451bb32f43bce90f0bcfeff46f9743 (diff) | |
dix: add KEYBOARD_OR_FLOAT and POINTER_OR_FLOAT to GetMaster()
GetMaster() currently requires an attached slave device as parameter,
resuling in many calls being IsFloating(dev) ? dev : GetMaster(...);
Add two new parameters so GetMaster can be called unconditionally to get the
right device.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/inputstr.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/inputstr.h b/include/inputstr.h index 00f72c260..838f9f021 100644 --- a/include/inputstr.h +++ b/include/inputstr.h @@ -472,7 +472,10 @@ typedef struct _SpriteInfoRec { #define MASTER_POINTER 1 #define MASTER_KEYBOARD 2 #define SLAVE 3 -#define MASTER_ATTACHED 4 /* special type for GetMaster */ +/* special types for GetMaster */ +#define MASTER_ATTACHED 4 /* Master for this device */ +#define KEYBOARD_OR_FLOAT 5 /* Keyboard master for this device or this device if floating */ +#define POINTER_OR_FLOAT 6 /* Pointer master for this device or this device if floating */ typedef struct _DeviceIntRec { DeviceRec public; |