hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-10-28 02:21:08 +00:00
Code Issues Projects Releases Wiki Activity

input: update to inputproto 1.9.99.8 XI2 defines.

Browse source 
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2009-05-07 16:52:31 +10:00
commit bae070914f
11 changed files with 60 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

10
dix/devices.c
View file

@ -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;

2
dix/eventconvert.c
View file

@ -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

20
dix/events.c
View file

@ -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);