8332947: [macos] OpenURIHandler events not received when AWT is embedded in another toolkit

Reviewed-by: kcr, honkar, prr

Author: Paul H

src/java.desktop/macosx/native/libawt_lwawt/awt/ApplicationDelegate.m

@@ -43,6 +43,11 @@
 // The following is a AWT convention?
 #define PREFERENCES_TAG  42
 
+// Custom event that is provided by AWT to allow libraries like
+// JavaFX to forward native events to AWT even if AWT runs in
+// embedded mode.
+static NSString* awtEmbeddedEvent = @"AWTEmbeddedEvent";
+
 static void addMenuItem(NSMenuItem* menuItem, NSInteger index) {
 AWT_ASSERT_APPKIT_THREAD;
 
@@ -125,6 +130,14 @@ + (ApplicationDelegate *)sharedDelegate {
             isApplicationOwner = YES;
         }
     }
+
+    if (!isApplicationOwner) {
+        // Register embedded event listener
+        NSNotificationCenter *ctr = [NSNotificationCenter defaultCenter];
+        Class clz = [ApplicationDelegate class];
+        [ctr addObserver:clz selector:@selector(_embeddedEvent:) name:awtEmbeddedEvent object:nil];
+    }
+
     checked = YES;
     if (!shouldInstall) {
         [ThreadUtilities setApplicationOwner:NO];
@@ -290,11 +303,16 @@ - (void)dealloc {
     GET_CLASS_RETURN(sjc_AppEventHandler, "com/apple/eawt/_AppEventHandler", ret);
 
 - (void)_handleOpenURLEvent:(NSAppleEventDescriptor *)openURLEvent withReplyEvent:(NSAppleEventDescriptor *)replyEvent {
-AWT_ASSERT_APPKIT_THREAD;
     if (!fHandlesURLTypes) return;
 
     NSString *url = [[openURLEvent paramDescriptorForKeyword:keyDirectObject] stringValue];
+    [ApplicationDelegate _openURL:url];
+
+    [replyEvent insertDescriptor:[NSAppleEventDescriptor nullDescriptor] atIndex:0];
+}
 
++ (void)_openURL:(NSString *)url {
+AWT_ASSERT_APPKIT_THREAD;
     //fprintf(stderr,"jm_handleOpenURL\n");
     JNIEnv *env = [ThreadUtilities getJNIEnv];
     jstring jURL = NSStringToJavaString(env, url);
@@ -303,8 +321,6 @@ - (void)_handleOpenURLEvent:(NSAppleEventDescriptor *)openURLEvent withReplyEven
     (*env)->CallStaticVoidMethod(env, sjc_AppEventHandler, jm_handleOpenURI, jURL);
     CHECK_EXCEPTION();
     (*env)->DeleteLocalRef(env, jURL);
-
-    [replyEvent insertDescriptor:[NSAppleEventDescriptor nullDescriptor] atIndex:0];
 }
 
 // Helper for both open file and print file methods
@@ -475,6 +491,15 @@ + (void)_systemDidWake {
     [self _notifyJava:com_apple_eawt__AppEventHandler_NOTIFY_SYSTEM_WAKE];
 }
 
++ (void)_embeddedEvent:(NSNotification *)notification {
+    NSString *name = notification.userInfo[@"name"];
+
+    if ([name isEqualToString:@"openURL"]) {
+        NSString *url = notification.userInfo[@"url"];
+        [ApplicationDelegate _openURL:url];
+    }
+}
+
 + (void)_registerForNotification:(NSNumber *)notificationTypeNum {
     NSNotificationCenter *ctr = [[NSWorkspace sharedWorkspace] notificationCenter];
     Class clz = [ApplicationDelegate class];