isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-29 03:20:46 -05:00
Code Issues Packages Projects Releases Wiki Activity

Partially revert 5c99eae8a9

Browse Source 
We must extract the window from XIDeviceEvent, to be able
to apply our workaround to spoof the event in compositor.c
This commit is contained in:
Giovanni Campagna 2014-02-27 23:45:49 +01:00
parent b6a0d4d368
commit 98e3e5e50f
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/core/display.c
View File

@ -1700,6 +1700,17 @@ get_input_event (MetaDisplay *display,
switch (input_event->evtype) switch (input_event->evtype)
{ {
case XI_Motion:
case XI_ButtonPress:
case XI_ButtonRelease:
if (((XIDeviceEvent *) input_event)->deviceid == META_VIRTUAL_CORE_POINTER_ID)
return input_event;
break;
case XI_KeyPress:
case XI_KeyRelease:
if (((XIDeviceEvent *) input_event)->deviceid == META_VIRTUAL_CORE_KEYBOARD_ID)
return input_event;
break;
case XI_FocusIn: case XI_FocusIn:
case XI_FocusOut: case XI_FocusOut:
if (((XIEnterEvent *) input_event)->deviceid == META_VIRTUAL_CORE_KEYBOARD_ID) if (((XIEnterEvent *) input_event)->deviceid == META_VIRTUAL_CORE_KEYBOARD_ID)
@ -3097,6 +3108,12 @@ xievent_get_modified_window (MetaDisplay *display,
{ {
switch (input_event->evtype) switch (input_event->evtype)
{ {
case XI_Motion:
case XI_ButtonPress:
case XI_ButtonRelease:
case XI_KeyPress:
case XI_KeyRelease:
return ((XIDeviceEvent *) input_event)->event;
case XI_FocusIn: case XI_FocusIn:
case XI_FocusOut: case XI_FocusOut:
case XI_Enter: case XI_Enter: