diff options
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/XChDevHier.c | 18 | ||||
| -rw-r--r-- | src/XIPassiveGrab.c | 8 | ||||
| -rw-r--r-- | src/XIQueryDevice.c | 12 |
4 files changed, 20 insertions, 20 deletions
diff --git a/configure.ac b/configure.ac index a46974b..fb0c4a3 100644 --- a/configure.ac +++ b/configure.ac @@ -19,7 +19,7 @@ AC_PROG_LIBTOOL XORG_CWARNFLAGS # Checks for pkg-config packages -PKG_CHECK_MODULES(XI, [xproto >= 7.0.13] [x11 >= 1.1.99.1] [xextproto >= 7.0.3] [xext >= 1.0.99.1] [inputproto >= 1.9.99.7]) +PKG_CHECK_MODULES(XI, [xproto >= 7.0.13] [x11 >= 1.1.99.1] [xextproto >= 7.0.3] [xext >= 1.0.99.1] [inputproto >= 1.9.99.8]) XI_CFLAGS="$CWARNFLAGS $XI_CFLAGS" AC_SUBST(XI_CFLAGS) AC_SUBST(XI_LIBS) 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; diff --git a/src/XIPassiveGrab.c b/src/XIPassiveGrab.c index 7da164b..949287d 100644 --- a/src/XIPassiveGrab.c +++ b/src/XIPassiveGrab.c @@ -92,7 +92,7 @@ XIGrabButton(Display* dpy, int deviceid, int button, Bool owner_events, XIDeviceEventMask *mask, int num_modifiers, int *modifiers_inout) { - return _XIPassiveGrabDevice(dpy, deviceid, GrabtypeButton, button, + return _XIPassiveGrabDevice(dpy, deviceid, XIGrabtypeButton, button, grab_window, cursor, grab_mode, paired_device_mode, owner_events, mask, num_modifiers, modifiers_inout); @@ -104,7 +104,7 @@ XIGrabKeysym(Display* dpy, int deviceid, int keysym, Bool owner_events, XIDeviceEventMask *mask, int num_modifiers, int *modifiers_inout) { - return _XIPassiveGrabDevice(dpy, deviceid, GrabtypeKeysym, keysym, + return _XIPassiveGrabDevice(dpy, deviceid, XIGrabtypeKeysym, keysym, grab_window, None, grab_mode, paired_device_mode, owner_events, mask, num_modifiers, modifiers_inout); @@ -143,7 +143,7 @@ int XIUngrabButton(Display* display, int deviceid, int button,Window grab_window, int num_modifiers, int *modifiers) { - return _XIPassiveUngrabDevice(display, deviceid, GrabtypeButton, button, + return _XIPassiveUngrabDevice(display, deviceid, XIGrabtypeButton, button, grab_window, num_modifiers, modifiers); } @@ -151,7 +151,7 @@ int XIUngrabKeysym(Display* display, int deviceid, int keysym, Window grab_window, int num_modifiers, int *modifiers) { - return _XIPassiveUngrabDevice(display, deviceid, GrabtypeKeysym, keysym, + return _XIPassiveUngrabDevice(display, deviceid, XIGrabtypeKeysym, keysym, grab_window, num_modifiers, modifiers); } diff --git a/src/XIQueryDevice.c b/src/XIQueryDevice.c index 2a07ce5..6c90b3e 100644 --- a/src/XIQueryDevice.c +++ b/src/XIQueryDevice.c @@ -52,15 +52,15 @@ copy_classes(XIDeviceInfo* to, xXIAnyInfo* from, int nclasses) any_wire = (xXIAnyInfo*)ptr_wire; switch(any_wire->type) { - case ButtonClass: + case XIButtonClass: l = sizeof(XIButtonClassInfo); l += ((xXIButtonInfo*)any_wire)->num_buttons * sizeof(Atom); break; - case KeyClass: + case XIKeyClass: l = sizeof(XIKeyClassInfo); l += ((xXIKeyInfo*)any_wire)->num_keycodes * sizeof(int); break; - case ValuatorClass: + case XIValuatorClass: l = sizeof(XIValuatorClassInfo); break; } @@ -86,7 +86,7 @@ copy_classes(XIDeviceInfo* to, xXIAnyInfo* from, int nclasses) any_lib->type = any_wire->type; switch(any_wire->type) { - case ButtonClass: + case XIButtonClass: { XIButtonClassInfo *cls_lib; xXIButtonInfo *cls_wire; @@ -103,7 +103,7 @@ copy_classes(XIDeviceInfo* to, xXIAnyInfo* from, int nclasses) ptr_lib += cls_lib->num_buttons * sizeof(Atom); break; } - case KeyClass: + case XIKeyClass: { XIKeyClassInfo *cls_lib; xXIKeyInfo *cls_wire; @@ -120,7 +120,7 @@ copy_classes(XIDeviceInfo* to, xXIAnyInfo* from, int nclasses) ptr_lib += cls_lib->num_keycodes * sizeof(int); break; } - case ValuatorClass: + case XIValuatorClass: { XIValuatorClassInfo *cls_lib; xXIValuatorInfo *cls_wire; |