isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-23 08:30:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

wayland/pointer: Send high-resolution scroll data

Browse Source 
Upgrade the seat protocol to version 8 and change the scroll handler to
support new clients.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1962>
This commit is contained in:
José Expósito 2021-09-20 19:53:46 +02:00 committed by Marge Bot
parent 5171e5b795
commit 9dd6268d13
2 changed files with 53 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/wayland/meta-wayland-pointer.c
View File

@ -730,8 +730,10 @@ handle_scroll_event (MetaWaylandPointer *pointer,
struct wl_resource *resource; struct wl_resource *resource;
wl_fixed_t x_value = 0, y_value = 0; wl_fixed_t x_value = 0, y_value = 0;
int x_discrete = 0, y_discrete = 0; int x_discrete = 0, y_discrete = 0;
int32_t x_value120 = 0, y_value120 = 0;
enum wl_pointer_axis_source source = -1; enum wl_pointer_axis_source source = -1;
MetaWaylandPointerClient *client; MetaWaylandPointerClient *client;
gboolean is_discrete_event = FALSE, is_value120_event = FALSE;
if (clutter_event_is_pointer_emulated (event)) if (clutter_event_is_pointer_emulated (event))
return; return;
@ -759,21 +761,25 @@ handle_scroll_event (MetaWaylandPointer *pointer,
switch (clutter_event_get_scroll_direction (event)) switch (clutter_event_get_scroll_direction (event))
{ {
case CLUTTER_SCROLL_UP: case CLUTTER_SCROLL_UP:
is_discrete_event = TRUE;
y_value = -DEFAULT_AXIS_STEP_DISTANCE; y_value = -DEFAULT_AXIS_STEP_DISTANCE;
y_discrete = -1; y_discrete = -1;
break; break;
case CLUTTER_SCROLL_DOWN: case CLUTTER_SCROLL_DOWN:
is_discrete_event = TRUE;
y_value = DEFAULT_AXIS_STEP_DISTANCE; y_value = DEFAULT_AXIS_STEP_DISTANCE;
y_discrete = 1; y_discrete = 1;
break; break;
case CLUTTER_SCROLL_LEFT: case CLUTTER_SCROLL_LEFT:
is_discrete_event = TRUE;
x_value = -DEFAULT_AXIS_STEP_DISTANCE; x_value = -DEFAULT_AXIS_STEP_DISTANCE;
x_discrete = -1; x_discrete = -1;
break; break;
case CLUTTER_SCROLL_RIGHT: case CLUTTER_SCROLL_RIGHT:
is_discrete_event = TRUE;
x_value = DEFAULT_AXIS_STEP_DISTANCE; x_value = DEFAULT_AXIS_STEP_DISTANCE;
x_discrete = 1; x_discrete = 1;
break; break;
@ -788,6 +794,13 @@ handle_scroll_event (MetaWaylandPointer *pointer,
clutter_event_get_scroll_delta (event, &dx, &dy); clutter_event_get_scroll_delta (event, &dx, &dy);
x_value = wl_fixed_from_double (dx) * factor; x_value = wl_fixed_from_double (dx) * factor;
y_value = wl_fixed_from_double (dy) * factor; y_value = wl_fixed_from_double (dy) * factor;
is_value120_event = (source == WL_POINTER_AXIS_SOURCE_WHEEL);
if (is_value120_event)
{
x_value120 = (int32_t) (dx * 120);
y_value120 = (int32_t) (dy * 120);
}
} }
break; break;
@ -798,18 +811,32 @@ handle_scroll_event (MetaWaylandPointer *pointer,
wl_resource_for_each (resource, &client->pointer_resources) wl_resource_for_each (resource, &client->pointer_resources)
{ {
int client_version = wl_resource_get_version (resource); int client_version = wl_resource_get_version (resource);
gboolean send_axis_x = TRUE, send_axis_y = TRUE;
if (client_version >= WL_POINTER_AXIS_SOURCE_SINCE_VERSION) if (client_version >= WL_POINTER_AXIS_SOURCE_SINCE_VERSION)
wl_pointer_send_axis_source (resource, source); wl_pointer_send_axis_source (resource, source);
/* X axis */ /* X axis */
if (x_discrete != 0 && if (client_version >= WL_POINTER_AXIS_VALUE120_SINCE_VERSION)
client_version >= WL_POINTER_AXIS_DISCRETE_SINCE_VERSION) {
if (is_value120_event && x_value120 != 0)
wl_pointer_send_axis_value120 (resource,
WL_POINTER_AXIS_HORIZONTAL_SCROLL,
x_value120);
send_axis_x = !is_discrete_event;
}
else if (client_version >= WL_POINTER_AXIS_DISCRETE_SINCE_VERSION)
{
if (is_discrete_event && x_discrete != 0)
wl_pointer_send_axis_discrete (resource, wl_pointer_send_axis_discrete (resource,
WL_POINTER_AXIS_HORIZONTAL_SCROLL, WL_POINTER_AXIS_HORIZONTAL_SCROLL,
x_discrete); x_discrete);
if (x_value) send_axis_x = !is_value120_event;
}
if (x_value && send_axis_x)
wl_pointer_send_axis (resource, clutter_event_get_time (event), wl_pointer_send_axis (resource, clutter_event_get_time (event),
WL_POINTER_AXIS_HORIZONTAL_SCROLL, x_value); WL_POINTER_AXIS_HORIZONTAL_SCROLL, x_value);
@ -819,13 +846,26 @@ handle_scroll_event (MetaWaylandPointer *pointer,
clutter_event_get_time (event), clutter_event_get_time (event),
WL_POINTER_AXIS_HORIZONTAL_SCROLL); WL_POINTER_AXIS_HORIZONTAL_SCROLL);
/* Y axis */ /* Y axis */
if (y_discrete != 0 && if (client_version >= WL_POINTER_AXIS_VALUE120_SINCE_VERSION)
client_version >= WL_POINTER_AXIS_DISCRETE_SINCE_VERSION) {
if (is_value120_event && y_value120 != 0)
wl_pointer_send_axis_value120 (resource,
WL_POINTER_AXIS_VERTICAL_SCROLL,
y_value120);
send_axis_y = !is_discrete_event;
}
else if (client_version >= WL_POINTER_AXIS_DISCRETE_SINCE_VERSION)
{
if (is_discrete_event && y_discrete != 0)
wl_pointer_send_axis_discrete (resource, wl_pointer_send_axis_discrete (resource,
WL_POINTER_AXIS_VERTICAL_SCROLL, WL_POINTER_AXIS_VERTICAL_SCROLL,
y_discrete); y_discrete);
if (y_value) send_axis_y = !is_value120_event;
}
if (y_value && send_axis_y)
wl_pointer_send_axis (resource, clutter_event_get_time (event), wl_pointer_send_axis (resource, clutter_event_get_time (event),
WL_POINTER_AXIS_VERTICAL_SCROLL, y_value); WL_POINTER_AXIS_VERTICAL_SCROLL, y_value);

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

@ -38,7 +38,7 @@
#define META_WL_COMPOSITOR_VERSION 5 #define META_WL_COMPOSITOR_VERSION 5
#define META_WL_DATA_DEVICE_MANAGER_VERSION 3 #define META_WL_DATA_DEVICE_MANAGER_VERSION 3
#define META_XDG_WM_BASE_VERSION 4 #define META_XDG_WM_BASE_VERSION 4
#define META_WL_SEAT_VERSION 5 #define META_WL_SEAT_VERSION 8
#define META_WL_OUTPUT_VERSION 2 #define META_WL_OUTPUT_VERSION 2
#define META_XSERVER_VERSION 1 #define META_XSERVER_VERSION 1
#define META_GTK_SHELL1_VERSION 5 #define META_GTK_SHELL1_VERSION 5