From d370be30dc75cc3b63246f026090a7377bf07135 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Tue, 27 Apr 2010 07:18:54 +0200 Subject: - Fix GLProcAddressResolver regression: Use GLProcAddressResolver ! - X11GLXDrawableFactory: - Move shared resource creation/destruction into it's own thread - Remove the ATI hack (no XDisplay closing) for every Display, this is only necessary for the shared XDisplay and in case of AWT. - Newt - Display: Only pumpMessages if device is ready. - X11Display: Verify handle not null at DispatchMessage. - Common recursive ToolkitLock implementation, from src/nativewindow/classes/com/jogamp/nativewindow/impl/LockingNativeWindowFactory.java and src/newt/classes/com/jogamp/newt/Window.java, -> com.jogamp.nativewindow.impl.RecursiveToolkitLock - Unique XLockDisplay/XUnlockDisplay call via X11Util to simplify debugging. X11Util: Added debug code for XLockDisplay/XUnlockDisplay. Added fast LongObjectHashMap Added static lib loading and initialization. Removed active and passive list, as well as unused methods, to easy maintenance. Possible since the only 'uncloseable' Display might be the shareable one. - X11Lib: Added static initialization via X11Util Test: junit/com/jogamp/test/junit/jogl/demos/gl2/gears/TestGears* - Add WindowListener for quit .. --- src/newt/native/MacWindow.m | 2 +- src/newt/native/X11Window.c | 34 ---------------------------------- 2 files changed, 1 insertion(+), 35 deletions(-) (limited to 'src/newt/native') diff --git a/src/newt/native/MacWindow.m b/src/newt/native/MacWindow.m index a4a5da7fc..21bc9b2ad 100644 --- a/src/newt/native/MacWindow.m +++ b/src/newt/native/MacWindow.m @@ -160,7 +160,7 @@ JNIEXPORT jboolean JNICALL Java_com_jogamp_newt_impl_macosx_MacDisplay_initNSApp * Signature: ()V */ JNIEXPORT void JNICALL Java_com_jogamp_newt_impl_macosx_MacDisplay_dispatchMessages0 - (JNIEnv *env, jobject unused, jlong window, jint eventMask) + (JNIEnv *env, jobject unused) { NSEvent* event = NULL; NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; diff --git a/src/newt/native/X11Window.c b/src/newt/native/X11Window.c index 8d5920f65..70fc421e8 100755 --- a/src/newt/native/X11Window.c +++ b/src/newt/native/X11Window.c @@ -278,40 +278,6 @@ JNIEXPORT jboolean JNICALL Java_com_jogamp_newt_impl_x11_X11Display_initIDs return JNI_TRUE; } -/* - * Class: com_jogamp_newt_impl_x11_X11Display - * Method: LockDisplay - * Signature: (J)V - */ -JNIEXPORT void JNICALL Java_com_jogamp_newt_impl_x11_X11Display_LockDisplay - (JNIEnv *env, jobject obj, jlong display) -{ - Display * dpy = (Display *)(intptr_t)display; - if(dpy==NULL) { - _FatalError(env, "invalid display connection.."); - } - XLockDisplay(dpy) ; - // DBG_PRINT1( "X11: LockDisplay 0x%X\n", dpy); -} - - -/* - * Class: com_jogamp_newt_impl_x11_X11Display - * Method: UnlockDisplay - * Signature: (J)V - */ -JNIEXPORT void JNICALL Java_com_jogamp_newt_impl_x11_X11Display_UnlockDisplay - (JNIEnv *env, jobject obj, jlong display) -{ - Display * dpy = (Display *)(intptr_t)display; - if(dpy==NULL) { - _FatalError(env, "invalid display connection.."); - } - XUnlockDisplay(dpy) ; - // DBG_PRINT1( "X11: UnlockDisplay 0x%X\n", dpy); -} - - /* * Class: com_jogamp_newt_impl_x11_X11Display * Method: CompleteDisplay -- cgit v1.2.3