fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2025-12-20 07:00:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

XQuartz: Ensure scroll events are delivered to a single window (not both X11 and AppKit)

Browse source 
Fixes: https://github.com/XQuartz/XQuartz/issues/130
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
(cherry picked from commit 4532b696c6)
This commit is contained in:
Jeremy Huddleston Sequoia 2022-06-16 00:10:26 -07:00
parent 64b2987c45
commit f1a8f0d215
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
hw/xquartz/X11Application.m
View file

@ -315,6 +315,8 @@ message_kit_thread(SEL selector, NSObject *arg)
case NSLeftMouseUp: case NSLeftMouseUp:
case NSRightMouseUp: case NSRightMouseUp:
case NSOtherMouseUp: case NSOtherMouseUp:
case NSScrollWheel:
if ([e window] != nil) { if ([e window] != nil) {
/* Pointer event has an (AppKit) window. Probably something for the kit. */ /* Pointer event has an (AppKit) window. Probably something for the kit. */
for_x = NO; for_x = NO;
@ -532,12 +534,14 @@ message_kit_thread(SEL selector, NSObject *arg)
break; /* for gcc */ break; /* for gcc */
} }
if (for_appkit) [super sendEvent:e]; if (for_appkit) {
[super sendEvent:e];
}
if (for_x) { if (for_x) {
dispatch_async(eventTranslationQueue, ^{ dispatch_async(eventTranslationQueue, ^{
[self sendX11NSEvent:e]; [self sendX11NSEvent:e];
}); });
} }
} }