Merge pull request #295 from guillep/fix/osx/events

Do only handle events that correspond to the VM window
OpenSmalltalk · Oct 23, 2018 · 671517e · 671517e
2 parents cdbc68e + d63dedc
commit 671517e
Showing 1 changed file with 18 additions and 0 deletions.
diff --git a/platforms/iOS/vm/OSX/sqSqueakOSXApplication+events.m b/platforms/iOS/vm/OSX/sqSqueakOSXApplication+events.m
@@ -70,10 +70,28 @@ @implementation sqSqueakOSXApplication (events)
 - (void) pumpRunLoopEventSendAndSignal:(BOOL)signal {
     NSEvent *event;
 
+#ifdef PharoVM
+    while ((event = [gDelegateApp.window nextEventMatchingMask:NSEventMaskAny
+                                       untilDate:nil
+                                          inMode:NSEventTrackingRunLoopMode
+                                         dequeue:NO])) {
+        if (event.window == 0 || event.window == gDelegateApp.window) {
+          event = [gDelegateApp.window nextEventMatchingMask:NSEventMaskAny
+                                                 untilDate:nil
+                                                    inMode:NSEventTrackingRunLoopMode
+                                                   dequeue:YES];
+        }
+        else{
+          // STOP THE LOOP
+          // We have an event that does not correspond to our window
+          break;
+        }
+#else
     while ((event = [NSApp nextEventMatchingMask:NSEventMaskAny
                                        untilDate:nil
                                           inMode:NSEventTrackingRunLoopMode
                                          dequeue:YES])) {
+#endif
         [NSApp sendEvent: event];
         if (signal) {
             interpreterProxy->signalSemaphoreWithIndex(gDelegateApp.squeakApplication.inputSemaphoreIndex);