mirror of
https://github.com/X11Libre/xserver.git
synced 2026-04-14 17:18:09 +00:00
XQuartz: Ensure scroll events are delivered to a single window (not both X11 and AppKit)
Fixes: https://github.com/XQuartz/XQuartz/issues/130 Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
This commit is contained in:
@@ -267,6 +267,8 @@ QuartzModeBundleInit(void);
|
||||
case NSLeftMouseUp:
|
||||
case NSRightMouseUp:
|
||||
case NSOtherMouseUp:
|
||||
case NSScrollWheel:
|
||||
|
||||
if ([e window] != nil) {
|
||||
/* Pointer event has an (AppKit) window. Probably something for the kit. */
|
||||
for_x = NO;
|
||||
@@ -466,12 +468,14 @@ QuartzModeBundleInit(void);
|
||||
break; /* for gcc */
|
||||
}
|
||||
|
||||
if (for_appkit) [super sendEvent:e];
|
||||
if (for_appkit) {
|
||||
[super sendEvent:e];
|
||||
}
|
||||
|
||||
if (for_x) {
|
||||
dispatch_async(eventTranslationQueue, ^{
|
||||
[self sendX11NSEvent:e];
|
||||
});
|
||||
[self sendX11NSEvent:e];
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user