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

pointer: Repick on update, not on handle_event

Browse Source 
pointer->current needs to always be the surface under the pointer,
even when we have a grab. We do need to make sure we keep the focus
surface the same even when we have a grab, though, so add logic
for that.
This commit is contained in:
Jasper St. Pierre 2014-04-20 10:59:49 -04:00
parent a378faf495
commit ceb0f1005d
1 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -352,21 +352,6 @@ count_buttons (const ClutterEvent *event)
return count; return count;
} }
void
meta_wayland_pointer_update (MetaWaylandPointer *pointer,
const ClutterEvent *event)
{
pointer->button_count = count_buttons (event);
if (pointer->cursor_tracker)
{
ClutterPoint pos;
clutter_input_device_get_coords (pointer->device, NULL, &pos);
meta_cursor_tracker_update_position (pointer->cursor_tracker, pos.x, pos.y);
}
}
static MetaWaylandSurface * static MetaWaylandSurface *
get_focus_surface (MetaWaylandPointer *pointer) get_focus_surface (MetaWaylandPointer *pointer)
{ {
@ -381,7 +366,15 @@ get_focus_surface (MetaWaylandPointer *pointer)
static void static void
sync_focus_surface (MetaWaylandPointer *pointer) sync_focus_surface (MetaWaylandPointer *pointer)
{ {
MetaWaylandSurface *focus_surface = get_focus_surface (pointer); MetaDisplay *display = meta_get_display ();
MetaWaylandSurface *focus_surface;
/* Don't update the focus surface while we have a special grab. */
if (meta_grab_op_is_mouse (display->grab_op) &&
display->grab_op != META_GRAB_OP_COMPOSITOR)
return;
focus_surface = get_focus_surface (pointer);
if (focus_surface != pointer->focus_surface) if (focus_surface != pointer->focus_surface)
{ {
@ -425,12 +418,27 @@ repick_for_event (MetaWaylandPointer *pointer,
sync_focus_surface (pointer); sync_focus_surface (pointer);
} }
void
meta_wayland_pointer_update (MetaWaylandPointer *pointer,
const ClutterEvent *event)
{
pointer->button_count = count_buttons (event);
repick_for_event (pointer, event);
if (pointer->cursor_tracker)
{
ClutterPoint pos;
clutter_input_device_get_coords (pointer->device, NULL, &pos);
meta_cursor_tracker_update_position (pointer->cursor_tracker, pos.x, pos.y);
}
}
static void static void
notify_motion (MetaWaylandPointer *pointer, notify_motion (MetaWaylandPointer *pointer,
const ClutterEvent *event) const ClutterEvent *event)
{ {
repick_for_event (pointer, event);
pointer->grab->interface->motion (pointer->grab, event); pointer->grab->interface->motion (pointer->grab, event);
} }