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

pointer: Remove get_focus_surface

Browse Source 
Yeah, I was wrong, it doesn't improve code clarity.
This commit is contained in:
Jasper St. Pierre 2014-04-20 11:08:09 -04:00
parent 258112d6a7
commit 3f375c9426
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -352,17 +352,6 @@ count_buttons (const ClutterEvent *event)
return count; return count;
} }
static MetaWaylandSurface *
get_focus_surface (MetaWaylandPointer *pointer)
{
MetaDisplay *display = meta_get_display ();
if (meta_grab_op_should_block_wayland (display->grab_op))
return NULL;
return pointer->current;
}
static void static void
sync_focus_surface (MetaWaylandPointer *pointer) sync_focus_surface (MetaWaylandPointer *pointer)
{ {
@ -373,7 +362,10 @@ sync_focus_surface (MetaWaylandPointer *pointer)
if (meta_grab_op_is_mouse (display->grab_op)) if (meta_grab_op_is_mouse (display->grab_op))
return; return;
focus_surface = get_focus_surface (pointer); if (meta_grab_op_should_block_wayland (display->grab_op))
focus_surface = NULL;
else
focus_surface = pointer->current;
if (focus_surface != pointer->focus_surface) if (focus_surface != pointer->focus_surface)
{ {