OS X Layered View Part8: Generalize OffscreenLayerSurface ; Use local JAWT instance ; Applet's on OS X are working

Generalize OffscreenLayerSurface
  - Using new OffscreenLayerSurface allows using this functionality in a clean manner,
    ie. no 'dirty' usage of MacOSXJAWTWindow in a JOGL GL class.

  - 'Promoting' OffscreenLayerSurface functionality to JAWTWindow
    and it's handling to GLDrawableFactoryImpl::createGLDrawable().

  - Move MacOSXCGLDrawableFactory's "MacOSXJAWTWindow getLayeredSurfaceHost(NativeSurface surface)"
    to NativeWindowFactory "OffscreenLayerSurface getOffscreenLayerSurface(NativeSurface surface, boolean ifEnabled)"

Use local JAWT instance
  - Only w/ a local JAWT instance per JAWTWindow it is possible to switch between
    offscreen-layer and onscreen. We also have to determing offscreen-layer lazy
    at surface lock, since only at that time we have knowledge whether it's an Applet
    or not.

+++

ContextUpdater:
  Use local pthread mutex, add DEBUG output

JAWTWindow/NewtCanvasAWT:
  Adding methods to request offscreen-layer-surface (if supported),
  besides 'if applet' this may trigger the new functionality.

+++

Applet's on OS X are working:
  - OS X 10.6.4
    - Safari:
      - Hangs for a while at start .. whole screen freezes .. approx. 10s
      - Sometimes crashes when Applet stops - after all our resources are released!
      - Keyboard input isn't assigned sometimes.
      - Otherwise .. works well, incl. offscreen/onscreen parenting

    - Firefox 8.0:
      - Hangs for a while at start .. whole screen freezes .. approx. 10s
      - Sometimes crashes when Applet stops - after all our resources are released!
      - Keyboard input is never assigned.
      - Otherwise .. works well, incl. offscreen/onscreen parenting

  - OS X 10.7
    - Safari:
      - Sometimes crashes when Applet stops - after all our resources are released!
      - Keyboard input isn't assigned sometimes.
      - Otherwise .. works well, incl. offscreen/onscreen parenting

    - Firefox 8.0:
      - Sometimes crashes when Applet stops - after all our resources are released!
      - Keyboard input is never assigned.
      - Otherwise .. works well, incl. offscreen/onscreen parenting

3 files changed, 25 insertions, 40 deletions

diff --git a/src/jogl/native/macosx/ContextUpdater.h b/src/jogl/native/macosx/ContextUpdater.h
index 3cf7315af..f00b2be57 100644
--- a/src/jogl/native/macosx/ContextUpdater.h
+++ b/src/jogl/native/macosx/ContextUpdater.h
@@ -25,17 +25,13 @@ This notification is sent whenever an NSView that has an attached NSSurface chan
 @interface ContextUpdater : NSObject
 {
 @protected
+    pthread_mutex_t resourceLock;
     NSView * view;
     NSRect viewRect;
     NSOpenGLContext *ctx;
     BOOL viewUpdated;
 }
 
-- (void) lock;
-- (void) lockInFunction:(char *)func atLine:(int)line;
-- (void) unlock;
-- (void) unlockInFunction:(char *)func atLine:(int)line;
-
 - (id) initWithContext:(NSOpenGLContext *)context view: (NSView *)nsView;
 
 - (void) update:(NSNotification *)notification;
diff --git a/src/jogl/native/macosx/ContextUpdater.m b/src/jogl/native/macosx/ContextUpdater.m
index e0668352c..a3b9b5c8c 100644
--- a/src/jogl/native/macosx/ContextUpdater.m
+++ b/src/jogl/native/macosx/ContextUpdater.m
@@ -1,43 +1,26 @@
 #import "ContextUpdater.h"
 #import <pthread.h>
 
-@implementation ContextUpdater
-{
-}
+#define VERBOSE_ON 1
 
-static pthread_mutex_t resourceLock = PTHREAD_MUTEX_INITIALIZER;
+#ifdef VERBOSE_ON
+    #define DBG_PRINT(...) NSLog(@ __VA_ARGS__)
+    // #define DBG_PRINT(...) fprintf(stderr, __VA_ARGS__); fflush(stderr)
+#else
+    #define DBG_PRINT(...)
+#endif
 
-static void printLockDebugInfo(char *message, char *func, int line)
-{
-    fprintf(stderr, "%s in function: \"%s\" at line: %d\n", message, func, line);
-    fflush(NULL);
-}
+#ifndef CGL_VERSION_1_3
+    #warning this SDK doesn't support OpenGL profile
+#endif
 
-- (void) lock
-{
-    pthread_mutex_lock(&resourceLock);
-}
-
-- (void) lockInFunction:(char *)func atLine:(int)line
-{
-    printLockDebugInfo("locked  ", func, line);
-    [self lock];
-}
-
-- (void) unlock
-{
-    pthread_mutex_unlock(&resourceLock);
-}
-
-- (void) unlockInFunction:(char *)func atLine:(int)line
+@implementation ContextUpdater
 {
-    printLockDebugInfo("unlocked", func, line);
-    [self unlock];
 }
 
 - (void) update:(NSNotification *)notification
 {
-    [self lock];
+    pthread_mutex_lock(&resourceLock);
     
     NSRect r = [view frame];
     if(viewRect.origin.x != r.origin.x || 
@@ -48,24 +31,26 @@ static void printLockDebugInfo(char *message, char *func, int line)
         viewRect = r;
     }
 
-    [self unlock];
+    pthread_mutex_unlock(&resourceLock);
 }
 
 - (BOOL) needsUpdate
 {
     BOOL r;
-    [self lock];
+    pthread_mutex_lock(&resourceLock);
     
     r = viewUpdated;
     viewUpdated = FALSE;
     
-    [self unlock];
+    pthread_mutex_unlock(&resourceLock);
 
     return r;
 }
 
 - (id) initWithContext:(NSOpenGLContext *)context view: (NSView *)nsView
 {
+    DBG_PRINT("ContextUpdater::init.0 view %p, ctx %p\n", view, ctx);
+    pthread_mutex_init(&resourceLock, NULL); // fast non-recursive
     ctx = context;
     view = nsView;
     [ctx retain];
@@ -73,15 +58,19 @@ static void printLockDebugInfo(char *message, char *func, int line)
     viewRect = [view frame];
     viewUpdated = TRUE;
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(update:) name:NSViewGlobalFrameDidChangeNotification object: view];
+    DBG_PRINT("ContextUpdater::init.X\n");
 
     return [super init];
 }
 
 - (void) dealloc
 {
+    DBG_PRINT("ContextUpdater::dealloc.0 view %p, ctx %p\n", view, ctx);
     [[NSNotificationCenter defaultCenter] removeObserver:self];
     [view release];
     [ctx release];
+    pthread_mutex_destroy(&resourceLock);
+    DBG_PRINT("ContextUpdater::dealloc.X\n");
     
     [super dealloc];
 }
diff --git a/src/jogl/native/macosx/MacOSXWindowSystemInterface.h b/src/jogl/native/macosx/MacOSXWindowSystemInterface.h
index 3625cfbde..b2d7f9db8 100644
--- a/src/jogl/native/macosx/MacOSXWindowSystemInterface.h
+++ b/src/jogl/native/macosx/MacOSXWindowSystemInterface.h
@@ -3,11 +3,11 @@
 #import <OpenGL/CGLTypes.h>
 #import <jni.h>
 
-// #define VERBOSE_ON 1
+#define VERBOSE_ON 1
 
 #ifdef VERBOSE_ON
-    // #define DBG_PRINT(...) NSLog(@ ## __VA_ARGS__)
-    #define DBG_PRINT(...) fprintf(stderr, __VA_ARGS__); fflush(stderr)
+    #define DBG_PRINT(...) NSLog(@ __VA_ARGS__)
+    // #define DBG_PRINT(...) fprintf(stderr, __VA_ARGS__); fflush(stderr)
 #else
     #define DBG_PRINT(...)
 #endif