stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8259651: [macOS] Replace JNF_COCOA_ENTER/EXIT macros

Browse Source 
Reviewed-by: serb
This commit is contained in:
Phil Race 2021-01-15 17:04:53 +00:00
parent 360c7226a7
commit 5855d52a2a
48 changed files with 583 additions and 544 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/java.desktop/macosx/native/libawt_lwawt/awt/AWTEvent.m
View File

@ -27,7 +27,7 @@
#import "java_awt_event_KeyEvent.h" #import "java_awt_event_KeyEvent.h"
#import "LWCToolkit.h" #import "LWCToolkit.h"
#import "jni_util.h" #import "JNIUtilities.h"
#import <JavaNativeFoundation/JavaNativeFoundation.h> #import <JavaNativeFoundation/JavaNativeFoundation.h>
#import <sys/time.h> #import <sys/time.h>
@ -668,11 +668,11 @@ Java_sun_lwawt_macosx_NSEvent_nsToJavaModifiers
{ {
jint jmodifiers = 0; jint jmodifiers = 0;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
jmodifiers = GetJavaMouseModifiers(modifierFlags); jmodifiers = GetJavaMouseModifiers(modifierFlags);
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return jmodifiers; return jmodifiers;
} }
@ -688,7 +688,7 @@ Java_sun_lwawt_macosx_NSEvent_nsToJavaKeyInfo
{ {
BOOL postsTyped = NO; BOOL postsTyped = NO;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
jboolean copy = JNI_FALSE; jboolean copy = JNI_FALSE;
jint *data = (*env)->GetIntArrayElements(env, inData, &copy); jint *data = (*env)->GetIntArrayElements(env, inData, &copy);
@ -716,7 +716,7 @@ JNF_COCOA_ENTER(env);
(*env)->ReleaseIntArrayElements(env, inData, data, 0); (*env)->ReleaseIntArrayElements(env, inData, data, 0);
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return postsTyped; return postsTyped;
} }
@ -730,7 +730,7 @@ JNIEXPORT void JNICALL
Java_sun_lwawt_macosx_NSEvent_nsKeyModifiersToJavaKeyInfo Java_sun_lwawt_macosx_NSEvent_nsKeyModifiersToJavaKeyInfo
(JNIEnv *env, jclass cls, jintArray inData, jintArray outData) (JNIEnv *env, jclass cls, jintArray inData, jintArray outData)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
jboolean copy = JNI_FALSE; jboolean copy = JNI_FALSE;
jint *data = (*env)->GetIntArrayElements(env, inData, &copy); jint *data = (*env)->GetIntArrayElements(env, inData, &copy);
@ -757,7 +757,7 @@ JNF_COCOA_ENTER(env);
(*env)->ReleaseIntArrayElements(env, inData, data, 0); (*env)->ReleaseIntArrayElements(env, inData, data, 0);
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -771,11 +771,11 @@ Java_sun_lwawt_macosx_NSEvent_nsToJavaChar
{ {
jchar javaChar = 0; jchar javaChar = 0;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
javaChar = NsCharToJavaChar(nsChar, modifierFlags, spaceKeyTyped); javaChar = NsCharToJavaChar(nsChar, modifierFlags, spaceKeyTyped);
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return javaChar; return javaChar;
} }

9
src/java.desktop/macosx/native/libawt_lwawt/awt/AWTSurfaceLayers.m
View File

@ -26,6 +26,7 @@
#import "AWTSurfaceLayers.h" #import "AWTSurfaceLayers.h"
#import "ThreadUtilities.h" #import "ThreadUtilities.h"
#import "LWCToolkit.h" #import "LWCToolkit.h"
#import "JNIUtilities.h"
#import <JavaNativeFoundation/JavaNativeFoundation.h> #import <JavaNativeFoundation/JavaNativeFoundation.h>
#import <QuartzCore/CATransaction.h> #import <QuartzCore/CATransaction.h>
@ -101,7 +102,7 @@ Java_sun_lwawt_macosx_CPlatformComponent_nativeCreateComponent
{ {
__block AWTSurfaceLayers *surfaceLayers = nil; __block AWTSurfaceLayers *surfaceLayers = nil;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
[ThreadUtilities performOnMainThreadWaiting:YES block:^(){ [ThreadUtilities performOnMainThreadWaiting:YES block:^(){
@ -109,7 +110,7 @@ JNF_COCOA_ENTER(env);
surfaceLayers = [[AWTSurfaceLayers alloc] initWithWindowLayer: windowLayer]; surfaceLayers = [[AWTSurfaceLayers alloc] initWithWindowLayer: windowLayer];
}]; }];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return ptr_to_jlong(surfaceLayers); return ptr_to_jlong(surfaceLayers);
} }
@ -122,7 +123,7 @@ JNF_COCOA_EXIT(env);
JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CPlatformComponent_nativeSetBounds JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CPlatformComponent_nativeSetBounds
(JNIEnv *env, jclass clazz, jlong surfaceLayersPtr, jint x, jint y, jint width, jint height) (JNIEnv *env, jclass clazz, jlong surfaceLayersPtr, jint x, jint y, jint width, jint height)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
AWTSurfaceLayers *surfaceLayers = OBJC(surfaceLayersPtr); AWTSurfaceLayers *surfaceLayers = OBJC(surfaceLayersPtr);
@ -132,5 +133,5 @@ JNF_COCOA_ENTER(env);
[surfaceLayers setBounds: rect]; [surfaceLayers setBounds: rect];
}]; }];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }

20
src/java.desktop/macosx/native/libawt_lwawt/awt/AWTView.m
View File

@ -1404,7 +1404,7 @@ Java_sun_lwawt_macosx_CPlatformView_nativeCreateView
{ {
__block AWTView *newView = nil; __block AWTView *newView = nil;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
NSRect rect = NSMakeRect(originX, originY, width, height); NSRect rect = NSMakeRect(originX, originY, width, height);
jobject cPlatformView = (*env)->NewWeakGlobalRef(env, obj); jobject cPlatformView = (*env)->NewWeakGlobalRef(env, obj);
@ -1417,7 +1417,7 @@ Java_sun_lwawt_macosx_CPlatformView_nativeCreateView
windowLayer:windowLayer]; windowLayer:windowLayer];
}]; }];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return ptr_to_jlong(newView); return ptr_to_jlong(newView);
} }
@ -1432,7 +1432,7 @@ JNIEXPORT void JNICALL
Java_sun_lwawt_macosx_CPlatformView_nativeSetAutoResizable Java_sun_lwawt_macosx_CPlatformView_nativeSetAutoResizable
(JNIEnv *env, jclass cls, jlong viewPtr, jboolean toResize) (JNIEnv *env, jclass cls, jlong viewPtr, jboolean toResize)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
NSView *view = (NSView *)jlong_to_ptr(viewPtr); NSView *view = (NSView *)jlong_to_ptr(viewPtr);
@ -1449,7 +1449,7 @@ Java_sun_lwawt_macosx_CPlatformView_nativeSetAutoResizable
} }
}]; }];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -1464,7 +1464,7 @@ Java_sun_lwawt_macosx_CPlatformView_nativeGetNSViewDisplayID
{ {
__block jint ret; //CGDirectDisplayID __block jint ret; //CGDirectDisplayID
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
NSView *view = (NSView *)jlong_to_ptr(viewPtr); NSView *view = (NSView *)jlong_to_ptr(viewPtr);
[ThreadUtilities performOnMainThreadWaiting:YES block:^(){ [ThreadUtilities performOnMainThreadWaiting:YES block:^(){
@ -1472,7 +1472,7 @@ Java_sun_lwawt_macosx_CPlatformView_nativeGetNSViewDisplayID
ret = (jint)[[AWTWindow getNSWindowDisplayID_AppKitThread: window] intValue]; ret = (jint)[[AWTWindow getNSWindowDisplayID_AppKitThread: window] intValue];
}]; }];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return ret; return ret;
} }
@ -1489,7 +1489,7 @@ Java_sun_lwawt_macosx_CPlatformView_nativeGetLocationOnScreen
{ {
jobject jRect = NULL; jobject jRect = NULL;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
__block NSRect rect = NSZeroRect; __block NSRect rect = NSZeroRect;
@ -1505,7 +1505,7 @@ Java_sun_lwawt_macosx_CPlatformView_nativeGetLocationOnScreen
}]; }];
jRect = NSToJavaRect(env, rect); jRect = NSToJavaRect(env, rect);
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return jRect; return jRect;
} }
@ -1521,7 +1521,7 @@ JNIEXPORT jboolean JNICALL Java_sun_lwawt_macosx_CPlatformView_nativeIsViewUnder
{ {
__block jboolean underMouse = JNI_FALSE; __block jboolean underMouse = JNI_FALSE;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
NSView *nsView = OBJC(viewPtr); NSView *nsView = OBJC(viewPtr);
[ThreadUtilities performOnMainThreadWaiting:YES block:^(){ [ThreadUtilities performOnMainThreadWaiting:YES block:^(){
@ -1530,7 +1530,7 @@ JNIEXPORT jboolean JNICALL Java_sun_lwawt_macosx_CPlatformView_nativeIsViewUnder
underMouse = [nsView hitTest:ptViewCoords] != nil; underMouse = [nsView hitTest:ptViewCoords] != nil;
}]; }];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return underMouse; return underMouse;
} }

102
src/java.desktop/macosx/native/libawt_lwawt/awt/AWTWindow.m
View File

@ -1101,7 +1101,7 @@ JNIEXPORT jlong JNICALL Java_sun_lwawt_macosx_CPlatformWindow_nativeCreateNSWind
{ {
__block AWTWindow *window = nil; __block AWTWindow *window = nil;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
JNFWeakJObjectWrapper *platformWindow = [JNFWeakJObjectWrapper wrapperWithJObject:obj withEnv:env]; JNFWeakJObjectWrapper *platformWindow = [JNFWeakJObjectWrapper wrapperWithJObject:obj withEnv:env];
NSView *contentView = OBJC(contentViewPtr); NSView *contentView = OBJC(contentViewPtr);
@ -1119,7 +1119,7 @@ JNF_COCOA_ENTER(env);
if (window) [window.nsWindow retain]; if (window) [window.nsWindow retain];
}]; }];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return ptr_to_jlong(window ? window.nsWindow : nil); return ptr_to_jlong(window ? window.nsWindow : nil);
} }
@ -1132,7 +1132,7 @@ JNF_COCOA_EXIT(env);
JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CPlatformWindow_nativeSetNSWindowStyleBits JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CPlatformWindow_nativeSetNSWindowStyleBits
(JNIEnv *env, jclass clazz, jlong windowPtr, jint mask, jint bits) (JNIEnv *env, jclass clazz, jlong windowPtr, jint mask, jint bits)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
NSWindow *nsWindow = OBJC(windowPtr); NSWindow *nsWindow = OBJC(windowPtr);
@ -1180,7 +1180,7 @@ JNF_COCOA_ENTER(env);
} }
}]; }];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -1191,7 +1191,7 @@ JNF_COCOA_EXIT(env);
JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CPlatformWindow_nativeSetNSWindowMenuBar JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CPlatformWindow_nativeSetNSWindowMenuBar
(JNIEnv *env, jclass clazz, jlong windowPtr, jlong menuBarPtr) (JNIEnv *env, jclass clazz, jlong windowPtr, jlong menuBarPtr)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
NSWindow *nsWindow = OBJC(windowPtr); NSWindow *nsWindow = OBJC(windowPtr);
CMenuBar *menuBar = OBJC(menuBarPtr); CMenuBar *menuBar = OBJC(menuBarPtr);
@ -1215,7 +1215,7 @@ JNF_COCOA_ENTER(env);
} }
}]; }];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -1228,7 +1228,7 @@ JNIEXPORT jobject JNICALL Java_sun_lwawt_macosx_CPlatformWindow_nativeGetNSWindo
{ {
jobject ret = NULL; jobject ret = NULL;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
NSWindow *nsWindow = OBJC(windowPtr); NSWindow *nsWindow = OBJC(windowPtr);
__block NSRect contentRect = NSZeroRect; __block NSRect contentRect = NSZeroRect;
@ -1249,7 +1249,7 @@ JNF_COCOA_ENTER(env);
DECLARE_METHOD_RETURN(jc_Insets_ctor, jc_Insets, "<init>", "(IIII)V", NULL); DECLARE_METHOD_RETURN(jc_Insets_ctor, jc_Insets, "<init>", "(IIII)V", NULL);
ret = (*env)->NewObject(env, jc_Insets, jc_Insets_ctor, top, left, bottom, right); ret = (*env)->NewObject(env, jc_Insets, jc_Insets_ctor, top, left, bottom, right);
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return ret; return ret;
} }
@ -1261,7 +1261,7 @@ JNF_COCOA_EXIT(env);
JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CPlatformWindow_nativeSetNSWindowBounds JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CPlatformWindow_nativeSetNSWindowBounds
(JNIEnv *env, jclass clazz, jlong windowPtr, jdouble originX, jdouble originY, jdouble width, jdouble height) (JNIEnv *env, jclass clazz, jlong windowPtr, jdouble originX, jdouble originY, jdouble width, jdouble height)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
NSRect jrect = NSMakeRect(originX, originY, width, height); NSRect jrect = NSMakeRect(originX, originY, width, height);
@ -1295,7 +1295,7 @@ JNF_COCOA_ENTER(env);
} }
}]; }];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -1307,7 +1307,7 @@ JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CPlatformWindow_nativeSetNSWindowSt
(JNIEnv *env, jclass clazz, jlong windowPtr, jdouble originX, jdouble originY, (JNIEnv *env, jclass clazz, jlong windowPtr, jdouble originX, jdouble originY,
jdouble width, jdouble height) jdouble width, jdouble height)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
NSRect jrect = NSMakeRect(originX, originY, width, height); NSRect jrect = NSMakeRect(originX, originY, width, height);
@ -1319,7 +1319,7 @@ JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CPlatformWindow_nativeSetNSWindowSt
window.standardFrame = rect; window.standardFrame = rect;
}]; }];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -1330,7 +1330,7 @@ JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CPlatformWindow_nativeSetNSWindowSt
JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CPlatformWindow_nativeSetNSWindowLocationByPlatform JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CPlatformWindow_nativeSetNSWindowLocationByPlatform
(JNIEnv *env, jclass clazz, jlong windowPtr) (JNIEnv *env, jclass clazz, jlong windowPtr)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
NSWindow *nsWindow = OBJC(windowPtr); NSWindow *nsWindow = OBJC(windowPtr);
[ThreadUtilities performOnMainThreadWaiting:NO block:^(){ [ThreadUtilities performOnMainThreadWaiting:NO block:^(){
@ -1344,7 +1344,7 @@ JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CPlatformWindow_nativeSetNSWindowLo
lastTopLeftPoint = [nsWindow cascadeTopLeftFromPoint:lastTopLeftPoint]; lastTopLeftPoint = [nsWindow cascadeTopLeftFromPoint:lastTopLeftPoint];
}]; }];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -1355,7 +1355,7 @@ JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CPlatformWindow_nativeSetNSWindowLo
JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CPlatformWindow_nativeSetNSWindowMinMax JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CPlatformWindow_nativeSetNSWindowMinMax
(JNIEnv *env, jclass clazz, jlong windowPtr, jdouble minW, jdouble minH, jdouble maxW, jdouble maxH) (JNIEnv *env, jclass clazz, jlong windowPtr, jdouble minW, jdouble minH, jdouble maxW, jdouble maxH)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
if (minW < 1) minW = 1; if (minW < 1) minW = 1;
if (minH < 1) minH = 1; if (minH < 1) minH = 1;
@ -1378,7 +1378,7 @@ JNF_COCOA_ENTER(env);
[window updateMinMaxSize:IS(window.styleBits, RESIZABLE)]; [window updateMinMaxSize:IS(window.styleBits, RESIZABLE)];
}]; }];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -1389,7 +1389,7 @@ JNF_COCOA_EXIT(env);
JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CPlatformWindow_nativePushNSWindowToBack JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CPlatformWindow_nativePushNSWindowToBack
(JNIEnv *env, jclass clazz, jlong windowPtr) (JNIEnv *env, jclass clazz, jlong windowPtr)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
NSWindow *nsWindow = OBJC(windowPtr); NSWindow *nsWindow = OBJC(windowPtr);
[ThreadUtilities performOnMainThreadWaiting:NO block:^(){ [ThreadUtilities performOnMainThreadWaiting:NO block:^(){
@ -1406,7 +1406,7 @@ JNF_COCOA_ENTER(env);
[(AWTWindow*)[nsWindow delegate] orderChildWindows:NO]; [(AWTWindow*)[nsWindow delegate] orderChildWindows:NO];
}]; }];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -1417,7 +1417,7 @@ JNF_COCOA_EXIT(env);
JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CPlatformWindow_nativePushNSWindowToFront JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CPlatformWindow_nativePushNSWindowToFront
(JNIEnv *env, jclass clazz, jlong windowPtr) (JNIEnv *env, jclass clazz, jlong windowPtr)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
NSWindow *nsWindow = OBJC(windowPtr); NSWindow *nsWindow = OBJC(windowPtr);
[ThreadUtilities performOnMainThreadWaiting:NO block:^(){ [ThreadUtilities performOnMainThreadWaiting:NO block:^(){
@ -1429,7 +1429,7 @@ JNF_COCOA_ENTER(env);
} }
}]; }];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -1440,14 +1440,14 @@ JNF_COCOA_EXIT(env);
JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CPlatformWindow_nativeSetNSWindowTitle JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CPlatformWindow_nativeSetNSWindowTitle
(JNIEnv *env, jclass clazz, jlong windowPtr, jstring jtitle) (JNIEnv *env, jclass clazz, jlong windowPtr, jstring jtitle)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
NSWindow *nsWindow = OBJC(windowPtr); NSWindow *nsWindow = OBJC(windowPtr);
[nsWindow performSelectorOnMainThread:@selector(setTitle:) [nsWindow performSelectorOnMainThread:@selector(setTitle:)
withObject:JNFJavaToNSString(env, jtitle) withObject:JNFJavaToNSString(env, jtitle)
waitUntilDone:NO]; waitUntilDone:NO];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -1458,14 +1458,14 @@ JNF_COCOA_EXIT(env);
JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CPlatformWindow_nativeRevalidateNSWindowShadow JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CPlatformWindow_nativeRevalidateNSWindowShadow
(JNIEnv *env, jclass clazz, jlong windowPtr) (JNIEnv *env, jclass clazz, jlong windowPtr)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
NSWindow *nsWindow = OBJC(windowPtr); NSWindow *nsWindow = OBJC(windowPtr);
[ThreadUtilities performOnMainThreadWaiting:NO block:^(){ [ThreadUtilities performOnMainThreadWaiting:NO block:^(){
[nsWindow invalidateShadow]; [nsWindow invalidateShadow];
}]; }];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -1478,14 +1478,14 @@ JNIEXPORT jint JNICALL Java_sun_lwawt_macosx_CPlatformWindow_nativeScreenOn_1App
{ {
jint ret = 0; jint ret = 0;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
AWT_ASSERT_APPKIT_THREAD; AWT_ASSERT_APPKIT_THREAD;
NSWindow *nsWindow = OBJC(windowPtr); NSWindow *nsWindow = OBJC(windowPtr);
NSDictionary *props = [[nsWindow screen] deviceDescription]; NSDictionary *props = [[nsWindow screen] deviceDescription];
ret = [[props objectForKey:@"NSScreenNumber"] intValue]; ret = [[props objectForKey:@"NSScreenNumber"] intValue];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return ret; return ret;
} }
@ -1498,7 +1498,7 @@ JNF_COCOA_EXIT(env);
JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CPlatformWindow_nativeSetNSWindowMinimizedIcon JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CPlatformWindow_nativeSetNSWindowMinimizedIcon
(JNIEnv *env, jclass clazz, jlong windowPtr, jlong nsImagePtr) (JNIEnv *env, jclass clazz, jlong windowPtr, jlong nsImagePtr)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
NSWindow *nsWindow = OBJC(windowPtr); NSWindow *nsWindow = OBJC(windowPtr);
NSImage *image = OBJC(nsImagePtr); NSImage *image = OBJC(nsImagePtr);
@ -1506,7 +1506,7 @@ JNF_COCOA_ENTER(env);
[nsWindow setMiniwindowImage:image]; [nsWindow setMiniwindowImage:image];
}]; }];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -1517,7 +1517,7 @@ JNF_COCOA_EXIT(env);
JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CPlatformWindow_nativeSetNSWindowRepresentedFilename JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CPlatformWindow_nativeSetNSWindowRepresentedFilename
(JNIEnv *env, jclass clazz, jlong windowPtr, jstring filename) (JNIEnv *env, jclass clazz, jlong windowPtr, jstring filename)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
NSWindow *nsWindow = OBJC(windowPtr); NSWindow *nsWindow = OBJC(windowPtr);
NSURL *url = (filename == NULL) ? nil : [NSURL fileURLWithPath:JNFNormalizedNSStringForPath(env, filename)]; NSURL *url = (filename == NULL) ? nil : [NSURL fileURLWithPath:JNFNormalizedNSStringForPath(env, filename)];
@ -1525,7 +1525,7 @@ JNF_COCOA_ENTER(env);
[nsWindow setRepresentedURL:url]; [nsWindow setRepresentedURL:url];
}]; }];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -1539,7 +1539,7 @@ JNICALL Java_sun_lwawt_macosx_CPlatformWindow_nativeGetTopmostPlatformWindowUnde
{ {
__block jobject topmostWindowUnderMouse = nil; __block jobject topmostWindowUnderMouse = nil;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
[ThreadUtilities performOnMainThreadWaiting:YES block:^{ [ThreadUtilities performOnMainThreadWaiting:YES block:^{
AWTWindow *awtWindow = [AWTWindow getTopmostWindowUnderMouse]; AWTWindow *awtWindow = [AWTWindow getTopmostWindowUnderMouse];
@ -1548,7 +1548,7 @@ JNICALL Java_sun_lwawt_macosx_CPlatformWindow_nativeGetTopmostPlatformWindowUnde
} }
}]; }];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return topmostWindowUnderMouse; return topmostWindowUnderMouse;
} }
@ -1561,13 +1561,13 @@ JNICALL Java_sun_lwawt_macosx_CPlatformWindow_nativeGetTopmostPlatformWindowUnde
JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CPlatformWindow_nativeSynthesizeMouseEnteredExitedEvents__ JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CPlatformWindow_nativeSynthesizeMouseEnteredExitedEvents__
(JNIEnv *env, jclass clazz) (JNIEnv *env, jclass clazz)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
[ThreadUtilities performOnMainThreadWaiting:NO block:^(){ [ThreadUtilities performOnMainThreadWaiting:NO block:^(){
[AWTWindow synthesizeMouseEnteredExitedEventsForAllWindows]; [AWTWindow synthesizeMouseEnteredExitedEventsForAllWindows];
}]; }];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -1578,7 +1578,7 @@ JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CPlatformWindow_nativeSynthesizeMou
JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CPlatformWindow_nativeSynthesizeMouseEnteredExitedEvents__JI JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CPlatformWindow_nativeSynthesizeMouseEnteredExitedEvents__JI
(JNIEnv *env, jclass clazz, jlong windowPtr, jint eventType) (JNIEnv *env, jclass clazz, jlong windowPtr, jint eventType)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
if (eventType == NSMouseEntered || eventType == NSMouseExited) { if (eventType == NSMouseEntered || eventType == NSMouseExited) {
NSWindow *nsWindow = OBJC(windowPtr); NSWindow *nsWindow = OBJC(windowPtr);
@ -1587,10 +1587,10 @@ JNF_COCOA_ENTER(env);
[AWTWindow synthesizeMouseEnteredExitedEvents:nsWindow withType:eventType]; [AWTWindow synthesizeMouseEnteredExitedEvents:nsWindow withType:eventType];
}]; }];
} else { } else {
[JNFException raise:env as:kIllegalArgumentException reason:"unknown event type"]; JNU_ThrowIllegalArgumentException(env, "unknown event type");
} }
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -1601,7 +1601,7 @@ JNF_COCOA_EXIT(env);
JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CPlatformWindow__1toggleFullScreenMode JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CPlatformWindow__1toggleFullScreenMode
(JNIEnv *env, jobject peer, jlong windowPtr) (JNIEnv *env, jobject peer, jlong windowPtr)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
NSWindow *nsWindow = OBJC(windowPtr); NSWindow *nsWindow = OBJC(windowPtr);
SEL toggleFullScreenSelector = @selector(toggleFullScreen:); SEL toggleFullScreenSelector = @selector(toggleFullScreen:);
@ -1611,13 +1611,13 @@ JNF_COCOA_ENTER(env);
[nsWindow performSelector:toggleFullScreenSelector withObject:nil]; [nsWindow performSelector:toggleFullScreenSelector withObject:nil];
}]; }];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CPlatformWindow_nativeSetEnabled JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CPlatformWindow_nativeSetEnabled
(JNIEnv *env, jclass clazz, jlong windowPtr, jboolean isEnabled) (JNIEnv *env, jclass clazz, jlong windowPtr, jboolean isEnabled)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
NSWindow *nsWindow = OBJC(windowPtr); NSWindow *nsWindow = OBJC(windowPtr);
[ThreadUtilities performOnMainThreadWaiting:NO block:^(){ [ThreadUtilities performOnMainThreadWaiting:NO block:^(){
@ -1626,13 +1626,13 @@ JNF_COCOA_ENTER(env);
[window setEnabled: isEnabled]; [window setEnabled: isEnabled];
}]; }];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CPlatformWindow_nativeDispose JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CPlatformWindow_nativeDispose
(JNIEnv *env, jclass clazz, jlong windowPtr) (JNIEnv *env, jclass clazz, jlong windowPtr)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
NSWindow *nsWindow = OBJC(windowPtr); NSWindow *nsWindow = OBJC(windowPtr);
[ThreadUtilities performOnMainThreadWaiting:NO block:^(){ [ThreadUtilities performOnMainThreadWaiting:NO block:^(){
@ -1651,13 +1651,13 @@ JNF_COCOA_ENTER(env);
[window release]; [window release];
}]; }];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CPlatformWindow_nativeEnterFullScreenMode JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CPlatformWindow_nativeEnterFullScreenMode
(JNIEnv *env, jclass clazz, jlong windowPtr) (JNIEnv *env, jclass clazz, jlong windowPtr)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
NSWindow *nsWindow = OBJC(windowPtr); NSWindow *nsWindow = OBJC(windowPtr);
[ThreadUtilities performOnMainThreadWaiting:NO block:^(){ [ThreadUtilities performOnMainThreadWaiting:NO block:^(){
@ -1677,19 +1677,17 @@ JNF_COCOA_ENTER(env);
NSRect screenRect = [[nsWindow screen] frame]; NSRect screenRect = [[nsWindow screen] frame];
[nsWindow setFrame:screenRect display:YES]; [nsWindow setFrame:screenRect display:YES];
} else { } else {
[JNFException raise:[ThreadUtilities getJNIEnv] [NSException raise:@"Java Exception" reason:@"Failed to enter full screen." userInfo:nil];
as:kRuntimeException
reason:"Failed to enter full screen."];
} }
}]; }];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CPlatformWindow_nativeExitFullScreenMode JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CPlatformWindow_nativeExitFullScreenMode
(JNIEnv *env, jclass clazz, jlong windowPtr) (JNIEnv *env, jclass clazz, jlong windowPtr)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
NSWindow *nsWindow = OBJC(windowPtr); NSWindow *nsWindow = OBJC(windowPtr);
[ThreadUtilities performOnMainThreadWaiting:NO block:^(){ [ThreadUtilities performOnMainThreadWaiting:NO block:^(){
@ -1704,12 +1702,10 @@ JNF_COCOA_ENTER(env);
// GraphicsDevice takes care of restoring pre full screen bounds // GraphicsDevice takes care of restoring pre full screen bounds
} else { } else {
[JNFException raise:[ThreadUtilities getJNIEnv] [NSException raise:@"Java Exception" reason:@"Failed to exit full screen." userInfo:nil];
as:kRuntimeException
reason:"Failed to exit full screen."];
} }
}]; }];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }

68
src/java.desktop/macosx/native/libawt_lwawt/awt/ApplicationDelegate.m
View File

@ -570,12 +570,12 @@ AWT_ASSERT_APPKIT_THREAD;
JNIEXPORT void JNICALL Java_com_apple_eawt_Application_nativeInitializeApplicationDelegate JNIEXPORT void JNICALL Java_com_apple_eawt_Application_nativeInitializeApplicationDelegate
(JNIEnv *env, jclass clz) (JNIEnv *env, jclass clz)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
// Force initialization to happen on AppKit thread! // Force initialization to happen on AppKit thread!
[ThreadUtilities performOnMainThreadWaiting:NO block:^(){ [ThreadUtilities performOnMainThreadWaiting:NO block:^(){
[ApplicationDelegate sharedDelegate]; [ApplicationDelegate sharedDelegate];
}]; }];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -586,13 +586,13 @@ JNF_COCOA_EXIT(env);
JNIEXPORT void JNICALL Java_com_apple_eawt__1AppEventHandler_nativeOpenCocoaAboutWindow JNIEXPORT void JNICALL Java_com_apple_eawt__1AppEventHandler_nativeOpenCocoaAboutWindow
(JNIEnv *env, jclass clz) (JNIEnv *env, jclass clz)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
[ThreadUtilities performOnMainThreadWaiting:NO block:^(){ [ThreadUtilities performOnMainThreadWaiting:NO block:^(){
[NSApp orderFrontStandardAboutPanel:nil]; [NSApp orderFrontStandardAboutPanel:nil];
}]; }];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -603,13 +603,13 @@ JNF_COCOA_EXIT(env);
JNIEXPORT void JNICALL Java_com_apple_eawt__1AppEventHandler_nativeReplyToAppShouldTerminate JNIEXPORT void JNICALL Java_com_apple_eawt__1AppEventHandler_nativeReplyToAppShouldTerminate
(JNIEnv *env, jclass clz, jboolean doTerminate) (JNIEnv *env, jclass clz, jboolean doTerminate)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
[ThreadUtilities performOnMainThreadWaiting:NO block:^(){ [ThreadUtilities performOnMainThreadWaiting:NO block:^(){
[NSApp replyToApplicationShouldTerminate:doTerminate]; [NSApp replyToApplicationShouldTerminate:doTerminate];
}]; }];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -620,12 +620,12 @@ JNF_COCOA_EXIT(env);
JNIEXPORT void JNICALL Java_com_apple_eawt__1AppEventHandler_nativeRegisterForNotification JNIEXPORT void JNICALL Java_com_apple_eawt__1AppEventHandler_nativeRegisterForNotification
(JNIEnv *env, jclass clz, jint notificationType) (JNIEnv *env, jclass clz, jint notificationType)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
[ThreadUtilities performOnMainThread:@selector(_registerForNotification:) [ThreadUtilities performOnMainThread:@selector(_registerForNotification:)
on:[ApplicationDelegate class] on:[ApplicationDelegate class]
withObject:[NSNumber numberWithInt:notificationType] withObject:[NSNumber numberWithInt:notificationType]
waitUntilDone:NO]; // AWT_THREADING Safe (non-blocking) waitUntilDone:NO]; // AWT_THREADING Safe (non-blocking)
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -636,14 +636,14 @@ JNF_COCOA_EXIT(env);
JNIEXPORT void JNICALL Java_com_apple_eawt__1AppDockIconHandler_nativeSetDockMenu JNIEXPORT void JNICALL Java_com_apple_eawt__1AppDockIconHandler_nativeSetDockMenu
(JNIEnv *env, jclass clz, jlong nsMenuPtr) (JNIEnv *env, jclass clz, jlong nsMenuPtr)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
NSMenu *menu = (NSMenu *)jlong_to_ptr(nsMenuPtr); NSMenu *menu = (NSMenu *)jlong_to_ptr(nsMenuPtr);
[ThreadUtilities performOnMainThreadWaiting:YES block:^(){ [ThreadUtilities performOnMainThreadWaiting:YES block:^(){
[ApplicationDelegate sharedDelegate].fDockMenu = menu; [ApplicationDelegate sharedDelegate].fDockMenu = menu;
}]; }];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -654,7 +654,7 @@ JNF_COCOA_EXIT(env);
JNIEXPORT void JNICALL Java_com_apple_eawt__1AppDockIconHandler_nativeSetDockIconImage JNIEXPORT void JNICALL Java_com_apple_eawt__1AppDockIconHandler_nativeSetDockIconImage
(JNIEnv *env, jclass clz, jlong nsImagePtr) (JNIEnv *env, jclass clz, jlong nsImagePtr)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
NSImage *_image = (NSImage *)jlong_to_ptr(nsImagePtr); NSImage *_image = (NSImage *)jlong_to_ptr(nsImagePtr);
[ThreadUtilities performOnMainThread:@selector(_setDockIconImage:) [ThreadUtilities performOnMainThread:@selector(_setDockIconImage:)
@ -662,7 +662,7 @@ JNF_COCOA_ENTER(env);
withObject:_image withObject:_image
waitUntilDone:NO]; waitUntilDone:NO];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -673,14 +673,14 @@ JNF_COCOA_EXIT(env);
JNIEXPORT void JNICALL Java_com_apple_eawt__1AppDockIconHandler_nativeSetDockIconProgress JNIEXPORT void JNICALL Java_com_apple_eawt__1AppDockIconHandler_nativeSetDockIconProgress
(JNIEnv *env, jclass clz, jint value) (JNIEnv *env, jclass clz, jint value)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
[ThreadUtilities performOnMainThread:@selector(_setDockIconProgress:) [ThreadUtilities performOnMainThread:@selector(_setDockIconProgress:)
on:[ApplicationDelegate class] on:[ApplicationDelegate class]
withObject:[NSNumber numberWithInt:value] withObject:[NSNumber numberWithInt:value]
waitUntilDone:NO]; waitUntilDone:NO];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -693,13 +693,13 @@ JNIEXPORT jlong JNICALL Java_com_apple_eawt__1AppDockIconHandler_nativeGetDockIc
{ {
__block NSImage *image = nil; __block NSImage *image = nil;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
[ThreadUtilities performOnMainThreadWaiting:YES block:^(){ [ThreadUtilities performOnMainThreadWaiting:YES block:^(){
image = [[ApplicationDelegate _dockIconImage] retain]; image = [[ApplicationDelegate _dockIconImage] retain];
}]; }];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return ptr_to_jlong(image); return ptr_to_jlong(image);
} }
@ -712,7 +712,7 @@ JNF_COCOA_EXIT(env);
JNIEXPORT void JNICALL Java_com_apple_eawt__1AppDockIconHandler_nativeSetDockIconBadge JNIEXPORT void JNICALL Java_com_apple_eawt__1AppDockIconHandler_nativeSetDockIconBadge
(JNIEnv *env, jclass clz, jstring badge) (JNIEnv *env, jclass clz, jstring badge)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
NSString *badgeString = JNFJavaToNSString(env, badge); NSString *badgeString = JNFJavaToNSString(env, badge);
[ThreadUtilities performOnMainThreadWaiting:NO block:^(){ [ThreadUtilities performOnMainThreadWaiting:NO block:^(){
@ -721,7 +721,7 @@ JNF_COCOA_ENTER(env);
[dockTile display]; [dockTile display];
}]; }];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -732,7 +732,7 @@ JNF_COCOA_EXIT(env);
JNIEXPORT void JNICALL Java_com_apple_eawt__1AppMiscHandlers_nativeRequestActivation JNIEXPORT void JNICALL Java_com_apple_eawt__1AppMiscHandlers_nativeRequestActivation
(JNIEnv *env, jclass clz, jboolean allWindows) (JNIEnv *env, jclass clz, jboolean allWindows)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
[ThreadUtilities performOnMainThreadWaiting:NO block:^(){ [ThreadUtilities performOnMainThreadWaiting:NO block:^(){
NSApplicationActivationOptions options = allWindows ? NSApplicationActivateAllWindows : 0; NSApplicationActivationOptions options = allWindows ? NSApplicationActivateAllWindows : 0;
@ -740,7 +740,7 @@ JNF_COCOA_ENTER(env);
[[NSRunningApplication currentApplication] activateWithOptions:options]; [[NSRunningApplication currentApplication] activateWithOptions:options];
}]; }];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -751,13 +751,13 @@ JNF_COCOA_EXIT(env);
JNIEXPORT void JNICALL Java_com_apple_eawt__1AppMiscHandlers_nativeRequestUserAttention JNIEXPORT void JNICALL Java_com_apple_eawt__1AppMiscHandlers_nativeRequestUserAttention
(JNIEnv *env, jclass clz, jboolean critical) (JNIEnv *env, jclass clz, jboolean critical)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
[ThreadUtilities performOnMainThreadWaiting:NO block:^(){ [ThreadUtilities performOnMainThreadWaiting:NO block:^(){
[NSApp requestUserAttention:critical ? NSCriticalRequest : NSInformationalRequest]; [NSApp requestUserAttention:critical ? NSCriticalRequest : NSInformationalRequest];
}]; }];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -768,14 +768,14 @@ JNF_COCOA_EXIT(env);
JNIEXPORT void JNICALL Java_com_apple_eawt__1AppMiscHandlers_nativeOpenHelpViewer JNIEXPORT void JNICALL Java_com_apple_eawt__1AppMiscHandlers_nativeOpenHelpViewer
(JNIEnv *env, jclass clz) (JNIEnv *env, jclass clz)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
[ThreadUtilities performOnMainThread:@selector(showHelp:) [ThreadUtilities performOnMainThread:@selector(showHelp:)
on:NSApp on:NSApp
withObject:nil withObject:nil
waitUntilDone:NO]; waitUntilDone:NO];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -786,11 +786,11 @@ JNF_COCOA_EXIT(env);
JNIEXPORT void JNICALL Java_com_apple_eawt__1AppMiscHandlers_nativeEnableSuddenTermination JNIEXPORT void JNICALL Java_com_apple_eawt__1AppMiscHandlers_nativeEnableSuddenTermination
(JNIEnv *env, jclass clz) (JNIEnv *env, jclass clz)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
[[NSProcessInfo processInfo] enableSuddenTermination]; // Foundation thread-safe [[NSProcessInfo processInfo] enableSuddenTermination]; // Foundation thread-safe
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -801,11 +801,11 @@ JNF_COCOA_EXIT(env);
JNIEXPORT void JNICALL Java_com_apple_eawt__1AppMiscHandlers_nativeDisableSuddenTermination JNIEXPORT void JNICALL Java_com_apple_eawt__1AppMiscHandlers_nativeDisableSuddenTermination
(JNIEnv *env, jclass clz) (JNIEnv *env, jclass clz)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
[[NSProcessInfo processInfo] disableSuddenTermination]; // Foundation thread-safe [[NSProcessInfo processInfo] disableSuddenTermination]; // Foundation thread-safe
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -816,7 +816,7 @@ JNF_COCOA_EXIT(env);
JNIEXPORT void JNICALL Java_com_apple_eawt__1AppMenuBarHandler_nativeSetMenuState JNIEXPORT void JNICALL Java_com_apple_eawt__1AppMenuBarHandler_nativeSetMenuState
(JNIEnv *env, jclass clz, jint menuID, jboolean visible, jboolean enabled) (JNIEnv *env, jclass clz, jint menuID, jboolean visible, jboolean enabled)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
[ThreadUtilities performOnMainThreadWaiting:NO block:^(){ [ThreadUtilities performOnMainThreadWaiting:NO block:^(){
ApplicationDelegate *delegate = [ApplicationDelegate sharedDelegate]; ApplicationDelegate *delegate = [ApplicationDelegate sharedDelegate];
@ -830,7 +830,7 @@ JNF_COCOA_ENTER(env);
} }
}]; }];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -841,14 +841,14 @@ JNF_COCOA_EXIT(env);
JNIEXPORT void JNICALL Java_com_apple_eawt__1AppMenuBarHandler_nativeSetDefaultMenuBar JNIEXPORT void JNICALL Java_com_apple_eawt__1AppMenuBarHandler_nativeSetDefaultMenuBar
(JNIEnv *env, jclass clz, jlong cMenuBarPtr) (JNIEnv *env, jclass clz, jlong cMenuBarPtr)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
CMenuBar *menu = (CMenuBar *)jlong_to_ptr(cMenuBarPtr); CMenuBar *menu = (CMenuBar *)jlong_to_ptr(cMenuBarPtr);
[ThreadUtilities performOnMainThreadWaiting:NO block:^(){ [ThreadUtilities performOnMainThreadWaiting:NO block:^(){
[ApplicationDelegate sharedDelegate].fDefaultMenuBar = menu; [ApplicationDelegate sharedDelegate].fDefaultMenuBar = menu;
}]; }];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -859,7 +859,7 @@ JNF_COCOA_EXIT(env);
JNIEXPORT void JNICALL Java_com_apple_eawt__1AppMenuBarHandler_nativeActivateDefaultMenuBar JNIEXPORT void JNICALL Java_com_apple_eawt__1AppMenuBarHandler_nativeActivateDefaultMenuBar
(JNIEnv *env, jclass clz, jlong cMenuBarPtr) (JNIEnv *env, jclass clz, jlong cMenuBarPtr)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
CMenuBar *menu = (CMenuBar *)jlong_to_ptr(cMenuBarPtr); CMenuBar *menu = (CMenuBar *)jlong_to_ptr(cMenuBarPtr);
[ThreadUtilities performOnMainThreadWaiting:NO block:^(){ [ThreadUtilities performOnMainThreadWaiting:NO block:^(){
@ -868,5 +868,5 @@ JNF_COCOA_ENTER(env);
} }
}]; }];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }

22
src/java.desktop/macosx/native/libawt_lwawt/awt/CClipboard.m
View File

@ -131,7 +131,7 @@
JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CClipboard_declareTypes JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CClipboard_declareTypes
(JNIEnv *env, jobject inObject, jlongArray inTypes, jobject inJavaClip) (JNIEnv *env, jobject inObject, jlongArray inTypes, jobject inJavaClip)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
jint i; jint i;
jint nElements = (*env)->GetArrayLength(env, inTypes); jint nElements = (*env)->GetArrayLength(env, inTypes);
@ -146,7 +146,7 @@ JNF_COCOA_ENTER(env);
(*env)->ReleasePrimitiveArrayCritical(env, inTypes, elements, JNI_ABORT); (*env)->ReleasePrimitiveArrayCritical(env, inTypes, elements, JNI_ABORT);
[[CClipboard sharedClipboard] declareTypes:formatArray withOwner:inJavaClip jniEnv:env]; [[CClipboard sharedClipboard] declareTypes:formatArray withOwner:inJavaClip jniEnv:env];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -161,7 +161,7 @@ JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CClipboard_setData
return; return;
} }
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
jint nBytes = (*env)->GetArrayLength(env, inBytes); jint nBytes = (*env)->GetArrayLength(env, inBytes);
jbyte *rawBytes = (*env)->GetPrimitiveArrayCritical(env, inBytes, NULL); jbyte *rawBytes = (*env)->GetPrimitiveArrayCritical(env, inBytes, NULL);
CHECK_NULL(rawBytes); CHECK_NULL(rawBytes);
@ -171,7 +171,7 @@ JNF_COCOA_ENTER(env);
[ThreadUtilities performOnMainThreadWaiting:YES block:^() { [ThreadUtilities performOnMainThreadWaiting:YES block:^() {
[[NSPasteboard generalPasteboard] setData:bytesAsData forType:format]; [[NSPasteboard generalPasteboard] setData:bytesAsData forType:format];
}]; }];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -183,7 +183,7 @@ JNIEXPORT jlongArray JNICALL Java_sun_lwawt_macosx_CClipboard_getClipboardFormat
(JNIEnv *env, jobject inObject) (JNIEnv *env, jobject inObject)
{ {
jlongArray returnValue = NULL; jlongArray returnValue = NULL;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
__block NSArray* dataTypes; __block NSArray* dataTypes;
[ThreadUtilities performOnMainThreadWaiting:YES block:^() { [ThreadUtilities performOnMainThreadWaiting:YES block:^() {
@ -228,7 +228,7 @@ JNF_COCOA_ENTER(env);
} }
(*env)->ReleaseLongArrayElements(env, returnValue, saveFormats, JNI_COMMIT); (*env)->ReleaseLongArrayElements(env, returnValue, saveFormats, JNI_COMMIT);
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return returnValue; return returnValue;
} }
@ -244,7 +244,7 @@ JNIEXPORT jbyteArray JNICALL Java_sun_lwawt_macosx_CClipboard_getClipboardData
// Note that this routine makes no attempt to interpret the data, since we're returning // Note that this routine makes no attempt to interpret the data, since we're returning
// a byte array back to Java. CDataTransferer will do that if necessary. // a byte array back to Java. CDataTransferer will do that if necessary.
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
NSString *formatAsString = formatForIndex(format); NSString *formatAsString = formatForIndex(format);
__block NSData* clipData; __block NSData* clipData;
@ -253,7 +253,7 @@ JNF_COCOA_ENTER(env);
}]; }];
if (clipData == NULL) { if (clipData == NULL) {
[JNFException raise:env as:"java/io/IOException" reason:"Font transform has NaN position"]; JNU_ThrowIOException(env, "Font transform has NaN position");
return NULL; return NULL;
} else { } else {
[clipData autorelease]; [clipData autorelease];
@ -270,7 +270,7 @@ JNF_COCOA_ENTER(env);
(*env)->SetByteArrayRegion(env, returnValue, 0, dataSize, (jbyte *)dataBuffer); (*env)->SetByteArrayRegion(env, returnValue, 0, dataSize, (jbyte *)dataBuffer);
} }
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return returnValue; return returnValue;
} }
@ -283,11 +283,11 @@ JNIEXPORT jboolean JNICALL Java_sun_lwawt_macosx_CClipboard_checkPasteboardWitho
(JNIEnv *env, jobject inObject) (JNIEnv *env, jobject inObject)
{ {
__block BOOL ret = NO; __block BOOL ret = NO;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
[ThreadUtilities performOnMainThreadWaiting:YES block:^(){ [ThreadUtilities performOnMainThreadWaiting:YES block:^(){
ret = [[CClipboard sharedClipboard] checkPasteboardWithoutNotification:nil]; ret = [[CClipboard sharedClipboard] checkPasteboardWithoutNotification:nil];
}]; }];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return ret; return ret;
} }

22
src/java.desktop/macosx/native/libawt_lwawt/awt/CCursorManager.m
View File

@ -73,31 +73,33 @@ JNIEXPORT void JNICALL
Java_sun_lwawt_macosx_CCursorManager_nativeSetBuiltInCursor Java_sun_lwawt_macosx_CCursorManager_nativeSetBuiltInCursor
(JNIEnv *env, jclass class, jint type, jstring name) (JNIEnv *env, jclass class, jint type, jstring name)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
NSString *cursorName = JNFJavaToNSString(env, name); NSString *cursorName = JNFJavaToNSString(env, name);
SEL cursorSelector = (type == sun_lwawt_macosx_CCursorManager_NAMED_CURSOR) ? lookupCursorSelectorForName(cursorName) : lookupCursorSelectorForType(type); SEL cursorSelector = (type == sun_lwawt_macosx_CCursorManager_NAMED_CURSOR) ? lookupCursorSelectorForName(cursorName) : lookupCursorSelectorForType(type);
if (cursorSelector == nil) { if (cursorSelector == nil) {
NSString *reason = [NSString stringWithFormat:@"unimplemented built-in cursor type: %d / %@", type, cursorName]; NSString *reason = [NSString stringWithFormat:@"unimplemented built-in cursor type: %d / %@", type, cursorName];
[JNFException raise:env as:kIllegalArgumentException reason:[reason UTF8String]]; JNU_ThrowIllegalArgumentException(env, [reason UTF8String]);
return;
} }
if (![[NSCursor class] respondsToSelector:cursorSelector]) { if (![[NSCursor class] respondsToSelector:cursorSelector]) {
[JNFException raise:env as:kNoSuchMethodException reason:"missing NSCursor selector"]; JNU_ThrowByName(env, "java/lang/NoSuchMethodException", "missing NSCursor selector");
return;
} }
[ThreadUtilities performOnMainThreadWaiting:NO block:^(){ [ThreadUtilities performOnMainThreadWaiting:NO block:^(){
setCursorOnAppKitThread([[NSCursor class] performSelector:cursorSelector]); setCursorOnAppKitThread([[NSCursor class] performSelector:cursorSelector]);
}]; }];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
JNIEXPORT void JNICALL JNIEXPORT void JNICALL
Java_sun_lwawt_macosx_CCursorManager_nativeSetCustomCursor Java_sun_lwawt_macosx_CCursorManager_nativeSetCustomCursor
(JNIEnv *env, jclass class, jlong imgPtr, jdouble x, jdouble y) (JNIEnv *env, jclass class, jlong imgPtr, jdouble x, jdouble y)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
NSImage *image = (NSImage *)jlong_to_ptr(imgPtr); NSImage *image = (NSImage *)jlong_to_ptr(imgPtr);
[ThreadUtilities performOnMainThreadWaiting:NO block:^(){ [ThreadUtilities performOnMainThreadWaiting:NO block:^(){
@ -107,7 +109,7 @@ JNF_COCOA_ENTER(env);
[cursor release]; [cursor release];
}]; }];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
JNIEXPORT jobject JNICALL JNIEXPORT jobject JNICALL
@ -116,7 +118,7 @@ Java_sun_lwawt_macosx_CCursorManager_nativeGetCursorPosition
{ {
jobject jpt = NULL; jobject jpt = NULL;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
CGEventRef event = CGEventCreate(NULL); CGEventRef event = CGEventCreate(NULL);
CGPoint globalPos = CGEventGetLocation(event); CGPoint globalPos = CGEventGetLocation(event);
@ -124,7 +126,7 @@ JNF_COCOA_ENTER(env);
jpt = NSToJavaPoint(env, globalPos); jpt = NSToJavaPoint(env, globalPos);
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return jpt; return jpt;
} }
@ -134,7 +136,7 @@ JNIEXPORT void JNICALL
Java_sun_lwawt_macosx_CCursorManager_nativeSetAllowsCursorSetInBackground Java_sun_lwawt_macosx_CCursorManager_nativeSetAllowsCursorSetInBackground
(JNIEnv *env, jclass class, jboolean allows) (JNIEnv *env, jclass class, jboolean allows)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
SEL allowsSetInBackground_SEL = @selector(javaSetAllowsCursorSetInBackground:); SEL allowsSetInBackground_SEL = @selector(javaSetAllowsCursorSetInBackground:);
if ([[NSCursor class] respondsToSelector:allowsSetInBackground_SEL]) { if ([[NSCursor class] respondsToSelector:allowsSetInBackground_SEL]) {
@ -150,6 +152,6 @@ JNF_COCOA_ENTER(env);
}]; }];
} }
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }

14
src/java.desktop/macosx/native/libawt_lwawt/awt/CDataTransferer.m
View File

@ -26,7 +26,7 @@
#import "CDataTransferer.h" #import "CDataTransferer.h"
#include "sun_lwawt_macosx_CDataTransferer.h" #include "sun_lwawt_macosx_CDataTransferer.h"
#import "jni_util.h" #import "JNIUtilities.h"
#import <JavaNativeFoundation/JavaNativeFoundation.h> #import <JavaNativeFoundation/JavaNativeFoundation.h>
@ -109,9 +109,9 @@ JNIEXPORT jlong JNICALL Java_sun_lwawt_macosx_CDataTransferer_registerFormatWith
(JNIEnv *env, jobject jthis, jstring newformat) (JNIEnv *env, jobject jthis, jstring newformat)
{ {
jlong returnValue = -1; jlong returnValue = -1;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
returnValue = registerFormatWithPasteboard(JNFJavaToNSString(env, newformat)); returnValue = registerFormatWithPasteboard(JNFJavaToNSString(env, newformat));
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return returnValue; return returnValue;
} }
@ -124,9 +124,9 @@ JNIEXPORT jstring JNICALL Java_sun_lwawt_macosx_CDataTransferer_formatForIndex
(JNIEnv *env, jobject jthis, jlong index) (JNIEnv *env, jobject jthis, jlong index)
{ {
jstring returnValue = NULL; jstring returnValue = NULL;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
returnValue = JNFNSToJavaString(env, formatForIndex(index)); returnValue = JNFNSToJavaString(env, formatForIndex(index));
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return returnValue; return returnValue;
} }
@ -200,7 +200,7 @@ Java_sun_lwawt_macosx_CDataTransferer_nativeDragQueryFile
jobjectArray jreturnArray = NULL; jobjectArray jreturnArray = NULL;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
// Get byte array elements: // Get byte array elements:
jboolean isCopy; jboolean isCopy;
jbyte* jbytes = (*env)->GetByteArrayElements(env, jbytearray, &isCopy); jbyte* jbytes = (*env)->GetByteArrayElements(env, jbytearray, &isCopy);
@ -250,6 +250,6 @@ JNF_COCOA_ENTER(env);
// We're done with the jbytes (backing the plist/plistArray): // We're done with the jbytes (backing the plist/plistArray):
(*env)->ReleaseByteArrayElements(env, jbytearray, jbytes, JNI_ABORT); (*env)->ReleaseByteArrayElements(env, jbytearray, jbytes, JNI_ABORT);
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return jreturnArray; return jreturnArray;
} }

9
src/java.desktop/macosx/native/libawt_lwawt/awt/CDesktopPeer.m
View File

@ -24,6 +24,7 @@
*/ */
#import "JNIUtilities.h"
#import <CoreFoundation/CoreFoundation.h> #import <CoreFoundation/CoreFoundation.h>
#import <ApplicationServices/ApplicationServices.h> #import <ApplicationServices/ApplicationServices.h>
#import <JavaNativeFoundation/JavaNativeFoundation.h> #import <JavaNativeFoundation/JavaNativeFoundation.h>
@ -37,7 +38,7 @@ JNIEXPORT jint JNICALL Java_sun_lwawt_macosx_CDesktopPeer__1lsOpenURI
(JNIEnv *env, jclass clz, jstring uri) (JNIEnv *env, jclass clz, jstring uri)
{ {
OSStatus status = noErr; OSStatus status = noErr;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
// I would love to use NSWorkspace here, but it's not thread safe. Why? I don't know. // I would love to use NSWorkspace here, but it's not thread safe. Why? I don't know.
// So we use LaunchServices directly. // So we use LaunchServices directly.
@ -49,7 +50,7 @@ JNF_COCOA_ENTER(env);
LSApplicationParameters params = {0, flags, NULL, NULL, NULL, NULL, NULL}; LSApplicationParameters params = {0, flags, NULL, NULL, NULL, NULL, NULL};
status = LSOpenURLsWithRole((CFArrayRef)[NSArray arrayWithObject:url], kLSRolesAll, NULL, &params, NULL, 0); status = LSOpenURLsWithRole((CFArrayRef)[NSArray arrayWithObject:url], kLSRolesAll, NULL, &params, NULL, 0);
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return status; return status;
} }
@ -62,7 +63,7 @@ JNIEXPORT jint JNICALL Java_sun_lwawt_macosx_CDesktopPeer__1lsOpenFile
(JNIEnv *env, jclass clz, jstring jpath, jboolean print) (JNIEnv *env, jclass clz, jstring jpath, jboolean print)
{ {
OSStatus status = noErr; OSStatus status = noErr;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
// I would love to use NSWorkspace here, but it's not thread safe. Why? I don't know. // I would love to use NSWorkspace here, but it's not thread safe. Why? I don't know.
// So we use LaunchServices directly. // So we use LaunchServices directly.
@ -81,7 +82,7 @@ JNF_COCOA_ENTER(env);
status = LSOpenURLsWithRole((CFArrayRef)[NSArray arrayWithObject:url], kLSRolesAll, NULL, &params, NULL, 0); status = LSOpenURLsWithRole((CFArrayRef)[NSArray arrayWithObject:url], kLSRolesAll, NULL, &params, NULL, 0);
[url release]; [url release];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return status; return status;
} }

4
src/java.desktop/macosx/native/libawt_lwawt/awt/CDragSource.m
View File

@ -645,7 +645,7 @@ static BOOL sNeedsEnter;
//DLog4(@"[CDragSource draggedImage moved]: (%d, %d) %@\n", (int) screenPoint.x, (int) screenPoint.y, self); //DLog4(@"[CDragSource draggedImage moved]: (%d, %d) %@\n", (int) screenPoint.x, (int) screenPoint.y, self);
JNIEnv* env = [ThreadUtilities getJNIEnv]; JNIEnv* env = [ThreadUtilities getJNIEnv];
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
[AWTToolkit eventCountPlusPlus]; [AWTToolkit eventCountPlusPlus];
// There are two things we would be interested in: // There are two things we would be interested in:
// a) mouse pointer has moved // a) mouse pointer has moved
@ -695,7 +695,7 @@ JNF_COCOA_ENTER(env);
(*env)->CallVoidMethod(env, fDragSourceContextPeer, dragMouseMovedMethod, targetActions, (jint) fModifiers, (jint) point.x, (jint) point.y); // AWT_THREADING Safe (event) (*env)->CallVoidMethod(env, fDragSourceContextPeer, dragMouseMovedMethod, targetActions, (jint) fModifiers, (jint) point.x, (jint) point.y); // AWT_THREADING Safe (event)
CHECK_EXCEPTION(); CHECK_EXCEPTION();
} }
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
- (BOOL)ignoreModifierKeysWhileDragging { - (BOOL)ignoreModifierKeysWhileDragging {

13
src/java.desktop/macosx/native/libawt_lwawt/awt/CDragSourceContextPeer.m
View File

@ -25,6 +25,7 @@
#import "sun_lwawt_macosx_CDragSourceContextPeer.h" #import "sun_lwawt_macosx_CDragSourceContextPeer.h"
#import "JNIUtilities.h"
#import <JavaNativeFoundation/JavaNativeFoundation.h> #import <JavaNativeFoundation/JavaNativeFoundation.h>
#import "CDragSource.h" #import "CDragSource.h"
@ -46,7 +47,7 @@ JNIEXPORT jlong JNICALL Java_sun_lwawt_macosx_CDragSourceContextPeer_createNativ
id controlObj = (id) jlong_to_ptr(jnativepeer); id controlObj = (id) jlong_to_ptr(jnativepeer);
__block CDragSource* dragSource = nil; __block CDragSource* dragSource = nil;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
// Global references are disposed when the DragSource is removed // Global references are disposed when the DragSource is removed
jobject gComponent = JNFNewGlobalRef(env, jcomponent); jobject gComponent = JNFNewGlobalRef(env, jcomponent);
@ -74,7 +75,7 @@ JNF_COCOA_ENTER(env);
formats:gFormats formats:gFormats
formatMap:gFormatMap]; formatMap:gFormatMap];
}]; }];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return ptr_to_jlong(dragSource); return ptr_to_jlong(dragSource);
} }
@ -91,9 +92,9 @@ JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CDragSourceContextPeer_doDragging
CDragSource* dragSource = (CDragSource*) jlong_to_ptr(nativeDragSourceVal); CDragSource* dragSource = (CDragSource*) jlong_to_ptr(nativeDragSourceVal);
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
[dragSource drag]; [dragSource drag];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -106,7 +107,7 @@ JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CDragSourceContextPeer_releaseNativ
{ {
CDragSource* dragSource = (CDragSource*) jlong_to_ptr(nativeDragSourceVal); CDragSource* dragSource = (CDragSource*) jlong_to_ptr(nativeDragSourceVal);
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
[dragSource removeFromView:env]; [dragSource removeFromView:env];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }

8
src/java.desktop/macosx/native/libawt_lwawt/awt/CDropTarget.m
View File

@ -731,10 +731,10 @@ JNIEXPORT jlong JNICALL Java_sun_lwawt_macosx_CDropTarget_createNativeDropTarget
{ {
CDropTarget* dropTarget = nil; CDropTarget* dropTarget = nil;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
id controlObj = (id) jlong_to_ptr(jnativepeer); id controlObj = (id) jlong_to_ptr(jnativepeer);
dropTarget = [[CDropTarget alloc] init:jdroptarget component:jcomponent control:controlObj]; dropTarget = [[CDropTarget alloc] init:jdroptarget component:jcomponent control:controlObj];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return ptr_to_jlong(dropTarget); return ptr_to_jlong(dropTarget);
} }
@ -749,7 +749,7 @@ JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CDropTarget_releaseNativeDropTarget
{ {
id dropTarget = (id)jlong_to_ptr(nativeDropTargetVal); id dropTarget = (id)jlong_to_ptr(nativeDropTargetVal);
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
[dropTarget removeFromView:env]; [dropTarget removeFromView:env];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }

8
src/java.desktop/macosx/native/libawt_lwawt/awt/CDropTargetContextPeer.m
View File

@ -76,7 +76,7 @@ JNIEXPORT jlong JNICALL Java_sun_lwawt_macosx_CDropTargetContextPeer_startTransf
// works off a data copy and doesn't have to go to the native event thread to get the data. // works off a data copy and doesn't have to go to the native event thread to get the data.
// We can have endTransfer just call startTransfer. // We can have endTransfer just call startTransfer.
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
// Get the drop target native object: // Get the drop target native object:
CDropTarget* dropTarget = GetCDropTarget(jdroptarget); CDropTarget* dropTarget = GetCDropTarget(jdroptarget);
if (dropTarget == nil) { if (dropTarget == nil) {
@ -113,7 +113,7 @@ JNF_COCOA_ENTER(env);
// if no error return dropTarget's draggingSequence // if no error return dropTarget's draggingSequence
result = [dropTarget getDraggingSequenceNumber]; result = [dropTarget getDraggingSequenceNumber];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return result; return result;
} }
@ -144,7 +144,7 @@ JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CDropTargetContextPeer_dropDone
(JNIEnv *env, jobject jthis, jlong jdroptarget, jlong jdroptransfer, jboolean jislocal, jboolean jsuccess, jint jdropaction) (JNIEnv *env, jobject jthis, jlong jdroptarget, jlong jdroptransfer, jboolean jislocal, jboolean jsuccess, jint jdropaction)
{ {
// Get the drop target native object: // Get the drop target native object:
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
CDropTarget* dropTarget = GetCDropTarget(jdroptarget); CDropTarget* dropTarget = GetCDropTarget(jdroptarget);
if (dropTarget == nil) { if (dropTarget == nil) {
DLog2(@"[CDropTargetContextPeer dropDone]: GetCDropTarget failed for %d.\n", (NSInteger) jdroptarget); DLog2(@"[CDropTargetContextPeer dropDone]: GetCDropTarget failed for %d.\n", (NSInteger) jdroptarget);
@ -153,7 +153,7 @@ JNF_COCOA_ENTER(env);
// Notify drop target Java is all done with this dragging sequence: // Notify drop target Java is all done with this dragging sequence:
[dropTarget javaDraggingEnded:(jlong)jdroptransfer success:jsuccess action:jdropaction]; [dropTarget javaDraggingEnded:(jlong)jdroptransfer success:jsuccess action:jdropaction];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return; return;
} }

6
src/java.desktop/macosx/native/libawt_lwawt/awt/CFRetainedResource.m
View File

@ -23,6 +23,8 @@
* questions. * questions.
*/ */
#import "JNIUtilities.h"
#import <Cocoa/Cocoa.h> #import <Cocoa/Cocoa.h>
#import <JavaNativeFoundation/JavaNativeFoundation.h> #import <JavaNativeFoundation/JavaNativeFoundation.h>
@ -53,11 +55,11 @@ JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CFRetainedResource_nativeCFRelease
} }
} else { } else {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
CFRelease(jlong_to_ptr(ptr)); CFRelease(jlong_to_ptr(ptr));
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
} }

4
src/java.desktop/macosx/native/libawt_lwawt/awt/CFileDialog.m
View File

@ -198,7 +198,7 @@ Java_sun_lwawt_macosx_CFileDialog_nativeRunFileDialog
{ {
jobjectArray returnValue = NULL; jobjectArray returnValue = NULL;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
NSString *dialogTitle = JNFJavaToNSString(env, title); NSString *dialogTitle = JNFJavaToNSString(env, title);
if ([dialogTitle length] == 0) { if ([dialogTitle length] == 0) {
dialogTitle = @" "; dialogTitle = @" ";
@ -235,6 +235,6 @@ JNF_COCOA_ENTER(env);
} }
[dialogDelegate release]; [dialogDelegate release];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return returnValue; return returnValue;
} }

24
src/java.desktop/macosx/native/libawt_lwawt/awt/CGraphicsDevice.m
View File

@ -151,7 +151,7 @@ static CGDisplayModeRef getBestModeForParameters(CFArrayRef allModes, int w, int
static jobject createJavaDisplayMode(CGDisplayModeRef mode, JNIEnv *env) { static jobject createJavaDisplayMode(CGDisplayModeRef mode, JNIEnv *env) {
jobject ret = NULL; jobject ret = NULL;
jint h = DEFAULT_DEVICE_HEIGHT, w = DEFAULT_DEVICE_WIDTH, bpp = 0, refrate = 0; jint h = DEFAULT_DEVICE_HEIGHT, w = DEFAULT_DEVICE_WIDTH, bpp = 0, refrate = 0;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
if (mode) { if (mode) {
CFStringRef currentBPP = CGDisplayModeCopyPixelEncoding(mode); CFStringRef currentBPP = CGDisplayModeCopyPixelEncoding(mode);
bpp = getBPPFromModeString(currentBPP); bpp = getBPPFromModeString(currentBPP);
@ -164,7 +164,7 @@ static jobject createJavaDisplayMode(CGDisplayModeRef mode, JNIEnv *env) {
DECLARE_METHOD_RETURN(jc_DisplayMode_ctor, jc_DisplayMode, "<init>", "(IIII)V", ret); DECLARE_METHOD_RETURN(jc_DisplayMode_ctor, jc_DisplayMode, "<init>", "(IIII)V", ret);
ret = (*env)->NewObject(env, jc_DisplayMode, jc_DisplayMode_ctor, w, h, bpp, refrate); ret = (*env)->NewObject(env, jc_DisplayMode, jc_DisplayMode_ctor, w, h, bpp, refrate);
CHECK_EXCEPTION(); CHECK_EXCEPTION();
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return ret; return ret;
} }
@ -234,7 +234,7 @@ Java_sun_awt_CGraphicsDevice_nativeGetScreenInsets
jobject ret = NULL; jobject ret = NULL;
__block NSRect frame = NSZeroRect; __block NSRect frame = NSZeroRect;
__block NSRect visibleFrame = NSZeroRect; __block NSRect visibleFrame = NSZeroRect;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
[ThreadUtilities performOnMainThreadWaiting:YES block:^(){ [ThreadUtilities performOnMainThreadWaiting:YES block:^(){
NSArray *screens = [NSScreen screens]; NSArray *screens = [NSScreen screens];
@ -258,7 +258,7 @@ JNF_COCOA_ENTER(env);
DECLARE_METHOD_RETURN(jc_Insets_ctor, jc_Insets, "<init>", "(IIII)V", ret); DECLARE_METHOD_RETURN(jc_Insets_ctor, jc_Insets, "<init>", "(IIII)V", ret);
ret = (*env)->NewObject(env, jc_Insets, jc_Insets_ctor, top, left, bottom, right); ret = (*env)->NewObject(env, jc_Insets, jc_Insets_ctor, top, left, bottom, right);
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return ret; return ret;
} }
@ -272,7 +272,7 @@ JNIEXPORT void JNICALL
Java_sun_awt_CGraphicsDevice_nativeSetDisplayMode Java_sun_awt_CGraphicsDevice_nativeSetDisplayMode
(JNIEnv *env, jclass class, jint displayID, jint w, jint h, jint bpp, jint refrate) (JNIEnv *env, jclass class, jint displayID, jint w, jint h, jint bpp, jint refrate)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
CFArrayRef allModes = getAllValidDisplayModes(displayID); CFArrayRef allModes = getAllValidDisplayModes(displayID);
CGDisplayModeRef closestMatch = getBestModeForParameters(allModes, (int)w, (int)h, (int)bpp, (int)refrate); CGDisplayModeRef closestMatch = getBestModeForParameters(allModes, (int)w, (int)h, (int)bpp, (int)refrate);
@ -289,14 +289,14 @@ Java_sun_awt_CGraphicsDevice_nativeSetDisplayMode
CGDisplayModeRelease(closestMatch); CGDisplayModeRelease(closestMatch);
}]; }];
} else { } else {
[JNFException raise:env as:kIllegalArgumentException reason:"Invalid display mode"]; JNU_ThrowIllegalArgumentException(env, "Invalid display mode");
} }
if (retCode != kCGErrorSuccess){ if (retCode != kCGErrorSuccess){
[JNFException raise:env as:kIllegalArgumentException reason:"Unable to set display mode!"]; JNU_ThrowIllegalArgumentException(env, "Unable to set display mode!");
} }
CFRelease(allModes); CFRelease(allModes);
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
* Class: sun_awt_CGraphicsDevice * Class: sun_awt_CGraphicsDevice
@ -325,7 +325,7 @@ Java_sun_awt_CGraphicsDevice_nativeGetDisplayModes
(JNIEnv *env, jclass class, jint displayID) (JNIEnv *env, jclass class, jint displayID)
{ {
jobjectArray jreturnArray = NULL; jobjectArray jreturnArray = NULL;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
CFArrayRef allModes = getAllValidDisplayModes(displayID); CFArrayRef allModes = getAllValidDisplayModes(displayID);
CFIndex numModes = allModes ? CFArrayGetCount(allModes): 0; CFIndex numModes = allModes ? CFArrayGetCount(allModes): 0;
@ -354,7 +354,7 @@ Java_sun_awt_CGraphicsDevice_nativeGetDisplayModes
if (allModes) { if (allModes) {
CFRelease(allModes); CFRelease(allModes);
} }
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return jreturnArray; return jreturnArray;
} }
@ -370,7 +370,7 @@ Java_sun_awt_CGraphicsDevice_nativeGetScaleFactor
{ {
__block jdouble ret = 1.0f; __block jdouble ret = 1.0f;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
[ThreadUtilities performOnMainThreadWaiting:YES block:^(){ [ThreadUtilities performOnMainThreadWaiting:YES block:^(){
NSArray *screens = [NSScreen screens]; NSArray *screens = [NSScreen screens];
@ -386,6 +386,6 @@ JNF_COCOA_ENTER(env);
} }
}]; }];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return ret; return ret;
} }

28
src/java.desktop/macosx/native/libawt_lwawt/awt/CGraphicsEnv.m
View File

@ -43,23 +43,19 @@ Java_sun_awt_CGraphicsEnvironment_getDisplayIDs
{ {
jintArray ret = NULL; jintArray ret = NULL;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
/* Get the count */ /* Get the count */
CGDisplayCount displayCount; CGDisplayCount displayCount;
if (CGGetOnlineDisplayList(MAX_DISPLAYS, NULL, &displayCount) != kCGErrorSuccess) { if (CGGetOnlineDisplayList(MAX_DISPLAYS, NULL, &displayCount) != kCGErrorSuccess) {
[JNFException raise:env JNU_ThrowInternalError(env, "CGGetOnlineDisplayList() failed to get display count");
as:kInternalError
reason:"CGGetOnlineDisplayList() failed to get display count"];
return NULL; return NULL;
} }
/* Allocate an array and get the size list of display Ids */ /* Allocate an array and get the size list of display Ids */
CGDirectDisplayID displays[MAX_DISPLAYS]; CGDirectDisplayID displays[MAX_DISPLAYS];
if (CGGetOnlineDisplayList(displayCount, displays, &displayCount) != kCGErrorSuccess) { if (CGGetOnlineDisplayList(displayCount, displays, &displayCount) != kCGErrorSuccess) {
[JNFException raise:env JNU_ThrowInternalError(env, "CGGetOnlineDisplayList() failed to get display list");
as:kInternalError
reason:"CGGetOnlineDisplayList() failed to get display list"];
return NULL; return NULL;
} }
@ -91,7 +87,7 @@ JNF_COCOA_ENTER(env);
(*env)->ReleaseIntArrayElements(env, ret, elems, 0); (*env)->ReleaseIntArrayElements(env, ret, elems, 0);
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return ret; return ret;
} }
@ -145,21 +141,19 @@ Java_sun_awt_CGraphicsEnvironment_registerDisplayReconfiguration
{ {
jlong ret = 0L; jlong ret = 0L;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
JNFWeakJObjectWrapper *wrapper = [[JNFWeakJObjectWrapper wrapperWithJObject:this withEnv:env] retain]; JNFWeakJObjectWrapper *wrapper = [[JNFWeakJObjectWrapper wrapperWithJObject:this withEnv:env] retain];
/* Register the callback */ /* Register the callback */
if (CGDisplayRegisterReconfigurationCallback(&displaycb_handle, wrapper) != kCGErrorSuccess) { if (CGDisplayRegisterReconfigurationCallback(&displaycb_handle, wrapper) != kCGErrorSuccess) {
[JNFException raise:env JNU_ThrowInternalError(env, "CGDisplayRegisterReconfigurationCallback() failed");
as:kInternalError
reason:"CGDisplayRegisterReconfigurationCallback() failed"];
return 0L; return 0L;
} }
ret = ptr_to_jlong(wrapper); ret = ptr_to_jlong(wrapper);
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return ret; return ret;
} }
@ -173,21 +167,19 @@ JNIEXPORT void JNICALL
Java_sun_awt_CGraphicsEnvironment_deregisterDisplayReconfiguration Java_sun_awt_CGraphicsEnvironment_deregisterDisplayReconfiguration
(JNIEnv *env, jobject this, jlong p) (JNIEnv *env, jobject this, jlong p)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
JNFWeakJObjectWrapper *wrapper = (JNFWeakJObjectWrapper *)jlong_to_ptr(p); JNFWeakJObjectWrapper *wrapper = (JNFWeakJObjectWrapper *)jlong_to_ptr(p);
if (!wrapper) return; if (!wrapper) return;
/* Remove the registration */ /* Remove the registration */
if (CGDisplayRemoveReconfigurationCallback(&displaycb_handle, wrapper) != kCGErrorSuccess) { if (CGDisplayRemoveReconfigurationCallback(&displaycb_handle, wrapper) != kCGErrorSuccess) {
[JNFException raise:env JNU_ThrowInternalError(env, "CGDisplayRemoveReconfigurationCallback() failed, leaking the callback context!");
as:kInternalError
reason:"CGDisplayRemoveReconfigurationCallback() failed, leaking the callback context!"];
return; return;
} }
[wrapper setJObject:NULL withEnv:env]; // more efficient to pre-clear [wrapper setJObject:NULL withEnv:env]; // more efficient to pre-clear
[wrapper release]; [wrapper release];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }

52
src/java.desktop/macosx/native/libawt_lwawt/awt/CImage.m
View File

@ -111,7 +111,7 @@ JNIEXPORT jlong JNICALL Java_sun_lwawt_macosx_CImage_nativeCreateNSImageFromArra
{ {
jlong result = 0L; jlong result = 0L;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
NSBitmapImageRep* imageRep = CImage_CreateImageRep(env, buffer, width, height); NSBitmapImageRep* imageRep = CImage_CreateImageRep(env, buffer, width, height);
if (imageRep) { if (imageRep) {
@ -120,7 +120,7 @@ JNF_COCOA_ENTER(env);
result = ptr_to_jlong(nsImage); result = ptr_to_jlong(nsImage);
} }
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return result; return result;
} }
@ -135,7 +135,7 @@ JNIEXPORT jlong JNICALL Java_sun_lwawt_macosx_CImage_nativeCreateNSImageFromArra
{ {
jlong result = 0L; jlong result = 0L;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
jsize num = (*env)->GetArrayLength(env, buffers); jsize num = (*env)->GetArrayLength(env, buffers);
NSMutableArray * reps = [NSMutableArray arrayWithCapacity: num]; NSMutableArray * reps = [NSMutableArray arrayWithCapacity: num];
@ -164,7 +164,7 @@ JNF_COCOA_ENTER(env);
result = ptr_to_jlong(nsImage); result = ptr_to_jlong(nsImage);
} }
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return result; return result;
} }
@ -179,7 +179,7 @@ JNIEXPORT jlong JNICALL Java_sun_lwawt_macosx_CImage_nativeCreateNSImageFromIcon
{ {
NSImage *image = nil; NSImage *image = nil;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
IconRef iconRef; IconRef iconRef;
if (noErr == GetIconRef(kOnSystemDisk, kSystemIconsCreator, selector, &iconRef)) { if (noErr == GetIconRef(kOnSystemDisk, kSystemIconsCreator, selector, &iconRef)) {
@ -187,7 +187,7 @@ JNF_COCOA_ENTER(env);
ReleaseIconRef(iconRef); ReleaseIconRef(iconRef);
} }
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return ptr_to_jlong(image); return ptr_to_jlong(image);
} }
@ -202,12 +202,12 @@ JNIEXPORT jlong JNICALL Java_sun_lwawt_macosx_CImage_nativeCreateNSImageFromFile
{ {
NSImage *image = nil; NSImage *image = nil;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
NSString *path = JNFNormalizedNSStringForPath(env, file); NSString *path = JNFNormalizedNSStringForPath(env, file);
image = [[NSImage alloc] initByReferencingFile:path]; image = [[NSImage alloc] initByReferencingFile:path];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return ptr_to_jlong(image); return ptr_to_jlong(image);
} }
@ -222,7 +222,7 @@ JNIEXPORT jlong JNICALL Java_sun_lwawt_macosx_CImage_nativeCreateNSImageOfFileFr
{ {
__block NSImage *image = nil; __block NSImage *image = nil;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
NSString *path = JNFNormalizedNSStringForPath(env, file); NSString *path = JNFNormalizedNSStringForPath(env, file);
[ThreadUtilities performOnMainThreadWaiting:YES block:^(){ [ThreadUtilities performOnMainThreadWaiting:YES block:^(){
@ -230,7 +230,7 @@ JNF_COCOA_ENTER(env);
[image setScalesWhenResized:TRUE]; [image setScalesWhenResized:TRUE];
}]; }];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return ptr_to_jlong(image); return ptr_to_jlong(image);
} }
@ -245,11 +245,11 @@ JNIEXPORT jlong JNICALL Java_sun_lwawt_macosx_CImage_nativeCreateNSImageFromImag
{ {
NSImage *image = nil; NSImage *image = nil;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
image = [[NSImage imageNamed:JNFJavaToNSString(env, name)] retain]; image = [[NSImage imageNamed:JNFJavaToNSString(env, name)] retain];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return ptr_to_jlong(image); return ptr_to_jlong(image);
} }
@ -263,7 +263,7 @@ JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CImage_nativeCopyNSImageIntoArray
(JNIEnv *env, jclass klass, jlong nsImgPtr, jintArray buffer, jint sw, jint sh, (JNIEnv *env, jclass klass, jlong nsImgPtr, jintArray buffer, jint sw, jint sh,
jint dw, jint dh) jint dw, jint dh)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
NSImage *img = (NSImage *)jlong_to_ptr(nsImgPtr); NSImage *img = (NSImage *)jlong_to_ptr(nsImgPtr);
jint *dst = (*env)->GetPrimitiveArrayCritical(env, buffer, NULL); jint *dst = (*env)->GetPrimitiveArrayCritical(env, buffer, NULL);
@ -274,7 +274,7 @@ JNF_COCOA_ENTER(env);
(*env)->ReleasePrimitiveArrayCritical(env, buffer, dst, JNI_ABORT); (*env)->ReleasePrimitiveArrayCritical(env, buffer, dst, JNI_ABORT);
} }
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -287,11 +287,11 @@ JNIEXPORT jobject JNICALL Java_sun_lwawt_macosx_CImage_nativeGetNSImageSize
{ {
jobject size = NULL; jobject size = NULL;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
size = NSToJavaSize(env, [(NSImage *)jlong_to_ptr(nsImgPtr) size]); size = NSToJavaSize(env, [(NSImage *)jlong_to_ptr(nsImgPtr) size]);
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return size; return size;
} }
@ -307,12 +307,12 @@ JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CImage_nativeSetNSImageSize
if (!image) return; if (!image) return;
NSImage *i = (NSImage *)jlong_to_ptr(image); NSImage *i = (NSImage *)jlong_to_ptr(image);
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
[i setScalesWhenResized:TRUE]; [i setScalesWhenResized:TRUE];
[i setSize:NSMakeSize(w, h)]; [i setSize:NSMakeSize(w, h)];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -326,7 +326,7 @@ JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CImage_nativeResizeNSImageRepresent
if (!image) return; if (!image) return;
NSImage *i = (NSImage *)jlong_to_ptr(image); NSImage *i = (NSImage *)jlong_to_ptr(image);
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
NSImageRep *imageRep = nil; NSImageRep *imageRep = nil;
NSArray *imageRepresentations = [i representations]; NSArray *imageRepresentations = [i representations];
@ -335,7 +335,7 @@ JNF_COCOA_ENTER(env);
[imageRep setSize:NSMakeSize(w, h)]; [imageRep setSize:NSMakeSize(w, h)];
} }
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
NSComparisonResult getOrder(BOOL order){ NSComparisonResult getOrder(BOOL order){
@ -355,7 +355,7 @@ JNIEXPORT jobjectArray JNICALL
jobjectArray jreturnArray = NULL; jobjectArray jreturnArray = NULL;
NSImage *img = (NSImage *)jlong_to_ptr(image); NSImage *img = (NSImage *)jlong_to_ptr(image);
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
NSArray *imageRepresentations = [img representations]; NSArray *imageRepresentations = [img representations];
if([imageRepresentations count] == 0){ if([imageRepresentations count] == 0){
@ -417,7 +417,7 @@ JNF_COCOA_ENTER(env);
JNU_CHECK_EXCEPTION_RETURN(env, NULL); JNU_CHECK_EXCEPTION_RETURN(env, NULL);
} }
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return jreturnArray; return jreturnArray;
} }
@ -432,7 +432,7 @@ JNIEXPORT jbyteArray JNICALL Java_sun_lwawt_macosx_CImage_nativeGetPlatformImage
{ {
jbyteArray result = 0L; jbyteArray result = 0L;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
NSBitmapImageRep* imageRep = CImage_CreateImageRep(env, buffer, width, height); NSBitmapImageRep* imageRep = CImage_CreateImageRep(env, buffer, width, height);
if (imageRep) { if (imageRep) {
@ -446,7 +446,7 @@ JNIEXPORT jbyteArray JNICALL Java_sun_lwawt_macosx_CImage_nativeGetPlatformImage
(*env)->ReleasePrimitiveArrayCritical(env, result, tiffData, 0); (*env)->ReleasePrimitiveArrayCritical(env, result, tiffData, 0);
} }
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return result; return result;
} }
@ -462,7 +462,7 @@ JNIEXPORT jlong JNICALL Java_sun_lwawt_macosx_CImage_nativeCreateNSImageFromByte
jlong result = 0L; jlong result = 0L;
CHECK_NULL_RETURN(sourceData, 0L); CHECK_NULL_RETURN(sourceData, 0L);
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
jsize sourceSize = (*env)->GetArrayLength(env, sourceData); jsize sourceSize = (*env)->GetArrayLength(env, sourceData);
if (sourceSize == 0) return 0L; if (sourceSize == 0) return 0L;
@ -476,7 +476,7 @@ JNIEXPORT jlong JNICALL Java_sun_lwawt_macosx_CImage_nativeCreateNSImageFromByte
CHECK_NULL_RETURN(newImage, 0L); CHECK_NULL_RETURN(newImage, 0L);
result = ptr_to_jlong(newImage); result = ptr_to_jlong(newImage);
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return result; return result;
} }

24
src/java.desktop/macosx/native/libawt_lwawt/awt/CInputMethod.m
View File

@ -152,7 +152,7 @@ JNIEXPORT jobject JNICALL Java_sun_lwawt_macosx_CInputMethod_nativeGetCurrentInp
if (!inputMethodController) return NULL; if (!inputMethodController) return NULL;
jobject returnValue = 0; jobject returnValue = 0;
__block NSString *keyboardInfo = NULL; __block NSString *keyboardInfo = NULL;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
[ThreadUtilities performOnMainThreadWaiting:YES block:^(){ [ThreadUtilities performOnMainThreadWaiting:YES block:^(){
keyboardInfo = [inputMethodController performSelector:@selector(currentInputMethodName)]; keyboardInfo = [inputMethodController performSelector:@selector(currentInputMethodName)];
@ -163,7 +163,7 @@ JNF_COCOA_ENTER(env);
returnValue = JNFNSToJavaString(env, keyboardInfo); returnValue = JNFNSToJavaString(env, keyboardInfo);
[keyboardInfo release]; [keyboardInfo release];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return returnValue; return returnValue;
} }
@ -175,14 +175,14 @@ JNF_COCOA_EXIT(env);
JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CInputMethod_nativeNotifyPeer JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CInputMethod_nativeNotifyPeer
(JNIEnv *env, jobject this, jlong nativePeer, jobject inputMethod) (JNIEnv *env, jobject this, jlong nativePeer, jobject inputMethod)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
AWTView *view = (AWTView *)jlong_to_ptr(nativePeer); AWTView *view = (AWTView *)jlong_to_ptr(nativePeer);
JNFJObjectWrapper *inputMethodWrapper = [[JNFJObjectWrapper alloc] initWithJObject:inputMethod withEnv:env]; JNFJObjectWrapper *inputMethodWrapper = [[JNFJObjectWrapper alloc] initWithJObject:inputMethod withEnv:env];
[ThreadUtilities performOnMainThreadWaiting:NO block:^(){ [ThreadUtilities performOnMainThreadWaiting:NO block:^(){
[CInputMethod _nativeNotifyPeerWithView:view inputMethod:inputMethodWrapper]; [CInputMethod _nativeNotifyPeerWithView:view inputMethod:inputMethodWrapper];
}]; }];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
@ -194,14 +194,14 @@ JNF_COCOA_EXIT(env);
JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CInputMethod_nativeEndComposition JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CInputMethod_nativeEndComposition
(JNIEnv *env, jobject this, jlong nativePeer) (JNIEnv *env, jobject this, jlong nativePeer)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
AWTView *view = (AWTView *)jlong_to_ptr(nativePeer); AWTView *view = (AWTView *)jlong_to_ptr(nativePeer);
[ThreadUtilities performOnMainThreadWaiting:NO block:^(){ [ThreadUtilities performOnMainThreadWaiting:NO block:^(){
[CInputMethod _nativeEndComposition:view]; [CInputMethod _nativeEndComposition:view];
}]; }];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -215,7 +215,7 @@ JNIEXPORT jobject JNICALL Java_sun_lwawt_macosx_CInputMethod_getNativeLocale
if (!inputMethodController) return NULL; if (!inputMethodController) return NULL;
jobject returnValue = 0; jobject returnValue = 0;
__block NSString *isoAbbreviation; __block NSString *isoAbbreviation;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
[ThreadUtilities performOnMainThreadWaiting:YES block:^(){ [ThreadUtilities performOnMainThreadWaiting:YES block:^(){
isoAbbreviation = (NSString *) [inputMethodController performSelector:@selector(currentInputMethodLocale)]; isoAbbreviation = (NSString *) [inputMethodController performSelector:@selector(currentInputMethodLocale)];
@ -245,7 +245,7 @@ JNF_COCOA_ENTER(env);
returnValue = sLastKeyboardLocaleObj; returnValue = sLastKeyboardLocaleObj;
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return returnValue; return returnValue;
} }
@ -258,7 +258,7 @@ JNF_COCOA_EXIT(env);
JNIEXPORT jboolean JNICALL Java_sun_lwawt_macosx_CInputMethod_setNativeLocale JNIEXPORT jboolean JNICALL Java_sun_lwawt_macosx_CInputMethod_setNativeLocale
(JNIEnv *env, jobject this, jstring locale, jboolean isActivating) (JNIEnv *env, jobject this, jstring locale, jboolean isActivating)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
NSString *localeStr = JNFJavaToNSString(env, locale); NSString *localeStr = JNFJavaToNSString(env, locale);
[localeStr retain]; [localeStr retain];
@ -267,7 +267,7 @@ JNF_COCOA_ENTER(env);
}]; }];
[localeStr release]; [localeStr release];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return JNI_TRUE; return JNI_TRUE;
} }
@ -299,7 +299,7 @@ JNIEXPORT jobject JNICALL Java_sun_lwawt_macosx_CInputMethodDescriptor_nativeGet
jobject returnValue = 0; jobject returnValue = 0;
__block NSArray *selectableArray = nil; __block NSArray *selectableArray = nil;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
[ThreadUtilities performOnMainThreadWaiting:YES block:^(){ [ThreadUtilities performOnMainThreadWaiting:YES block:^(){
selectableArray = (NSArray *)[inputMethodController performSelector:@selector(availableInputMethodLocales)]; selectableArray = (NSArray *)[inputMethodController performSelector:@selector(availableInputMethodLocales)];
@ -327,7 +327,7 @@ JNF_COCOA_ENTER(env);
(*env)->DeleteLocalRef(env, localeObj); (*env)->DeleteLocalRef(env, localeObj);
} }
[selectableArray release]; [selectableArray release];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return returnValue; return returnValue;
} }

21
src/java.desktop/macosx/native/libawt_lwawt/awt/CMenu.m
View File

@ -30,6 +30,7 @@
#import "CMenu.h" #import "CMenu.h"
#import "CMenuBar.h" #import "CMenuBar.h"
#import "ThreadUtilities.h" #import "ThreadUtilities.h"
#import "JNIUtilities.h"
#import "sun_lwawt_macosx_CMenu.h" #import "sun_lwawt_macosx_CMenu.h"
@ -155,7 +156,7 @@ Java_sun_lwawt_macosx_CMenu_nativeCreateSubMenu
(JNIEnv *env, jobject peer, jlong parentMenu) (JNIEnv *env, jobject peer, jlong parentMenu)
{ {
CMenu *aCMenu = nil; CMenu *aCMenu = nil;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
jobject cPeerObjGlobal = (*env)->NewGlobalRef(env, peer); jobject cPeerObjGlobal = (*env)->NewGlobalRef(env, peer);
@ -164,7 +165,7 @@ JNF_COCOA_ENTER(env);
// Add it to the parent menu // Add it to the parent menu
[((CMenu *)jlong_to_ptr(parentMenu)) addJavaSubmenu: aCMenu]; [((CMenu *)jlong_to_ptr(parentMenu)) addJavaSubmenu: aCMenu];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return ptr_to_jlong(aCMenu); return ptr_to_jlong(aCMenu);
} }
@ -183,7 +184,7 @@ Java_sun_lwawt_macosx_CMenu_nativeCreateMenu
{ {
CMenu *aCMenu = nil; CMenu *aCMenu = nil;
CMenuBar *parent = (CMenuBar *)jlong_to_ptr(parentMenuBar); CMenuBar *parent = (CMenuBar *)jlong_to_ptr(parentMenuBar);
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
jobject cPeerObjGlobal = (*env)->NewGlobalRef(env, peer); jobject cPeerObjGlobal = (*env)->NewGlobalRef(env, peer);
@ -199,7 +200,7 @@ JNF_COCOA_ENTER(env);
[parent javaSetHelpMenu: aCMenu]; [parent javaSetHelpMenu: aCMenu];
} }
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return ptr_to_jlong(aCMenu); return ptr_to_jlong(aCMenu);
} }
@ -213,10 +214,10 @@ JNIEXPORT void JNICALL
Java_sun_lwawt_macosx_CMenu_nativeSetMenuTitle Java_sun_lwawt_macosx_CMenu_nativeSetMenuTitle
(JNIEnv *env, jobject peer, jlong menuObject, jstring label) (JNIEnv *env, jobject peer, jlong menuObject, jstring label)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
// Set the menu's title. // Set the menu's title.
[((CMenu *)jlong_to_ptr(menuObject)) setJavaMenuTitle:JNFJavaToNSString(env, label)]; [((CMenu *)jlong_to_ptr(menuObject)) setJavaMenuTitle:JNFJavaToNSString(env, label)];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -228,10 +229,10 @@ JNIEXPORT void JNICALL
Java_sun_lwawt_macosx_CMenu_nativeDeleteItem Java_sun_lwawt_macosx_CMenu_nativeDeleteItem
(JNIEnv *env, jobject peer, jlong menuObject, jint index) (JNIEnv *env, jobject peer, jlong menuObject, jint index)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
// Remove the specified item. // Remove the specified item.
[((CMenu *)jlong_to_ptr(menuObject)) deleteJavaItem: index]; [((CMenu *)jlong_to_ptr(menuObject)) deleteJavaItem: index];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -245,10 +246,10 @@ Java_sun_lwawt_macosx_CMenu_nativeGetNSMenu
{ {
NSMenu* nsMenu = NULL; NSMenu* nsMenu = NULL;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
// Strong retain this menu; it'll get released in Java_apple_laf_ScreenMenu_addMenuListeners // Strong retain this menu; it'll get released in Java_apple_laf_ScreenMenu_addMenuListeners
nsMenu = [[((CMenu *)jlong_to_ptr(menuObject)) menu] retain]; nsMenu = [[((CMenu *)jlong_to_ptr(menuObject)) menu] retain];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return ptr_to_jlong(nsMenu); return ptr_to_jlong(nsMenu);
} }

18
src/java.desktop/macosx/native/libawt_lwawt/awt/CMenuBar.m
View File

@ -23,6 +23,8 @@
* questions. * questions.
*/ */
#import "JNIUtilities.h"
#import <AppKit/AppKit.h> #import <AppKit/AppKit.h>
#import <JavaNativeFoundation/JavaNativeFoundation.h> #import <JavaNativeFoundation/JavaNativeFoundation.h>
#import <JavaRuntimeSupport/JavaRuntimeSupport.h> #import <JavaRuntimeSupport/JavaRuntimeSupport.h>
@ -407,7 +409,7 @@ Java_sun_lwawt_macosx_CMenuBar_nativeCreateMenuBar
(JNIEnv *env, jobject peer) (JNIEnv *env, jobject peer)
{ {
__block CMenuBar *aCMenuBar = nil; __block CMenuBar *aCMenuBar = nil;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
jobject cPeerObjGlobal = (*env)->NewGlobalRef(env, peer); jobject cPeerObjGlobal = (*env)->NewGlobalRef(env, peer);
@ -420,7 +422,7 @@ Java_sun_lwawt_macosx_CMenuBar_nativeCreateMenuBar
return 0L; return 0L;
} }
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return ptr_to_jlong(aCMenuBar); return ptr_to_jlong(aCMenuBar);
} }
@ -434,10 +436,10 @@ Java_sun_lwawt_macosx_CMenuBar_nativeAddAtIndex
(JNIEnv *env, jobject peer, (JNIEnv *env, jobject peer,
jlong menuBarObject, jlong menuObject, jint index) jlong menuBarObject, jlong menuObject, jint index)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
// Remove the specified item. // Remove the specified item.
[((CMenuBar *) jlong_to_ptr(menuBarObject)) javaAddMenu:(CMenu *) jlong_to_ptr(menuObject) atIndex:index]; [((CMenuBar *) jlong_to_ptr(menuBarObject)) javaAddMenu:(CMenu *) jlong_to_ptr(menuObject) atIndex:index];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -449,10 +451,10 @@ JNIEXPORT void JNICALL
Java_sun_lwawt_macosx_CMenuBar_nativeDelMenu Java_sun_lwawt_macosx_CMenuBar_nativeDelMenu
(JNIEnv *env, jobject peer, jlong menuBarObject, jint index) (JNIEnv *env, jobject peer, jlong menuBarObject, jint index)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
// Remove the specified item. // Remove the specified item.
[((CMenuBar *) jlong_to_ptr(menuBarObject)) javaDeleteMenu: index]; [((CMenuBar *) jlong_to_ptr(menuBarObject)) javaDeleteMenu: index];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -464,8 +466,8 @@ JNIEXPORT void JNICALL
Java_sun_lwawt_macosx_CMenuBar_nativeSetHelpMenu Java_sun_lwawt_macosx_CMenuBar_nativeSetHelpMenu
(JNIEnv *env, jobject peer, jlong menuBarObject, jlong menuObject) (JNIEnv *env, jobject peer, jlong menuBarObject, jlong menuObject)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
// Remove the specified item. // Remove the specified item.
[((CMenuBar *) jlong_to_ptr(menuBarObject)) javaSetHelpMenu: ((CMenu *)jlong_to_ptr(menuObject))]; [((CMenuBar *) jlong_to_ptr(menuBarObject)) javaSetHelpMenu: ((CMenu *)jlong_to_ptr(menuObject))];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }

32
src/java.desktop/macosx/native/libawt_lwawt/awt/CMenuItem.m
View File

@ -70,7 +70,7 @@
- (void)handleAction:(NSMenuItem *)sender { - (void)handleAction:(NSMenuItem *)sender {
AWT_ASSERT_APPKIT_THREAD; AWT_ASSERT_APPKIT_THREAD;
JNIEnv *env = [ThreadUtilities getJNIEnv]; JNIEnv *env = [ThreadUtilities getJNIEnv];
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
// If we are called as a result of user pressing a shortcut, do nothing, // If we are called as a result of user pressing a shortcut, do nothing,
// because AVTView has already sent corresponding key event to the Java // because AVTView has already sent corresponding key event to the Java
@ -111,7 +111,7 @@
(*env)->CallVoidMethod(env, fPeer, jm_handleAction, UTC(currEvent), javaModifiers); // AWT_THREADING Safe (event) (*env)->CallVoidMethod(env, fPeer, jm_handleAction, UTC(currEvent), javaModifiers); // AWT_THREADING Safe (event)
} }
CHECK_EXCEPTION(); CHECK_EXCEPTION();
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
- (void) setJavaLabel:(NSString *)theLabel shortcut:(NSString *)theKeyEquivalent modifierMask:(jint)modifiers { - (void) setJavaLabel:(NSString *)theLabel shortcut:(NSString *)theKeyEquivalent modifierMask:(jint)modifiers {
@ -312,7 +312,7 @@ Java_sun_lwawt_macosx_CMenuItem_nativeSetLabel
jlong menuItemObj, jstring label, jlong menuItemObj, jstring label,
jchar shortcutKey, jint shortcutKeyCode, jint mods) jchar shortcutKey, jint shortcutKeyCode, jint mods)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
NSString *theLabel = JNFJavaToNSString(env, label); NSString *theLabel = JNFJavaToNSString(env, label);
NSString *theKeyEquivalent = nil; NSString *theKeyEquivalent = nil;
unichar macKey = shortcutKey; unichar macKey = shortcutKey;
@ -329,7 +329,7 @@ Java_sun_lwawt_macosx_CMenuItem_nativeSetLabel
} }
[((CMenuItem *)jlong_to_ptr(menuItemObj)) setJavaLabel:theLabel shortcut:theKeyEquivalent modifierMask:mods]; [((CMenuItem *)jlong_to_ptr(menuItemObj)) setJavaLabel:theLabel shortcut:theKeyEquivalent modifierMask:mods];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -341,10 +341,10 @@ JNIEXPORT void JNICALL
Java_sun_lwawt_macosx_CMenuItem_nativeSetTooltip Java_sun_lwawt_macosx_CMenuItem_nativeSetTooltip
(JNIEnv *env, jobject peer, jlong menuItemObj, jstring tooltip) (JNIEnv *env, jobject peer, jlong menuItemObj, jstring tooltip)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
NSString *theTooltip = JNFJavaToNSString(env, tooltip); NSString *theTooltip = JNFJavaToNSString(env, tooltip);
[((CMenuItem *)jlong_to_ptr(menuItemObj)) setJavaToolTipText:theTooltip]; [((CMenuItem *)jlong_to_ptr(menuItemObj)) setJavaToolTipText:theTooltip];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -356,9 +356,9 @@ JNIEXPORT void JNICALL
Java_sun_lwawt_macosx_CMenuItem_nativeSetImage Java_sun_lwawt_macosx_CMenuItem_nativeSetImage
(JNIEnv *env, jobject peer, jlong menuItemObj, jlong image) (JNIEnv *env, jobject peer, jlong menuItemObj, jlong image)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
[((CMenuItem *)jlong_to_ptr(menuItemObj)) setJavaImage:(NSImage*)jlong_to_ptr(image)]; [((CMenuItem *)jlong_to_ptr(menuItemObj)) setJavaImage:(NSImage*)jlong_to_ptr(image)];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -374,7 +374,7 @@ Java_sun_lwawt_macosx_CMenuItem_nativeCreate
__block CMenuItem *aCMenuItem = nil; __block CMenuItem *aCMenuItem = nil;
BOOL asSeparator = (isSeparator == JNI_TRUE) ? YES: NO; BOOL asSeparator = (isSeparator == JNI_TRUE) ? YES: NO;
CMenu *parentCMenu = (CMenu *)jlong_to_ptr(parentCMenuObj); CMenu *parentCMenu = (CMenu *)jlong_to_ptr(parentCMenuObj);
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
jobject cPeerObjGlobal = (*env)->NewGlobalRef(env, peer); jobject cPeerObjGlobal = (*env)->NewGlobalRef(env, peer);
@ -393,7 +393,7 @@ Java_sun_lwawt_macosx_CMenuItem_nativeCreate
// setLabel will be called after creation completes. // setLabel will be called after creation completes.
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return ptr_to_jlong(aCMenuItem); return ptr_to_jlong(aCMenuItem);
} }
@ -406,10 +406,10 @@ JNIEXPORT void JNICALL
Java_sun_lwawt_macosx_CMenuItem_nativeSetEnabled Java_sun_lwawt_macosx_CMenuItem_nativeSetEnabled
(JNIEnv *env, jobject peer, jlong menuItemObj, jboolean enable) (JNIEnv *env, jobject peer, jlong menuItemObj, jboolean enable)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
CMenuItem *item = (CMenuItem *)jlong_to_ptr(menuItemObj); CMenuItem *item = (CMenuItem *)jlong_to_ptr(menuItemObj);
[item setJavaEnabled: (enable == JNI_TRUE)]; [item setJavaEnabled: (enable == JNI_TRUE)];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -421,10 +421,10 @@ JNIEXPORT void JNICALL
Java_sun_lwawt_macosx_CCheckboxMenuItem_nativeSetState Java_sun_lwawt_macosx_CCheckboxMenuItem_nativeSetState
(JNIEnv *env, jobject peer, jlong menuItemObj, jboolean state) (JNIEnv *env, jobject peer, jlong menuItemObj, jboolean state)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
CMenuItem *item = (CMenuItem *)jlong_to_ptr(menuItemObj); CMenuItem *item = (CMenuItem *)jlong_to_ptr(menuItemObj);
[item setJavaState: (state == JNI_TRUE)]; [item setJavaState: (state == JNI_TRUE)];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -436,8 +436,8 @@ JNIEXPORT void JNICALL
Java_sun_lwawt_macosx_CCheckboxMenuItem_nativeSetIsCheckbox Java_sun_lwawt_macosx_CCheckboxMenuItem_nativeSetIsCheckbox
(JNIEnv *env, jobject peer, jlong menuItemObj) (JNIEnv *env, jobject peer, jlong menuItemObj)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
CMenuItem *item = (CMenuItem *)jlong_to_ptr(menuItemObj); CMenuItem *item = (CMenuItem *)jlong_to_ptr(menuItemObj);
[item setIsCheckbox]; [item setIsCheckbox];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }

8
src/java.desktop/macosx/native/libawt_lwawt/awt/CPopupMenu.m
View File

@ -60,7 +60,7 @@ JNIEXPORT jlong JNICALL Java_sun_lwawt_macosx_CPopupMenu_nativeCreatePopupMenu
__block CPopupMenu *aCPopupMenu = nil; __block CPopupMenu *aCPopupMenu = nil;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
jobject cPeerObjGlobal = JNFNewGlobalRef(env, peer); jobject cPeerObjGlobal = JNFNewGlobalRef(env, peer);
@ -68,7 +68,7 @@ JNF_COCOA_ENTER(env);
aCPopupMenu = [[CPopupMenu alloc] initWithPeer:cPeerObjGlobal]; aCPopupMenu = [[CPopupMenu alloc] initWithPeer:cPeerObjGlobal];
}]; }];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return ptr_to_jlong(aCPopupMenu); return ptr_to_jlong(aCPopupMenu);
} }
@ -76,7 +76,7 @@ JNF_COCOA_EXIT(env);
JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CPopupMenu_nativeShowPopupMenu JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CPopupMenu_nativeShowPopupMenu
(JNIEnv *env, jobject peer, jlong menuPtr, jint x, jint y) { (JNIEnv *env, jobject peer, jlong menuPtr, jint x, jint y) {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
CPopupMenu* cPopupMenu = (CPopupMenu*)jlong_to_ptr(menuPtr); CPopupMenu* cPopupMenu = (CPopupMenu*)jlong_to_ptr(menuPtr);
@ -88,7 +88,7 @@ JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CPopupMenu_nativeShowPopupMenu
inView: nil]; inView: nil];
}]; }];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }

32
src/java.desktop/macosx/native/libawt_lwawt/awt/CPrinterJob.m
View File

@ -507,12 +507,12 @@ static void javaPrinterJobToNSPrintInfo(JNIEnv* env, jobject srcPrinterJob, jobj
JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CPrinterJob_abortDoc JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CPrinterJob_abortDoc
(JNIEnv *env, jobject jthis) (JNIEnv *env, jobject jthis)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
// This is only called during the printLoop from the printLoop thread // This is only called during the printLoop from the printLoop thread
NSPrintOperation* printLoop = [NSPrintOperation currentOperation]; NSPrintOperation* printLoop = [NSPrintOperation currentOperation];
NSPrintInfo* printInfo = [printLoop printInfo]; NSPrintInfo* printInfo = [printLoop printInfo];
[printInfo setJobDisposition:NSPrintCancelJob]; [printInfo setJobDisposition:NSPrintCancelJob];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -523,13 +523,13 @@ JNF_COCOA_EXIT(env);
JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CPrinterJob_getDefaultPage JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CPrinterJob_getDefaultPage
(JNIEnv *env, jobject jthis, jobject page) (JNIEnv *env, jobject jthis, jobject page)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
NSPrintInfo* printInfo = createDefaultNSPrintInfo(env, NULL); NSPrintInfo* printInfo = createDefaultNSPrintInfo(env, NULL);
nsPrintInfoToJavaPageFormat(env, printInfo, page); nsPrintInfoToJavaPageFormat(env, printInfo, page);
[printInfo release]; [printInfo release];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -540,7 +540,7 @@ JNF_COCOA_EXIT(env);
JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CPrinterJob_validatePaper JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CPrinterJob_validatePaper
(JNIEnv *env, jobject jthis, jobject origpaper, jobject newpaper) (JNIEnv *env, jobject jthis, jobject origpaper, jobject newpaper)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
NSPrintInfo* printInfo = createDefaultNSPrintInfo(env, NULL); NSPrintInfo* printInfo = createDefaultNSPrintInfo(env, NULL);
@ -549,7 +549,7 @@ JNF_COCOA_ENTER(env);
nsPrintInfoToJavaPaper(env, printInfo, newpaper); nsPrintInfoToJavaPaper(env, printInfo, newpaper);
[printInfo release]; [printInfo release];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -561,7 +561,7 @@ JNIEXPORT jlong JNICALL Java_sun_lwawt_macosx_CPrinterJob_createNSPrintInfo
(JNIEnv *env, jobject jthis) (JNIEnv *env, jobject jthis)
{ {
jlong result = -1; jlong result = -1;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
// This is used to create the NSPrintInfo for this PrinterJob. Thread // This is used to create the NSPrintInfo for this PrinterJob. Thread
// safety is assured by the java side of this call. // safety is assured by the java side of this call.
@ -569,7 +569,7 @@ JNF_COCOA_ENTER(env);
result = ptr_to_jlong(printInfo); result = ptr_to_jlong(printInfo);
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return result; return result;
} }
@ -581,13 +581,13 @@ JNF_COCOA_EXIT(env);
JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CPrinterJob_dispose JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CPrinterJob_dispose
(JNIEnv *env, jobject jthis, jlong nsPrintInfo) (JNIEnv *env, jobject jthis, jlong nsPrintInfo)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
if (nsPrintInfo != -1) if (nsPrintInfo != -1)
{ {
NSPrintInfo* printInfo = (NSPrintInfo*)jlong_to_ptr(nsPrintInfo); NSPrintInfo* printInfo = (NSPrintInfo*)jlong_to_ptr(nsPrintInfo);
[printInfo release]; [printInfo release];
} }
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
@ -610,7 +610,7 @@ JNIEXPORT jboolean JNICALL Java_sun_lwawt_macosx_CPrinterJob_printLoop
jboolean retVal = JNI_FALSE; jboolean retVal = JNI_FALSE;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
// Get the first page's PageFormat for setting things up (This introduces // Get the first page's PageFormat for setting things up (This introduces
// and is a facet of the same problem in Radar 2818593/2708932). // and is a facet of the same problem in Radar 2818593/2708932).
jobject page = (*env)->CallObjectMethod(env, jthis, jm_getPageFormat, 0); // AWT_THREADING Safe (!appKit) jobject page = (*env)->CallObjectMethod(env, jthis, jm_getPageFormat, 0); // AWT_THREADING Safe (!appKit)
@ -674,7 +674,7 @@ JNF_COCOA_ENTER(env);
(*env)->DeleteLocalRef(env, pageFormatArea); (*env)->DeleteLocalRef(env, pageFormatArea);
} }
} }
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return retVal; return retVal;
} }
@ -691,7 +691,7 @@ JNIEXPORT jboolean JNICALL Java_sun_lwawt_macosx_CPrinterPageDialog_showDialog
DECLARE_FIELD_RETURN(jm_page, jc_CPrinterPageDialog, "fPage", "Ljava/awt/print/PageFormat;", NO); DECLARE_FIELD_RETURN(jm_page, jc_CPrinterPageDialog, "fPage", "Ljava/awt/print/PageFormat;", NO);
jboolean result = JNI_FALSE; jboolean result = JNI_FALSE;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
GET_CPRINTERDIALOG_FIELD_RETURN(NO); GET_CPRINTERDIALOG_FIELD_RETURN(NO);
GET_NSPRINTINFO_METHOD_RETURN(NO) GET_NSPRINTINFO_METHOD_RETURN(NO)
jobject printerJob = (*env)->GetObjectField(env, jthis, sjm_printerJob); jobject printerJob = (*env)->GetObjectField(env, jthis, sjm_printerJob);
@ -725,7 +725,7 @@ JNF_COCOA_ENTER(env);
(*env)->DeleteLocalRef(env, page); (*env)->DeleteLocalRef(env, page);
} }
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return result; return result;
} }
@ -741,7 +741,7 @@ JNIEXPORT jboolean JNICALL Java_sun_lwawt_macosx_CPrinterJobDialog_showDialog
DECLARE_FIELD_RETURN(jm_pageable, jc_CPrinterJobDialog, "fPageable", "Ljava/awt/print/Pageable;", NO); DECLARE_FIELD_RETURN(jm_pageable, jc_CPrinterJobDialog, "fPageable", "Ljava/awt/print/Pageable;", NO);
jboolean result = JNI_FALSE; jboolean result = JNI_FALSE;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
GET_CPRINTERDIALOG_FIELD_RETURN(NO); GET_CPRINTERDIALOG_FIELD_RETURN(NO);
jobject printerJob = (*env)->GetObjectField(env, jthis, sjm_printerJob); jobject printerJob = (*env)->GetObjectField(env, jthis, sjm_printerJob);
if (printerJob == NULL) return NO; if (printerJob == NULL) return NO;
@ -772,6 +772,6 @@ JNF_COCOA_ENTER(env);
(*env)->DeleteLocalRef(env, pageable); (*env)->DeleteLocalRef(env, pageable);
} }
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return result; return result;
} }

10
src/java.desktop/macosx/native/libawt_lwawt/awt/CRobot.m
View File

@ -23,7 +23,7 @@
* questions. * questions.
*/ */
#import "jni_util.h" #import "JNIUtilities.h"
#import <JavaNativeFoundation/JavaNativeFoundation.h> #import <JavaNativeFoundation/JavaNativeFoundation.h>
#import <ApplicationServices/ApplicationServices.h> #import <ApplicationServices/ApplicationServices.h>
@ -168,7 +168,7 @@ Java_sun_lwawt_macosx_CRobot_mouseEvent
(JNIEnv *env, jobject peer, jint mouseLastX, jint mouseLastY, jint buttonsState, (JNIEnv *env, jobject peer, jint mouseLastX, jint mouseLastY, jint buttonsState,
jboolean isButtonsDownState, jboolean isMouseMove) jboolean isButtonsDownState, jboolean isMouseMove)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
autoDelay(isMouseMove); autoDelay(isMouseMove);
// This is the native method called when Robot mouse events occur. // This is the native method called when Robot mouse events occur.
@ -254,7 +254,7 @@ Java_sun_lwawt_macosx_CRobot_mouseEvent
PostMouseEvent(point, button, type, clickCount, eventNumber); PostMouseEvent(point, button, type, clickCount, eventNumber);
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -316,7 +316,7 @@ Java_sun_lwawt_macosx_CRobot_nativeGetScreenPixels
(JNIEnv *env, jobject peer, (JNIEnv *env, jobject peer,
jint x, jint y, jint width, jint height, jdouble scale, jintArray pixels) jint x, jint y, jint width, jint height, jdouble scale, jintArray pixels)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
jint picX = x; jint picX = x;
jint picY = y; jint picY = y;
@ -362,7 +362,7 @@ Java_sun_lwawt_macosx_CRobot_nativeGetScreenPixels
// release the Java int array back up to the JVM // release the Java int array back up to the JVM
(*env)->ReleasePrimitiveArrayCritical(env, pixels, jPixelData, 0); (*env)->ReleasePrimitiveArrayCritical(env, pixels, jPixelData, 0);
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/**************************************************** /****************************************************

4
src/java.desktop/macosx/native/libawt_lwawt/awt/CSystemColors.m
View File

@ -41,10 +41,10 @@ NSColor **appleColors = nil;
+ (void)initialize { + (void)initialize {
JNIEnv *env = [ThreadUtilities getJNIEnv]; JNIEnv *env = [ThreadUtilities getJNIEnv];
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
[CSystemColors reloadColors]; [CSystemColors reloadColors];
[[NSNotificationCenter defaultCenter] addObserver:[CSystemColors class] selector:@selector(systemColorsDidChange:) name:NSSystemColorsDidChangeNotification object:nil]; [[NSNotificationCenter defaultCenter] addObserver:[CSystemColors class] selector:@selector(systemColorsDidChange:) name:NSSystemColorsDidChangeNotification object:nil];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }

19
src/java.desktop/macosx/native/libawt_lwawt/awt/CTextPipe.m
View File

@ -589,7 +589,7 @@ JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CTextPipe_doDrawString
QuartzSDOps *qsdo = (QuartzSDOps *)SurfaceData_GetOps(env, jsurfacedata); QuartzSDOps *qsdo = (QuartzSDOps *)SurfaceData_GetOps(env, jsurfacedata);
AWTStrike *awtStrike = (AWTStrike *)jlong_to_ptr(awtStrikePtr); AWTStrike *awtStrike = (AWTStrike *)jlong_to_ptr(awtStrikePtr);
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
jsize len = (*env)->GetStringLength(env, str); jsize len = (*env)->GetStringLength(env, str);
@ -613,7 +613,7 @@ JNF_COCOA_ENTER(env);
JNFReleaseStringUTF16UniChars(env, str, unichars); JNFReleaseStringUTF16UniChars(env, str, unichars);
} }
JNF_COCOA_RENDERER_EXIT(env); JNI_COCOA_RENDERER_EXIT(env);
} }
@ -628,7 +628,7 @@ JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CTextPipe_doUnicodes
QuartzSDOps *qsdo = (QuartzSDOps *)SurfaceData_GetOps(env, jsurfacedata); QuartzSDOps *qsdo = (QuartzSDOps *)SurfaceData_GetOps(env, jsurfacedata);
AWTStrike *awtStrike = (AWTStrike *)jlong_to_ptr(awtStrikePtr); AWTStrike *awtStrike = (AWTStrike *)jlong_to_ptr(awtStrikePtr);
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
// Setup the text context // Setup the text context
if (length < MAX_STACK_ALLOC_GLYPH_BUFFER_SIZE) // optimized for stack allocation if (length < MAX_STACK_ALLOC_GLYPH_BUFFER_SIZE) // optimized for stack allocation
@ -642,7 +642,8 @@ JNF_COCOA_ENTER(env);
{ {
jchar *copyUnichars = malloc(length * sizeof(jchar)); jchar *copyUnichars = malloc(length * sizeof(jchar));
if (!copyUnichars) { if (!copyUnichars) {
[JNFException raise:env as:kOutOfMemoryError reason:"Failed to malloc memory to create the glyphs for string drawing"]; JNU_ThrowOutOfMemoryError(env, "Failed to malloc memory to create the glyphs for string drawing");
return;
} }
@try { @try {
@ -654,7 +655,7 @@ JNF_COCOA_ENTER(env);
} }
} }
JNF_COCOA_RENDERER_EXIT(env); JNI_COCOA_RENDERER_EXIT(env);
} }
/* /*
@ -668,11 +669,11 @@ JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CTextPipe_doOneUnicode
QuartzSDOps *qsdo = (QuartzSDOps *)SurfaceData_GetOps(env, jsurfacedata); QuartzSDOps *qsdo = (QuartzSDOps *)SurfaceData_GetOps(env, jsurfacedata);
AWTStrike *awtStrike = (AWTStrike *)jlong_to_ptr(awtStrikePtr); AWTStrike *awtStrike = (AWTStrike *)jlong_to_ptr(awtStrikePtr);
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
DrawTextContext(env, qsdo, awtStrike, &aUnicode, 1, x, y); DrawTextContext(env, qsdo, awtStrike, &aUnicode, 1, x, y);
JNF_COCOA_RENDERER_EXIT(env); JNI_COCOA_RENDERER_EXIT(env);
} }
/* /*
@ -686,7 +687,7 @@ JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CTextPipe_doDrawGlyphs
QuartzSDOps *qsdo = (QuartzSDOps *)SurfaceData_GetOps(env, jsurfacedata); QuartzSDOps *qsdo = (QuartzSDOps *)SurfaceData_GetOps(env, jsurfacedata);
AWTStrike *awtStrike = (AWTStrike *)jlong_to_ptr(awtStrikePtr); AWTStrike *awtStrike = (AWTStrike *)jlong_to_ptr(awtStrikePtr);
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
qsdo->BeginSurface(env, qsdo, SD_Text); qsdo->BeginSurface(env, qsdo, SD_Text);
if (qsdo->cgRef == NULL) if (qsdo->cgRef == NULL)
@ -704,5 +705,5 @@ JNF_COCOA_ENTER(env);
qsdo->FinishSurface(env, qsdo); qsdo->FinishSurface(env, qsdo);
JNF_COCOA_RENDERER_EXIT(env); JNI_COCOA_RENDERER_EXIT(env);
} }

20
src/java.desktop/macosx/native/libawt_lwawt/awt/CTrayIcon.m
View File

@ -309,14 +309,14 @@ JNIEXPORT jlong JNICALL Java_sun_lwawt_macosx_CTrayIcon_nativeCreate
(JNIEnv *env, jobject peer) { (JNIEnv *env, jobject peer) {
__block AWTTrayIcon *trayIcon = nil; __block AWTTrayIcon *trayIcon = nil;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
jobject thePeer = JNFNewGlobalRef(env, peer); jobject thePeer = JNFNewGlobalRef(env, peer);
[ThreadUtilities performOnMainThreadWaiting:YES block:^(){ [ThreadUtilities performOnMainThreadWaiting:YES block:^(){
trayIcon = [[AWTTrayIcon alloc] initWithPeer:thePeer]; trayIcon = [[AWTTrayIcon alloc] initWithPeer:thePeer];
}]; }];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return ptr_to_jlong(trayIcon); return ptr_to_jlong(trayIcon);
} }
@ -339,7 +339,7 @@ JNIEXPORT void JNICALL Java_java_awt_TrayIcon_initIDs
*/ */
JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CTrayIcon_nativeSetToolTip JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CTrayIcon_nativeSetToolTip
(JNIEnv *env, jobject self, jlong model, jstring jtooltip) { (JNIEnv *env, jobject self, jlong model, jstring jtooltip) {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
AWTTrayIcon *icon = jlong_to_ptr(model); AWTTrayIcon *icon = jlong_to_ptr(model);
NSString *tooltip = JNFJavaToNSString(env, jtooltip); NSString *tooltip = JNFJavaToNSString(env, jtooltip);
@ -347,7 +347,7 @@ JNF_COCOA_ENTER(env);
[icon setTooltip:tooltip]; [icon setTooltip:tooltip];
}]; }];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -357,14 +357,14 @@ JNF_COCOA_EXIT(env);
*/ */
JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CTrayIcon_setNativeImage JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CTrayIcon_setNativeImage
(JNIEnv *env, jobject self, jlong model, jlong imagePtr, jboolean autosize, jboolean isTemplate) { (JNIEnv *env, jobject self, jlong model, jlong imagePtr, jboolean autosize, jboolean isTemplate) {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
AWTTrayIcon *icon = jlong_to_ptr(model); AWTTrayIcon *icon = jlong_to_ptr(model);
[ThreadUtilities performOnMainThreadWaiting:YES block:^(){ [ThreadUtilities performOnMainThreadWaiting:YES block:^(){
[icon setImage:jlong_to_ptr(imagePtr) sizing:autosize template:isTemplate]; [icon setImage:jlong_to_ptr(imagePtr) sizing:autosize template:isTemplate];
}]; }];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
JNIEXPORT jobject JNICALL JNIEXPORT jobject JNICALL
@ -372,7 +372,7 @@ Java_sun_lwawt_macosx_CTrayIcon_nativeGetIconLocation
(JNIEnv *env, jobject self, jlong model) { (JNIEnv *env, jobject self, jlong model) {
jobject jpt = NULL; jobject jpt = NULL;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
__block NSPoint pt = NSZeroPoint; __block NSPoint pt = NSZeroPoint;
AWTTrayIcon *icon = jlong_to_ptr(model); AWTTrayIcon *icon = jlong_to_ptr(model);
@ -383,7 +383,7 @@ JNF_COCOA_ENTER(env);
jpt = NSToJavaPoint(env, pt); jpt = NSToJavaPoint(env, pt);
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return jpt; return jpt;
} }
@ -392,7 +392,7 @@ JNIEXPORT void JNICALL
Java_sun_lwawt_macosx_CTrayIcon_nativeShowNotification Java_sun_lwawt_macosx_CTrayIcon_nativeShowNotification
(JNIEnv *env, jobject self, jlong model, jobject jcaption, jobject jtext, (JNIEnv *env, jobject self, jlong model, jobject jcaption, jobject jtext,
long nsimage) { long nsimage) {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
AWTTrayIcon *icon = jlong_to_ptr(model); AWTTrayIcon *icon = jlong_to_ptr(model);
NSString *caption = JNFJavaToNSString(env, jcaption); NSString *caption = JNFJavaToNSString(env, jcaption);
@ -410,5 +410,5 @@ JNF_COCOA_ENTER(env);
deliverNotification:notification]; deliverNotification:notification];
}]; }];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }

112
src/java.desktop/macosx/native/libawt_lwawt/awt/CWrapper.m
View File

@ -23,6 +23,8 @@
* questions. * questions.
*/ */
#import "JNIUtilities.h"
#import <JavaNativeFoundation/JavaNativeFoundation.h> #import <JavaNativeFoundation/JavaNativeFoundation.h>
#import "ThreadUtilities.h" #import "ThreadUtilities.h"
#import "sun_lwawt_macosx_CWrapper_NSWindow.h" #import "sun_lwawt_macosx_CWrapper_NSWindow.h"
@ -36,7 +38,7 @@ JNIEXPORT void JNICALL
Java_sun_lwawt_macosx_CWrapper_00024NSWindow_makeKeyAndOrderFront Java_sun_lwawt_macosx_CWrapper_00024NSWindow_makeKeyAndOrderFront
(JNIEnv *env, jclass cls, jlong windowPtr) (JNIEnv *env, jclass cls, jlong windowPtr)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
NSWindow *window = (NSWindow *)jlong_to_ptr(windowPtr); NSWindow *window = (NSWindow *)jlong_to_ptr(windowPtr);
[ThreadUtilities performOnMainThread:@selector(makeKeyAndOrderFront:) [ThreadUtilities performOnMainThread:@selector(makeKeyAndOrderFront:)
@ -44,7 +46,7 @@ JNF_COCOA_ENTER(env);
withObject:nil withObject:nil
waitUntilDone:NO]; waitUntilDone:NO];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -56,7 +58,7 @@ JNIEXPORT void JNICALL
Java_sun_lwawt_macosx_CWrapper_00024NSWindow_makeKeyWindow Java_sun_lwawt_macosx_CWrapper_00024NSWindow_makeKeyWindow
(JNIEnv *env, jclass cls, jlong windowPtr) (JNIEnv *env, jclass cls, jlong windowPtr)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
NSWindow *window = (NSWindow *)jlong_to_ptr(windowPtr); NSWindow *window = (NSWindow *)jlong_to_ptr(windowPtr);
[ThreadUtilities performOnMainThread:@selector(makeKeyWindow) [ThreadUtilities performOnMainThread:@selector(makeKeyWindow)
@ -64,7 +66,7 @@ JNF_COCOA_ENTER(env);
withObject:nil withObject:nil
waitUntilDone:NO]; waitUntilDone:NO];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -76,7 +78,7 @@ JNIEXPORT void JNICALL
Java_sun_lwawt_macosx_CWrapper_00024NSWindow_makeMainWindow Java_sun_lwawt_macosx_CWrapper_00024NSWindow_makeMainWindow
(JNIEnv *env, jclass cls, jlong windowPtr) (JNIEnv *env, jclass cls, jlong windowPtr)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
NSWindow *window = (NSWindow *)jlong_to_ptr(windowPtr); NSWindow *window = (NSWindow *)jlong_to_ptr(windowPtr);
[ThreadUtilities performOnMainThread:@selector(makeMainWindow) [ThreadUtilities performOnMainThread:@selector(makeMainWindow)
@ -84,7 +86,7 @@ JNF_COCOA_ENTER(env);
withObject:nil withObject:nil
waitUntilDone:NO]; waitUntilDone:NO];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -98,14 +100,14 @@ Java_sun_lwawt_macosx_CWrapper_00024NSWindow_canBecomeMainWindow
{ {
__block jboolean canBecomeMainWindow = JNI_FALSE; __block jboolean canBecomeMainWindow = JNI_FALSE;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
NSWindow *window = (NSWindow *)jlong_to_ptr(windowPtr); NSWindow *window = (NSWindow *)jlong_to_ptr(windowPtr);
[ThreadUtilities performOnMainThreadWaiting:YES block:^(){ [ThreadUtilities performOnMainThreadWaiting:YES block:^(){
canBecomeMainWindow = [window canBecomeMainWindow]; canBecomeMainWindow = [window canBecomeMainWindow];
}]; }];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return canBecomeMainWindow; return canBecomeMainWindow;
} }
@ -121,14 +123,14 @@ Java_sun_lwawt_macosx_CWrapper_00024NSWindow_isKeyWindow
{ {
__block jboolean isKeyWindow = JNI_FALSE; __block jboolean isKeyWindow = JNI_FALSE;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
NSWindow *window = (NSWindow *)jlong_to_ptr(windowPtr); NSWindow *window = (NSWindow *)jlong_to_ptr(windowPtr);
[ThreadUtilities performOnMainThreadWaiting:YES block:^(){ [ThreadUtilities performOnMainThreadWaiting:YES block:^(){
isKeyWindow = [window isKeyWindow]; isKeyWindow = [window isKeyWindow];
}]; }];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return isKeyWindow; return isKeyWindow;
} }
@ -142,7 +144,7 @@ JNIEXPORT void JNICALL
Java_sun_lwawt_macosx_CWrapper_00024NSWindow_orderFront Java_sun_lwawt_macosx_CWrapper_00024NSWindow_orderFront
(JNIEnv *env, jclass cls, jlong windowPtr) (JNIEnv *env, jclass cls, jlong windowPtr)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
NSWindow *window = (NSWindow *)jlong_to_ptr(windowPtr); NSWindow *window = (NSWindow *)jlong_to_ptr(windowPtr);
[ThreadUtilities performOnMainThread:@selector(orderFront:) [ThreadUtilities performOnMainThread:@selector(orderFront:)
@ -150,7 +152,7 @@ JNF_COCOA_ENTER(env);
withObject:window withObject:window
waitUntilDone:NO]; waitUntilDone:NO];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -162,7 +164,7 @@ JNIEXPORT void JNICALL
Java_sun_lwawt_macosx_CWrapper_00024NSWindow_orderOut Java_sun_lwawt_macosx_CWrapper_00024NSWindow_orderOut
(JNIEnv *env, jclass cls, jlong windowPtr) (JNIEnv *env, jclass cls, jlong windowPtr)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
NSWindow *window = (NSWindow *)jlong_to_ptr(windowPtr); NSWindow *window = (NSWindow *)jlong_to_ptr(windowPtr);
[ThreadUtilities performOnMainThread:@selector(orderOut:) [ThreadUtilities performOnMainThread:@selector(orderOut:)
@ -170,7 +172,7 @@ JNF_COCOA_ENTER(env);
withObject:window withObject:window
waitUntilDone:NO]; waitUntilDone:NO];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -182,12 +184,12 @@ JNIEXPORT void JNICALL
Java_sun_lwawt_macosx_CWrapper_00024NSWindow_close Java_sun_lwawt_macosx_CWrapper_00024NSWindow_close
(JNIEnv *env, jclass cls, jlong windowPtr) (JNIEnv *env, jclass cls, jlong windowPtr)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
NSWindow *window = (NSWindow *)jlong_to_ptr(windowPtr); NSWindow *window = (NSWindow *)jlong_to_ptr(windowPtr);
[ThreadUtilities performOnMainThreadWaiting:NO block:^(){ [ThreadUtilities performOnMainThreadWaiting:NO block:^(){
[window close]; [window close];
}]; }];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -199,7 +201,7 @@ JNIEXPORT void JNICALL
Java_sun_lwawt_macosx_CWrapper_00024NSWindow_orderFrontRegardless Java_sun_lwawt_macosx_CWrapper_00024NSWindow_orderFrontRegardless
(JNIEnv *env, jclass cls, jlong windowPtr) (JNIEnv *env, jclass cls, jlong windowPtr)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
NSWindow *window = (NSWindow *)jlong_to_ptr(windowPtr); NSWindow *window = (NSWindow *)jlong_to_ptr(windowPtr);
[ThreadUtilities performOnMainThread:@selector(orderFrontRegardless) [ThreadUtilities performOnMainThread:@selector(orderFrontRegardless)
@ -207,7 +209,7 @@ JNF_COCOA_ENTER(env);
withObject:nil withObject:nil
waitUntilDone:NO]; waitUntilDone:NO];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -219,7 +221,7 @@ JNIEXPORT void JNICALL
Java_sun_lwawt_macosx_CWrapper_00024NSWindow_orderWindow Java_sun_lwawt_macosx_CWrapper_00024NSWindow_orderWindow
(JNIEnv *env, jclass cls, jlong windowPtr, jint order, jlong relativeToPtr) (JNIEnv *env, jclass cls, jlong windowPtr, jint order, jlong relativeToPtr)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
NSWindow *window = (NSWindow *)jlong_to_ptr(windowPtr); NSWindow *window = (NSWindow *)jlong_to_ptr(windowPtr);
NSWindow *relativeTo = (NSWindow *)jlong_to_ptr(relativeToPtr); NSWindow *relativeTo = (NSWindow *)jlong_to_ptr(relativeToPtr);
@ -227,7 +229,7 @@ JNF_COCOA_ENTER(env);
[window orderWindow:(NSWindowOrderingMode)order relativeTo:[relativeTo windowNumber]]; [window orderWindow:(NSWindowOrderingMode)order relativeTo:[relativeTo windowNumber]];
}]; }];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
// Used for CWrapper.NSWindow.setLevel() (and level() which isn't implemented yet) // Used for CWrapper.NSWindow.setLevel() (and level() which isn't implemented yet)
@ -252,7 +254,7 @@ JNIEXPORT void JNICALL
Java_sun_lwawt_macosx_CWrapper_00024NSWindow_setLevel Java_sun_lwawt_macosx_CWrapper_00024NSWindow_setLevel
(JNIEnv *env, jclass cls, jlong windowPtr, jint level) (JNIEnv *env, jclass cls, jlong windowPtr, jint level)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
if (level >= 0 && level < sun_lwawt_macosx_CWrapper_NSWindow_MAX_WINDOW_LEVELS) { if (level >= 0 && level < sun_lwawt_macosx_CWrapper_NSWindow_MAX_WINDOW_LEVELS) {
initLevels(); initLevels();
@ -262,10 +264,10 @@ JNF_COCOA_ENTER(env);
[window setLevel: LEVELS[level]]; [window setLevel: LEVELS[level]];
}]; }];
} else { } else {
[JNFException raise:env as:kIllegalArgumentException reason:"unknown level"]; JNU_ThrowIllegalArgumentException(env, "unknown level");
} }
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -277,7 +279,7 @@ JNIEXPORT void JNICALL
Java_sun_lwawt_macosx_CWrapper_00024NSWindow_addChildWindow Java_sun_lwawt_macosx_CWrapper_00024NSWindow_addChildWindow
(JNIEnv *env, jclass cls, jlong parentPtr, jlong childPtr, jint order) (JNIEnv *env, jclass cls, jlong parentPtr, jlong childPtr, jint order)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
NSWindow *parent = (NSWindow *)jlong_to_ptr(parentPtr); NSWindow *parent = (NSWindow *)jlong_to_ptr(parentPtr);
NSWindow *child = (NSWindow *)jlong_to_ptr(childPtr); NSWindow *child = (NSWindow *)jlong_to_ptr(childPtr);
@ -285,7 +287,7 @@ JNF_COCOA_ENTER(env);
[parent addChildWindow:child ordered:order]; [parent addChildWindow:child ordered:order];
}]; }];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -297,7 +299,7 @@ JNIEXPORT void JNICALL
Java_sun_lwawt_macosx_CWrapper_00024NSWindow_removeChildWindow Java_sun_lwawt_macosx_CWrapper_00024NSWindow_removeChildWindow
(JNIEnv *env, jclass cls, jlong parentPtr, jlong childPtr) (JNIEnv *env, jclass cls, jlong parentPtr, jlong childPtr)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
NSWindow *parent = (NSWindow *)jlong_to_ptr(parentPtr); NSWindow *parent = (NSWindow *)jlong_to_ptr(parentPtr);
NSWindow *child = (NSWindow *)jlong_to_ptr(childPtr); NSWindow *child = (NSWindow *)jlong_to_ptr(childPtr);
@ -306,7 +308,7 @@ JNF_COCOA_ENTER(env);
withObject:child withObject:child
waitUntilDone:NO]; waitUntilDone:NO];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -318,14 +320,14 @@ JNIEXPORT void JNICALL
Java_sun_lwawt_macosx_CWrapper_00024NSWindow_setAlphaValue Java_sun_lwawt_macosx_CWrapper_00024NSWindow_setAlphaValue
(JNIEnv *env, jclass cls, jlong windowPtr, jfloat alpha) (JNIEnv *env, jclass cls, jlong windowPtr, jfloat alpha)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
NSWindow *window = (NSWindow *)jlong_to_ptr(windowPtr); NSWindow *window = (NSWindow *)jlong_to_ptr(windowPtr);
[ThreadUtilities performOnMainThreadWaiting:NO block:^(){ [ThreadUtilities performOnMainThreadWaiting:NO block:^(){
[window setAlphaValue:(CGFloat)alpha]; [window setAlphaValue:(CGFloat)alpha];
}]; }];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -337,14 +339,14 @@ JNIEXPORT void JNICALL
Java_sun_lwawt_macosx_CWrapper_00024NSWindow_setOpaque Java_sun_lwawt_macosx_CWrapper_00024NSWindow_setOpaque
(JNIEnv *env, jclass cls, jlong windowPtr, jboolean opaque) (JNIEnv *env, jclass cls, jlong windowPtr, jboolean opaque)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
NSWindow *window = (NSWindow *)jlong_to_ptr(windowPtr); NSWindow *window = (NSWindow *)jlong_to_ptr(windowPtr);
[ThreadUtilities performOnMainThreadWaiting:NO block:^(){ [ThreadUtilities performOnMainThreadWaiting:NO block:^(){
[window setOpaque:(BOOL)opaque]; [window setOpaque:(BOOL)opaque];
}]; }];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -356,7 +358,7 @@ JNIEXPORT void JNICALL
Java_sun_lwawt_macosx_CWrapper_00024NSWindow_setBackgroundColor Java_sun_lwawt_macosx_CWrapper_00024NSWindow_setBackgroundColor
(JNIEnv *env, jclass cls, jlong windowPtr, jint rgb) (JNIEnv *env, jclass cls, jlong windowPtr, jint rgb)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
NSWindow *window = (NSWindow *)jlong_to_ptr(windowPtr); NSWindow *window = (NSWindow *)jlong_to_ptr(windowPtr);
CGFloat alpha = (((rgb >> 24) & 0xff) / 255.0); CGFloat alpha = (((rgb >> 24) & 0xff) / 255.0);
@ -369,7 +371,7 @@ JNF_COCOA_ENTER(env);
[window setBackgroundColor:color]; [window setBackgroundColor:color];
}]; }];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -381,7 +383,7 @@ JNIEXPORT void JNICALL
Java_sun_lwawt_macosx_CWrapper_00024NSWindow_miniaturize Java_sun_lwawt_macosx_CWrapper_00024NSWindow_miniaturize
(JNIEnv *env, jclass cls, jlong windowPtr) (JNIEnv *env, jclass cls, jlong windowPtr)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
NSWindow *window = (NSWindow *)jlong_to_ptr(windowPtr); NSWindow *window = (NSWindow *)jlong_to_ptr(windowPtr);
[ThreadUtilities performOnMainThread:@selector(miniaturize:) [ThreadUtilities performOnMainThread:@selector(miniaturize:)
@ -389,7 +391,7 @@ JNF_COCOA_ENTER(env);
withObject:nil withObject:nil
waitUntilDone:NO]; waitUntilDone:NO];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -401,7 +403,7 @@ JNIEXPORT void JNICALL
Java_sun_lwawt_macosx_CWrapper_00024NSWindow_deminiaturize Java_sun_lwawt_macosx_CWrapper_00024NSWindow_deminiaturize
(JNIEnv *env, jclass cls, jlong windowPtr) (JNIEnv *env, jclass cls, jlong windowPtr)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
NSWindow *window = (NSWindow *)jlong_to_ptr(windowPtr); NSWindow *window = (NSWindow *)jlong_to_ptr(windowPtr);
[ThreadUtilities performOnMainThread:@selector(deminiaturize:) [ThreadUtilities performOnMainThread:@selector(deminiaturize:)
@ -409,7 +411,7 @@ JNF_COCOA_ENTER(env);
withObject:nil withObject:nil
waitUntilDone:NO]; waitUntilDone:NO];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -423,14 +425,14 @@ Java_sun_lwawt_macosx_CWrapper_00024NSWindow_isZoomed
{ {
__block jboolean isZoomed = JNI_FALSE; __block jboolean isZoomed = JNI_FALSE;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
NSWindow *window = (NSWindow *)jlong_to_ptr(windowPtr); NSWindow *window = (NSWindow *)jlong_to_ptr(windowPtr);
[ThreadUtilities performOnMainThreadWaiting:YES block:^(){ [ThreadUtilities performOnMainThreadWaiting:YES block:^(){
isZoomed = [window isZoomed]; isZoomed = [window isZoomed];
}]; }];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return isZoomed; return isZoomed;
} }
@ -444,7 +446,7 @@ JNIEXPORT void JNICALL
Java_sun_lwawt_macosx_CWrapper_00024NSWindow_zoom Java_sun_lwawt_macosx_CWrapper_00024NSWindow_zoom
(JNIEnv *env, jclass cls, jlong windowPtr) (JNIEnv *env, jclass cls, jlong windowPtr)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
NSWindow *window = (NSWindow *)jlong_to_ptr(windowPtr); NSWindow *window = (NSWindow *)jlong_to_ptr(windowPtr);
[ThreadUtilities performOnMainThread:@selector(zoom:) [ThreadUtilities performOnMainThread:@selector(zoom:)
@ -452,7 +454,7 @@ JNF_COCOA_ENTER(env);
withObject:nil withObject:nil
waitUntilDone:NO]; waitUntilDone:NO];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -464,7 +466,7 @@ JNIEXPORT void JNICALL
Java_sun_lwawt_macosx_CWrapper_00024NSWindow_makeFirstResponder Java_sun_lwawt_macosx_CWrapper_00024NSWindow_makeFirstResponder
(JNIEnv *env, jclass cls, jlong windowPtr, jlong responderPtr) (JNIEnv *env, jclass cls, jlong windowPtr, jlong responderPtr)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
NSWindow *window = (NSWindow *)jlong_to_ptr(windowPtr); NSWindow *window = (NSWindow *)jlong_to_ptr(windowPtr);
NSResponder *responder = (NSResponder *)jlong_to_ptr(responderPtr); NSResponder *responder = (NSResponder *)jlong_to_ptr(responderPtr);
@ -473,7 +475,7 @@ JNF_COCOA_ENTER(env);
withObject:responder withObject:responder
waitUntilDone:NO]; waitUntilDone:NO];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -485,7 +487,7 @@ JNIEXPORT void JNICALL
Java_sun_lwawt_macosx_CWrapper_00024NSView_addSubview Java_sun_lwawt_macosx_CWrapper_00024NSView_addSubview
(JNIEnv *env, jclass cls, jlong viewPtr, jlong subviewPtr) (JNIEnv *env, jclass cls, jlong viewPtr, jlong subviewPtr)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
NSView *view = (NSView *)jlong_to_ptr(viewPtr); NSView *view = (NSView *)jlong_to_ptr(viewPtr);
NSView *subview = (NSView *)jlong_to_ptr(subviewPtr); NSView *subview = (NSView *)jlong_to_ptr(subviewPtr);
@ -493,7 +495,7 @@ JNF_COCOA_ENTER(env);
[view addSubview:subview]; [view addSubview:subview];
}]; }];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -505,7 +507,7 @@ JNIEXPORT void JNICALL
Java_sun_lwawt_macosx_CWrapper_00024NSView_removeFromSuperview Java_sun_lwawt_macosx_CWrapper_00024NSView_removeFromSuperview
(JNIEnv *env, jclass cls, jlong viewPtr) (JNIEnv *env, jclass cls, jlong viewPtr)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
NSView *view = (NSView *)jlong_to_ptr(viewPtr); NSView *view = (NSView *)jlong_to_ptr(viewPtr);
[ThreadUtilities performOnMainThread:@selector(removeFromSuperview) [ThreadUtilities performOnMainThread:@selector(removeFromSuperview)
@ -513,7 +515,7 @@ JNF_COCOA_ENTER(env);
withObject:nil withObject:nil
waitUntilDone:NO]; waitUntilDone:NO];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -525,14 +527,14 @@ JNIEXPORT void JNICALL
Java_sun_lwawt_macosx_CWrapper_00024NSView_setFrame Java_sun_lwawt_macosx_CWrapper_00024NSView_setFrame
(JNIEnv *env, jclass cls, jlong viewPtr, jint x, jint y, jint w, jint h) (JNIEnv *env, jclass cls, jlong viewPtr, jint x, jint y, jint w, jint h)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
NSView *view = (NSView *)jlong_to_ptr(viewPtr); NSView *view = (NSView *)jlong_to_ptr(viewPtr);
[ThreadUtilities performOnMainThreadWaiting:NO block:^(){ [ThreadUtilities performOnMainThreadWaiting:NO block:^(){
[view setFrame:NSMakeRect(x, y, w, h)]; [view setFrame:NSMakeRect(x, y, w, h)];
}]; }];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -546,14 +548,14 @@ Java_sun_lwawt_macosx_CWrapper_00024NSView_window
{ {
__block jlong windowPtr = 0L; __block jlong windowPtr = 0L;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
NSView *view = (NSView *)jlong_to_ptr(viewPtr); NSView *view = (NSView *)jlong_to_ptr(viewPtr);
[ThreadUtilities performOnMainThreadWaiting:YES block:^(){ [ThreadUtilities performOnMainThreadWaiting:YES block:^(){
windowPtr = ptr_to_jlong([view window]); windowPtr = ptr_to_jlong([view window]);
}]; }];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return windowPtr; return windowPtr;
} }
@ -567,14 +569,14 @@ JNIEXPORT void JNICALL
Java_sun_lwawt_macosx_CWrapper_00024NSView_setHidden Java_sun_lwawt_macosx_CWrapper_00024NSView_setHidden
(JNIEnv *env, jclass cls, jlong viewPtr, jboolean toHide) (JNIEnv *env, jclass cls, jlong viewPtr, jboolean toHide)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
NSView *view = (NSView *)jlong_to_ptr(viewPtr); NSView *view = (NSView *)jlong_to_ptr(viewPtr);
[ThreadUtilities performOnMainThreadWaiting:NO block:^(){ [ThreadUtilities performOnMainThreadWaiting:NO block:^(){
[view setHidden:(BOOL)toHide]; [view setHidden:(BOOL)toHide];
}]; }];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -587,7 +589,7 @@ Java_sun_lwawt_macosx_CWrapper_00024NSView_setToolTip
(JNIEnv *env, jclass cls, jlong viewPtr, jstring msg) (JNIEnv *env, jclass cls, jlong viewPtr, jstring msg)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
NSView *view = (NSView *)jlong_to_ptr(viewPtr); NSView *view = (NSView *)jlong_to_ptr(viewPtr);
NSString* s = JNFJavaToNSString(env, msg); NSString* s = JNFJavaToNSString(env, msg);
@ -595,5 +597,5 @@ JNF_COCOA_ENTER(env);
[view setToolTip: s]; [view setToolTip: s];
}]; }];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }

8
src/java.desktop/macosx/native/libawt_lwawt/awt/ImageSurfaceData.m
View File

@ -1241,7 +1241,7 @@ PRINT("xorSurfacePixels")
jboolean handled = JNI_FALSE; jboolean handled = JNI_FALSE;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
ImageSDOps* srcIsdo = LockImagePixels(env, srcIsd); ImageSDOps* srcIsdo = LockImagePixels(env, srcIsd);
ImageSDOps* dstIsdo = LockImagePixels(env, dstIsd); ImageSDOps* dstIsdo = LockImagePixels(env, dstIsd);
@ -1320,7 +1320,7 @@ fprintf(stderr, " dstIsdo->width=%d, dstIsdo->height=%d, biqsdoPixels->width=%
UnlockImagePixels(env, srcIsdo); UnlockImagePixels(env, srcIsdo);
UnlockImagePixels(env, dstIsdo); UnlockImagePixels(env, dstIsdo);
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return handled; return handled;
} }
@ -1329,7 +1329,7 @@ IMAGE_SURFACE_INLINE jboolean clearSurfacePixels(JNIEnv *env, jobject bisd, jint
PRINT("clearSurfacePixels") PRINT("clearSurfacePixels")
jboolean handled = JNI_FALSE; jboolean handled = JNI_FALSE;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
ImageSDOps *isdo = LockImagePixels(env, bisd); ImageSDOps *isdo = LockImagePixels(env, bisd);
@ -1361,7 +1361,7 @@ JNF_COCOA_ENTER(env);
} }
UnlockImagePixels(env, isdo); UnlockImagePixels(env, isdo);
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return handled; return handled;
} }

36
src/java.desktop/macosx/native/libawt_lwawt/awt/JavaComponentAccessibility.m
View File

@ -1504,9 +1504,9 @@ static NSObject *sAttributeNamesLOCK = nil;
JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CAccessibility_focusChanged JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CAccessibility_focusChanged
(JNIEnv *env, jobject jthis) (JNIEnv *env, jobject jthis)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
[ThreadUtilities performOnMainThread:@selector(postFocusChanged:) on:[JavaComponentAccessibility class] withObject:nil waitUntilDone:NO]; [ThreadUtilities performOnMainThread:@selector(postFocusChanged:) on:[JavaComponentAccessibility class] withObject:nil waitUntilDone:NO];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -1517,9 +1517,9 @@ JNF_COCOA_EXIT(env);
JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CAccessible_valueChanged JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CAccessible_valueChanged
(JNIEnv *env, jclass jklass, jlong element) (JNIEnv *env, jclass jklass, jlong element)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
[ThreadUtilities performOnMainThread:@selector(postValueChanged) on:(JavaComponentAccessibility *)jlong_to_ptr(element) withObject:nil waitUntilDone:NO]; [ThreadUtilities performOnMainThread:@selector(postValueChanged) on:(JavaComponentAccessibility *)jlong_to_ptr(element) withObject:nil waitUntilDone:NO];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -1530,12 +1530,12 @@ JNF_COCOA_EXIT(env);
JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CAccessible_selectedTextChanged JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CAccessible_selectedTextChanged
(JNIEnv *env, jclass jklass, jlong element) (JNIEnv *env, jclass jklass, jlong element)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
[ThreadUtilities performOnMainThread:@selector(postSelectedTextChanged) [ThreadUtilities performOnMainThread:@selector(postSelectedTextChanged)
on:(JavaComponentAccessibility *)jlong_to_ptr(element) on:(JavaComponentAccessibility *)jlong_to_ptr(element)
withObject:nil withObject:nil
waitUntilDone:NO]; waitUntilDone:NO];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -1546,9 +1546,9 @@ JNF_COCOA_EXIT(env);
JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CAccessible_selectionChanged JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CAccessible_selectionChanged
(JNIEnv *env, jclass jklass, jlong element) (JNIEnv *env, jclass jklass, jlong element)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
[ThreadUtilities performOnMainThread:@selector(postSelectionChanged) on:(JavaComponentAccessibility *)jlong_to_ptr(element) withObject:nil waitUntilDone:NO]; [ThreadUtilities performOnMainThread:@selector(postSelectionChanged) on:(JavaComponentAccessibility *)jlong_to_ptr(element) withObject:nil waitUntilDone:NO];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -1559,9 +1559,9 @@ JNF_COCOA_EXIT(env);
JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CAccessible_titleChanged JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CAccessible_titleChanged
(JNIEnv *env, jclass jklass, jlong element) (JNIEnv *env, jclass jklass, jlong element)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
[ThreadUtilities performOnMainThread:@selector(postTitleChanged) on:(JavaComponentAccessibility*)jlong_to_ptr(element) withObject:nil waitUntilDone:NO]; [ThreadUtilities performOnMainThread:@selector(postTitleChanged) on:(JavaComponentAccessibility*)jlong_to_ptr(element) withObject:nil waitUntilDone:NO];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -1572,12 +1572,12 @@ JNF_COCOA_EXIT(env);
JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CAccessible_menuOpened JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CAccessible_menuOpened
(JNIEnv *env, jclass jklass, jlong element) (JNIEnv *env, jclass jklass, jlong element)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
[ThreadUtilities performOnMainThread:@selector(postMenuOpened) [ThreadUtilities performOnMainThread:@selector(postMenuOpened)
on:(JavaComponentAccessibility *)jlong_to_ptr(element) on:(JavaComponentAccessibility *)jlong_to_ptr(element)
withObject:nil withObject:nil
waitUntilDone:NO]; waitUntilDone:NO];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -1588,12 +1588,12 @@ JNF_COCOA_EXIT(env);
JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CAccessible_menuClosed JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CAccessible_menuClosed
(JNIEnv *env, jclass jklass, jlong element) (JNIEnv *env, jclass jklass, jlong element)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
[ThreadUtilities performOnMainThread:@selector(postMenuClosed) [ThreadUtilities performOnMainThread:@selector(postMenuClosed)
on:(JavaComponentAccessibility *)jlong_to_ptr(element) on:(JavaComponentAccessibility *)jlong_to_ptr(element)
withObject:nil withObject:nil
waitUntilDone:NO]; waitUntilDone:NO];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -1604,12 +1604,12 @@ JNF_COCOA_EXIT(env);
JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CAccessible_menuItemSelected JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CAccessible_menuItemSelected
(JNIEnv *env, jclass jklass, jlong element) (JNIEnv *env, jclass jklass, jlong element)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
[ThreadUtilities performOnMainThread:@selector(postMenuItemSelected) [ThreadUtilities performOnMainThread:@selector(postMenuItemSelected)
on:(JavaComponentAccessibility *)jlong_to_ptr(element) on:(JavaComponentAccessibility *)jlong_to_ptr(element)
withObject:nil withObject:nil
waitUntilDone:NO]; waitUntilDone:NO];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -1620,9 +1620,9 @@ JNF_COCOA_EXIT(env);
JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CAccessible_unregisterFromCocoaAXSystem JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CAccessible_unregisterFromCocoaAXSystem
(JNIEnv *env, jclass jklass, jlong element) (JNIEnv *env, jclass jklass, jlong element)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
[ThreadUtilities performOnMainThread:@selector(unregisterFromCocoaAXSystem) on:(JavaComponentAccessibility *)jlong_to_ptr(element) withObject:nil waitUntilDone:NO]; [ThreadUtilities performOnMainThread:@selector(unregisterFromCocoaAXSystem) on:(JavaComponentAccessibility *)jlong_to_ptr(element) withObject:nil waitUntilDone:NO];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
@implementation TabGroupAccessibility @implementation TabGroupAccessibility

44
src/java.desktop/macosx/native/libawt_lwawt/awt/LWCToolkit.m
View File

@ -474,9 +474,9 @@ JNIEXPORT jboolean JNICALL Java_sun_lwawt_macosx_LWCToolkit_nativeSyncQueue
JNIEXPORT void JNICALL Java_sun_lwawt_macosx_LWCToolkit_flushNativeSelectors JNIEXPORT void JNICALL Java_sun_lwawt_macosx_LWCToolkit_flushNativeSelectors
(JNIEnv *env, jclass clz) (JNIEnv *env, jclass clz)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
[ThreadUtilities performOnMainThreadWaiting:YES block:^(){}]; [ThreadUtilities performOnMainThreadWaiting:YES block:^(){}];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -541,11 +541,11 @@ BOOL doLoadNativeColors(JNIEnv *env, jintArray jColors, BOOL useAppleColors) {
JNIEXPORT void JNICALL Java_sun_lwawt_macosx_LWCToolkit_loadNativeColors JNIEXPORT void JNICALL Java_sun_lwawt_macosx_LWCToolkit_loadNativeColors
(JNIEnv *env, jobject peer, jintArray jSystemColors, jintArray jAppleColors) (JNIEnv *env, jobject peer, jintArray jSystemColors, jintArray jAppleColors)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
if (doLoadNativeColors(env, jSystemColors, NO)) { if (doLoadNativeColors(env, jSystemColors, NO)) {
doLoadNativeColors(env, jAppleColors, YES); doLoadNativeColors(env, jAppleColors, YES);
} }
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -560,11 +560,11 @@ AWT_ASSERT_APPKIT_THREAD;
jlong result; jlong result;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
// We double retain because this object is owned by both main thread and "other" thread // We double retain because this object is owned by both main thread and "other" thread
// We release in both doAWTRunLoop and stopAWTRunLoop // We release in both doAWTRunLoop and stopAWTRunLoop
result = ptr_to_jlong([[[AWTRunLoopObject alloc] init] retain]); result = ptr_to_jlong([[[AWTRunLoopObject alloc] init] retain]);
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return result; return result;
} }
@ -578,7 +578,7 @@ JNIEXPORT void JNICALL Java_sun_lwawt_macosx_LWCToolkit_doAWTRunLoopImpl
(JNIEnv *env, jclass clz, jlong mediator, jboolean processEvents, jboolean inAWT) (JNIEnv *env, jclass clz, jlong mediator, jboolean processEvents, jboolean inAWT)
{ {
AWT_ASSERT_APPKIT_THREAD; AWT_ASSERT_APPKIT_THREAD;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
AWTRunLoopObject* mediatorObject = (AWTRunLoopObject*)jlong_to_ptr(mediator); AWTRunLoopObject* mediatorObject = (AWTRunLoopObject*)jlong_to_ptr(mediator);
@ -604,7 +604,7 @@ JNF_COCOA_ENTER(env);
} }
} }
[mediatorObject release]; [mediatorObject release];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -615,7 +615,7 @@ JNF_COCOA_EXIT(env);
JNIEXPORT void JNICALL Java_sun_lwawt_macosx_LWCToolkit_stopAWTRunLoop JNIEXPORT void JNICALL Java_sun_lwawt_macosx_LWCToolkit_stopAWTRunLoop
(JNIEnv *env, jclass clz, jlong mediator) (JNIEnv *env, jclass clz, jlong mediator)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
AWTRunLoopObject* mediatorObject = (AWTRunLoopObject*)jlong_to_ptr(mediator); AWTRunLoopObject* mediatorObject = (AWTRunLoopObject*)jlong_to_ptr(mediator);
@ -623,7 +623,7 @@ JNF_COCOA_ENTER(env);
[mediatorObject release]; [mediatorObject release];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -634,14 +634,14 @@ JNF_COCOA_EXIT(env);
JNIEXPORT void JNICALL Java_sun_lwawt_macosx_LWCToolkit_performOnMainThreadAfterDelay JNIEXPORT void JNICALL Java_sun_lwawt_macosx_LWCToolkit_performOnMainThreadAfterDelay
(JNIEnv *env, jclass clz, jobject runnable, jlong delay) (JNIEnv *env, jclass clz, jobject runnable, jlong delay)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
jobject gRunnable = (*env)->NewGlobalRef(env, runnable); jobject gRunnable = (*env)->NewGlobalRef(env, runnable);
CHECK_NULL(gRunnable); CHECK_NULL(gRunnable);
[ThreadUtilities performOnMainThreadWaiting:NO block:^() { [ThreadUtilities performOnMainThreadWaiting:NO block:^() {
JavaRunnable* performer = [[JavaRunnable alloc] initWithRunnable:gRunnable]; JavaRunnable* performer = [[JavaRunnable alloc] initWithRunnable:gRunnable];
[performer performSelector:@selector(perform) withObject:nil afterDelay:(delay/1000.0)]; [performer performSelector:@selector(perform) withObject:nil afterDelay:(delay/1000.0)];
}]; }];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
@ -672,13 +672,13 @@ JNIEXPORT jboolean JNICALL Java_sun_lwawt_macosx_LWCToolkit_isApplicationActive
{ {
__block jboolean active = JNI_FALSE; __block jboolean active = JNI_FALSE;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
[ThreadUtilities performOnMainThreadWaiting:YES block:^() { [ThreadUtilities performOnMainThreadWaiting:YES block:^() {
active = (jboolean)[NSRunningApplication currentApplication].active; active = (jboolean)[NSRunningApplication currentApplication].active;
}]; }];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return active; return active;
} }
@ -691,13 +691,13 @@ JNF_COCOA_EXIT(env);
JNIEXPORT void JNICALL Java_sun_lwawt_macosx_LWCToolkit_activateApplicationIgnoringOtherApps JNIEXPORT void JNICALL Java_sun_lwawt_macosx_LWCToolkit_activateApplicationIgnoringOtherApps
(JNIEnv *env, jclass clazz) (JNIEnv *env, jclass clazz)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
[ThreadUtilities performOnMainThreadWaiting:NO block:^(){ [ThreadUtilities performOnMainThreadWaiting:NO block:^(){
if(![NSApp isActive]){ if(![NSApp isActive]){
[NSApp activateIgnoringOtherApps:YES]; [NSApp activateIgnoringOtherApps:YES];
} }
}]; }];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
@ -748,7 +748,7 @@ JNIEXPORT void JNICALL
Java_sun_lwawt_macosx_LWCToolkit_initIDs Java_sun_lwawt_macosx_LWCToolkit_initIDs
(JNIEnv *env, jclass klass) { (JNIEnv *env, jclass klass) {
JNF_COCOA_ENTER(env) JNI_COCOA_ENTER(env);
gNumberOfButtons = sun_lwawt_macosx_LWCToolkit_BUTTONS; gNumberOfButtons = sun_lwawt_macosx_LWCToolkit_BUTTONS;
@ -777,7 +777,7 @@ Java_sun_lwawt_macosx_LWCToolkit_initIDs
(*env)->ReleaseIntArrayElements(env, obj, tmp, 0); (*env)->ReleaseIntArrayElements(env, obj, tmp, 0);
(*env)->DeleteLocalRef(env, obj); (*env)->DeleteLocalRef(env, obj);
JNF_COCOA_EXIT(env) JNI_COCOA_EXIT(env);
} }
/* /*
@ -788,7 +788,7 @@ Java_sun_lwawt_macosx_LWCToolkit_initIDs
JNIEXPORT void JNICALL JNIEXPORT void JNICALL
Java_sun_lwawt_macosx_LWCToolkit_initAppkit Java_sun_lwawt_macosx_LWCToolkit_initAppkit
(JNIEnv *env, jclass klass, jobject appkitThreadGroup, jboolean headless) { (JNIEnv *env, jclass klass, jobject appkitThreadGroup, jboolean headless) {
JNF_COCOA_ENTER(env) JNI_COCOA_ENTER(env);
[ThreadUtilities setAppkitThreadGroup:(*env)->NewGlobalRef(env, appkitThreadGroup)]; [ThreadUtilities setAppkitThreadGroup:(*env)->NewGlobalRef(env, appkitThreadGroup)];
@ -806,7 +806,7 @@ Java_sun_lwawt_macosx_LWCToolkit_initAppkit
[AWTStarter start:headless ? YES : NO]; [AWTStarter start:headless ? YES : NO];
JNF_COCOA_EXIT(env) JNI_COCOA_EXIT(env);
} }
JNIEXPORT jint JNICALL DEF_JNI_OnLoad(JavaVM *vm, void *reserved) { JNIEXPORT jint JNICALL DEF_JNI_OnLoad(JavaVM *vm, void *reserved) {
@ -868,10 +868,10 @@ Java_sun_awt_PlatformGraphicsInfo_isInAquaSession
JNIEXPORT jint JNICALL JNIEXPORT jint JNICALL
Java_sun_lwawt_macosx_LWCToolkit_getMultiClickTime(JNIEnv *env, jclass klass) { Java_sun_lwawt_macosx_LWCToolkit_getMultiClickTime(JNIEnv *env, jclass klass) {
__block jint multiClickTime = 0; __block jint multiClickTime = 0;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
[JNFRunLoop performOnMainThreadWaiting:YES withBlock:^(){ [JNFRunLoop performOnMainThreadWaiting:YES withBlock:^(){
multiClickTime = (jint)([NSEvent doubleClickInterval] * 1000); multiClickTime = (jint)([NSEvent doubleClickInterval] * 1000);
}]; }];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return multiClickTime; return multiClickTime;
} }

4
src/java.desktop/macosx/native/libawt_lwawt/awt/PrintModel.m
View File

@ -127,7 +127,7 @@ AWT_ASSERT_NOT_APPKIT_THREAD;
JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CPrinterJob__1safePrintLoop JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CPrinterJob__1safePrintLoop
(JNIEnv *env, jclass clz, jlong target, jlong view) (JNIEnv *env, jclass clz, jlong target, jlong view)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
PrintModel *model = (PrintModel *)jlong_to_ptr(target); PrintModel *model = (PrintModel *)jlong_to_ptr(target);
PrinterView *arg = (PrinterView *)jlong_to_ptr(view); PrinterView *arg = (PrinterView *)jlong_to_ptr(view);
@ -138,6 +138,6 @@ JNF_COCOA_ENTER(env);
[model release]; [model release];
[arg release]; [arg release];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }

4
src/java.desktop/macosx/native/libawt_lwawt/awt/PrinterSurfaceData.m
View File

@ -83,7 +83,7 @@ PRINT(" PrintSD_dispose")
JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CPrinterSurfaceData_initOps(JNIEnv *env, jobject jthis, jlong nsRef, jobject jGraphicsState, jobjectArray jGraphicsStateObject, jint width, jint height) JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CPrinterSurfaceData_initOps(JNIEnv *env, jobject jthis, jlong nsRef, jobject jGraphicsState, jobjectArray jGraphicsStateObject, jint width, jint height)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
PRINT("Java_sun_lwawt_macosx_CPrinterSurfaceData_initOps") PRINT("Java_sun_lwawt_macosx_CPrinterSurfaceData_initOps")
@ -116,7 +116,7 @@ PRINT("Java_sun_lwawt_macosx_CPrinterSurfaceData_initOps")
sdo->Setup = NULL; sdo->Setup = NULL;
sdo->Dispose = PrintSD_dispose; sdo->Dispose = PrintSD_dispose;
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
static jint PrintSD_Lock(JNIEnv *env, SurfaceDataOps *sdo, SurfaceDataRasInfo *pRasInfo, jint lockflags) static jint PrintSD_Lock(JNIEnv *env, SurfaceDataOps *sdo, SurfaceDataRasInfo *pRasInfo, jint lockflags)

32
src/java.desktop/macosx/native/libawt_lwawt/awt/QuartzRenderer.m
View File

@ -636,7 +636,7 @@ JNIEXPORT void JNICALL Java_sun_java2d_CRenderer_doLine
{ {
PRINT("Java_sun_java2d_CRenderer_doLine") PRINT("Java_sun_java2d_CRenderer_doLine")
QuartzSDOps *qsdo = (QuartzSDOps*)SurfaceData_GetOps(env, jsurfacedata); QuartzSDOps *qsdo = (QuartzSDOps*)SurfaceData_GetOps(env, jsurfacedata);
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
SDRenderType renderType = SD_Stroke; SDRenderType renderType = SD_Stroke;
qsdo->BeginSurface(env, qsdo, renderType); qsdo->BeginSurface(env, qsdo, renderType);
if (qsdo->cgRef != NULL) if (qsdo->cgRef != NULL)
@ -644,7 +644,7 @@ JNF_COCOA_ENTER(env);
doLine(qsdo, x1, y1, x2, y2); doLine(qsdo, x1, y1, x2, y2);
} }
qsdo->FinishSurface(env, qsdo); qsdo->FinishSurface(env, qsdo);
JNF_COCOA_RENDERER_EXIT(env); JNI_COCOA_RENDERER_EXIT(env);
} }
/* /*
@ -657,7 +657,7 @@ JNIEXPORT void JNICALL Java_sun_java2d_CRenderer_doRect
{ {
PRINT("Java_sun_java2d_CRenderer_doRect") PRINT("Java_sun_java2d_CRenderer_doRect")
QuartzSDOps *qsdo = (QuartzSDOps*)SurfaceData_GetOps(env, jsurfacedata); QuartzSDOps *qsdo = (QuartzSDOps*)SurfaceData_GetOps(env, jsurfacedata);
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
SDRenderType renderType = (isfill? SD_Fill : SD_Stroke); SDRenderType renderType = (isfill? SD_Fill : SD_Stroke);
qsdo->BeginSurface(env, qsdo, renderType); qsdo->BeginSurface(env, qsdo, renderType);
if (qsdo->cgRef != NULL) if (qsdo->cgRef != NULL)
@ -665,7 +665,7 @@ JNF_COCOA_ENTER(env);
doRect(qsdo, x, y, w, h, isfill); doRect(qsdo, x, y, w, h, isfill);
} }
qsdo->FinishSurface(env, qsdo); qsdo->FinishSurface(env, qsdo);
JNF_COCOA_RENDERER_EXIT(env); JNI_COCOA_RENDERER_EXIT(env);
} }
/* /*
@ -678,7 +678,7 @@ JNIEXPORT void JNICALL Java_sun_java2d_CRenderer_doRoundRect
{ {
PRINT("Java_sun_java2d_CRenderer_doRoundRect") PRINT("Java_sun_java2d_CRenderer_doRoundRect")
QuartzSDOps *qsdo = (QuartzSDOps*)SurfaceData_GetOps(env, jsurfacedata); QuartzSDOps *qsdo = (QuartzSDOps*)SurfaceData_GetOps(env, jsurfacedata);
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
SDRenderType renderType = (isfill? SD_Fill : SD_Stroke); SDRenderType renderType = (isfill? SD_Fill : SD_Stroke);
qsdo->BeginSurface(env, qsdo, renderType); qsdo->BeginSurface(env, qsdo, renderType);
if (qsdo->cgRef != NULL) if (qsdo->cgRef != NULL)
@ -686,7 +686,7 @@ JNF_COCOA_ENTER(env);
doRoundRect(qsdo, x, y, w, h, arcWidth, arcHeight, isfill); doRoundRect(qsdo, x, y, w, h, arcWidth, arcHeight, isfill);
} }
qsdo->FinishSurface(env, qsdo); qsdo->FinishSurface(env, qsdo);
JNF_COCOA_RENDERER_EXIT(env); JNI_COCOA_RENDERER_EXIT(env);
} }
/* /*
@ -699,7 +699,7 @@ JNIEXPORT void JNICALL Java_sun_java2d_CRenderer_doOval
{ {
PRINT("Java_sun_java2d_CRenderer_doOval") PRINT("Java_sun_java2d_CRenderer_doOval")
QuartzSDOps *qsdo = (QuartzSDOps*)SurfaceData_GetOps(env, jsurfacedata); QuartzSDOps *qsdo = (QuartzSDOps*)SurfaceData_GetOps(env, jsurfacedata);
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
SDRenderType renderType = (isfill? SD_Fill : SD_Stroke); SDRenderType renderType = (isfill? SD_Fill : SD_Stroke);
qsdo->BeginSurface(env, qsdo, renderType); qsdo->BeginSurface(env, qsdo, renderType);
if (qsdo->cgRef != NULL) if (qsdo->cgRef != NULL)
@ -707,7 +707,7 @@ JNF_COCOA_ENTER(env);
doOval(qsdo, x, y, w, h, isfill); doOval(qsdo, x, y, w, h, isfill);
} }
qsdo->FinishSurface(env, qsdo); qsdo->FinishSurface(env, qsdo);
JNF_COCOA_RENDERER_EXIT(env); JNI_COCOA_RENDERER_EXIT(env);
} }
/* /*
@ -720,7 +720,7 @@ JNIEXPORT void JNICALL Java_sun_java2d_CRenderer_doArc
{ {
PRINT("Java_sun_java2d_CRenderer_doArc") PRINT("Java_sun_java2d_CRenderer_doArc")
QuartzSDOps *qsdo = (QuartzSDOps*)SurfaceData_GetOps(env, jsurfacedata); QuartzSDOps *qsdo = (QuartzSDOps*)SurfaceData_GetOps(env, jsurfacedata);
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
SDRenderType renderType = (isfill? SD_Fill : SD_Stroke); SDRenderType renderType = (isfill? SD_Fill : SD_Stroke);
qsdo->BeginSurface(env, qsdo, renderType); qsdo->BeginSurface(env, qsdo, renderType);
if (qsdo->cgRef != NULL) if (qsdo->cgRef != NULL)
@ -728,7 +728,7 @@ JNF_COCOA_ENTER(env);
doArc(qsdo, x, y, w, h, angleStart, angleExtent, arcType, isfill); doArc(qsdo, x, y, w, h, angleStart, angleExtent, arcType, isfill);
} }
qsdo->FinishSurface(env, qsdo); qsdo->FinishSurface(env, qsdo);
JNF_COCOA_RENDERER_EXIT(env); JNI_COCOA_RENDERER_EXIT(env);
} }
/* /*
@ -741,7 +741,7 @@ JNIEXPORT void JNICALL Java_sun_java2d_CRenderer_doPoly
{ {
PRINT("Java_sun_java2d_CRenderer_doPoly") PRINT("Java_sun_java2d_CRenderer_doPoly")
QuartzSDOps *qsdo = (QuartzSDOps*)SurfaceData_GetOps(env, jsurfacedata); QuartzSDOps *qsdo = (QuartzSDOps*)SurfaceData_GetOps(env, jsurfacedata);
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
BOOL eoFill = YES; // polys are WIND_EVEN_ODD by definition BOOL eoFill = YES; // polys are WIND_EVEN_ODD by definition
SDRenderType renderType = (isfill? (eoFill ? SD_EOFill : SD_Fill) : SD_Stroke); SDRenderType renderType = (isfill? (eoFill ? SD_EOFill : SD_Fill) : SD_Stroke);
qsdo->BeginSurface(env, qsdo, renderType); qsdo->BeginSurface(env, qsdo, renderType);
@ -750,7 +750,7 @@ JNF_COCOA_ENTER(env);
doPoly(env, qsdo, xpointsarray, ypointsarray, npoints, ispolygon, isfill); doPoly(env, qsdo, xpointsarray, ypointsarray, npoints, ispolygon, isfill);
} }
qsdo->FinishSurface(env, qsdo); qsdo->FinishSurface(env, qsdo);
JNF_COCOA_RENDERER_EXIT(env); JNI_COCOA_RENDERER_EXIT(env);
} }
/* /*
@ -763,7 +763,7 @@ JNIEXPORT void JNICALL Java_sun_java2d_CRenderer_doShape
{ {
PRINT("Java_sun_java2d_CRenderer_doShape") PRINT("Java_sun_java2d_CRenderer_doShape")
QuartzSDOps *qsdo = (QuartzSDOps*)SurfaceData_GetOps(env, jsurfacedata); QuartzSDOps *qsdo = (QuartzSDOps*)SurfaceData_GetOps(env, jsurfacedata);
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
BOOL eoFill = (windingRule == java_awt_geom_PathIterator_WIND_EVEN_ODD); BOOL eoFill = (windingRule == java_awt_geom_PathIterator_WIND_EVEN_ODD);
SDRenderType renderType = (isfill? (eoFill ? SD_EOFill : SD_Fill) : SD_Stroke); SDRenderType renderType = (isfill? (eoFill ? SD_EOFill : SD_Fill) : SD_Stroke);
qsdo->BeginSurface(env, qsdo, renderType); qsdo->BeginSurface(env, qsdo, renderType);
@ -774,7 +774,7 @@ JNF_COCOA_ENTER(env);
doShape(qsdo, types, coordinates, length, isfill, shouldApplyOffset); doShape(qsdo, types, coordinates, length, isfill, shouldApplyOffset);
} }
qsdo->FinishSurface(env, qsdo); qsdo->FinishSurface(env, qsdo);
JNF_COCOA_RENDERER_EXIT(env); JNI_COCOA_RENDERER_EXIT(env);
} }
#define invalidContext(c) \ #define invalidContext(c) \
@ -790,12 +790,12 @@ JNIEXPORT void JNICALL Java_sun_java2d_CRenderer_doImage
{ {
PRINT("Java_sun_java2d_CRenderer_doImage") PRINT("Java_sun_java2d_CRenderer_doImage")
QuartzSDOps *qsdo = (QuartzSDOps*)SurfaceData_GetOps(env, jsurfacedata); QuartzSDOps *qsdo = (QuartzSDOps*)SurfaceData_GetOps(env, jsurfacedata);
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
qsdo->BeginSurface(env, qsdo, SD_Image); qsdo->BeginSurface(env, qsdo, SD_Image);
if (qsdo->cgRef != NULL) if (qsdo->cgRef != NULL)
{ {
doImage(env, qsdo, imageSurfaceData, fliph, flipv, w, h, sx, sy, sw, sh, dx, dy, dw, dh); doImage(env, qsdo, imageSurfaceData, fliph, flipv, w, h, sx, sy, sw, sh, dx, dy, dw, dh);
} }
qsdo->FinishSurface(env, qsdo); qsdo->FinishSurface(env, qsdo);
JNF_COCOA_RENDERER_EXIT(env); JNI_COCOA_RENDERER_EXIT(env);
} }

10
src/java.desktop/macosx/native/libawt_lwawt/awt/QuartzSurfaceData.h
View File

@ -27,6 +27,7 @@
#import "BufImgSurfaceData.h" #import "BufImgSurfaceData.h"
#import "AWTFont.h" #import "AWTFont.h"
#import <Cocoa/Cocoa.h> #import <Cocoa/Cocoa.h>
#import "JNIUtilities.h"
// these flags are not defined on Tiger on PPC, so we need to make them a no-op // these flags are not defined on Tiger on PPC, so we need to make them a no-op
#if !defined(kCGBitmapByteOrder32Host) #if !defined(kCGBitmapByteOrder32Host)
@ -150,10 +151,5 @@ void CompleteCGContext(JNIEnv *env, QuartzSDOps *qsdo);
NSColor* ByteParametersToNSColor(JNIEnv* env, jint *javaGraphicsStates, NSColor* defColor); NSColor* ByteParametersToNSColor(JNIEnv* env, jint *javaGraphicsStates, NSColor* defColor);
#define JNF_COCOA_RENDERER_EXIT(env) \ #define JNI_COCOA_RENDERER_EXIT(env) \
} @catch(NSException *localException) { \ JNI_COCOA_EXIT_WITH_ACTION(env, qsdo->FinishSurface(env, qsdo))
qsdo->FinishSurface(env, qsdo); \
[JNFException throwToJava:env exception:localException]; \
} \
if (_token) JNFNativeMethodExit(_token); \
}

12
src/java.desktop/macosx/native/libawt_lwawt/awt/QuartzSurfaceData.m
View File

@ -49,6 +49,12 @@
#define kOffset (0.5f) #define kOffset (0.5f)
#define JNI_COCOA_THROW_OOME(env, msg) \
if ([NSThread isMainThread] == NO) { \
JNU_ThrowOutOfMemoryError(env, msg); \
} \
[NSException raise:@"Java Exception" reason:@"Java OutOfMemoryException" userInfo:nil]
BOOL gAdjustForJavaDrawing; BOOL gAdjustForJavaDrawing;
#pragma mark #pragma mark
@ -914,7 +920,7 @@ void setupGradient(JNIEnv *env, QuartzSDOps* qsdo, jfloat* javaFloatGraphicsStat
qsdo->gradientInfo = (StateGradientInfo*)malloc(sizeof(StateGradientInfo)); qsdo->gradientInfo = (StateGradientInfo*)malloc(sizeof(StateGradientInfo));
if (qsdo->gradientInfo == NULL) if (qsdo->gradientInfo == NULL)
{ {
[JNFException raise:env as:kOutOfMemoryError reason:"Failed to malloc memory for gradient paint"]; JNI_COCOA_THROW_OOME(env, "Failed to malloc memory for gradient paint");
} }
qsdo->graphicsStateInfo.simpleStroke = NO; qsdo->graphicsStateInfo.simpleStroke = NO;
@ -1015,7 +1021,7 @@ SDRenderType SetUpPaint(JNIEnv *env, QuartzSDOps *qsdo, SDRenderType renderType)
qsdo->shadingInfo = (StateShadingInfo*)malloc(sizeof(StateShadingInfo)); qsdo->shadingInfo = (StateShadingInfo*)malloc(sizeof(StateShadingInfo));
if (qsdo->shadingInfo == NULL) if (qsdo->shadingInfo == NULL)
{ {
[JNFException raise:env as:kOutOfMemoryError reason:"Failed to malloc memory for gradient paint"]; JNI_COCOA_THROW_OOME(env, "Failed to malloc memory for gradient paint");
} }
qsdo->graphicsStateInfo.simpleStroke = NO; qsdo->graphicsStateInfo.simpleStroke = NO;
@ -1061,7 +1067,7 @@ SDRenderType SetUpPaint(JNIEnv *env, QuartzSDOps *qsdo, SDRenderType renderType)
qsdo->patternInfo = (StatePatternInfo*)malloc(sizeof(StatePatternInfo)); qsdo->patternInfo = (StatePatternInfo*)malloc(sizeof(StatePatternInfo));
if (qsdo->patternInfo == NULL) if (qsdo->patternInfo == NULL)
{ {
[JNFException raise:env as:kOutOfMemoryError reason:"Failed to malloc memory for texture paint"]; JNI_COCOA_THROW_OOME(env, "Failed to malloc memory for texture paint");
} }
qsdo->graphicsStateInfo.simpleStroke = NO; qsdo->graphicsStateInfo.simpleStroke = NO;

28
src/java.desktop/macosx/native/libawt_lwawt/font/AWTFont.m
View File

@ -302,7 +302,7 @@ Java_sun_font_CFontManager_loadNativeFonts
jint num = 0; jint num = 0;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
NSArray *filteredFonts = GetFilteredFonts(); NSArray *filteredFonts = GetFilteredFonts();
num = (jint)[filteredFonts count]; num = (jint)[filteredFonts count];
@ -320,7 +320,7 @@ JNF_COCOA_ENTER(env);
(*env)->DeleteLocalRef(env, jFontFamilyName); (*env)->DeleteLocalRef(env, jFontFamilyName);
} }
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -332,7 +332,7 @@ JNIEXPORT void JNICALL
Java_sun_font_CFontManager_loadNativeDirFonts Java_sun_font_CFontManager_loadNativeDirFonts
(JNIEnv *env, jclass clz, jstring filename) (JNIEnv *env, jclass clz, jstring filename)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
NSString *path = JNFJavaToNSString(env, filename); NSString *path = JNFJavaToNSString(env, filename);
NSURL *url = [NSURL fileURLWithPath:(NSString *)path]; NSURL *url = [NSURL fileURLWithPath:(NSString *)path];
@ -342,7 +342,7 @@ JNF_COCOA_ENTER(env);
NSLog(@"url is : %@", (NSString*)url); NSLog(@"url is : %@", (NSString*)url);
printf("res is %d\n", res); printf("res is %d\n", res);
#endif #endif
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
#pragma mark --- sun.font.CFont JNI --- #pragma mark --- sun.font.CFont JNI ---
@ -372,7 +372,7 @@ Java_sun_font_CFont_getTableBytesNative
jlong awtFontPtr, jint jtag) jlong awtFontPtr, jint jtag)
{ {
jbyteArray jbytes = NULL; jbyteArray jbytes = NULL;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
CTFontTableTag tag = (CTFontTableTag)jtag; CTFontTableTag tag = (CTFontTableTag)jtag;
int i, found = 0; int i, found = 0;
@ -414,7 +414,7 @@ JNF_COCOA_ENTER(env);
(jbyte*)tableBytes); (jbyte*)tableBytes);
CFRelease(table); CFRelease(table);
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return jbytes; return jbytes;
} }
@ -431,7 +431,7 @@ Java_sun_font_CFont_createNativeFont
{ {
AWTFont *awtFont = nil; AWTFont *awtFont = nil;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
awtFont = awtFont =
[AWTFont awtFontForName:JNFJavaToNSString(env, nativeFontName) [AWTFont awtFontForName:JNFJavaToNSString(env, nativeFontName)
@ -441,7 +441,7 @@ JNF_COCOA_ENTER(env);
CFRetain(awtFont); // GC CFRetain(awtFont); // GC
} }
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return ptr_to_jlong(awtFont); return ptr_to_jlong(awtFont);
} }
@ -456,7 +456,7 @@ Java_sun_font_CFont_getWidthNative
(JNIEnv *env, jobject cfont, jlong awtFontPtr) (JNIEnv *env, jobject cfont, jlong awtFontPtr)
{ {
float widthVal; float widthVal;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
AWTFont *awtFont = (AWTFont *)jlong_to_ptr(awtFontPtr); AWTFont *awtFont = (AWTFont *)jlong_to_ptr(awtFontPtr);
NSFont* nsFont = awtFont->fFont; NSFont* nsFont = awtFont->fFont;
@ -465,7 +465,7 @@ JNF_COCOA_ENTER(env);
NSNumber *width = [fontTraits objectForKey : NSFontWidthTrait]; NSNumber *width = [fontTraits objectForKey : NSFontWidthTrait];
widthVal = (float)[width floatValue]; widthVal = (float)[width floatValue];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return (jfloat)widthVal; return (jfloat)widthVal;
} }
@ -479,7 +479,7 @@ Java_sun_font_CFont_getWeightNative
(JNIEnv *env, jobject cfont, jlong awtFontPtr) (JNIEnv *env, jobject cfont, jlong awtFontPtr)
{ {
float weightVal; float weightVal;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
AWTFont *awtFont = (AWTFont *)jlong_to_ptr(awtFontPtr); AWTFont *awtFont = (AWTFont *)jlong_to_ptr(awtFontPtr);
NSFont* nsFont = awtFont->fFont; NSFont* nsFont = awtFont->fFont;
@ -488,7 +488,7 @@ JNF_COCOA_ENTER(env);
NSNumber *weight = [fontTraits objectForKey : NSFontWeightTrait]; NSNumber *weight = [fontTraits objectForKey : NSFontWeightTrait];
weightVal = (float)[weight floatValue]; weightVal = (float)[weight floatValue];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return (jfloat)weightVal; return (jfloat)weightVal;
} }
@ -501,13 +501,13 @@ JNIEXPORT void JNICALL
Java_sun_font_CFont_disposeNativeFont Java_sun_font_CFont_disposeNativeFont
(JNIEnv *env, jclass clazz, jlong awtFontPtr) (JNIEnv *env, jclass clazz, jlong awtFontPtr)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
if (awtFontPtr) { if (awtFontPtr) {
CFRelease((AWTFont *)jlong_to_ptr(awtFontPtr)); // GC CFRelease((AWTFont *)jlong_to_ptr(awtFontPtr)); // GC
} }
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }

34
src/java.desktop/macosx/native/libawt_lwawt/font/AWTStrike.m
View File

@ -104,7 +104,7 @@ static CGAffineTransform sInverseTX = { 1, 0, 0, -1, 0, 0 };
if (_fontThrowJavaException == YES) { \ if (_fontThrowJavaException == YES) { \
char s[512]; \ char s[512]; \
sprintf(s, "%s-%s:%d", __FILE__, __FUNCTION__, __LINE__); \ sprintf(s, "%s-%s:%d", __FILE__, __FUNCTION__, __LINE__); \
[JNFException raise:env as:kRuntimeException reason:s]; \ JNU_ThrowByName(env, "java/lang/RuntimeException", s); \
} }
@ -144,7 +144,7 @@ Java_sun_font_CStrike_getNativeGlyphAdvance
(JNIEnv *env, jclass clazz, jlong awtStrikePtr, jint glyphCode) (JNIEnv *env, jclass clazz, jlong awtStrikePtr, jint glyphCode)
{ {
CGSize advance; CGSize advance;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
AWTStrike *awtStrike = (AWTStrike *)jlong_to_ptr(awtStrikePtr); AWTStrike *awtStrike = (AWTStrike *)jlong_to_ptr(awtStrikePtr);
AWTFont *awtFont = awtStrike->fAWTFont; AWTFont *awtFont = awtStrike->fAWTFont;
@ -159,7 +159,7 @@ JNF_COCOA_ENTER(env);
advance.width = round(advance.width); advance.width = round(advance.width);
} }
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return advance.width; return advance.width;
} }
@ -174,7 +174,7 @@ Java_sun_font_CStrike_getNativeGlyphImageBounds
jlong awtStrikePtr, jint glyphCode, jlong awtStrikePtr, jint glyphCode,
jobject result /*Rectangle*/, jdouble x, jdouble y) jobject result /*Rectangle*/, jdouble x, jdouble y)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
AWTStrike *awtStrike = (AWTStrike *)jlong_to_ptr(awtStrikePtr); AWTStrike *awtStrike = (AWTStrike *)jlong_to_ptr(awtStrikePtr);
AWTFont *awtFont = awtStrike->fAWTFont; AWTFont *awtFont = awtStrike->fAWTFont;
@ -203,7 +203,7 @@ JNF_COCOA_ENTER(env);
(jfloat)bbox.origin.x, (jfloat)bbox.origin.y, (jfloat)bbox.size.width, (jfloat)bbox.size.height); (jfloat)bbox.origin.x, (jfloat)bbox.origin.y, (jfloat)bbox.size.width, (jfloat)bbox.size.height);
CHECK_EXCEPTION(); CHECK_EXCEPTION();
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -218,7 +218,7 @@ Java_sun_font_CStrike_getNativeGlyphOutline
{ {
jobject generalPath = NULL; jobject generalPath = NULL;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
AWTPathRef path = NULL; AWTPathRef path = NULL;
jfloatArray pointCoords = NULL; jfloatArray pointCoords = NULL;
@ -290,7 +290,7 @@ cleanup:
} }
AWT_FONT_CLEANUP_FINISH; AWT_FONT_CLEANUP_FINISH;
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return generalPath; return generalPath;
} }
@ -305,7 +305,7 @@ Java_sun_font_CStrike_getGlyphImagePtrsNative
jlong awtStrikePtr, jlongArray glyphInfoLongArray, jlong awtStrikePtr, jlongArray glyphInfoLongArray,
jintArray glyphCodes, jint len) jintArray glyphCodes, jint len)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
AWTStrike *awtStrike = (AWTStrike *)jlong_to_ptr(awtStrikePtr); AWTStrike *awtStrike = (AWTStrike *)jlong_to_ptr(awtStrikePtr);
@ -333,7 +333,7 @@ JNF_COCOA_ENTER(env);
} }
} }
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -345,7 +345,7 @@ JNIEXPORT jlong JNICALL Java_sun_font_CStrike_createNativeStrikePtr
(JNIEnv *env, jclass clazz, jlong nativeFontPtr, jdoubleArray glyphTxArray, jdoubleArray invDevTxArray, jint aaStyle, jint fmHint) (JNIEnv *env, jclass clazz, jlong nativeFontPtr, jdoubleArray glyphTxArray, jdoubleArray invDevTxArray, jint aaStyle, jint fmHint)
{ {
AWTStrike *awtStrike = nil; AWTStrike *awtStrike = nil;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
AWTFont *awtFont = (AWTFont *)jlong_to_ptr(nativeFontPtr); AWTFont *awtFont = (AWTFont *)jlong_to_ptr(nativeFontPtr);
JRSFontRenderingStyle style = JRSFontGetRenderingStyleForHints(fmHint, aaStyle); JRSFontRenderingStyle style = JRSFontGetRenderingStyleForHints(fmHint, aaStyle);
@ -360,7 +360,7 @@ JNF_COCOA_ENTER(env);
CFRetain(awtStrike); // GC CFRetain(awtStrike); // GC
} }
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return ptr_to_jlong(awtStrike); return ptr_to_jlong(awtStrike);
} }
@ -373,13 +373,13 @@ JNIEXPORT void JNICALL
Java_sun_font_CStrike_disposeNativeStrikePtr Java_sun_font_CStrike_disposeNativeStrikePtr
(JNIEnv *env, jclass clazz, jlong awtStrike) (JNIEnv *env, jclass clazz, jlong awtStrike)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
if (awtStrike) { if (awtStrike) {
CFRelease((AWTStrike *)jlong_to_ptr(awtStrike)); // GC CFRelease((AWTStrike *)jlong_to_ptr(awtStrike)); // GC
} }
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -393,7 +393,7 @@ Java_sun_font_CStrike_getFontMetrics
{ {
jobject metrics = NULL; jobject metrics = NULL;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
AWT_FONT_CLEANUP_SETUP; AWT_FONT_CLEANUP_SETUP;
AWTFont *awtfont = ((AWTStrike *)jlong_to_ptr(awtStrikePtr))->fAWTFont; AWTFont *awtfont = ((AWTStrike *)jlong_to_ptr(awtStrikePtr))->fAWTFont;
@ -436,7 +436,7 @@ JNF_COCOA_ENTER(env);
cleanup: cleanup:
AWT_FONT_CLEANUP_FINISH; AWT_FONT_CLEANUP_FINISH;
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return metrics; return metrics;
} }
@ -450,9 +450,9 @@ extern void AccelGlyphCache_RemoveAllInfos(GlyphInfo* glyph);
JNIEXPORT void JNICALL Java_sun_font_CStrikeDisposer_removeGlyphInfoFromCache JNIEXPORT void JNICALL Java_sun_font_CStrikeDisposer_removeGlyphInfoFromCache
(JNIEnv *env, jclass cls, jlong glyphInfo) (JNIEnv *env, jclass cls, jlong glyphInfo)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
AccelGlyphCache_RemoveAllCellInfos((GlyphInfo*)jlong_to_ptr(glyphInfo)); AccelGlyphCache_RemoveAllCellInfos((GlyphInfo*)jlong_to_ptr(glyphInfo));
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }

10
src/java.desktop/macosx/native/libawt_lwawt/font/CCharToGlyphMapper.m
View File

@ -23,6 +23,8 @@
* questions. * questions.
*/ */
#import "JNIUtilities.h"
#import <JavaNativeFoundation/JavaNativeFoundation.h> #import <JavaNativeFoundation/JavaNativeFoundation.h>
#import "AWTFont.h" #import "AWTFont.h"
@ -41,12 +43,12 @@ Java_sun_font_CCharToGlyphMapper_countGlyphs
{ {
jint numGlyphs = 0; jint numGlyphs = 0;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
AWTFont *awtFont = (AWTFont *)jlong_to_ptr(awtFontPtr); AWTFont *awtFont = (AWTFont *)jlong_to_ptr(awtFontPtr);
numGlyphs = [awtFont->fFont numberOfGlyphs]; numGlyphs = [awtFont->fFont numberOfGlyphs];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return numGlyphs; return numGlyphs;
} }
@ -90,7 +92,7 @@ Java_sun_font_CCharToGlyphMapper_nativeCharsToGlyphs
(JNIEnv *env, jclass clazz, (JNIEnv *env, jclass clazz,
jlong awtFontPtr, jint count, jcharArray unicodes, jintArray glyphs) jlong awtFontPtr, jint count, jcharArray unicodes, jintArray glyphs)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
AWTFont *awtFont = (AWTFont *)jlong_to_ptr(awtFontPtr); AWTFont *awtFont = (AWTFont *)jlong_to_ptr(awtFontPtr);
@ -111,5 +113,5 @@ JNF_COCOA_ENTER(env);
unicodesAsChars, JNI_ABORT); unicodesAsChars, JNI_ABORT);
} }
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }

5
src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl/CGLGraphicsConfig.m
View File

@ -28,6 +28,7 @@
#import "CGLGraphicsConfig.h" #import "CGLGraphicsConfig.h"
#import "CGLSurfaceData.h" #import "CGLSurfaceData.h"
#import "ThreadUtilities.h" #import "ThreadUtilities.h"
#import "JNIUtilities.h"
#import <stdlib.h> #import <stdlib.h>
#import <string.h> #import <string.h>
@ -120,7 +121,7 @@ Java_sun_java2d_opengl_CGLGraphicsConfig_getCGLConfigInfo
(JNIEnv *env, jclass cglgc) (JNIEnv *env, jclass cglgc)
{ {
__block jlong ret = 0L; __block jlong ret = 0L;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
[ThreadUtilities performOnMainThreadWaiting:YES block:^(){ [ThreadUtilities performOnMainThreadWaiting:YES block:^(){
JNIEnv *env = [ThreadUtilities getJNIEnvUncached]; JNIEnv *env = [ThreadUtilities getJNIEnvUncached];
@ -288,7 +289,7 @@ Java_sun_java2d_opengl_CGLGraphicsConfig_getCGLConfigInfo
ret = ptr_to_jlong(cglinfo); ret = ptr_to_jlong(cglinfo);
[pool drain]; [pool drain];
}]; }];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return ret; return ret;
} }

8
src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl/CGLLayer.m
View File

@ -170,7 +170,7 @@ Java_sun_java2d_opengl_CGLLayer_nativeCreateLayer
{ {
__block CGLLayer *layer = nil; __block CGLLayer *layer = nil;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
JNFWeakJObjectWrapper *javaLayer = [JNFWeakJObjectWrapper wrapperWithJObject:obj withEnv:env]; JNFWeakJObjectWrapper *javaLayer = [JNFWeakJObjectWrapper wrapperWithJObject:obj withEnv:env];
@ -180,7 +180,7 @@ JNF_COCOA_ENTER(env);
layer = [[CGLLayer alloc] initWithJavaLayer: javaLayer]; layer = [[CGLLayer alloc] initWithJavaLayer: javaLayer];
}]; }];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return ptr_to_jlong(layer); return ptr_to_jlong(layer);
} }
@ -217,7 +217,7 @@ JNIEXPORT void JNICALL
Java_sun_java2d_opengl_CGLLayer_nativeSetScale Java_sun_java2d_opengl_CGLLayer_nativeSetScale
(JNIEnv *env, jclass cls, jlong layerPtr, jdouble scale) (JNIEnv *env, jclass cls, jlong layerPtr, jdouble scale)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
CGLLayer *layer = jlong_to_ptr(layerPtr); CGLLayer *layer = jlong_to_ptr(layerPtr);
// We always call all setXX methods asynchronously, exception is only in // We always call all setXX methods asynchronously, exception is only in
// this method where we need to change native texture size and layer's scale // this method where we need to change native texture size and layer's scale
@ -226,5 +226,5 @@ Java_sun_java2d_opengl_CGLLayer_nativeSetScale
[ThreadUtilities performOnMainThreadWaiting:[NSThread isMainThread] block:^(){ [ThreadUtilities performOnMainThreadWaiting:[NSThread isMainThread] block:^(){
layer.contentsScale = scale; layer.contentsScale = scale;
}]; }];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }

30
src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl/CGLSurfaceData.m
View File

@ -27,7 +27,7 @@
#import "sun_java2d_opengl_CGLSurfaceData.h" #import "sun_java2d_opengl_CGLSurfaceData.h"
#import "jni_util.h" #import "JNIUtilities.h"
#import "OGLRenderQueue.h" #import "OGLRenderQueue.h"
#import "CGLGraphicsConfig.h" #import "CGLGraphicsConfig.h"
#import "CGLSurfaceData.h" #import "CGLSurfaceData.h"
@ -62,9 +62,9 @@ OGLSD_UnlockFocus(OGLContext *oglc, OGLSDOps *dstOps)
NSOpenGLView *nsView = cglsdo->peerData; NSOpenGLView *nsView = cglsdo->peerData;
if (nsView != NULL) { if (nsView != NULL) {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
[nsView unlockFocus]; [nsView unlockFocus];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
} }
#endif #endif
@ -85,7 +85,7 @@ CGLSD_MakeCurrentToScratch(JNIEnv *env, OGLContext *oglc)
return JNI_FALSE; return JNI_FALSE;
} }
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
CGLCtxInfo *ctxinfo = (CGLCtxInfo *)oglc->ctxInfo; CGLCtxInfo *ctxinfo = (CGLCtxInfo *)oglc->ctxInfo;
#if USE_NSVIEW_FOR_SCRATCH #if USE_NSVIEW_FOR_SCRATCH
@ -99,7 +99,7 @@ JNF_COCOA_ENTER(env);
currentVirtualScreen: [ctxinfo->context currentVirtualScreen]]; currentVirtualScreen: [ctxinfo->context currentVirtualScreen]];
#endif #endif
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return JNI_TRUE; return JNI_TRUE;
} }
@ -113,7 +113,7 @@ OGLSD_DestroyOGLSurface(JNIEnv *env, OGLSDOps *oglsdo)
{ {
J2dTraceLn(J2D_TRACE_INFO, "OGLSD_DestroyOGLSurface"); J2dTraceLn(J2D_TRACE_INFO, "OGLSD_DestroyOGLSurface");
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
CGLSDOps *cglsdo = (CGLSDOps *)oglsdo->privOps; CGLSDOps *cglsdo = (CGLSDOps *)oglsdo->privOps;
if (oglsdo->drawableType == OGLSD_WINDOW) { if (oglsdo->drawableType == OGLSD_WINDOW) {
@ -126,7 +126,7 @@ JNF_COCOA_ENTER(env);
oglsdo->drawableType = OGLSD_UNDEFINED; oglsdo->drawableType = OGLSD_UNDEFINED;
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/** /**
@ -154,7 +154,7 @@ OGLSD_SetScratchSurface(JNIEnv *env, jlong pConfigInfo)
CGLCtxInfo *ctxinfo = (CGLCtxInfo *)oglc->ctxInfo; CGLCtxInfo *ctxinfo = (CGLCtxInfo *)oglc->ctxInfo;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
// avoid changing the context's target view whenever possible, since // avoid changing the context's target view whenever possible, since
// calling setView causes flickering; as long as our context is current // calling setView causes flickering; as long as our context is current
@ -181,7 +181,7 @@ JNF_COCOA_ENTER(env);
j2d_glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0); j2d_glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
} }
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return oglc; return oglc;
} }
@ -235,7 +235,7 @@ OGLSD_MakeOGLContextCurrent(JNIEnv *env, OGLSDOps *srcOps, OGLSDOps *dstOps)
return oglc; return oglc;
} }
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
CGLSDOps *cglsdo = (CGLSDOps *)dstOps->privOps; CGLSDOps *cglsdo = (CGLSDOps *)dstOps->privOps;
NSView *nsView = (NSView *)cglsdo->peerData; NSView *nsView = (NSView *)cglsdo->peerData;
@ -252,7 +252,7 @@ JNF_COCOA_ENTER(env);
j2d_glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0); j2d_glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
} }
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return oglc; return oglc;
} }
@ -284,13 +284,13 @@ OGLSD_InitOGLWindow(JNIEnv *env, OGLSDOps *oglsdo)
return JNI_FALSE; return JNI_FALSE;
} }
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
NSRect surfaceBounds = [v bounds]; NSRect surfaceBounds = [v bounds];
oglsdo->drawableType = OGLSD_WINDOW; oglsdo->drawableType = OGLSD_WINDOW;
oglsdo->isOpaque = JNI_TRUE; oglsdo->isOpaque = JNI_TRUE;
oglsdo->width = surfaceBounds.size.width; oglsdo->width = surfaceBounds.size.width;
oglsdo->height = surfaceBounds.size.height; oglsdo->height = surfaceBounds.size.height;
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
J2dTraceLn2(J2D_TRACE_VERBOSE, " created window: w=%d h=%d", oglsdo->width, oglsdo->height); J2dTraceLn2(J2D_TRACE_VERBOSE, " created window: w=%d h=%d", oglsdo->width, oglsdo->height);
@ -302,9 +302,9 @@ OGLSD_SwapBuffers(JNIEnv *env, jlong pPeerData)
{ {
J2dTraceLn(J2D_TRACE_INFO, "OGLSD_SwapBuffers"); J2dTraceLn(J2D_TRACE_INFO, "OGLSD_SwapBuffers");
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
[[NSOpenGLContext currentContext] flushBuffer]; [[NSOpenGLContext currentContext] flushBuffer];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
void void

46
src/java.desktop/macosx/native/libosx/CFileManager.m
View File

@ -25,6 +25,8 @@
#import "com_apple_eio_FileManager.h" #import "com_apple_eio_FileManager.h"
#import "JNIUtilities.h"
#import <Cocoa/Cocoa.h> #import <Cocoa/Cocoa.h>
#import <JavaNativeFoundation/JavaNativeFoundation.h> #import <JavaNativeFoundation/JavaNativeFoundation.h>
@ -39,13 +41,13 @@
JNIEXPORT void JNICALL Java_com_apple_eio_FileManager__1setFileTypeAndCreator JNIEXPORT void JNICALL Java_com_apple_eio_FileManager__1setFileTypeAndCreator
(JNIEnv *env, jclass clz, jstring javaFilename, jint type, jint creator) (JNIEnv *env, jclass clz, jstring javaFilename, jint type, jint creator)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
NSString *filename = JNFNormalizedNSStringForPath(env, javaFilename); NSString *filename = JNFNormalizedNSStringForPath(env, javaFilename);
NSDictionary *attr = [NSDictionary dictionaryWithObjectsAndKeys: NSDictionary *attr = [NSDictionary dictionaryWithObjectsAndKeys:
[NSNumber numberWithInt:type], NSFileHFSTypeCode, [NSNumber numberWithInt:type], NSFileHFSTypeCode,
[NSNumber numberWithInt:creator], NSFileHFSCreatorCode, nil]; [NSNumber numberWithInt:creator], NSFileHFSCreatorCode, nil];
[[NSFileManager defaultManager] changeFileAttributes:attr atPath:filename]; [[NSFileManager defaultManager] changeFileAttributes:attr atPath:filename];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -56,11 +58,11 @@ JNF_COCOA_EXIT(env);
JNIEXPORT void JNICALL Java_com_apple_eio_FileManager__1setFileType JNIEXPORT void JNICALL Java_com_apple_eio_FileManager__1setFileType
(JNIEnv *env, jclass ckz, jstring javaFilename, jint type) (JNIEnv *env, jclass ckz, jstring javaFilename, jint type)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
NSString *filename = JNFNormalizedNSStringForPath(env, javaFilename); NSString *filename = JNFNormalizedNSStringForPath(env, javaFilename);
NSDictionary *attr = [NSDictionary dictionaryWithObject:[NSNumber numberWithInt:type] forKey:NSFileHFSTypeCode]; NSDictionary *attr = [NSDictionary dictionaryWithObject:[NSNumber numberWithInt:type] forKey:NSFileHFSTypeCode];
[[NSFileManager defaultManager] changeFileAttributes:attr atPath:filename]; [[NSFileManager defaultManager] changeFileAttributes:attr atPath:filename];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -71,11 +73,11 @@ JNF_COCOA_EXIT(env);
JNIEXPORT void JNICALL Java_com_apple_eio_FileManager__1setFileCreator JNIEXPORT void JNICALL Java_com_apple_eio_FileManager__1setFileCreator
(JNIEnv *env, jclass clz, jstring javaFilename, jint creator) (JNIEnv *env, jclass clz, jstring javaFilename, jint creator)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
NSString *filename = JNFNormalizedNSStringForPath(env, javaFilename); NSString *filename = JNFNormalizedNSStringForPath(env, javaFilename);
NSDictionary *attr = [NSDictionary dictionaryWithObject:[NSNumber numberWithInt:creator] forKey:NSFileHFSCreatorCode]; NSDictionary *attr = [NSDictionary dictionaryWithObject:[NSNumber numberWithInt:creator] forKey:NSFileHFSCreatorCode];
[[NSFileManager defaultManager] changeFileAttributes:attr atPath:filename]; [[NSFileManager defaultManager] changeFileAttributes:attr atPath:filename];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
/* /*
@ -87,12 +89,12 @@ JNIEXPORT jint JNICALL Java_com_apple_eio_FileManager__1getFileType
(JNIEnv *env, jclass clz, jstring javaFilename) (JNIEnv *env, jclass clz, jstring javaFilename)
{ {
jint type = 0; jint type = 0;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
NSString *filename = JNFNormalizedNSStringForPath(env, javaFilename); NSString *filename = JNFNormalizedNSStringForPath(env, javaFilename);
NSDictionary *attributes = [[NSFileManager defaultManager] fileAttributesAtPath:filename traverseLink:YES]; NSDictionary *attributes = [[NSFileManager defaultManager] fileAttributesAtPath:filename traverseLink:YES];
NSNumber *val = [attributes objectForKey:NSFileHFSTypeCode]; NSNumber *val = [attributes objectForKey:NSFileHFSTypeCode];
type = [val intValue]; type = [val intValue];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return type; return type;
} }
@ -105,12 +107,12 @@ JNIEXPORT jint JNICALL Java_com_apple_eio_FileManager__1getFileCreator
(JNIEnv *env, jclass clz, jstring javaFilename) (JNIEnv *env, jclass clz, jstring javaFilename)
{ {
jint creator = 0; jint creator = 0;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
NSString *filename = JNFNormalizedNSStringForPath(env, javaFilename); NSString *filename = JNFNormalizedNSStringForPath(env, javaFilename);
NSDictionary *attributes = [[NSFileManager defaultManager] fileAttributesAtPath:filename traverseLink:YES]; NSDictionary *attributes = [[NSFileManager defaultManager] fileAttributesAtPath:filename traverseLink:YES];
NSNumber *val = [attributes objectForKey:NSFileHFSCreatorCode]; NSNumber *val = [attributes objectForKey:NSFileHFSCreatorCode];
creator = [val intValue]; creator = [val intValue];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return creator; return creator;
} }
@ -123,7 +125,7 @@ JNIEXPORT jstring JNICALL Java_com_apple_eio_FileManager__1findFolder__SIZ
(JNIEnv *env, jclass clz, jshort domain, jint folderType, jboolean createIfNeeded) (JNIEnv *env, jclass clz, jshort domain, jint folderType, jboolean createIfNeeded)
{ {
jstring filename = nil; jstring filename = nil;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
FSRef foundRef; FSRef foundRef;
createIfNeeded = createIfNeeded || (folderType == kTemporaryFolderType) || (folderType == kChewableItemsFolderType); createIfNeeded = createIfNeeded || (folderType == kTemporaryFolderType) || (folderType == kChewableItemsFolderType);
@ -135,7 +137,7 @@ JNF_COCOA_ENTER(env);
} }
} }
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return filename; return filename;
} }
@ -148,7 +150,7 @@ JNF_COCOA_EXIT(env);
JNIEXPORT void JNICALL Java_com_apple_eio_FileManager__1openURL JNIEXPORT void JNICALL Java_com_apple_eio_FileManager__1openURL
(JNIEnv *env, jclass clz, jstring urlString) (JNIEnv *env, jclass clz, jstring urlString)
{ {
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
NSURL *url = [NSURL URLWithString:JNFNormalizedNSStringForPath(env, urlString)]; NSURL *url = [NSURL URLWithString:JNFNormalizedNSStringForPath(env, urlString)];
@ -157,7 +159,7 @@ JNF_COCOA_ENTER(env);
[[NSWorkspace sharedWorkspace] openURL:url]; [[NSWorkspace sharedWorkspace] openURL:url];
}]; }];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
@ -170,7 +172,7 @@ JNIEXPORT jstring JNICALL Java_com_apple_eio_FileManager_getNativeResourceFromBu
(JNIEnv *env, jclass clz, jstring javaResourceName, jstring javaSubDirName, jstring javaTypeName) (JNIEnv *env, jclass clz, jstring javaResourceName, jstring javaSubDirName, jstring javaTypeName)
{ {
jstring filename = NULL; jstring filename = NULL;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
NSString *resourceName = JNFNormalizedNSStringForPath(env, javaResourceName); NSString *resourceName = JNFNormalizedNSStringForPath(env, javaResourceName);
NSString *subDirectory = JNFNormalizedNSStringForPath(env, javaSubDirName); NSString *subDirectory = JNFNormalizedNSStringForPath(env, javaSubDirName);
@ -182,7 +184,7 @@ JNF_COCOA_ENTER(env);
filename = JNFNormalizedJavaStringForPath(env, path); filename = JNFNormalizedJavaStringForPath(env, path);
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return filename; return filename;
} }
@ -196,12 +198,12 @@ JNIEXPORT jstring JNICALL Java_com_apple_eio_FileManager_getNativePathToApplicat
(JNIEnv *env, jclass clazz) (JNIEnv *env, jclass clazz)
{ {
jstring filename = nil; jstring filename = nil;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
NSBundle *mainBundle = [NSBundle mainBundle]; NSBundle *mainBundle = [NSBundle mainBundle];
filename = JNFNormalizedJavaStringForPath(env, [mainBundle bundlePath]); filename = JNFNormalizedJavaStringForPath(env, [mainBundle bundlePath]);
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return filename; return filename;
} }
@ -216,7 +218,7 @@ JNIEXPORT jboolean JNICALL Java_com_apple_eio_FileManager__1moveToTrash
(JNIEnv *env, jclass clz, jstring fileName) (JNIEnv *env, jclass clz, jstring fileName)
{ {
__block BOOL returnValue = NO; __block BOOL returnValue = NO;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
NSString * path = JNFNormalizedNSStringForPath(env, fileName); NSString * path = JNFNormalizedNSStringForPath(env, fileName);
NSURL *url = [NSURL fileURLWithPath:path]; NSURL *url = [NSURL fileURLWithPath:path];
@ -227,7 +229,7 @@ JNF_COCOA_ENTER(env);
error:nil]; error:nil];
}]; }];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return returnValue ? JNI_TRUE: JNI_FALSE; return returnValue ? JNI_TRUE: JNI_FALSE;
} }
@ -242,14 +244,14 @@ JNIEXPORT jboolean JNICALL Java_com_apple_eio_FileManager__1revealInFinder
(JNIEnv *env, jclass clz, jstring url) (JNIEnv *env, jclass clz, jstring url)
{ {
__block jboolean returnValue = JNI_FALSE; __block jboolean returnValue = JNI_FALSE;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
NSString *path = JNFNormalizedNSStringForPath(env, url); NSString *path = JNFNormalizedNSStringForPath(env, url);
[JNFRunLoop performOnMainThreadWaiting:YES withBlock:^(){ [JNFRunLoop performOnMainThreadWaiting:YES withBlock:^(){
returnValue = [[NSWorkspace sharedWorkspace] selectFile:path inFileViewerRootedAtPath:@""]; returnValue = [[NSWorkspace sharedWorkspace] selectFile:path inFileViewerRootedAtPath:@""];
}]; }];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return returnValue; return returnValue;
} }

31
src/java.desktop/macosx/native/libosxapp/JNIUtilities.h
View File

@ -206,4 +206,35 @@
return y; \ return y; \
}; };
/* Create a pool and initiate a try block to catch any exception */
#define JNI_COCOA_ENTER(env) \
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; \
@try {
/* Don't allow NSExceptions to escape to Java.
* If there is a Java exception that has been thrown that should escape.
* And ensure we drain the auto-release pool.
*/
#define JNI_COCOA_EXIT(env) \
} \
@catch (NSException *e) { \
NSLog(@"%@", [e callStackSymbols]); \
} \
@finally { \
[pool drain]; \
};
/* Same as above but adds a clean up action.
* Requires that whatever is being cleaned up is in scope.
*/
#define JNI_COCOA_EXIT_WITH_ACTION(env, action) \
} \
@catch (NSException *e) { \
{ action; }; \
NSLog(@"%@", [e callStackSymbols]); \
} \
@finally { \
[pool drain]; \
};
#endif /* __JNIUTILITIES_H */ #endif /* __JNIUTILITIES_H */

26
src/java.desktop/macosx/native/libosxui/AquaFileView.m
View File

@ -24,7 +24,7 @@
*/ */
#include <jni_util.h> #include <JNIUtilities.h>
#import "com_apple_laf_AquaFileView.h" #import "com_apple_laf_AquaFileView.h"
@ -42,11 +42,11 @@
(JNIEnv *env, jclass clazz) (JNIEnv *env, jclass clazz)
{ {
jstring returnValue = NULL; jstring returnValue = NULL;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
returnValue = JNFNSToJavaString(env, getRunningJavaBundle()); returnValue = JNFNSToJavaString(env, getRunningJavaBundle());
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return returnValue; return returnValue;
}*/ }*/
@ -59,11 +59,11 @@ JNIEXPORT jstring JNICALL Java_com_apple_laf_AquaFileView_getNativePathToSharedJ
(JNIEnv *env, jclass clazz) (JNIEnv *env, jclass clazz)
{ {
jstring returnValue = NULL; jstring returnValue = NULL;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
returnValue = JNFNSToJavaString(env, [[NSBundle bundleWithIdentifier:@"com.apple.JavaVM"] bundlePath]); returnValue = JNFNSToJavaString(env, [[NSBundle bundleWithIdentifier:@"com.apple.JavaVM"] bundlePath]);
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return returnValue; return returnValue;
} }
@ -76,7 +76,7 @@ JNIEXPORT jstring JNICALL Java_com_apple_laf_AquaFileView_getNativeMachineName
(JNIEnv *env, jclass clazz) (JNIEnv *env, jclass clazz)
{ {
jstring returnValue = NULL; jstring returnValue = NULL;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
CFStringRef machineName = CSCopyMachineName(); CFStringRef machineName = CSCopyMachineName();
returnValue = JNFNSToJavaString(env, (NSString*)machineName); returnValue = JNFNSToJavaString(env, (NSString*)machineName);
@ -85,7 +85,7 @@ JNF_COCOA_ENTER(env);
CFRelease(machineName); CFRelease(machineName);
} }
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return returnValue; return returnValue;
} }
@ -98,7 +98,7 @@ JNIEXPORT jint JNICALL Java_com_apple_laf_AquaFileView_getNativeLSInfo
(JNIEnv *env, jclass clazz, jbyteArray absolutePath, jboolean isDir) (JNIEnv *env, jclass clazz, jbyteArray absolutePath, jboolean isDir)
{ {
jint returnValue = com_apple_laf_AquaFileView_UNINITALIZED_LS_INFO; jint returnValue = com_apple_laf_AquaFileView_UNINITALIZED_LS_INFO;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
jbyte *byteArray = (*env)->GetByteArrayElements(env, absolutePath, NULL); jbyte *byteArray = (*env)->GetByteArrayElements(env, absolutePath, NULL);
CHECK_NULL_RETURN(byteArray, returnValue); CHECK_NULL_RETURN(byteArray, returnValue);
@ -126,7 +126,7 @@ JNF_COCOA_ENTER(env);
} }
} }
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return returnValue; return returnValue;
} }
@ -139,7 +139,7 @@ JNIEXPORT jstring JNICALL Java_com_apple_laf_AquaFileView_getNativeDisplayName
(JNIEnv *env, jclass clazz, jbyteArray absolutePath, jboolean isDir) (JNIEnv *env, jclass clazz, jbyteArray absolutePath, jboolean isDir)
{ {
jstring returnValue = NULL; jstring returnValue = NULL;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
jbyte *byteArray = (*env)->GetByteArrayElements(env, absolutePath, NULL); jbyte *byteArray = (*env)->GetByteArrayElements(env, absolutePath, NULL);
CHECK_NULL_RETURN(byteArray, returnValue); CHECK_NULL_RETURN(byteArray, returnValue);
@ -178,7 +178,7 @@ JNF_COCOA_ENTER(env);
} }
} }
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return returnValue; return returnValue;
} }
@ -191,7 +191,7 @@ JNIEXPORT jstring JNICALL Java_com_apple_laf_AquaFileView_getNativePathForResolv
(JNIEnv *env, jclass clazz, jbyteArray pathToAlias, jboolean isDir) (JNIEnv *env, jclass clazz, jbyteArray pathToAlias, jboolean isDir)
{ {
jstring returnValue = NULL; jstring returnValue = NULL;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
UInt8 pathCString[MAXPATHLEN + 1]; UInt8 pathCString[MAXPATHLEN + 1];
size_t maxPathLen = sizeof(pathCString) - 1; size_t maxPathLen = sizeof(pathCString) - 1;
@ -224,6 +224,6 @@ JNF_COCOA_ENTER(env);
} }
} }
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return returnValue; return returnValue;
} }

4
src/java.desktop/macosx/native/libosxui/AquaNativeResources.m
View File

@ -39,10 +39,10 @@ JNIEXPORT jlong JNICALL Java_com_apple_laf_AquaNativeResources_getWindowBackgrou
// TODO(cpc): this code is currently disabled at the Java level // TODO(cpc): this code is currently disabled at the Java level
#if 0 #if 0
NSColor* color = nil; NSColor* color = nil;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
color = [NSColor lightGrayColor];//[AWTColor getMagicBackgroundColor]; color = [NSColor lightGrayColor];//[AWTColor getMagicBackgroundColor];
if (color) CFRetain(color); // GC if (color) CFRetain(color); // GC
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return ptr_to_jlong(color); return ptr_to_jlong(color);
#else #else
return 0L; return 0L;

24
src/java.desktop/macosx/native/libosxui/ScreenMenu.m
View File

@ -105,13 +105,13 @@ static jint ns2awtMouseButton(NSInteger mouseButton) {
} }
JNIEnv *env = [ThreadUtilities getJNIEnv]; JNIEnv *env = [ThreadUtilities getJNIEnv];
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
//NSLog(@"menuWillOpen %@", [menu title]); //NSLog(@"menuWillOpen %@", [menu title]);
GET_SCREENMENU_CLASS(); GET_SCREENMENU_CLASS();
DECLARE_METHOD(jm_ScreenMenu_invokeOpenLater, sjc_ScreenMenu, "invokeOpenLater", "()V"); DECLARE_METHOD(jm_ScreenMenu_invokeOpenLater, sjc_ScreenMenu, "invokeOpenLater", "()V");
(*env)->CallVoidMethod(env, [self.javaObjectWrapper jObject], jm_ScreenMenu_invokeOpenLater); // AWT_THREADING Safe (AWTRunLoopMode) (*env)->CallVoidMethod(env, [self.javaObjectWrapper jObject], jm_ScreenMenu_invokeOpenLater); // AWT_THREADING Safe (AWTRunLoopMode)
CHECK_EXCEPTION(); CHECK_EXCEPTION();
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
@ -125,13 +125,13 @@ JNF_COCOA_EXIT(env);
} }
JNIEnv *env = [ThreadUtilities getJNIEnv]; JNIEnv *env = [ThreadUtilities getJNIEnv];
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
//NSLog(@"menuDidClose %@", [menu title]); //NSLog(@"menuDidClose %@", [menu title]);
GET_SCREENMENU_CLASS(); GET_SCREENMENU_CLASS();
DECLARE_METHOD(jm_ScreenMenu_invokeMenuClosing, sjc_ScreenMenu, "invokeMenuClosing", "()V"); DECLARE_METHOD(jm_ScreenMenu_invokeMenuClosing, sjc_ScreenMenu, "invokeMenuClosing", "()V");
(*env)->CallVoidMethod(env, [self.javaObjectWrapper jObject], jm_ScreenMenu_invokeMenuClosing); // AWT_THREADING Safe (AWTRunLoopMode) (*env)->CallVoidMethod(env, [self.javaObjectWrapper jObject], jm_ScreenMenu_invokeMenuClosing); // AWT_THREADING Safe (AWTRunLoopMode)
CHECK_EXCEPTION(); CHECK_EXCEPTION();
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
@ -145,7 +145,7 @@ JNF_COCOA_EXIT(env);
} }
JNIEnv *env = [ThreadUtilities getJNIEnv]; JNIEnv *env = [ThreadUtilities getJNIEnv];
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
// Send that to Java so we can test which item was hit. // Send that to Java so we can test which item was hit.
GET_SCREENMENU_CLASS(); GET_SCREENMENU_CLASS();
DECLARE_METHOD(jm_ScreenMenu_updateSelectedItem, sjc_ScreenMenu, "handleItemTargeted", "(IIIII)V"); DECLARE_METHOD(jm_ScreenMenu_updateSelectedItem, sjc_ScreenMenu, "handleItemTargeted", "(IIIII)V");
@ -153,7 +153,7 @@ JNF_COCOA_ENTER(env);
NSMinY(rect), NSMinX(rect), NSMaxY(rect), NSMaxX(rect)); // AWT_THREADING Safe (AWTRunLoopMode) NSMinY(rect), NSMinX(rect), NSMaxY(rect), NSMaxX(rect)); // AWT_THREADING Safe (AWTRunLoopMode)
CHECK_EXCEPTION(); CHECK_EXCEPTION();
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
@ -191,13 +191,13 @@ JNF_COCOA_EXIT(env);
// Call the mouse event handler, which will generate Java mouse events. // Call the mouse event handler, which will generate Java mouse events.
JNIEnv *env = [ThreadUtilities getJNIEnv]; JNIEnv *env = [ThreadUtilities getJNIEnv];
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
GET_SCREENMENU_CLASS(); GET_SCREENMENU_CLASS();
DECLARE_METHOD(jm_ScreenMenu_handleMouseEvent, sjc_ScreenMenu, "handleMouseEvent", "(IIIIJ)V"); DECLARE_METHOD(jm_ScreenMenu_handleMouseEvent, sjc_ScreenMenu, "handleMouseEvent", "(IIIIJ)V");
(*env)->CallVoidMethod(env, [self.javaObjectWrapper jObject], jm_ScreenMenu_handleMouseEvent, (*env)->CallVoidMethod(env, [self.javaObjectWrapper jObject], jm_ScreenMenu_handleMouseEvent,
javaKind, javaX, javaY, javaModifiers, javaWhen); // AWT_THREADING Safe (AWTRunLoopMode) javaKind, javaX, javaY, javaModifiers, javaWhen); // AWT_THREADING Safe (AWTRunLoopMode)
CHECK_EXCEPTION(); CHECK_EXCEPTION();
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }
@end @end
@ -213,7 +213,7 @@ JNIEXPORT jlong JNICALL Java_com_apple_laf_ScreenMenu_addMenuListeners
{ {
NativeToJavaDelegate *delegate = nil; NativeToJavaDelegate *delegate = nil;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
JNFJObjectWrapper *wrapper = [JNFJObjectWrapper wrapperWithJObject:listener withEnv:env]; JNFJObjectWrapper *wrapper = [JNFJObjectWrapper wrapperWithJObject:listener withEnv:env];
NSMenu *menu = jlong_to_ptr(nativeMenu); NSMenu *menu = jlong_to_ptr(nativeMenu);
@ -229,7 +229,7 @@ JNF_COCOA_ENTER(env);
} }
}]; }];
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
return ptr_to_jlong(delegate); return ptr_to_jlong(delegate);
} }
@ -244,7 +244,7 @@ JNIEXPORT void JNICALL Java_com_apple_laf_ScreenMenu_removeMenuListeners
{ {
if (fModelPtr == 0L) return; if (fModelPtr == 0L) return;
JNF_COCOA_ENTER(env); JNI_COCOA_ENTER(env);
NativeToJavaDelegate *delegate = (NativeToJavaDelegate *)jlong_to_ptr(fModelPtr); NativeToJavaDelegate *delegate = (NativeToJavaDelegate *)jlong_to_ptr(fModelPtr);
@ -258,5 +258,5 @@ JNF_COCOA_ENTER(env);
CFRelease(delegate); // GC CFRelease(delegate); // GC
JNF_COCOA_EXIT(env); JNI_COCOA_EXIT(env);
} }