From 3878f806ff771651829977a01b84313c34997285 Mon Sep 17 00:00:00 2001 From: Vaxry Date: Wed, 24 Apr 2024 21:12:26 +0100 Subject: pointer-gestures: move to new impl --- src/events/Devices.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'src/events/Devices.cpp') diff --git a/src/events/Devices.cpp b/src/events/Devices.cpp index f0d68337..de5de7f8 100644 --- a/src/events/Devices.cpp +++ b/src/events/Devices.cpp @@ -4,6 +4,7 @@ #include "../helpers/WLClasses.hpp" #include "../managers/input/InputManager.hpp" #include "../render/Renderer.hpp" +#include "../protocols/PointerGestures.hpp" // ---------------------------------------------------- // // _____ ________ _______ _____ ______ _____ // @@ -141,17 +142,17 @@ void Events::listener_swipeEnd(wl_listener* listener, void* data) { void Events::listener_pinchBegin(wl_listener* listener, void* data) { const auto EV = (wlr_pointer_pinch_begin_event*)data; - wlr_pointer_gestures_v1_send_pinch_begin(g_pCompositor->m_sWLRPointerGestures, g_pCompositor->m_sSeat.seat, EV->time_msec, EV->fingers); + PROTO::pointerGestures->pinchBegin(EV->time_msec, EV->fingers); } void Events::listener_pinchUpdate(wl_listener* listener, void* data) { const auto EV = (wlr_pointer_pinch_update_event*)data; - wlr_pointer_gestures_v1_send_pinch_update(g_pCompositor->m_sWLRPointerGestures, g_pCompositor->m_sSeat.seat, EV->time_msec, EV->dx, EV->dy, EV->scale, EV->rotation); + PROTO::pointerGestures->pinchUpdate(EV->time_msec, {EV->dx, EV->dy}, EV->scale, EV->rotation); } void Events::listener_pinchEnd(wl_listener* listener, void* data) { const auto EV = (wlr_pointer_pinch_end_event*)data; - wlr_pointer_gestures_v1_send_pinch_end(g_pCompositor->m_sWLRPointerGestures, g_pCompositor->m_sSeat.seat, EV->time_msec, EV->cancelled); + PROTO::pointerGestures->pinchEnd(EV->time_msec, EV->cancelled); } void Events::listener_newVirtualKeyboard(wl_listener* listener, void* data) { @@ -177,9 +178,11 @@ void Events::listener_touchFrame(wl_listener* listener, void* data) { } void Events::listener_holdBegin(wl_listener* listener, void* data) { - g_pInputManager->onPointerHoldBegin((wlr_pointer_hold_begin_event*)data); + const auto EV = (wlr_pointer_hold_begin_event*)data; + PROTO::pointerGestures->holdBegin(EV->time_msec, EV->fingers); } void Events::listener_holdEnd(wl_listener* listener, void* data) { - g_pInputManager->onPointerHoldEnd((wlr_pointer_hold_end_event*)data); + const auto EV = (wlr_pointer_hold_end_event*)data; + PROTO::pointerGestures->holdEnd(EV->time_msec, EV->cancelled); } \ No newline at end of file -- cgit v1.2.3