diff --git a/src/backends/drm/drm_backend.cpp b/src/backends/drm/drm_backend.cpp index 591e202539..46c8199fe9 100644 --- a/src/backends/drm/drm_backend.cpp +++ b/src/backends/drm/drm_backend.cpp @@ -77,7 +77,6 @@ DrmBackend::DrmBackend(Session *session, QObject *parent) , m_explicitGpus(splitPathList(qEnvironmentVariable("KWIN_DRM_DEVICES"), ':')) , m_dpmsFilter() { - setSupportsPointerWarping(true); setSupportsGammaControl(true); } diff --git a/src/backends/virtual/virtual_backend.cpp b/src/backends/virtual/virtual_backend.cpp index b7fb77e1c6..d703e04d32 100644 --- a/src/backends/virtual/virtual_backend.cpp +++ b/src/backends/virtual/virtual_backend.cpp @@ -30,7 +30,6 @@ VirtualBackend::VirtualBackend(QObject *parent) } } - setSupportsPointerWarping(true); setSupportsGammaControl(true); } diff --git a/src/backends/x11/windowed/x11_windowed_backend.cpp b/src/backends/x11/windowed/x11_windowed_backend.cpp index 3a45e15751..850f8ad54f 100644 --- a/src/backends/x11/windowed/x11_windowed_backend.cpp +++ b/src/backends/x11/windowed/x11_windowed_backend.cpp @@ -155,7 +155,6 @@ void X11WindowedInputBackend::initialize() X11WindowedBackend::X11WindowedBackend() { - setSupportsPointerWarping(true); } X11WindowedBackend::~X11WindowedBackend() @@ -656,13 +655,6 @@ std::unique_ptr X11WindowedBackend::createInputBackend() return std::make_unique(this); } -void X11WindowedBackend::warpPointer(const QPointF &globalPos) -{ - const xcb_window_t w = m_outputs.at(0)->window(); - xcb_warp_pointer(m_connection, w, w, 0, 0, 0, 0, globalPos.x(), globalPos.y()); - xcb_flush(m_connection); -} - xcb_window_t X11WindowedBackend::windowForScreen(Output *output) const { if (!output) { diff --git a/src/backends/x11/windowed/x11_windowed_backend.h b/src/backends/x11/windowed/x11_windowed_backend.h index 634fc4c49e..8061a3f0f5 100644 --- a/src/backends/x11/windowed/x11_windowed_backend.h +++ b/src/backends/x11/windowed/x11_windowed_backend.h @@ -117,7 +117,6 @@ public: std::unique_ptr createOpenGLBackend() override; std::unique_ptr createQPainterBackend() override; std::unique_ptr createInputBackend() override; - void warpPointer(const QPointF &globalPos) override; QVector supportedCompositors() const override { diff --git a/src/core/platform.cpp b/src/core/platform.cpp index c95f202771..8a695fad4b 100644 --- a/src/core/platform.cpp +++ b/src/core/platform.cpp @@ -134,10 +134,6 @@ void Platform::removeVirtualOutput(Output *output) Q_ASSERT(!output); } -void Platform::warpPointer(const QPointF &globalPos) -{ -} - bool Platform::supportsNativeFence() const { if (Compositor *compositor = Compositor::self()) { diff --git a/src/core/platform.h b/src/core/platform.h index 4713db37fe..54de1131d5 100644 --- a/src/core/platform.h +++ b/src/core/platform.h @@ -74,7 +74,6 @@ public: * The default implementation creates an InputRedirectionCursor. */ virtual void createPlatformCursor(QObject *parent = nullptr); - virtual void warpPointer(const QPointF &globalPos); /** * Whether our Compositing EGL display supports creating native EGL fences. */ @@ -203,10 +202,6 @@ public: { m_deviceIdentifier = identifier; } - bool supportsPointerWarping() const - { - return m_pointerWarping; - } int initialOutputCount() const { return m_initialOutputCount; @@ -304,10 +299,6 @@ protected: { return m_deviceIdentifier; } - void setSupportsPointerWarping(bool set) - { - m_pointerWarping = set; - } void setSupportsGammaControl(bool set) { m_supportsGammaControl = set; @@ -317,7 +308,6 @@ private: bool m_ready = false; QSize m_initialWindowSize; QByteArray m_deviceIdentifier; - bool m_pointerWarping = false; int m_initialOutputCount = 1; qreal m_initialOutputScale = 1; EGLDisplay m_eglDisplay; diff --git a/src/pointer_input.cpp b/src/pointer_input.cpp index 11e6e48533..15fbe0b691 100644 --- a/src/pointer_input.cpp +++ b/src/pointer_input.cpp @@ -815,17 +815,13 @@ void PointerInputRedirection::updateButton(uint32_t button, InputRedirection::Po void PointerInputRedirection::warp(const QPointF &pos) { if (supportsWarping()) { - kwinApp()->platform()->warpPointer(pos); processMotionAbsolute(pos, waylandServer()->seat()->timestamp()); } } bool PointerInputRedirection::supportsWarping() const { - if (!inited()) { - return false; - } - return kwinApp()->platform()->supportsPointerWarping(); + return inited(); } void PointerInputRedirection::updateAfterScreenChange()