--- a/jdk/src/macosx/native/sun/awt/AWTWindow.m Fri Nov 02 16:14:14 2012 +0400
+++ b/jdk/src/macosx/native/sun/awt/AWTWindow.m Fri Nov 02 19:20:03 2012 +0400
@@ -51,6 +51,14 @@
static JNF_CLASS_CACHE(jc_CPlatformWindow, "sun/lwawt/macosx/CPlatformWindow");
+// Cocoa windowDidBecomeKey/windowDidResignKey notifications
+// doesn't provide information about "opposite" window, so we
+// have to do a bit of tracking. This variable points to a window
+// which had been the key window just before a new key window
+// was set. It would be nil if the new key window isn't an AWT
+// window or the app currently has no key window.
+static AWTWindow* lastKeyWindow = nil;
+
// --------------------------------------------------------------
// NSWindow/NSPanel descendants implementation
#define AWT_NS_WINDOW_IMPLEMENTATION \
@@ -505,15 +513,17 @@
[self _deliverIconify:JNI_FALSE];
}
-- (void) _deliverWindowFocusEvent:(BOOL)focused {
+- (void) _deliverWindowFocusEvent:(BOOL)focused oppositeWindow:(AWTWindow *)opposite {
//AWT_ASSERT_APPKIT_THREAD;
-
JNIEnv *env = [ThreadUtilities getJNIEnvUncached];
jobject platformWindow = [self.javaPlatformWindow jObjectWithEnv:env];
if (platformWindow != NULL) {
- static JNF_MEMBER_CACHE(jm_deliverWindowFocusEvent, jc_CPlatformWindow, "deliverWindowFocusEvent", "(Z)V");
- JNFCallVoidMethod(env, platformWindow, jm_deliverWindowFocusEvent, (jboolean)focused);
+ jobject oppositeWindow = [opposite.javaPlatformWindow jObjectWithEnv:env];
+
+ static JNF_MEMBER_CACHE(jm_deliverWindowFocusEvent, jc_CPlatformWindow, "deliverWindowFocusEvent", "(ZLsun/lwawt/macosx/CPlatformWindow;)V");
+ JNFCallVoidMethod(env, platformWindow, jm_deliverWindowFocusEvent, (jboolean)focused, oppositeWindow);
(*env)->DeleteLocalRef(env, platformWindow);
+ (*env)->DeleteLocalRef(env, oppositeWindow);
}
}
@@ -522,7 +532,10 @@
AWT_ASSERT_APPKIT_THREAD;
[AWTToolkit eventCountPlusPlus];
[CMenuBar activate:self.javaMenuBar modallyDisabled:NO];
- [self _deliverWindowFocusEvent:YES];
+ AWTWindow *opposite = [AWTWindow lastKeyWindow];
+ [AWTWindow setLastKeyWindow:nil];
+
+ [self _deliverWindowFocusEvent:YES oppositeWindow: opposite];
}
- (void) windowDidResignKey: (NSNotification *) notification {
@@ -530,7 +543,18 @@
AWT_ASSERT_APPKIT_THREAD;
[AWTToolkit eventCountPlusPlus];
[self.javaMenuBar deactivate];
- [self _deliverWindowFocusEvent:NO];
+
+ // the new key window
+ NSWindow *keyWindow = [NSApp keyWindow];
+ AWTWindow *opposite = nil;
+ if ([AWTWindow isAWTWindow: keyWindow]) {
+ opposite = (AWTWindow *)[keyWindow delegate];
+ [AWTWindow setLastKeyWindow: self];
+ } else {
+ [AWTWindow setLastKeyWindow: nil];
+ }
+
+ [self _deliverWindowFocusEvent:NO oppositeWindow: opposite];
}
- (void) windowDidBecomeMain: (NSNotification *) notification {
@@ -684,6 +708,17 @@
}
}
++ (void) setLastKeyWindow:(AWTWindow *)window {
+ [window retain];
+ [lastKeyWindow release];
+ lastKeyWindow = window;
+}
+
++ (AWTWindow *) lastKeyWindow {
+ return lastKeyWindow;
+}
+
+
@end // AWTWindow
@@ -1208,6 +1243,10 @@
[JNFRunLoop performOnMainThreadWaiting:NO withBlock:^(){
AWTWindow *window = (AWTWindow*)[nsWindow delegate];
+ if ([AWTWindow lastKeyWindow] == window) {
+ [AWTWindow setLastKeyWindow: nil];
+ }
+
// AWTWindow holds a reference to the NSWindow in its nsWindow
// property. Unsetting the delegate allows it to be deallocated
// which releases the reference. This, in turn, allows the window