Drop nativeButton parameter in InputEventFilter::pointerEvent()

It's already supplied with the event object.

src/dpmsinputeventfilter.cpp

@@ -36,7 +36,7 @@ DpmsInputEventFilter::~DpmsInputEventFilter()
 {
 }
 
-bool DpmsInputEventFilter::pointerEvent(MouseEvent *event, quint32 nativeButton)
+bool DpmsInputEventFilter::pointerEvent(MouseEvent *event)
 {
     if (!event->isWarp()) {
         // The intention is to wake the screen on user interactions

src/dpmsinputeventfilter.h

@@ -26,7 +26,7 @@ public:
     DpmsInputEventFilter();
     ~DpmsInputEventFilter() override;
 
-    bool pointerEvent(MouseEvent *event, quint32 nativeButton) override;
+    bool pointerEvent(MouseEvent *event) override;
     bool wheelEvent(WheelEvent *event) override;
     bool keyEvent(KeyEvent *event) override;
     bool touchDown(qint32 id, const QPointF &pos, std::chrono::microseconds time) override;

src/input.cpp

@@ -117,7 +117,7 @@ int InputEventFilter::weight() const
     return m_weight;
 }
 
-bool InputEventFilter::pointerEvent(MouseEvent *event, quint32 nativeButton)
+bool InputEventFilter::pointerEvent(MouseEvent *event)
 {
     return false;
 }
@@ -294,7 +294,7 @@ public:
         : InputEventFilter(InputFilterOrder::LockScreen)
     {
     }
-    bool pointerEvent(MouseEvent *event, quint32 nativeButton) override
+    bool pointerEvent(MouseEvent *event) override
     {
         if (!waylandServer()->isScreenLocked()) {
             return false;
@@ -322,7 +322,7 @@ public:
                     ? PointerButtonState::Pressed
                     : PointerButtonState::Released;
                 seat->setTimestamp(event->timestamp());
-                seat->notifyPointerButton(nativeButton, state);
+                seat->notifyPointerButton(event->nativeButton(), state);
             }
         }
         return true;
@@ -520,7 +520,7 @@ public:
         : InputEventFilter(InputFilterOrder::Effects)
     {
     }
-    bool pointerEvent(MouseEvent *event, quint32 nativeButton) override
+    bool pointerEvent(MouseEvent *event) override
     {
         if (!effects) {
             return false;
@@ -608,7 +608,7 @@ public:
         : InputEventFilter(InputFilterOrder::InteractiveMoveResize)
     {
     }
-    bool pointerEvent(MouseEvent *event, quint32 nativeButton) override
+    bool pointerEvent(MouseEvent *event) override
     {
         Window *window = workspace()->moveResizeWindow();
         if (!window) {
@@ -721,7 +721,7 @@ public:
         : InputEventFilter(InputFilterOrder::WindowSelector)
     {
     }
-    bool pointerEvent(MouseEvent *event, quint32 nativeButton) override
+    bool pointerEvent(MouseEvent *event) override
     {
         if (!m_active) {
             return false;
@@ -893,7 +893,7 @@ public:
         m_powerDown.setInterval(1000);
     }
 
-    bool pointerEvent(MouseEvent *event, quint32 nativeButton) override
+    bool pointerEvent(MouseEvent *event) override
     {
         if (event->type() == QEvent::MouseButtonPress) {
             if (input()->shortcuts()->processPointerPressed(event->modifiers(), event->buttons())) {
@@ -1214,7 +1214,7 @@ public:
                                                           10, 0, kwinApp()->session()->seat(), QPointingDeviceUniqueId());
         QWindowSystemInterface::registerInputDevice(m_touchDevice.get());
     }
-    bool pointerEvent(MouseEvent *event, quint32 nativeButton) override
+    bool pointerEvent(MouseEvent *event) override
     {
         if (!input()->pointer()->focus() || !input()->pointer()->focus()->isInternal()) {
             return false;
@@ -1396,7 +1396,7 @@ public:
         : InputEventFilter(InputFilterOrder::Decoration)
     {
     }
-    bool pointerEvent(MouseEvent *event, quint32 nativeButton) override
+    bool pointerEvent(MouseEvent *event) override
     {
         auto decoration = input()->pointer()->decoration();
         if (!decoration) {
@@ -1614,7 +1614,7 @@ public:
         : InputEventFilter(InputFilterOrder::TabBox)
     {
     }
-    bool pointerEvent(MouseEvent *event, quint32 button) override
+    bool pointerEvent(MouseEvent *event) override
     {
         if (!workspace()->tabbox() || !workspace()->tabbox()->isGrabbed()) {
             return false;
@@ -1652,7 +1652,7 @@ public:
         : InputEventFilter(InputFilterOrder::ScreenEdge)
     {
     }
-    bool pointerEvent(MouseEvent *event, quint32 nativeButton) override
+    bool pointerEvent(MouseEvent *event) override
     {
         workspace()->screenEdges()->isEntered(event);
         // always forward
@@ -1712,7 +1712,7 @@ public:
         : InputEventFilter(InputFilterOrder::WindowAction)
     {
     }
-    bool pointerEvent(MouseEvent *event, quint32 nativeButton) override
+    bool pointerEvent(MouseEvent *event) override
     {
         if (event->type() == QEvent::MouseButtonPress) {
             Window *window = input()->pointer()->focus();
@@ -1802,7 +1802,7 @@ public:
     {
     }
 
-    bool pointerEvent(MouseEvent *event, quint32 nativeButton) override
+    bool pointerEvent(MouseEvent *event) override
     {
         auto inputMethod = kwinApp()->inputMethod();
         if (!inputMethod) {
@@ -1851,7 +1851,7 @@ public:
         : InputEventFilter(InputFilterOrder::Forward)
     {
     }
-    bool pointerEvent(MouseEvent *event, quint32 nativeButton) override
+    bool pointerEvent(MouseEvent *event) override
     {
         auto seat = waylandServer()->seat();
         seat->setTimestamp(event->timestamp());
@@ -1868,10 +1868,10 @@ public:
             break;
         }
         case QEvent::MouseButtonPress:
-            seat->notifyPointerButton(nativeButton, PointerButtonState::Pressed);
+            seat->notifyPointerButton(event->nativeButton(), PointerButtonState::Pressed);
             break;
         case QEvent::MouseButtonRelease:
-            seat->notifyPointerButton(nativeButton, PointerButtonState::Released);
+            seat->notifyPointerButton(event->nativeButton(), PointerButtonState::Released);
             break;
         default:
             break;
@@ -2257,7 +2257,7 @@ public:
         });
     }
 
-    bool pointerEvent(MouseEvent *event, quint32 nativeButton) override
+    bool pointerEvent(MouseEvent *event) override
     {
         auto seat = waylandServer()->seat();
         if (!seat->isDragPointer()) {
@@ -2313,12 +2313,12 @@ public:
             break;
         }
         case QEvent::MouseButtonPress:
-            seat->notifyPointerButton(nativeButton, PointerButtonState::Pressed);
+            seat->notifyPointerButton(event->nativeButton(), PointerButtonState::Pressed);
             break;
         case QEvent::MouseButtonRelease:
             raiseDragTarget();
             m_dragTarget = nullptr;
-            seat->notifyPointerButton(nativeButton, PointerButtonState::Released);
+            seat->notifyPointerButton(event->nativeButton(), PointerButtonState::Released);
             break;
         default:
             break;

src/input.h

@@ -387,16 +387,10 @@ public:
     /**
      * Event filter for pointer events which can be described by a QMouseEvent.
      *
-     * Please note that the button translation in QMouseEvent cannot cover all
-     * possible buttons. Because of that also the @p nativeButton code is passed
-     * through the filter. For internal areas it's fine to use @p event, but for
-     * passing to client windows the @p nativeButton should be used.
-     *
      * @param event The event information about the move or button press/release
-     * @param nativeButton The native key code of the button, for move events 0
      * @return @c true to stop further event processing, @c false to pass to next filter
      */
-    virtual bool pointerEvent(MouseEvent *event, quint32 nativeButton);
+    virtual bool pointerEvent(MouseEvent *event);
     virtual bool pointerFrame();
     /**
      * Event filter for pointer axis events.

src/placeholderinputeventfilter.cpp

@@ -19,7 +19,7 @@ PlaceholderInputEventFilter::PlaceholderInputEventFilter()
 {
 }
 
-bool PlaceholderInputEventFilter::pointerEvent(MouseEvent *event, quint32 nativeButton)
+bool PlaceholderInputEventFilter::pointerEvent(MouseEvent *event)
 {
     return true;
 }

src/placeholderinputeventfilter.h

@@ -17,7 +17,7 @@ class PlaceholderInputEventFilter : public InputEventFilter
 {
 public:
     PlaceholderInputEventFilter();
-    bool pointerEvent(MouseEvent *event, quint32 nativeButton) override;
+    bool pointerEvent(MouseEvent *event) override;
     bool wheelEvent(WheelEvent *event) override;
     bool keyEvent(KeyEvent *event) override;
     bool touchDown(qint32 id, const QPointF &pos, std::chrono::microseconds time) override;

src/plugins/buttonrebinds/buttonrebindsfilter.cpp

@@ -197,7 +197,7 @@ void ButtonRebindsFilter::loadConfig(const KConfigGroup &group)
     }
 }
 
-bool ButtonRebindsFilter::pointerEvent(KWin::MouseEvent *event, quint32 nativeButton)
+bool ButtonRebindsFilter::pointerEvent(KWin::MouseEvent *event)
 {
     if (event->type() != QEvent::MouseButtonPress && event->type() != QEvent::MouseButtonRelease) {
         return false;

src/plugins/buttonrebinds/buttonrebindsfilter.h

@@ -74,7 +74,7 @@ public:
 
     explicit ButtonRebindsFilter();
     ~ButtonRebindsFilter() override;
-    bool pointerEvent(KWin::MouseEvent *event, quint32 nativeButton) override;
+    bool pointerEvent(KWin::MouseEvent *event) override;
     bool tabletToolEvent(KWin::TabletEvent *event) override;
     bool tabletPadButtonEvent(KWin::TabletPadButtonEvent *event) override;
     bool tabletToolButtonEvent(KWin::TabletToolButtonEvent *event) override;

src/plugins/eis/eisinputcapturefilter.cpp

@@ -29,7 +29,7 @@ void EisInputCaptureFilter::clearTouches()
     m_touches.clear();
 }
 
-bool EisInputCaptureFilter::pointerEvent(MouseEvent *event, quint32 nativeButton)
+bool EisInputCaptureFilter::pointerEvent(MouseEvent *event)
 {
     if (!m_manager->activeCapture()) {
         return false;
@@ -38,7 +38,7 @@ bool EisInputCaptureFilter::pointerEvent(MouseEvent *event, quint32 nativeButton
         if (event->type() == QMouseEvent::MouseMove) {
             eis_device_pointer_motion(pointer, event->delta().x(), event->delta().y());
         } else if (event->type() == QMouseEvent::MouseButtonPress || event->type() == QMouseEvent::MouseButtonRelease) {
-            eis_device_button_button(pointer, nativeButton, event->type() == QMouseEvent::MouseButtonPress);
+            eis_device_button_button(pointer, event->nativeButton(), event->type() == QMouseEvent::MouseButtonPress);
         }
     }
     return true;

src/plugins/eis/eisinputcapturefilter.h

@@ -23,7 +23,7 @@ public:
 
     void clearTouches();
 
-    bool pointerEvent(MouseEvent *event, quint32 nativeButton) override;
+    bool pointerEvent(MouseEvent *event) override;
     bool pointerFrame() override;
     bool wheelEvent(WheelEvent *event) override;
 

src/pointer_input.cpp

@@ -260,7 +260,7 @@ void PointerInputRedirection::processMotionInternal(const QPointF &pos, const QP
 
     update();
     input()->processSpies(std::bind(&InputEventSpy::pointerEvent, std::placeholders::_1, &event));
-    input()->processFilters(std::bind(&InputEventFilter::pointerEvent, std::placeholders::_1, &event, 0));
+    input()->processFilters(std::bind(&InputEventFilter::pointerEvent, std::placeholders::_1, &event));
 }
 
 void PointerInputRedirection::processButton(uint32_t button, InputDevice::PointerButtonState state, std::chrono::microseconds time, InputDevice *device)
@@ -292,7 +292,7 @@ void PointerInputRedirection::processButton(uint32_t button, InputDevice::Pointe
     event.setNativeButton(button);
 
     input()->processSpies(std::bind(&InputEventSpy::pointerEvent, std::placeholders::_1, &event));
-    input()->processFilters(std::bind(&InputEventFilter::pointerEvent, std::placeholders::_1, &event, button));
+    input()->processFilters(std::bind(&InputEventFilter::pointerEvent, std::placeholders::_1, &event));
 
     if (state == InputDevice::PointerButtonReleased) {
         update();

src/popup_input_filter.cpp

@@ -48,7 +48,7 @@ void PopupInputFilter::handleWindowAdded(Window *window)
     }
 }
 
-bool PopupInputFilter::pointerEvent(MouseEvent *event, quint32 nativeButton)
+bool PopupInputFilter::pointerEvent(MouseEvent *event)
 {
     if (m_popupWindows.isEmpty()) {
         return false;

src/popup_input_filter.h

@@ -20,7 +20,7 @@ class PopupInputFilter : public QObject, public InputEventFilter
     Q_OBJECT
 public:
     explicit PopupInputFilter();
-    bool pointerEvent(MouseEvent *event, quint32 nativeButton) override;
+    bool pointerEvent(MouseEvent *event) override;
     bool keyEvent(KeyEvent *event) override;
     bool touchDown(qint32 id, const QPointF &pos, std::chrono::microseconds time) override;
     bool tabletToolEvent(TabletEvent *event) override;

src/xwayland/xwayland.cpp

@@ -426,7 +426,7 @@ public:
         return false;
     }
 
-    bool pointerEvent(KWin::MouseEvent *event, quint32 nativeButton) override
+    bool pointerEvent(KWin::MouseEvent *event) override
     {
 
         ClientConnection *xwaylandClient = waylandServer()->xWaylandConnection();