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

pointer: Forcibly steal pointer focus when the compositor has a grab

Browse Source
This commit is contained in:
Jasper St. Pierre 2014-11-26 15:23:36 -08:00
parent 71dab32769
commit a0e038f34b
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/wayland/meta-wayland-pointer.c
View File

@ -251,7 +251,6 @@ static void
sync_focus_surface (MetaWaylandPointer *pointer) sync_focus_surface (MetaWaylandPointer *pointer)
{ {
MetaDisplay *display = meta_get_display (); MetaDisplay *display = meta_get_display ();
MetaWaylandSurface *focus_surface;
switch (display->event_route) switch (display->event_route)
{ {
@ -260,21 +259,22 @@ sync_focus_surface (MetaWaylandPointer *pointer)
return; return;
case META_EVENT_ROUTE_COMPOSITOR_GRAB: case META_EVENT_ROUTE_COMPOSITOR_GRAB:
/* The compositor has focus, so remove our focus... */ /* The compositor has a grab, so remove our focus... */
focus_surface = NULL; meta_wayland_pointer_set_focus (pointer, NULL);
break; break;
case META_EVENT_ROUTE_NORMAL: case META_EVENT_ROUTE_NORMAL:
case META_EVENT_ROUTE_WAYLAND_POPUP: case META_EVENT_ROUTE_WAYLAND_POPUP:
focus_surface = pointer->current; {
const MetaWaylandPointerGrabInterface *interface = pointer->grab->interface;
interface->focus (pointer->grab, pointer->current);
}
break; break;
default: default:
g_assert_not_reached (); g_assert_not_reached ();
} }
const MetaWaylandPointerGrabInterface *interface = pointer->grab->interface;
interface->focus (pointer->grab, focus_surface);
} }
static void static void