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

evdev: Mark either of smooth/discrete scroll events as emulating

Browse Source 
We're always emulating one of those, depending on the scrolling
device/source, so mark these as such.
This commit is contained in:
Carlos Garnacho 2015-10-23 16:56:00 +02:00
parent 9753c99382
commit a9f16c3d1f
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
clutter/evdev/clutter-device-manager-evdev.c
View File

@ -454,7 +454,8 @@ discrete_to_direction (gdouble discrete_x,
static void static void
notify_discrete_scroll (ClutterInputDevice *input_device, notify_discrete_scroll (ClutterInputDevice *input_device,
guint32 time_, guint32 time_,
ClutterScrollDirection direction) ClutterScrollDirection direction,
gboolean emulated)
{ {
ClutterInputDeviceEvdev *device_evdev; ClutterInputDeviceEvdev *device_evdev;
ClutterSeatEvdev *seat; ClutterSeatEvdev *seat;
@ -487,6 +488,8 @@ notify_discrete_scroll (ClutterInputDevice *input_device,
clutter_event_set_device (event, seat->core_pointer); clutter_event_set_device (event, seat->core_pointer);
clutter_event_set_source_device (event, input_device); clutter_event_set_source_device (event, input_device);
_clutter_event_set_pointer_emulated (event, emulated);
queue_event (event); queue_event (event);
} }
@ -494,7 +497,8 @@ static void
notify_scroll (ClutterInputDevice *input_device, notify_scroll (ClutterInputDevice *input_device,
guint32 time_, guint32 time_,
gdouble dx, gdouble dx,
gdouble dy) gdouble dy,
gboolean emulated)
{ {
ClutterInputDeviceEvdev *device_evdev; ClutterInputDeviceEvdev *device_evdev;
ClutterSeatEvdev *seat; ClutterSeatEvdev *seat;
@ -532,6 +536,8 @@ notify_scroll (ClutterInputDevice *input_device,
clutter_event_set_device (event, seat->core_pointer); clutter_event_set_device (event, seat->core_pointer);
clutter_event_set_source_device (event, input_device); clutter_event_set_source_device (event, input_device);
_clutter_event_set_pointer_emulated (event, emulated);
queue_event (event); queue_event (event);
} }
@ -1277,14 +1283,16 @@ check_notify_discrete_scroll (ClutterDeviceManagerEvdev *manager_evdev,
{ {
notify_discrete_scroll (device, time_, notify_discrete_scroll (device, time_,
seat->accum_scroll_dx > 0 ? seat->accum_scroll_dx > 0 ?
CLUTTER_SCROLL_RIGHT : CLUTTER_SCROLL_LEFT); CLUTTER_SCROLL_RIGHT : CLUTTER_SCROLL_LEFT,
TRUE);
} }
for (i = 0; i < n_yscrolls; i++) for (i = 0; i < n_yscrolls; i++)
{ {
notify_discrete_scroll (device, time_, notify_discrete_scroll (device, time_,
seat->accum_scroll_dy > 0 ? seat->accum_scroll_dy > 0 ?
CLUTTER_SCROLL_DOWN : CLUTTER_SCROLL_UP); CLUTTER_SCROLL_DOWN : CLUTTER_SCROLL_UP,
TRUE);
} }
seat->accum_scroll_dx = fmodf (seat->accum_scroll_dx, DISCRETE_SCROLL_STEP); seat->accum_scroll_dx = fmodf (seat->accum_scroll_dx, DISCRETE_SCROLL_STEP);
@ -1450,12 +1458,13 @@ process_device_event (ClutterDeviceManagerEvdev *manager_evdev,
{ {
notify_scroll (device, time, notify_scroll (device, time,
discrete_x * DISCRETE_SCROLL_STEP, discrete_x * DISCRETE_SCROLL_STEP,
discrete_y * DISCRETE_SCROLL_STEP); discrete_y * DISCRETE_SCROLL_STEP,
notify_discrete_scroll (device, time, discrete_to_direction (discrete_x, discrete_y)); TRUE);
notify_discrete_scroll (device, time, discrete_to_direction (discrete_x, discrete_y), FALSE);
} }
else else
{ {
notify_scroll (device, time, dx, dy); notify_scroll (device, time, dx, dy, FALSE);
check_notify_discrete_scroll (manager_evdev, device, time); check_notify_discrete_scroll (manager_evdev, device, time);
} }