summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <jeremyhu@freedesktop.org>2009-10-02 18:58:35 -0700
committerJeremy Huddleston <jeremyhu@freedesktop.org>2009-10-07 18:13:03 -0700
commitb916ac74e27ce8998ac0866bb2b39dcd378e0182 (patch)
tree02cec802353c0ad1f9626d8c44e9ff36f11c9e04
parenta4ce2aa6348ecca3a5b1ac8d87caf974bdad3455 (diff)
XQuartz: Send mouse location with scroll events.
This fixes the problem where (0, 0) was sent as the mouse location with scroll button events causing the event to not reach the client. (cherry picked from commit c4886fbabc1d8b4054654b227fcad83f58e8e798)
-rw-r--r--hw/xquartz/X11Application.m2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m
index 749a8932b..f4fbb1abe 100644
--- a/hw/xquartz/X11Application.m
+++ b/hw/xquartz/X11Application.m
@@ -986,7 +986,7 @@ static inline int ensure_flag(int flags, int device_independent, int device_depe
isMouseOrTabletEvent = [e type] == NSLeftMouseDown || [e type] == NSOtherMouseDown || [e type] == NSRightMouseDown ||
[e type] == NSLeftMouseUp || [e type] == NSOtherMouseUp || [e type] == NSRightMouseUp ||
[e type] == NSLeftMouseDragged || [e type] == NSOtherMouseDragged || [e type] == NSRightMouseDragged ||
- [e type] == NSMouseMoved || [e type] == NSTabletPoint;
+ [e type] == NSMouseMoved || [e type] == NSTabletPoint || [e type] == NSScrollWheel;
isTabletEvent = ([e type] == NSTabletPoint) ||
(isMouseOrTabletEvent && ([e subtype] == NSTabletPointEventSubtype || [e subtype] == NSTabletProximityEventSubtype));