Changeset 271292 in webkit

Timestamp:

Jan 8, 2021, 5:27:34 AM (6 years ago)

Author:

Chris Lord

Message:

[WPE] Enable smooth-motion and kinetic scrolling on touchpads
​https://bugs.webkit.org/show_bug.cgi?id=219942

Reviewed by Žan Doberšek.

Source/WebKit:

Interpret axis motion events with a zero value as axis stop events and
send the appropriate wheel event phase. This enables kinetic scrolling
when using touchpads and other smooth-scrolling devices.

• UIProcess/API/wpe/PageClientImpl.cpp:

(WebKit::PageClientImpl::doneWithTouchEvent):

• UIProcess/API/wpe/WPEView.cpp:

(WKWPE::m_backend):

• UIProcess/API/wpe/WPEView.h:

Tools:

• wpe/backends/WindowViewBackend.cpp:

Update to Wayland protocol 5 and interpret axis stop, discrete and
smooth axis motion events.

Location:

trunk

Files:

• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/UIProcess/API/wpe/PageClientImpl.cpp (modified) (1 diff)
• Source/WebKit/UIProcess/API/wpe/WPEView.cpp (modified) (1 diff)
• Source/WebKit/UIProcess/API/wpe/WPEView.h (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/wpe/backends/WindowViewBackend.cpp (modified) (2 diffs)
• Tools/wpe/backends/WindowViewBackend.h (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-01-08  Chris Lord  <clord@igalia.com>
+
+        [WPE] Enable smooth-motion and kinetic scrolling on touchpads
+        https://bugs.webkit.org/show_bug.cgi?id=219942
+
+        Reviewed by Žan Doberšek.
+
+        Interpret axis motion events with a zero value as axis stop events and
+        send the appropriate wheel event phase. This enables kinetic scrolling
+        when using touchpads and other smooth-scrolling devices.
+
+        * UIProcess/API/wpe/PageClientImpl.cpp:
+        (WebKit::PageClientImpl::doneWithTouchEvent):
+        * UIProcess/API/wpe/WPEView.cpp:
+        (WKWPE::m_backend):
+        * UIProcess/API/wpe/WPEView.h:
+
 2021-01-08  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebKit/UIProcess/API/wpe/PageClientImpl.cpp

@@ -218 +218 @@
         struct wpe_input_axis_event* axisEvent = scrollGestureController.axisEvent();
         if (axisEvent->type != wpe_input_axis_event_type_null)
-            page.handleWheelEvent(WebKit::NativeWebWheelEvent(axisEvent, m_view.page().deviceScaleFactor(), WebWheelEvent::Phase::PhaseNone, WebWheelEvent::Phase::PhaseNone));
+            page.handleWheelEvent(WebKit::NativeWebWheelEvent(axisEvent, m_view.page().deviceScaleFactor(), scrollGestureController.phase(), WebWheelEvent::Phase::PhaseNone));
         return;
     }

trunk/Source/WebKit/UIProcess/API/wpe/WPEView.cpp

@@ -160 +160 @@
         [](void* data, struct wpe_input_axis_event* event)
         {
-            auto& page = reinterpret_cast<View*>(data)->page();
-            page.handleWheelEvent(WebKit::NativeWebWheelEvent(event, page.deviceScaleFactor(), WebWheelEvent::Phase::PhaseNone, WebWheelEvent::Phase::PhaseNone));
+            auto& view = *reinterpret_cast<View*>(data);
+
+            // FIXME: We shouldn't hard-code this.
+            enum Axis {
+                Vertical,
+                Horizontal
+            };
+
+            switch (event->axis) {
+            case Vertical:
+                view.m_horizontalScrollActive = !!event->value;
+                break;
+            case Horizontal:
+                view.m_verticalScrollActive = !!event->value;
+                break;
+            }
+
+            // We treat an axis motion event with a value of zero to be equivalent
+            // to a 'stop' event. Motion events with zero motion don't exist naturally,
+            // so this allows a backend to express 'stop' events without changing API.
+            auto& page = view.page();
+            if (event->value)
+                page.handleWheelEvent(WebKit::NativeWebWheelEvent(event, page.deviceScaleFactor(), WebWheelEvent::Phase::PhaseChanged, WebWheelEvent::Phase::PhaseNone));
+            else if (!view.m_horizontalScrollActive && !view.m_verticalScrollActive)
+                page.handleWheelEvent(WebKit::NativeWebWheelEvent(event, page.deviceScaleFactor(), WebWheelEvent::Phase::PhaseEnded, WebWheelEvent::Phase::PhaseNone));
         },
         // handle_touch_event

trunk/Source/WebKit/UIProcess/API/wpe/WPEView.h

@@ -135 +135 @@
 #endif
 
+    bool m_horizontalScrollActive { false };
+    bool m_verticalScrollActive { false };
+
     WebKit::InputMethodFilter m_inputMethodFilter;
 };

trunk/Tools/ChangeLog

@@ +1 @@
+2021-01-08  Chris Lord  <clord@igalia.com>
+
+        [WPE] Enable smooth-motion and kinetic scrolling on touchpads
+        https://bugs.webkit.org/show_bug.cgi?id=219942
+
+        Reviewed by Žan Doberšek.
+
+        * wpe/backends/WindowViewBackend.cpp:
+        Update to Wayland protocol 5 and interpret axis stop, discrete and
+        smooth axis motion events.
+
 2021-01-07  Paulo Matos  <pmatos@igalia.com>
 

trunk/Tools/wpe/backends/WindowViewBackend.cpp

@@ -147 +147 @@
 
         if (!std::strcmp(interface, "wl_seat"))
-            window->m_seat = static_cast<struct wl_seat*>(wl_registry_bind(registry, name, &wl_seat_interface, 4));
+            window->m_seat = static_cast<struct wl_seat*>(wl_registry_bind(registry, name, &wl_seat_interface, 5));
     },
     // global_remove
@@ -239 +239 @@
     [](void* data, struct wl_pointer*, uint32_t time, uint32_t axis, wl_fixed_t value)
     {
+        if (axis != WL_POINTER_AXIS_HORIZONTAL_SCROLL && axis != WL_POINTER_AXIS_VERTICAL_SCROLL)
+            return;
+
         auto& window = *static_cast<WindowViewBackend*>(data);
         if (window.m_seatData.pointer.target) {
             struct wpe_input_axis_event event = { wpe_input_axis_event_type_motion,
                 time, window.m_seatData.pointer.coords.first, window.m_seatData.pointer.coords.second, axis, -wl_fixed_to_int(value), window.modifiers() };
+            if (axis == WL_POINTER_AXIS_HORIZONTAL_SCROLL && window.m_seatData.axis_discrete.horizontal)
+                event.value = window.m_seatData.axis_discrete.horizontal;
+            else if (axis == WL_POINTER_AXIS_VERTICAL_SCROLL && window.m_seatData.axis_discrete.vertical)
+                event.value = window.m_seatData.axis_discrete.vertical;
+#if WPE_CHECK_VERSION(1, 5, 0)
+            else {
+                struct wpe_input_axis_2d_event event2d = { event, 0, 0 };
+                event2d.base.type = static_cast<wpe_input_axis_event_type>(wpe_input_axis_event_type_mask_2d | wpe_input_axis_event_type_motion_smooth);
+
+                if (axis == WL_POINTER_AXIS_HORIZONTAL_SCROLL)
+                    event2d.x_axis = wl_fixed_to_double(value);
+                else
+                    event2d.y_axis = -wl_fixed_to_double(value);
+
+                window.dispatchInputAxisEvent(&event2d.base);
+                return;
+            }
+#endif
             window.dispatchInputAxisEvent(&event);
-        }
-    },
-    nullptr, // frame
-    nullptr, // axis_source
-    nullptr, // axis_stop
-    nullptr, // axis_discrete
+            window.m_seatData.axis_discrete.horizontal = window.m_seatData.axis_discrete.vertical = 0;
+        }
+    },
+    // frame
+    [](void*, struct wl_pointer*) { },
+    // axis_source
+    [](void*, struct wl_pointer*, uint32_t) { },
+    // axis_stop
+    [](void* data, struct wl_pointer*, uint32_t time, uint32_t axis)
+    {
+        if (axis != WL_POINTER_AXIS_HORIZONTAL_SCROLL && axis != WL_POINTER_AXIS_VERTICAL_SCROLL)
+            return;
+
+        auto& window = *static_cast<WindowViewBackend*>(data);
+        if (window.m_seatData.pointer.target) {
+            struct wpe_input_axis_event event = { wpe_input_axis_event_type_motion,
+                time, window.m_seatData.pointer.coords.first, window.m_seatData.pointer.coords.second, axis, 0, window.modifiers() };
+            window.dispatchInputAxisEvent(&event);
+        }
+    },
+    // axis_discrete
+    [](void* data, struct wl_pointer*, uint32_t axis, int32_t discrete) {
+        auto& window = *static_cast<WindowViewBackend*>(data);
+        switch (axis) {
+        case WL_POINTER_AXIS_HORIZONTAL_SCROLL:
+            window.m_seatData.axis_discrete.horizontal = discrete;
+            break;
+        case WL_POINTER_AXIS_VERTICAL_SCROLL:
+            window.m_seatData.axis_discrete.vertical = -discrete;
+            break;
+        }
+    },
 };
 

trunk/Tools/wpe/backends/WindowViewBackend.h

@@ -91 +91 @@
 
         struct {
+            int32_t horizontal { 0 };
+            int32_t vertical { 0 };
+        } axis_discrete;
+
+        struct {
             int32_t rate { 0 };
             int32_t delay { 0 };