diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-02-01 20:18:33 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-02-23 17:52:39 +1000 |
| commit | a3718536989fa7d3358e0b2d859c25fde0a2d93e (patch) | |
| tree | 58ede35fa1db11895bd1e0718b0fb9ee49350de9 /Xi | |
| parent | 8f94ec6f788565474931cc7d5e3d4672f0f31670 (diff) | |
dix: Deliver{Grabbed|Focused|Device}Events API changed to InternalEvents.
With the API change, we can now purge the XI conversion from POE.
Note: this commit breaks DGA even more.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'Xi')
| -rw-r--r-- | Xi/exevents.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/Xi/exevents.c b/Xi/exevents.c index bb5fe6176..1ce3688a8 100644 --- a/Xi/exevents.c +++ b/Xi/exevents.c @@ -889,11 +889,6 @@ ProcessOtherEvent(xEventPtr ev, DeviceIntPtr device, int count) DeviceIntPtr mouse = NULL, kbd = NULL; DeviceEvent *event = (DeviceEvent*)ev; - /* FIXME: temporary solution only. */ - static int nevents; - static xEvent xE[1000]; /* enough bytes for the events we have atm */ - - if (IsPointerDevice(device)) { kbd = GetPairedDevice(device); @@ -989,15 +984,14 @@ ProcessOtherEvent(xEventPtr ev, DeviceIntPtr device, int count) deactivateDeviceGrab = TRUE; } - nevents = ConvertBackToXI((InternalEvent*)ev, xE); if (grab) - DeliverGrabbedEvent(xE, device, deactivateDeviceGrab, count); - else if (device->focus && !IsPointerEvent(xE)) - DeliverFocusedEvent(device, xE, GetSpriteWindow(device), count); + DeliverGrabbedEvent(event, device, deactivateDeviceGrab); + else if (device->focus && !IsPointerEvent((InternalEvent*)ev)) + DeliverFocusedEvent(device, event, GetSpriteWindow(device)); else - DeliverDeviceEvents(GetSpriteWindow(device), xE, NullGrab, NullWindow, - device, count); + DeliverDeviceEvents(GetSpriteWindow(device), event, NullGrab, + NullWindow, device); if (deactivateDeviceGrab == TRUE) (*device->deviceGrab.DeactivateGrab) (device); |