diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-05-07 16:25:13 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-05-07 16:25:13 +1000 |
| commit | 9451d09d2b9cdbe2deff7986a4c5553ba922989c (patch) | |
| tree | 3fb2758b554be82b3b2503769c0e31455c64564a /src/XChDevHier.c | |
| parent | 92cfef2cebfa85bdb0c1b3b6ee2f78520b003eb7 (diff) | |
Use the new prefixed constants for XI2 and require inputproto 1.99.9.8
Diffstat (limited to 'src/XChDevHier.c')
| -rw-r--r-- | src/XChDevHier.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/XChDevHier.c b/src/XChDevHier.c index f72b73d..d6688cd 100644 --- a/src/XChDevHier.c +++ b/src/XChDevHier.c @@ -63,20 +63,20 @@ XIChangeDeviceHierarchy(Display* dpy, { switch(any->type) { - case CH_CreateMasterDevice: + case XICreateMasterDevice: { int slen = (strlen(any->create.name)); dlen += sizeof(xXICreateMasterInfo) + slen + (4 - (slen % 4)); } break; - case CH_RemoveMasterDevice: + case XIRemoveMasterDevice: dlen += sizeof(xXIRemoveMasterInfo); break; - case CH_AttachSlave: + case XIAttachSlave: dlen += sizeof(xXIAttachSlaveInfo); break; - case CH_DetachSlave: + case XIDetachSlave: dlen += sizeof(xXIDetachSlaveInfo); break; default: @@ -94,7 +94,7 @@ XIChangeDeviceHierarchy(Display* dpy, { switch(any->type) { - case CH_CreateMasterDevice: + case XICreateMasterDevice: { XICreateMasterInfo* C = &any->create; xXICreateMasterInfo* c = (xXICreateMasterInfo*)dptr; @@ -107,7 +107,7 @@ XIChangeDeviceHierarchy(Display* dpy, dptr += c->length; } break; - case CH_RemoveMasterDevice: + case XIRemoveMasterDevice: { XIRemoveMasterInfo* R = &any->remove; xXIRemoveMasterInfo* r = (xXIRemoveMasterInfo*)dptr; @@ -115,7 +115,7 @@ XIChangeDeviceHierarchy(Display* dpy, r->return_mode = R->returnMode; r->deviceid = R->device; r->length = sizeof(xXIRemoveMasterInfo)/4; - if (r->return_mode == AttachToMaster) + if (r->return_mode == XIAttachToMaster) { r->return_pointer = R->returnPointer; r->return_keyboard = R->returnKeyboard; @@ -123,7 +123,7 @@ XIChangeDeviceHierarchy(Display* dpy, dptr += sizeof(xXIRemoveMasterInfo); } break; - case CH_AttachSlave: + case XIAttachSlave: { XIAttachSlaveInfo* C = &any->attach; xXIAttachSlaveInfo* c = (xXIAttachSlaveInfo*)dptr; @@ -136,7 +136,7 @@ XIChangeDeviceHierarchy(Display* dpy, dptr += sizeof(xXIAttachSlaveInfo); } break; - case CH_DetachSlave: + case XIDetachSlave: { XIDetachSlaveInfo *D = &any->detach; xXIDetachSlaveInfo *d = (xXIDetachSlaveInfo*)dptr; |