diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-06-07 14:55:42 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-06-09 10:56:34 +1000 |
| commit | 199dd64b809c7622b0f0bd94e1c5551c931ea1e5 (patch) | |
| tree | 5395df241bb22df9f6331d24b05065057805e593 | |
| parent | 27d39fdbfddec6bb92ee3d3b7ef6c21ab3026926 (diff) | |
Hierarchy changes should use "deviceid", not device.
Every other call/interface uses deviceid, so change for consistency.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | include/X11/extensions/XInput2.h | 6 | ||||
| -rw-r--r-- | man/XIChangeHierarchy.txt | 6 | ||||
| -rw-r--r-- | src/XIHierarchy.c | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/include/X11/extensions/XInput2.h b/include/X11/extensions/XInput2.h index 7425b44..6b40a6c 100644 --- a/include/X11/extensions/XInput2.h +++ b/include/X11/extensions/XInput2.h @@ -43,7 +43,7 @@ typedef struct { typedef struct { int type; - int device; + int deviceid; int returnMode; /* AttachToMaster, Floating */ int returnPointer; int returnKeyboard; @@ -51,13 +51,13 @@ typedef struct { typedef struct { int type; - int device; + int deviceid; int newMaster; } XIAttachSlaveInfo; typedef struct { int type; - int device; + int deviceid; } XIDetachSlaveInfo; typedef union { diff --git a/man/XIChangeHierarchy.txt b/man/XIChangeHierarchy.txt index e4ffd5b..c862183 100644 --- a/man/XIChangeHierarchy.txt +++ b/man/XIChangeHierarchy.txt @@ -58,7 +58,7 @@ DESCRIPTION typedef struct { int type; /* XIRemoveMaster */ - int device; + int deviceid; int returnMode; XDevice* returnPointer; XDevice* returnKeyboard; @@ -66,13 +66,13 @@ DESCRIPTION typedef struct { int type; /* XIAttachSlave */ - int device; + int deviceid; int newMaster; } XIAttachSlaveInfo; typedef struct { int type; /* XIDetachSlave */ - int device; + int deviceid; } XIDetachSlaveInfo; XICreateMasterInfo creates a new master pointer and a new diff --git a/src/XIHierarchy.c b/src/XIHierarchy.c index 813f622..83a7b99 100644 --- a/src/XIHierarchy.c +++ b/src/XIHierarchy.c @@ -112,7 +112,7 @@ XIChangeHierarchy(Display* dpy, xXIRemoveMasterInfo* r = (xXIRemoveMasterInfo*)dptr; r->type = R->type; r->return_mode = R->returnMode; - r->deviceid = R->device; + r->deviceid = R->deviceid; r->length = sizeof(xXIRemoveMasterInfo)/4; if (r->return_mode == XIAttachToMaster) { @@ -128,7 +128,7 @@ XIChangeHierarchy(Display* dpy, xXIAttachSlaveInfo* c = (xXIAttachSlaveInfo*)dptr; c->type = C->type; - c->deviceid = C->device; + c->deviceid = C->deviceid; c->length = sizeof(xXIAttachSlaveInfo)/4; c->new_master = C->newMaster; @@ -141,7 +141,7 @@ XIChangeHierarchy(Display* dpy, xXIDetachSlaveInfo *d = (xXIDetachSlaveInfo*)dptr; d->type = D->type; - d->deviceid = D->device; + d->deviceid = D->deviceid; d->length = sizeof(xXIDetachSlaveInfo)/4; dptr += sizeof(xXIDetachSlaveInfo); } |