smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: scroll Issue on X11 by not checking for wheel in mapButtonToX

Browse source
This commit is contained in:
sithlord48 2026-02-03 09:10:05 -05:00 committed by Chris Rizzitello
parent be4e861604
commit 4200de66ee
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/lib/deskflow/MouseTypes.h
View file

@ -26,6 +26,10 @@ static const ButtonID kButtonExtra1 = 5;
static const ButtonID kMacButtonRight = 2; static const ButtonID kMacButtonRight = 2;
static const ButtonID kMacButtonMiddle = 3; static const ButtonID kMacButtonMiddle = 3;
// Only used for X11 Scroll Wheel
static const ButtonID kX11ScrollWheelUp = 255;
static const ButtonID kX11ScrollWheelDown = 254;
//@} //@}
static const uint8_t NumButtonIDs = 6; static const uint8_t NumButtonIDs = 6;

6
src/lib/platform/XWindowsScreen.cpp
View file

@ -800,7 +800,7 @@ void XWindowsScreen::fakeMouseWheel(int32_t, int32_t yDelta) const
yDelta = mapClientScrollDirection(yDelta); yDelta = mapClientScrollDirection(yDelta);
// choose button depending on rotation direction // choose button depending on rotation direction
const unsigned int xButton = mapButtonToX(static_cast<ButtonID>((yDelta >= 0) ? -1 : -2)); const unsigned int xButton = mapButtonToX(yDelta >= 0 ? kX11ScrollWheelUp : kX11ScrollWheelDown);
if (xButton == 0) { if (xButton == 0) {
// If we get here, then the XServer does not support the scroll // If we get here, then the XServer does not support the scroll
// wheel buttons, so send PageUp/PageDown keystrokes instead. // wheel buttons, so send PageUp/PageDown keystrokes instead.
@ -1764,6 +1764,10 @@ unsigned int XWindowsScreen::mapButtonToX(ButtonID id) const
case kButtonRight: case kButtonRight:
case kButtonMiddle: case kButtonMiddle:
return static_cast<uint>(id); return static_cast<uint>(id);
case kX11ScrollWheelUp:
return 4;
case kX11ScrollWheelDown:
return 5;
case kButtonExtra0: case kButtonExtra0:
return 8; return 8;
case kButtonExtra1: case kButtonExtra1: