From e5ab975727134d8249277f4df707b2b14a7788f3 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Sun, 25 Sep 2011 04:38:59 +0200
Subject: NEWT/JOGL: MacOSX Update

Feature related:

- Added always-on-top

- Added translucency

- Child Window Position

  - AWT parent: manual traverse up the tree and calc position on screen
    (Problem: the parent view rect is not at the proper position,
     but covers the whole frame)

EDTUtil related:

- Works now w/ AWT ot headless (again)

- OSX native JNI callbacks gathering JNIEnv properly
  and attaches/detaches thread.

- AWT case: using AWT-Event which properly dispatches our cocoa events

- MainThread (headless) case: Fork off thread w/ main class
  and kick off NSApp run().
  This leads to same behavior as w/ AWT case.

- Using DefaultEDTUtil

- Cleanup MainThread (implements EDTUtil)
  - Currently not used as EDTUtil (osx), just as launcher
  - Removed EDTUtil impl code, reuse DefaultEDTUtil

- Cleanup AWTEDTUtil (implements EDTUtil)
  - Currently not used as EDTUtil (osx)
---
 src/newt/native/X11Window.c | 26 ++++++++------------------
 1 file changed, 8 insertions(+), 18 deletions(-)

(limited to 'src/newt/native/X11Window.c')

diff --git a/src/newt/native/X11Window.c b/src/newt/native/X11Window.c
index 30ff7f6f3..e1a0071b5 100644
--- a/src/newt/native/X11Window.c
+++ b/src/newt/native/X11Window.c
@@ -208,32 +208,22 @@ static int displayDispatchErrorHandler(Display *dpy, XErrorEvent *e)
     } else if (e->error_code == BadWindow) {
         fprintf(stderr, "         BadWindow (%p): Window probably already removed\n", (void*)e->resourceid);
     } else {
-        JNIEnv *curEnv = NULL;
-        JNIEnv *newEnv = NULL;
-        int envRes ;
+        int shallBeDetached = 0;
+        JNIEnv *jniEnv = NULL;
         const char * errStr = strerror(errno);
 
         fprintf(stderr, "Info: NEWT X11 Error: Display %p, Code 0x%X, errno %s\n", dpy, e->error_code, errStr);
 
-        // retrieve this thread's JNIEnv curEnv - or detect it's detached
-        envRes = (*jvmHandle)->GetEnv(jvmHandle, (void **) &curEnv, jvmVersion) ;
-        if( JNI_EDETACHED == envRes ) {
-            // detached thread - attach to JVM
-            if( JNI_OK != ( envRes = (*jvmHandle)->AttachCurrentThread(jvmHandle, (void**) &newEnv, NULL) ) ) {
-                fprintf(stderr, "NEWT X11 Error: can't attach thread: %d\n", envRes);
-                return;
-            }
-            curEnv = newEnv;
-        } else if( JNI_OK != envRes ) {
-            // oops ..
-            fprintf(stderr, "NEWT X11 Error: can't GetEnv: %d\n", envRes);
+        jniEnv = NewtCommon_GetJNIEnv(jvmHandle, jvmVersion, &shallBeDetached);
+        if(NULL==jniEnv) {
+            fprintf(stderr, "NEWT X11 Error: null JNIEnv");
             return;
         }
-        NewtCommon_throwNewRuntimeException(curEnv, "Info: NEWT X11 Error: Display %p, Code 0x%X, errno %s", 
+
+        NewtCommon_throwNewRuntimeException(jniEnv, "Info: NEWT X11 Error: Display %p, Code 0x%X, errno %s", 
                                             dpy, e->error_code, errStr);
 
-        if( NULL != newEnv ) {
-            // detached attached thread
+        if (shallBeDetached) {
             (*jvmHandle)->DetachCurrentThread(jvmHandle);
         }
     }
-- 
cgit v1.2.3