brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

compositor: Identify XI2 events as grabbed events

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=688779
This commit is contained in:
Jasper St. Pierre 2012-11-20 19:27:02 -05:00
parent 55251aa986
commit 8931b8026e
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/compositor/compositor.c
View File

@ -714,9 +714,26 @@ meta_compositor_set_updates (MetaCompositor *compositor,
} }
static gboolean static gboolean
is_grabbed_event (XEvent *event) is_grabbed_event (MetaDisplay *display,
XEvent *event)
{ {
switch (event->xany.type) if (event->type == GenericEvent &&
event->xcookie.extension == display->xinput_opcode)
{
XIEvent *xev = (XIEvent *) event->xcookie.data;
switch (xev->evtype)
{
case XI_Motion:
case XI_ButtonPress:
case XI_ButtonRelease:
case XI_KeyPress:
case XI_KeyRelease:
return TRUE;
}
}
switch (event->type)
{ {
case ButtonPress: case ButtonPress:
case ButtonRelease: case ButtonRelease:
@ -749,7 +766,7 @@ meta_compositor_process_event (MetaCompositor *compositor,
XEvent *event, XEvent *event,
MetaWindow *window) MetaWindow *window)
{ {
if (compositor->modal_plugin && is_grabbed_event (event)) if (compositor->modal_plugin && is_grabbed_event (compositor->display, event))
{ {
MetaPluginClass *klass = META_PLUGIN_GET_CLASS (compositor->modal_plugin); MetaPluginClass *klass = META_PLUGIN_GET_CLASS (compositor->modal_plugin);