Module: wine Branch: master Commit: 893080e4df5a45929320ebb88b8668eea316476c URL: https://source.winehq.org/git/wine.git/?a=commit;h=893080e4df5a45929320ebb88...
Author: Murray Colpman muzer@tim32.org Date: Tue May 12 00:39:02 2020 +0100
winex11.drv: Interpret mouse 6/7 as horiz scroll.
X11 Mouse buttons 6 and 7 were set to translate into browser back/forward button events. However, this is based on an old convention where buttons 6 and 7 could either mean horizontal scroll or browser back/forward. Nowadays, 6 and 7 solely mean horizontal scroll, 8 and 9 being used for back/forward. In addition, the wide adoption of two-finger two-dimensional scrolling on laptop trackpads since this code was written has meant that back/forward events may be generated unintentionally, which can be very disruptive when using tools such as web browsers.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49142 Signed-off-by: Murray Colpman muzer@tim32.org Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/winex11.drv/mouse.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index d4bfc5a196..d78449c2cc 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -74,8 +74,8 @@ static const UINT button_down_flags[NB_BUTTONS] = MOUSEEVENTF_RIGHTDOWN, MOUSEEVENTF_WHEEL, MOUSEEVENTF_WHEEL, - MOUSEEVENTF_XDOWN, /* FIXME: horizontal wheel */ - MOUSEEVENTF_XDOWN, + MOUSEEVENTF_HWHEEL, + MOUSEEVENTF_HWHEEL, MOUSEEVENTF_XDOWN, MOUSEEVENTF_XDOWN }; @@ -87,8 +87,8 @@ static const UINT button_up_flags[NB_BUTTONS] = MOUSEEVENTF_RIGHTUP, 0, 0, - MOUSEEVENTF_XUP, - MOUSEEVENTF_XUP, + 0, + 0, MOUSEEVENTF_XUP, MOUSEEVENTF_XUP }; @@ -100,8 +100,8 @@ static const UINT button_down_data[NB_BUTTONS] = 0, WHEEL_DELTA, -WHEEL_DELTA, - XBUTTON1, - XBUTTON2, + -WHEEL_DELTA, + WHEEL_DELTA, XBUTTON1, XBUTTON2 }; @@ -113,8 +113,8 @@ static const UINT button_up_data[NB_BUTTONS] = 0, 0, 0, - XBUTTON1, - XBUTTON2, + 0, + 0, XBUTTON1, XBUTTON2 };