isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-01 20:30:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

seat: Don't save the current stage ourselves

Browse Source 
ClutterInputDevice already saves it.
This commit is contained in:
Jasper St. Pierre 2014-04-17 17:56:56 -04:00
parent a8d2dfd14f
commit 65ed8a817d
2 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/wayland/meta-wayland-seat.c
View File

@ -146,8 +146,6 @@ meta_wayland_seat_new (struct wl_display *display)
seat->display = display; seat->display = display;
seat->current_stage = 0;
wl_global_create (display, &wl_seat_interface, META_WL_SEAT_VERSION, seat, bind_seat); wl_global_create (display, &wl_seat_interface, META_WL_SEAT_VERSION, seat, bind_seat);
return seat; return seat;
@ -204,20 +202,19 @@ repick_for_event (MetaWaylandSeat *seat,
{ {
actor = clutter_event_get_source (for_event); actor = clutter_event_get_source (for_event);
} }
else if (seat->current_stage) else
{ {
ClutterStage *stage = CLUTTER_STAGE (seat->current_stage); ClutterDeviceManager *device_manager = clutter_device_manager_get_default ();
ClutterInputDevice *device = clutter_device_manager_get_device (device_manager, META_VIRTUAL_CORE_POINTER_ID);
ClutterStage *stage = clutter_input_device_get_pointer_stage (device);
if (stage)
actor = clutter_stage_get_actor_at_pos (stage, actor = clutter_stage_get_actor_at_pos (stage,
CLUTTER_PICK_REACTIVE, CLUTTER_PICK_REACTIVE,
wl_fixed_to_double (pointer->x), wl_fixed_to_double (pointer->x),
wl_fixed_to_double (pointer->y)); wl_fixed_to_double (pointer->y));
} }
if (actor)
seat->current_stage = clutter_actor_get_stage (actor);
else
seat->current_stage = NULL;
if (META_IS_SURFACE_ACTOR_WAYLAND (actor)) if (META_IS_SURFACE_ACTOR_WAYLAND (actor))
surface = meta_surface_actor_wayland_get_surface (META_SURFACE_ACTOR_WAYLAND (actor)); surface = meta_surface_actor_wayland_get_surface (META_SURFACE_ACTOR_WAYLAND (actor));

2
src/wayland/meta-wayland-seat.h
View File

@ -57,8 +57,6 @@ struct _MetaWaylandSeat
MetaWaylandKeyboard keyboard; MetaWaylandKeyboard keyboard;
struct wl_display *display; struct wl_display *display;
ClutterActor *current_stage;
}; };
MetaWaylandSeat * MetaWaylandSeat *