summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2009-03-03 14:39:28 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2009-03-11 14:26:07 +1000
commit5f4058db225d7cb4455fd27b11dff10422e94748 (patch)
tree3abc40bbf02d850d31624a6e33ee97d968c109af /include
parent2d5bdbe0fad5f22f153aa74e38aa3a1ca09d4192 (diff)
Replace all XDevice* with ints.
There's no reason to have XDevice structs. It's not as if they carry useful information.
Diffstat (limited to 'include')
-rw-r--r--include/X11/extensions/XInput2.h22
1 files changed, 11 insertions, 11 deletions
diff --git a/include/X11/extensions/XInput2.h b/include/X11/extensions/XInput2.h
index ff15f32..a31b1b7 100644
--- a/include/X11/extensions/XInput2.h
+++ b/include/X11/extensions/XInput2.h
@@ -43,21 +43,21 @@ typedef struct {
typedef struct {
int type;
- XDevice* device;
+ int device;
int returnMode; /* AttachToMaster, Floating */
- XDevice* returnPointer;
- XDevice* returnKeyboard;
+ int returnPointer;
+ int returnKeyboard;
} XIRemoveMasterInfo;
typedef struct {
int type;
- XDevice* device;
- XDevice* newMaster;
+ int device;
+ int newMaster;
} XIAttachSlaveInfo;
typedef struct {
int type;
- XDevice* device;
+ int device;
} XIDetachSlaveInfo;
typedef union {
@@ -72,7 +72,7 @@ _XFUNCPROTOBEGIN
extern Bool XIQueryDevicePointer(
Display* /* display */,
- XDevice* /* device */,
+ int /* deviceid */,
Window /* win */,
Window* /* root */,
Window* /* child */,
@@ -85,7 +85,7 @@ extern Bool XIQueryDevicePointer(
extern Bool XIWarpDevicePointer(
Display* /* display */,
- XDevice* /* device */,
+ int /* deviceid */,
Window /* src_win */,
Window /* dst_win */,
int /* src_x */,
@@ -98,14 +98,14 @@ extern Bool XIWarpDevicePointer(
extern Status XIDefineDeviceCursor(
Display* /* display */,
- XDevice* /* device */,
+ int /* deviceid */,
Window /* win */,
Cursor /* cursor */
);
extern Status XIUndefineDeviceCursor(
Display* /* display */,
- XDevice* /* device */,
+ int /* deviceid */,
Window /* win */
);
@@ -118,7 +118,7 @@ extern Status XIChangeDeviceHierarchy(
extern Status XISetClientPointer(
Display* /* dpy */,
Window /* win */,
- XDevice* /* device */
+ int /* deviceid */
);
extern Bool XIGetClientPointer(