[mutter] wayland-pointer: Just use the pointer actor instead of doing a full repick
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] wayland-pointer: Just use the pointer actor instead of doing a full repick
- Date: Wed, 8 Oct 2014 04:32:06 +0000 (UTC)
commit 33acb5fea07c83236f254456d11d34e2c7671719
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Tue Oct 7 21:28:45 2014 -0700
wayland-pointer: Just use the pointer actor instead of doing a full repick
The full repick is unnecessary -- Clutter already does it for us.
src/wayland/meta-wayland-pointer.c | 19 +++----------------
1 files changed, 3 insertions(+), 16 deletions(-)
---
diff --git a/src/wayland/meta-wayland-pointer.c b/src/wayland/meta-wayland-pointer.c
index 24c2818..63a0374 100644
--- a/src/wayland/meta-wayland-pointer.c
+++ b/src/wayland/meta-wayland-pointer.c
@@ -281,25 +281,12 @@ static void
repick_for_event (MetaWaylandPointer *pointer,
const ClutterEvent *for_event)
{
- ClutterActor *actor = NULL;
+ ClutterActor *actor;
if (for_event)
- {
- actor = clutter_event_get_source (for_event);
- }
+ actor = clutter_event_get_source (for_event);
else
- {
- ClutterStage *stage = clutter_input_device_get_pointer_stage (pointer->device);
-
- if (stage)
- {
- ClutterPoint pos;
-
- clutter_input_device_get_coords (pointer->device, NULL, &pos);
- actor = clutter_stage_get_actor_at_pos (stage, CLUTTER_PICK_REACTIVE,
- pos.x, pos.y);
- }
- }
+ actor = clutter_input_device_get_pointer_actor (pointer->device);
if (META_IS_SURFACE_ACTOR_WAYLAND (actor))
pointer->current = meta_surface_actor_wayland_get_surface (META_SURFACE_ACTOR_WAYLAND (actor));
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]