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

wayland/pointer: Call wl_resource_get_version once

Browse Source 
Call wl_resource_get_version once for each pointer resource.

Refactor, no functional changes.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1966>
This commit is contained in:
José Expósito 2021-09-20 19:53:31 +02:00 committed by Marge Bot
parent 2e8aef6f8a
commit d703ba56c3
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -784,12 +784,14 @@ handle_scroll_event (MetaWaylandPointer *pointer,
{ {
wl_resource_for_each (resource, &pointer->focus_client->pointer_resources) wl_resource_for_each (resource, &pointer->focus_client->pointer_resources)
{ {
if (wl_resource_get_version (resource) >= WL_POINTER_AXIS_SOURCE_SINCE_VERSION) int client_version = wl_resource_get_version (resource);
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 (x_discrete != 0 &&
wl_resource_get_version (resource) >= WL_POINTER_AXIS_DISCRETE_SINCE_VERSION) client_version >= WL_POINTER_AXIS_DISCRETE_SINCE_VERSION)
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);
@ -799,13 +801,13 @@ handle_scroll_event (MetaWaylandPointer *pointer,
WL_POINTER_AXIS_HORIZONTAL_SCROLL, x_value); WL_POINTER_AXIS_HORIZONTAL_SCROLL, x_value);
if ((event->scroll.finish_flags & CLUTTER_SCROLL_FINISHED_HORIZONTAL) && if ((event->scroll.finish_flags & CLUTTER_SCROLL_FINISHED_HORIZONTAL) &&
wl_resource_get_version (resource) >= WL_POINTER_AXIS_STOP_SINCE_VERSION) client_version >= WL_POINTER_AXIS_STOP_SINCE_VERSION)
wl_pointer_send_axis_stop (resource, wl_pointer_send_axis_stop (resource,
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 (y_discrete != 0 &&
wl_resource_get_version (resource) >= WL_POINTER_AXIS_DISCRETE_SINCE_VERSION) client_version >= WL_POINTER_AXIS_DISCRETE_SINCE_VERSION)
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);
@ -815,7 +817,7 @@ handle_scroll_event (MetaWaylandPointer *pointer,
WL_POINTER_AXIS_VERTICAL_SCROLL, y_value); WL_POINTER_AXIS_VERTICAL_SCROLL, y_value);
if ((event->scroll.finish_flags & CLUTTER_SCROLL_FINISHED_VERTICAL) && if ((event->scroll.finish_flags & CLUTTER_SCROLL_FINISHED_VERTICAL) &&
wl_resource_get_version (resource) >= WL_POINTER_AXIS_STOP_SINCE_VERSION) client_version >= WL_POINTER_AXIS_STOP_SINCE_VERSION)
wl_pointer_send_axis_stop (resource, wl_pointer_send_axis_stop (resource,
clutter_event_get_time (event), clutter_event_get_time (event),
WL_POINTER_AXIS_VERTICAL_SCROLL); WL_POINTER_AXIS_VERTICAL_SCROLL);