From bae070914fc27db122e6131ae4838559c4a72f65 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 7 May 2009 16:52:31 +1000 Subject: input: update to inputproto 1.9.99.8 XI2 defines. Signed-off-by: Peter Hutterer --- Xi/chdevhier.c | 24 ++++++++++++------------ Xi/exevents.c | 2 +- Xi/querydev.c | 24 ++++++++++++------------ Xi/selectev.c | 2 +- Xi/xiallowev.c | 12 ++++++------ Xi/xipassivegrab.c | 14 +++++++------- Xi/xiselectev.c | 7 ++++--- configure.ac | 2 +- dix/devices.c | 10 +++++----- dix/eventconvert.c | 2 +- dix/events.c | 20 ++++++++++---------- 11 files changed, 60 insertions(+), 59 deletions(-) diff --git a/Xi/chdevhier.c b/Xi/chdevhier.c index 746f4a597..96b515df4 100644 --- a/Xi/chdevhier.c +++ b/Xi/chdevhier.c @@ -95,7 +95,7 @@ void XISendDeviceHierarchyEvent(int flags) info++; } - dummyDev.id = AllDevices; + dummyDev.id = XIAllDevices; SendEventToAllWindows(&dummyDev, (XI_HierarchyChangedMask >> 8), (xEvent*)ev, 1); } @@ -146,7 +146,7 @@ ProcXIChangeDeviceHierarchy(ClientPtr client) switch(any->type) { - case CH_CreateMasterDevice: + case XICreateMasterDevice: { xXICreateMasterInfo* c = (xXICreateMasterInfo*)any; char* name; @@ -194,16 +194,16 @@ ProcXIChangeDeviceHierarchy(ClientPtr client) AttachDevice(NULL, xtstkeybd, keybd); xfree(name); - flags |= HF_MasterAdded; + flags |= XIMasterAdded; } break; - case CH_RemoveMasterDevice: + case XIRemoveMasterDevice: { xXIRemoveMasterInfo* r = (xXIRemoveMasterInfo*)any; DeviceIntPtr xtstdevice; - if (r->return_mode != AttachToMaster && - r->return_mode != Floating) + if (r->return_mode != XIAttachToMaster && + r->return_mode != XIFloating) return BadValue; rc = dixLookupDevice(&ptr, r->deviceid, client, @@ -300,7 +300,7 @@ ProcXIChangeDeviceHierarchy(ClientPtr client) /* Disabling sends the devices floating, reattach them if * desired. */ - if (r->return_mode == AttachToMaster) + if (r->return_mode == XIAttachToMaster) { DeviceIntPtr attached, newptr, @@ -360,10 +360,10 @@ ProcXIChangeDeviceHierarchy(ClientPtr client) RemoveDevice(xtstkeybd); RemoveDevice(keybd); RemoveDevice(ptr); - flags |= HF_MasterRemoved; + flags |= XIMasterRemoved; } break; - case CH_DetachSlave: + case XIDetachSlave: { xXIDetachSlaveInfo* c = (xXIDetachSlaveInfo*)any; DeviceIntPtr *xtstdevice; @@ -392,10 +392,10 @@ ProcXIChangeDeviceHierarchy(ClientPtr client) } AttachDevice(client, ptr, NULL); - flags |= HF_SlaveDetached; + flags |= XISlaveDetached; } break; - case CH_AttachSlave: + case XIAttachSlave: { xXIAttachSlaveInfo* c = (xXIAttachSlaveInfo*)any; DeviceIntPtr newmaster; @@ -444,7 +444,7 @@ ProcXIChangeDeviceHierarchy(ClientPtr client) goto unwind; } AttachDevice(client, ptr, newmaster); - flags |= HF_SlaveAttached; + flags |= XISlaveAttached; } break; } diff --git a/Xi/exevents.c b/Xi/exevents.c index 12c53eba2..777202965 100644 --- a/Xi/exevents.c +++ b/Xi/exevents.c @@ -685,7 +685,7 @@ XISendDeviceChangedEvent(DeviceIntPtr device, DeviceIntPtr master, DeviceChanged dcce->time = GetTimeInMillis(); dcce->deviceid = master->id; dcce->sourceid = device->id; - dcce->reason = SlaveSwitch; + dcce->reason = XISlaveSwitch; dcce->num_classes = 0; dcce->length = (len - sizeof(xEvent))/4; diff --git a/Xi/querydev.c b/Xi/querydev.c index c7ee0e162..b50d0382e 100644 --- a/Xi/querydev.c +++ b/Xi/querydev.c @@ -70,7 +70,7 @@ ProcXIQueryDevice(ClientPtr client) REQUEST(xXIQueryDeviceReq); REQUEST_SIZE_MATCH(xXIQueryDeviceReq); - if (stuff->deviceid != AllDevices && stuff->deviceid != AllMasterDevices) + if (stuff->deviceid != XIAllDevices && stuff->deviceid != XIAllMasterDevices) { rc = dixLookupDevice(&dev, stuff->deviceid, client, DixGetAttrAccess); if (rc != Success) @@ -87,15 +87,15 @@ ProcXIQueryDevice(ClientPtr client) len = 0; for (dev = inputInfo.devices; dev; dev = dev->next) { - if (stuff->deviceid == AllDevices || - (stuff->deviceid == AllMasterDevices && dev->isMaster)) + if (stuff->deviceid == XIAllDevices || + (stuff->deviceid == XIAllMasterDevices && dev->isMaster)) len += SizeDeviceInfo(dev); } for (dev = inputInfo.off_devices; dev; dev = dev->next) { - if (stuff->deviceid == AllDevices || - (stuff->deviceid == AllMasterDevices && dev->isMaster)) + if (stuff->deviceid == XIAllDevices || + (stuff->deviceid == XIAllMasterDevices && dev->isMaster)) len += SizeDeviceInfo(dev); } @@ -125,8 +125,8 @@ ProcXIQueryDevice(ClientPtr client) { for (dev = inputInfo.devices; dev; dev = dev->next) { - if (stuff->deviceid == AllDevices || - (stuff->deviceid == AllMasterDevices && dev->isMaster)) + if (stuff->deviceid == XIAllDevices || + (stuff->deviceid == XIAllMasterDevices && dev->isMaster)) { len = ListDeviceInfo(dev, (xXIDeviceInfo*)info); if (client->swapped) @@ -138,8 +138,8 @@ ProcXIQueryDevice(ClientPtr client) for (dev = inputInfo.off_devices; dev; dev = dev->next) { - if (stuff->deviceid == AllDevices || - (stuff->deviceid == AllMasterDevices && dev->isMaster)) + if (stuff->deviceid == XIAllDevices || + (stuff->deviceid == XIAllMasterDevices && dev->isMaster)) { len = ListDeviceInfo(dev, (xXIDeviceInfo*)info); if (client->swapped) @@ -329,14 +329,14 @@ int GetDeviceUse(DeviceIntPtr dev, uint16_t *attachment) if (dev->isMaster) { DeviceIntPtr paired = GetPairedDevice(dev); - use = IsPointerDevice(dev) ? MasterPointer : MasterKeyboard; + use = IsPointerDevice(dev) ? XIMasterPointer : XIMasterKeyboard; *attachment = (paired ? paired->id : 0); } else if (master) { - use = IsPointerDevice(master) ? SlavePointer : SlaveKeyboard; + use = IsPointerDevice(master) ? XISlavePointer : XISlaveKeyboard; *attachment = master->id; } else - use = FloatingSlave; + use = XIFloatingSlave; return use; } diff --git a/Xi/selectev.c b/Xi/selectev.c index 45bf68b3b..013fdc930 100644 --- a/Xi/selectev.c +++ b/Xi/selectev.c @@ -106,7 +106,7 @@ HandleDevicePresenceMask(ClientPtr client, WindowPtr win, /* We always only use mksidx = AllDevices for events not bound to * devices */ - if (AddExtensionClient (win, client, mask, AllDevices) != Success) + if (AddExtensionClient (win, client, mask, XIAllDevices) != Success) return BadAlloc; RecalculateDeviceDeliverableEvents(win); diff --git a/Xi/xiallowev.c b/Xi/xiallowev.c index 4df9a1033..9eb36c42b 100644 --- a/Xi/xiallowev.c +++ b/Xi/xiallowev.c @@ -72,24 +72,24 @@ ProcXIAllowEvents(ClientPtr client) time = ClientTimeToServerTime(stuff->time); switch (stuff->mode) { - case ReplayDevice: + case XIReplayDevice: AllowSome(client, time, dev, NOT_GRABBED); break; - case SyncDevice: + case XISyncDevice: AllowSome(client, time, dev, FREEZE_NEXT_EVENT); break; - case AsyncDevice: + case XIAsyncDevice: AllowSome(client, time, dev, THAWED); break; - case AsyncPairedDevice: + case XIAsyncPairedDevice: if (dev->isMaster) AllowSome(client, time, dev, THAW_OTHERS); break; - case SyncPair: + case XISyncPair: if (dev->isMaster) AllowSome(client, time, dev, FREEZE_BOTH_NEXT_EVENT); break; - case AsyncPair: + case XIAsyncPair: if (dev->isMaster) AllowSome(client, time, dev, THAWED_BOTH); break; diff --git a/Xi/xipassivegrab.c b/Xi/xipassivegrab.c index 61f36d268..0a6f0e517 100644 --- a/Xi/xipassivegrab.c +++ b/Xi/xipassivegrab.c @@ -93,8 +93,8 @@ ProcXIPassiveGrabDevice(ClientPtr client) if (ret != Success) return ret; - if (stuff->grab_type != GrabtypeButton && - stuff->grab_type != GrabtypeKeysym) + if (stuff->grab_type != XIGrabtypeButton && + stuff->grab_type != XIGrabtypeKeysym) { client->errorValue = stuff->grab_type; return BadValue; @@ -149,11 +149,11 @@ ProcXIPassiveGrabDevice(ClientPtr client) param.modifiers = *modifiers; switch(stuff->grab_type) { - case GrabtypeButton: + case XIGrabtypeButton: status = GrabButton(client, dev, mod_dev, stuff->detail, ¶m, GRABTYPE_XI2, &mask); break; - case GrabtypeKeysym: + case XIGrabtypeKeysym: status = GrabKey(client, dev, mod_dev, stuff->detail, ¶m, GRABTYPE_XI2, &mask); break; @@ -231,8 +231,8 @@ ProcXIPassiveUngrabDevice(ClientPtr client) if (rc != Success) return rc; - if (stuff->grab_type != GrabtypeButton && - stuff->grab_type != GrabtypeKeysym) + if (stuff->grab_type != XIGrabtypeButton && + stuff->grab_type != XIGrabtypeKeysym) { client->errorValue = stuff->grab_type; return BadValue; @@ -250,7 +250,7 @@ ProcXIPassiveUngrabDevice(ClientPtr client) tempGrab.device = dev; tempGrab.window = win; tempGrab.type = - (stuff->grab_type == GrabtypeButton) ? XI_ButtonPress : XI_KeyPress; + (stuff->grab_type == XIGrabtypeButton) ? XI_ButtonPress : XI_KeyPress; tempGrab.grabtype = GRABTYPE_XI2; tempGrab.modifierDevice = mod_dev; tempGrab.modifiersDetail.pMask = NULL; diff --git a/Xi/xiselectev.c b/Xi/xiselectev.c index 607b9b4d0..601dec3f9 100644 --- a/Xi/xiselectev.c +++ b/Xi/xiselectev.c @@ -82,7 +82,8 @@ ProcXISelectEvent(ClientPtr client) num_masks = stuff->num_masks; while(num_masks--) { - if (evmask->deviceid != AllDevices && evmask->deviceid != AllMasterDevices) + if (evmask->deviceid != XIAllDevices && + evmask->deviceid != XIAllMasterDevices) rc = dixLookupDevice(&dev, evmask->deviceid, client, DixReadAccess); else { /* XXX: XACE here? */ @@ -109,8 +110,8 @@ ProcXISelectEvent(ClientPtr client) num_masks = stuff->num_masks; while(num_masks--) { - if (evmask->deviceid == AllDevices || - evmask->deviceid == AllMasterDevices) + if (evmask->deviceid == XIAllDevices || + evmask->deviceid == XIAllMasterDevices) { dummy.id = evmask->deviceid; dev = &dummy; diff --git a/configure.ac b/configure.ac index d95b2e8aa..98f93321d 100644 --- a/configure.ac +++ b/configure.ac @@ -700,7 +700,7 @@ XEXT_LIB='$(top_builddir)/Xext/libXext.la' XEXTXORG_LIB='$(top_builddir)/Xext/libXextbuiltin.la' dnl Core modules for most extensions, et al. -REQUIRED_MODULES="[randrproto >= 1.2.99.3] [renderproto >= 0.9.3] [fixesproto >= 4.0] [damageproto >= 1.1] xcmiscproto [xextproto >= 7.0.3] [xproto >= 7.0.13] [xtrans >= 1.2.2] bigreqsproto resourceproto fontsproto [inputproto >= 1.9.99.7] [kbproto >= 1.0.3]" +REQUIRED_MODULES="[randrproto >= 1.2.99.3] [renderproto >= 0.9.3] [fixesproto >= 4.0] [damageproto >= 1.1] xcmiscproto [xextproto >= 7.0.3] [xproto >= 7.0.13] [xtrans >= 1.2.2] bigreqsproto resourceproto fontsproto [inputproto >= 1.9.99.8] [kbproto >= 1.0.3]" REQUIRED_LIBS="xfont xau fontenc [pixman-1 >= 0.13.2]" dnl HAVE_DBUS is true if we actually have the D-Bus library, whereas diff --git a/dix/devices.c b/dix/devices.c index f7e32feb9..83285b4d1 100644 --- a/dix/devices.c +++ b/dix/devices.c @@ -267,7 +267,7 @@ SendDevicePresenceEvent(int deviceid, int type) ev.time = currentTime.milliseconds; ev.devchange = type; ev.deviceid = deviceid; - dummyDev.id = AllDevices; + dummyDev.id = XIAllDevices; SendEventToAllWindows(&dummyDev, DevicePresenceNotifyMask, (xEvent*)&ev, 1); } @@ -359,7 +359,7 @@ EnableDevice(DeviceIntPtr dev) TRUE); SendDevicePresenceEvent(dev->id, DeviceEnabled); - XISendDeviceHierarchyEvent(HF_DeviceEnabled); + XISendDeviceHierarchyEvent(XIDeviceEnabled); return TRUE; } @@ -430,7 +430,7 @@ DisableDevice(DeviceIntPtr dev) TRUE); SendDevicePresenceEvent(dev->id, DeviceDisabled); - XISendDeviceHierarchyEvent(HF_DeviceDisabled); + XISendDeviceHierarchyEvent(XIDeviceDisabled); return TRUE; } @@ -462,7 +462,7 @@ ActivateDevice(DeviceIntPtr dev) pScreen->DeviceCursorInitialize(dev, pScreen); SendDevicePresenceEvent(dev->id, DeviceAdded); - XISendDeviceHierarchyEvent(HF_SlaveAdded); + XISendDeviceHierarchyEvent(XISlaveAdded); return ret; } @@ -977,7 +977,7 @@ RemoveDevice(DeviceIntPtr dev) if (ret == Success && initialized) { inputInfo.numDevices--; SendDevicePresenceEvent(deviceid, DeviceRemoved); - XISendDeviceHierarchyEvent(HF_SlaveRemoved); + XISendDeviceHierarchyEvent(XISlaveRemoved); } return ret; diff --git a/dix/eventconvert.c b/dix/eventconvert.c index d97ed811f..e51b8ec07 100644 --- a/dix/eventconvert.c +++ b/dix/eventconvert.c @@ -323,7 +323,7 @@ eventToClassesChanged(DeviceChangedEvent *ev, xEvent **xi) dce->evtype = XI_DeviceChanged; dce->time = GetTimeInMillis(); dce->sourceid = slave->id; - dce->reason = SlaveSwitch; + dce->reason = XISlaveSwitch; dce->length = (len - sizeof(xEvent))/4; /* FIXME: this should come from the event, not from the device. See diff --git a/dix/events.c b/dix/events.c index bfdb096e0..e1410ed2a 100644 --- a/dix/events.c +++ b/dix/events.c @@ -454,8 +454,8 @@ GetWindowXI2Mask(DeviceIntPtr dev, WindowPtr win, xEvent* ev) filter = GetEventFilter(dev, ev); return ((inputMasks->xi2mask[dev->id][evtype/8] & filter) || - inputMasks->xi2mask[AllDevices][evtype/8] || - (inputMasks->xi2mask[AllMasterDevices][evtype/8] && dev->isMaster)); + inputMasks->xi2mask[XIAllDevices][evtype/8] || + (inputMasks->xi2mask[XIAllMasterDevices][evtype/8] && dev->isMaster)); } static Mask @@ -466,10 +466,10 @@ GetEventMask(DeviceIntPtr dev, xEvent *event, InputClients* other) { int byte = ((xGenericEvent*)event)->evtype / 8; return (other->xi2mask[dev->id][byte] | - other->xi2mask[AllDevices][byte] | - (dev->isMaster? other->xi2mask[AllMasterDevices][byte] : 0)); + other->xi2mask[XIAllDevices][byte] | + (dev->isMaster? other->xi2mask[XIAllMasterDevices][byte] : 0)); } else if (CORE_EVENT(event)) - return other->mask[AllDevices]; + return other->mask[XIAllDevices]; else return other->mask[dev->id]; } @@ -2310,8 +2310,8 @@ EventIsDeliverable(DeviceIntPtr dev, InternalEvent* event, WindowPtr win) ((xGenericEvent*)&ev)->evtype = type; filter = GetEventFilter(dev, &ev); if (type && (inputMasks = wOtherInputMasks(win)) && - ((inputMasks->xi2mask[AllDevices][type/8] & filter) || - ((inputMasks->xi2mask[AllMasterDevices][type/8] & filter) && dev->isMaster) || + ((inputMasks->xi2mask[XIAllDevices][type/8] & filter) || + ((inputMasks->xi2mask[XIAllMasterDevices][type/8] & filter) && dev->isMaster) || (inputMasks->xi2mask[dev->id][type/8] & filter))) rc |= XI2_MASK; @@ -2499,7 +2499,7 @@ DeliverEvents(WindowPtr pWin, xEvent *xE, int count, if (!count) return 0; - dummy.id = AllDevices; + dummy.id = XIAllDevices; filter = GetEventFilter(&dummy, xE); if ((filter & SubstructureNotifyMask) && (xE->u.u.type != CreateNotify)) xE->u.destroyNotify.event = pWin->drawable.id; @@ -3745,8 +3745,8 @@ DeliverGrabbedEvent(InternalEvent *event, DeviceIntPtr thisDev, if (!deliveries) { int evtype = ((xGenericEvent*)xi2)->evtype; - mask = grab->xi2mask[AllDevices][evtype/8] | - grab->xi2mask[AllMasterDevices][evtype/8] | + mask = grab->xi2mask[XIAllDevices][evtype/8] | + grab->xi2mask[XIAllMasterDevices][evtype/8] | grab->xi2mask[thisDev->id][evtype/8]; /* try XI2 event */ FixUpEventFromWindow(thisDev, xi2, grab->window, None, TRUE); -- cgit v1.2.3