diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2011-02-15 11:27:59 +0000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2011-04-07 08:36:58 +1000 |
| commit | 8da04cb0d94462a2bdfe3003e3c460cecbecb6f6 (patch) | |
| tree | 1d4b8cca993a8d587818e12343e63023f7b7bd4f /Xi | |
| parent | 9c803d2fe06163157edf84ed8e0563db20ec4a73 (diff) | |
Input: Actually send Xi 1.x DeviceStateNotify events
When a client has selected for Xi 1.x DeviceStateNotify events, they
should receive them when a DeviceFocusIn event is generated. The code
to do this was there, but an incorrect test meant they were never being
sent.
The "type" passed in is the XI2 type, the XI1 type is in event.type.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit 737562257e8ee30b1c438e5160a61fbb26ca609e)
Diffstat (limited to 'Xi')
| -rw-r--r-- | Xi/exevents.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Xi/exevents.c b/Xi/exevents.c index 3da50bfe7..35f96e6cd 100644 --- a/Xi/exevents.c +++ b/Xi/exevents.c @@ -1280,7 +1280,7 @@ DeviceFocusEvent(DeviceIntPtr dev, int type, int mode, int detail, DeliverEventsToWindow(dev, pWin, (xEvent *) & event, 1, DeviceFocusChangeMask, NullGrab); - if ((type == DeviceFocusIn) && + if ((event.type == DeviceFocusIn) && (wOtherInputMasks(pWin)) && (wOtherInputMasks(pWin)->inputEvents[dev->id] & DeviceStateNotifyMask)) { |