jdk-sandbox: comparison jdk/src/macosx/native/sun/awt/AWTWindow.m

equal deleted inserted replaced

-:5270c932737d
+:de61414bbcf2
 [self setPropertiesForStyleBits:styleBits mask:MASK(_METHOD_PROP_BITMASK)];
 return self;
 }
-// checks that this window is under the mouse cursor and this point is not overlapped by others windows
++ (BOOL) isAWTWindow:(NSWindow *)window {
-- (BOOL) isTopmostWindowUnderMouse {
+return [window isKindOfClass: [AWTWindow_Panel class]] || [window isKindOfClass: [AWTWindow_Normal class]];
+}
-int currentWinID = [self.nsWindow windowNumber];
+// returns id for the topmost window under mouse
++ (NSInteger) getTopmostWindowUnderMouseID {
 NSRect screenRect = [[NSScreen mainScreen] frame];
 NSPoint nsMouseLocation = [NSEvent mouseLocation];
 CGPoint cgMouseLocation = CGPointMake(nsMouseLocation.x, screenRect.size.height - nsMouseLocation.y);
 NSMutableArray *windows = (NSMutableArray *)CGWindowListCopyWindowInfo(kCGWindowListOptionOnScreenOnly | kCGWindowListExcludeDesktopElements, kCGNullWindowID);
 for (NSDictionary *window in windows) {
-int layer = [[window objectForKey:(id)kCGWindowLayer] intValue];
+NSInteger layer = [[window objectForKey:(id)kCGWindowLayer] integerValue];
 if (layer == 0) {
-int winID = [[window objectForKey:(id)kCGWindowNumber] intValue];
 CGRect rect;
 CGRectMakeWithDictionaryRepresentation((CFDictionaryRef)[window objectForKey:(id)kCGWindowBounds], &rect);
 if (CGRectContainsPoint(rect, cgMouseLocation)) {
-return currentWinID == winID;
+return [[window objectForKey:(id)kCGWindowNumber] integerValue];
-} else if (currentWinID == winID) {
-return NO;
 }
 }
 }
-return NO;
+return -1;
 }
-- (void) synthesizeMouseEnteredExitedEvents {
+// checks that this window is under the mouse cursor and this point is not overlapped by others windows
+- (BOOL) isTopmostWindowUnderMouse {
-int eventType = 0;
+return [self.nsWindow windowNumber] == [AWTWindow getTopmostWindowUnderMouseID];
-BOOL isUnderMouse = [self isTopmostWindowUnderMouse];
+}
-BOOL mouseIsOver = [[self.nsWindow contentView] mouseIsOver];
++ (AWTWindow *) getTopmostWindowUnderMouse {
-if (isUnderMouse && !mouseIsOver) {
+NSEnumerator *windowEnumerator = [[NSApp windows] objectEnumerator];
-eventType = NSMouseEntered;
+NSWindow *window;
-} else if (!isUnderMouse && mouseIsOver) {
-eventType = NSMouseExited;
+NSInteger topmostWindowUnderMouseID = [AWTWindow getTopmostWindowUnderMouseID];
-} else {
-return;
+while ((window = [windowEnumerator nextObject]) != nil) {
-}
+if ([window windowNumber] == topmostWindowUnderMouseID) {
+BOOL isAWTWindow = [AWTWindow isAWTWindow: window];
+return isAWTWindow ? (AWTWindow *) [window delegate] : nil;
+}
+}
+return nil;
+}
++ (void) synthesizeMouseEnteredExitedEvents:(NSWindow*)window withType:(NSEventType)eventType {
 NSPoint screenLocation = [NSEvent mouseLocation];
-NSPoint windowLocation = [self.nsWindow convertScreenToBase: screenLocation];
+NSPoint windowLocation = [window convertScreenToBase: screenLocation];
 int modifierFlags = (eventType == NSMouseEntered) ? NSMouseEnteredMask : NSMouseExitedMask;
 NSEvent *mouseEvent = [NSEvent enterExitEventWithType: eventType
 location: windowLocation
 modifierFlags: modifierFlags
 timestamp: 0
-windowNumber: [self.nsWindow windowNumber]
+windowNumber: [window windowNumber]
 context: nil
 eventNumber: 0
 trackingNumber: 0
 userData: nil
 ];
-[[self.nsWindow contentView] deliverJavaMouseEvent: mouseEvent];
+[[window contentView] deliverJavaMouseEvent: mouseEvent];
+}
++ (void) synthesizeMouseEnteredExitedEventsForAllWindows {
+NSInteger topmostWindowUnderMouseID = [AWTWindow getTopmostWindowUnderMouseID];
+NSArray *windows = [NSApp windows];
+NSWindow *window;
+NSEnumerator *windowEnumerator = [windows objectEnumerator];
+while ((window = [windowEnumerator nextObject]) != nil) {
+if ([AWTWindow isAWTWindow: window]) {
+BOOL isUnderMouse = ([window windowNumber] == topmostWindowUnderMouseID);
+BOOL mouseIsOver = [[window contentView] mouseIsOver];
+if (isUnderMouse && !mouseIsOver) {
+[AWTWindow synthesizeMouseEnteredExitedEvents:window withType:NSMouseEntered];
+} else if (!isUnderMouse && mouseIsOver) {
+[AWTWindow synthesizeMouseEnteredExitedEvents:window withType:NSMouseExited];
+}
+}
+}
 }
 - (void) dealloc {
 AWT_ASSERT_APPKIT_THREAD;
 // ensure we repaint the whole window after the resize operation
 // (this will also re-enable screen updates, which were disabled above)
 // TODO: send PaintEvent
-[window synthesizeMouseEnteredExitedEvents];
+[AWTWindow synthesizeMouseEnteredExitedEventsForAllWindows];
 }];
 JNF_COCOA_EXIT(env);
 }
 JNF_COCOA_EXIT(env);
 }
 /*
 * Class:     sun_lwawt_macosx_CPlatformWindow
+* Method:    nativeGetTopmostPlatformWindowUnderMouse
+* Signature: (J)V
+*/
+JNIEXPORT jobject
+JNICALL Java_sun_lwawt_macosx_CPlatformWindow_nativeGetTopmostPlatformWindowUnderMouse
+(JNIEnv *env, jclass clazz)
+{
+jobject topmostWindowUnderMouse = nil;
+JNF_COCOA_ENTER(env);
+AWT_ASSERT_APPKIT_THREAD;
+AWTWindow *awtWindow = [AWTWindow getTopmostWindowUnderMouse];
+if (awtWindow != nil) {
+topmostWindowUnderMouse = [awtWindow.javaPlatformWindow jObject];
+}
+JNF_COCOA_EXIT(env);
+return topmostWindowUnderMouse;
+}
+/*
+* Class:     sun_lwawt_macosx_CPlatformWindow
 * Method:    nativeSynthesizeMouseEnteredExitedEvents
 * Signature: (J)V
 */
 JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CPlatformWindow_nativeSynthesizeMouseEnteredExitedEvents
-(JNIEnv *env, jclass clazz, jlong windowPtr)
+(JNIEnv *env, jclass clazz)
 {
 JNF_COCOA_ENTER(env);
 AWT_ASSERT_NOT_APPKIT_THREAD;
-NSWindow *nsWindow = OBJC(windowPtr);
 [JNFRunLoop performOnMainThreadWaiting:NO withBlock:^(){
 AWT_ASSERT_APPKIT_THREAD;
+[AWTWindow synthesizeMouseEnteredExitedEventsForAllWindows];
-AWTWindow *window = (AWTWindow*)[nsWindow delegate];
-[window synthesizeMouseEnteredExitedEvents];
 }];
 JNF_COCOA_EXIT(env);
 }

changeset 13647	de61414bbcf2
parent 13233	4d45f7ebc0d7
child 13777	c94cf7e1bac2