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

seat: Redo scroll handling

Browse Source 
To make way for smooth scrolling
This commit is contained in:
Jasper St. Pierre 2014-03-10 11:09:20 -04:00
parent c595a9c29f
commit 254e2e993c
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -276,8 +276,7 @@ static void
handle_scroll_event (MetaWaylandSeat *seat,
const ClutterEvent *event)
{
enum wl_pointer_axis axis;
wl_fixed_t value;
wl_fixed_t x_value = 0, y_value = 0;
notify_motion (seat, event);
@ -287,33 +286,31 @@ handle_scroll_event (MetaWaylandSeat *seat,
switch (clutter_event_get_scroll_direction (event))
{
case CLUTTER_SCROLL_UP:
axis = WL_POINTER_AXIS_VERTICAL_SCROLL;
value = -DEFAULT_AXIS_STEP_DISTANCE;
y_value = -DEFAULT_AXIS_STEP_DISTANCE;
break;
case CLUTTER_SCROLL_DOWN:
axis = WL_POINTER_AXIS_VERTICAL_SCROLL;
value = DEFAULT_AXIS_STEP_DISTANCE;
y_value = DEFAULT_AXIS_STEP_DISTANCE;
break;
case CLUTTER_SCROLL_LEFT:
axis = WL_POINTER_AXIS_HORIZONTAL_SCROLL;
value = -DEFAULT_AXIS_STEP_DISTANCE;
x_value = -DEFAULT_AXIS_STEP_DISTANCE;
break;
case CLUTTER_SCROLL_RIGHT:
axis = WL_POINTER_AXIS_HORIZONTAL_SCROLL;
value = DEFAULT_AXIS_STEP_DISTANCE;
x_value = DEFAULT_AXIS_STEP_DISTANCE;
break;
default:
return;
}
wl_pointer_send_axis (seat->pointer.focus_resource,
clutter_event_get_time (event),
axis,
value);
if (x_value)
wl_pointer_send_axis (seat->pointer.focus_resource, clutter_event_get_time (event),
WL_POINTER_AXIS_HORIZONTAL_SCROLL, x_value);
if (y_value)
wl_pointer_send_axis (seat->pointer.focus_resource, clutter_event_get_time (event),
WL_POINTER_AXIS_VERTICAL_SCROLL, y_value);
}
static int