AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

wayland: Implement support for tablet wheel scrolling

Browse Source 
Adds support for creating scroll events from Wayland tablet wheel events.
Even though no Wacom tablet puck has a smooth-scrolling wheel, both event
types need to be generated to make the upper layers happy.

https://bugzilla.gnome.org/show_bug.cgi?id=783716
This commit is contained in:
Jason Gerecke 2017-06-12 15:41:51 -07:00 committed by Carlos Garnacho
parent 3be5aae56a
commit 837c2002e9
1 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
gdk/wayland/gdkdevice-wayland.c
View File

@ -3441,6 +3441,9 @@ gdk_wayland_tablet_flush_frame_event (GdkWaylandTabletData *tablet,
sizeof (gdouble) *
gdk_device_get_n_axes (tablet->current_device));
break;
case GDK_SCROLL:
event->scroll.time = time;
break;
case GDK_PROXIMITY_IN:
case GDK_PROXIMITY_OUT:
event->proximity.time = time;
@ -3862,7 +3865,32 @@ tablet_tool_handle_wheel (void *data,
int32_t degrees,
int32_t clicks)
{
/* FIXME: Handle wheel */
GdkWaylandTabletToolData *tool = data;
GdkWaylandTabletData *tablet = tool->current_tablet;
GdkWaylandSeat *seat = GDK_WAYLAND_SEAT (tablet->seat);
GdkEvent *event;
GDK_NOTE (EVENTS,
g_message ("tablet tool %d wheel %d/%d",
gdk_device_tool_get_tool_type (tool->tool), degrees, clicks));
if (clicks == 0)
return;
/* Send smooth event */
event = create_scroll_event (seat, &tablet->pointer_info,
tablet->master, tablet->current_device, FALSE);
gdk_event_set_device_tool (event, tablet->current_tool->tool);
event->scroll.direction = GDK_SCROLL_SMOOTH;
event->scroll.delta_y = clicks;
_gdk_wayland_display_deliver_event (seat->display, event);
/* Send discrete event */
event = create_scroll_event (seat, &tablet->pointer_info,
tablet->master, tablet->current_device, TRUE);
gdk_event_set_device_tool (event, tablet->current_tool->tool);
event->scroll.direction = (clicks > 0) ? GDK_SCROLL_DOWN : GDK_SCROLL_UP;
_gdk_wayland_display_deliver_event (seat->display, event);
}
static void