From d0f91a8ed17fbb1a7b56511c4e53a29e576f01af Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Thu, 8 Nov 2012 18:07:19 +0100
Subject: Fix GLAutoDrawable.dispose(): Dispose drawable even w/o context;
 JAWTWindow.lockSurface(): Check AWT component's native peer

- Fix GLAutoDrawable.dispose(): Dispose drawable even w/o context
  - It is possible to have the GLContext not being created (not made current),
    so drawable shall be disposed independent.

  - Merge Runnable 'postDisposeOnEDTAction' to dispose Runnable for clarity

  - GLDrawableHelper: Split disposeGL from invokeGLImpl for clarity

- JAWTWindow.lockSurface(): Check AWT component's native peer
  - W/o a native peer (!isDisplayable()), JAWT locking cannot succeed.

  - On OSX OpenJDK 1.7, attempting to JAWT lock a peer-less component crashes the VM

  - MacOSXJAWTWindow.lockSurfaceImpl(): Remove redundant null checks
---
 .../com/jogamp/nativewindow/awt/JAWTWindow.java    | 47 +++++++++++++---------
 .../nativewindow/jawt/macosx/MacOSXJAWTWindow.java | 40 +++++++++---------
 2 files changed, 46 insertions(+), 41 deletions(-)

(limited to 'src/nativewindow/classes')

diff --git a/src/nativewindow/classes/com/jogamp/nativewindow/awt/JAWTWindow.java b/src/nativewindow/classes/com/jogamp/nativewindow/awt/JAWTWindow.java
index 35c919f28..8527a0200 100644
--- a/src/nativewindow/classes/com/jogamp/nativewindow/awt/JAWTWindow.java
+++ b/src/nativewindow/classes/com/jogamp/nativewindow/awt/JAWTWindow.java
@@ -320,32 +320,41 @@ public abstract class JAWTWindow implements NativeWindow, OffscreenLayerSurface,
     int res = surfaceLock.getHoldCount() == 1 ? LOCK_SURFACE_NOT_READY : LOCK_SUCCESS; // new lock ?
 
     if ( LOCK_SURFACE_NOT_READY == res ) {
-        determineIfApplet();
-        try {
-            final AbstractGraphicsDevice adevice = getGraphicsConfiguration().getScreen().getDevice();
-            adevice.lock();
+        if( !component.isDisplayable() ) {
+            // W/o native peer, we cannot utilize JAWT for locking.
+            surfaceLock.unlock();
+            if(DEBUG) {
+                System.err.println("JAWTWindow: Can't lock surface, component peer n/a. Component displayable "+component.isDisplayable()+", "+component);
+                Thread.dumpStack();
+            }
+        } else {
+            determineIfApplet();
             try {
-                if(null == jawt) { // no need to re-fetch for each frame
-                    jawt = fetchJAWTImpl();
-                    isOffscreenLayerSurface = JAWTUtil.isJAWTUsingOffscreenLayer(jawt);
-                }
-                res = lockSurfaceImpl();
-                if(LOCK_SUCCESS == res && drawable_old != drawable) {
-                    res = LOCK_SURFACE_CHANGED;
-                    if(DEBUG) {
-                        System.err.println("JAWTWindow: surface change 0x"+Long.toHexString(drawable_old)+" -> 0x"+Long.toHexString(drawable));
-                        // Thread.dumpStack();
+                final AbstractGraphicsDevice adevice = getGraphicsConfiguration().getScreen().getDevice();
+                adevice.lock();
+                try {
+                    if(null == jawt) { // no need to re-fetch for each frame
+                        jawt = fetchJAWTImpl();
+                        isOffscreenLayerSurface = JAWTUtil.isJAWTUsingOffscreenLayer(jawt);
+                    }
+                    res = lockSurfaceImpl();
+                    if(LOCK_SUCCESS == res && drawable_old != drawable) {
+                        res = LOCK_SURFACE_CHANGED;
+                        if(DEBUG) {
+                            System.err.println("JAWTWindow: surface change 0x"+Long.toHexString(drawable_old)+" -> 0x"+Long.toHexString(drawable));
+                            // Thread.dumpStack();
+                        }
+                    }
+                } finally {
+                    if (LOCK_SURFACE_NOT_READY >= res) {
+                        adevice.unlock();
                     }
                 }
             } finally {
                 if (LOCK_SURFACE_NOT_READY >= res) {
-                    adevice.unlock();
+                    surfaceLock.unlock();
                 }
             }
-        } finally {
-            if (LOCK_SURFACE_NOT_READY >= res) {
-                surfaceLock.unlock();
-            }
         }
     }
     return res;
diff --git a/src/nativewindow/classes/jogamp/nativewindow/jawt/macosx/MacOSXJAWTWindow.java b/src/nativewindow/classes/jogamp/nativewindow/jawt/macosx/MacOSXJAWTWindow.java
index 5fd242247..449121be1 100644
--- a/src/nativewindow/classes/jogamp/nativewindow/jawt/macosx/MacOSXJAWTWindow.java
+++ b/src/nativewindow/classes/jogamp/nativewindow/jawt/macosx/MacOSXJAWTWindow.java
@@ -119,13 +119,11 @@ public class MacOSXJAWTWindow extends JAWTWindow implements MutableSurface {
   }
   protected int lockSurfaceImpl() throws NativeWindowException {
     int ret = NativeWindow.LOCK_SURFACE_NOT_READY;
-    if(null == ds) {
-        ds = getJAWT().GetDrawingSurface(component);
-        if (ds == null) {
-          // Widget not yet realized
-          unlockSurfaceImpl();
-          return NativeWindow.LOCK_SURFACE_NOT_READY;
-        }
+    ds = getJAWT().GetDrawingSurface(component);
+    if (ds == null) {
+      // Widget not yet realized
+      unlockSurfaceImpl();
+      return NativeWindow.LOCK_SURFACE_NOT_READY;
     }
     int res = ds.Lock();
     dsLocked = ( 0 == ( res & JAWTFactory.JAWT_LOCK_ERROR ) ) ;
@@ -141,21 +139,19 @@ public class MacOSXJAWTWindow extends JAWTWindow implements MutableSurface {
     if ((res & JAWTFactory.JAWT_LOCK_SURFACE_CHANGED) != 0) {
       ret = NativeWindow.LOCK_SURFACE_CHANGED;
     }
-    if(null == dsi) {
-        if (firstLock) {
-          AccessController.doPrivileged(new PrivilegedAction<Object>() {
-              public Object run() {
-                dsi = ds.GetDrawingSurfaceInfo();
-                return null;
-              }
-            });
-        } else {
-          dsi = ds.GetDrawingSurfaceInfo();
-        }
-        if (dsi == null) {
-          unlockSurfaceImpl();
-          return NativeWindow.LOCK_SURFACE_NOT_READY;
-        }
+    if (firstLock) {
+      AccessController.doPrivileged(new PrivilegedAction<Object>() {
+          public Object run() {
+            dsi = ds.GetDrawingSurfaceInfo();
+            return null;
+          }
+        });
+    } else {
+      dsi = ds.GetDrawingSurfaceInfo();
+    }
+    if (dsi == null) {
+      unlockSurfaceImpl();
+      return NativeWindow.LOCK_SURFACE_NOT_READY;
     }
     updateBounds(dsi.getBounds());
     if (DEBUG && firstLock ) {
-- 
cgit v1.2.3