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-02 19:03:26 -0700
commit9d7e6fd72b47da3b3ed5f0b75b047e59b3097849 (patch)
tree137da622930544e0cca6048ce17bc95c445496ec
parentc292b166ea2aa1407a441e10a6826b16eaf5b79e (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));