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

wayland: Move cursor tracker handling code to meta_wayland_seat_handle_event

Browse Source
This commit is contained in:
Jasper St. Pierre 2013-10-04 02:33:10 -04:00
parent b7b95123ed
commit 6cc014a941
2 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -369,6 +369,19 @@ meta_wayland_seat_handle_event (MetaWaylandSeat *seat,
{ {
seat->pointer.button_count = count_buttons (event); seat->pointer.button_count = count_buttons (event);
if (seat->cursor_tracker)
{
meta_cursor_tracker_update_position (seat->cursor_tracker,
wl_fixed_to_int (seat->pointer.x),
wl_fixed_to_int (seat->pointer.y));
if (seat->pointer.current == NULL)
meta_cursor_tracker_revert_root (seat->cursor_tracker);
meta_cursor_tracker_queue_redraw (seat->cursor_tracker,
CLUTTER_ACTOR (event->any.stage));
}
switch (event->type) switch (event->type)
{ {
case CLUTTER_MOTION: case CLUTTER_MOTION:

19
src/wayland/meta-wayland.c
View File

@ -567,27 +567,10 @@ event_filter_cb (const ClutterEvent *event,
{ {
MetaWaylandCompositor *compositor = user_data; MetaWaylandCompositor *compositor = user_data;
MetaWaylandSeat *seat = compositor->seat; MetaWaylandSeat *seat = compositor->seat;
MetaWaylandPointer *pointer = &seat->pointer;
reset_idletimes (event); reset_idletimes (event);
if (meta_wayland_seat_handle_event (compositor->seat, event)) return meta_wayland_seat_handle_event (compositor->seat, event);
return TRUE;
if (seat->cursor_tracker)
{
meta_cursor_tracker_update_position (seat->cursor_tracker,
wl_fixed_to_int (pointer->x),
wl_fixed_to_int (pointer->y));
if (pointer->current == NULL)
meta_cursor_tracker_revert_root (seat->cursor_tracker);
meta_cursor_tracker_queue_redraw (seat->cursor_tracker,
CLUTTER_ACTOR (event->any.stage));
}
return FALSE;
} }
static void static void