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:01:48 -0700
commit3fc87c3b1054c5ec4811cd1a99c79eddd2ef6f34 (patch)
tree67c1c5200512bba008753f44066fd287a032ec20
parent293c318c85deb022fdaae460a33cf57c6a1e6931 (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));