From b916ac74e27ce8998ac0866bb2b39dcd378e0182 Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Date: Fri, 2 Oct 2009 18:58:35 -0700 Subject: [PATCH] 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) --- hw/xquartz/X11Application.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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));