Bug 1222 - NEWT OSX: setAlwaysOnTop() and setAlwaysOnBottom() not working

- The NSWindow level must be set at window creation

- Levels are
  - aontop: kCGMaximumWindowLevel
  - aonbottom: kCGDesktopIconWindowLevel (w/ input)
  - normal: NSNormalWindowLevel

- Hence we need to recreate the NSWindow if toggling the state,
  similar to opaque .. etc.

5 files changed, 27 insertions, 63 deletions

diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh
index 50f9cf869..25b3963e6 100644
--- a/make/scripts/tests.sh
+++ b/make/scripts/tests.sh
@@ -189,7 +189,7 @@ function jrun() {
     #D_ARGS="-Djogl.debug.DebugGL -Djogl.debug.TraceGL -Djogl.debug.GLContext.TraceSwitch -Djogl.debug=all"
     #D_ARGS="-Djogl.debug.GLArrayData"
     #D_ARGS="-Dnewt.debug.Screen -Dnewt.debug.Window"
-    D_ARGS="-Dnewt.debug.Window"
+    #D_ARGS="-Dnewt.debug.Window"
     #D_ARGS="-Dnewt.debug.Screen"
     #D_ARGS="-Dnewt.test.Screen.disableRandR13"
     #D_ARGS="-Dnewt.test.Screen.disableScreenMode -Dnewt.debug.Screen"
diff --git a/src/newt/classes/jogamp/newt/driver/macosx/WindowDriver.java b/src/newt/classes/jogamp/newt/driver/macosx/WindowDriver.java
index f2d0d5127..a433ef382 100644
--- a/src/newt/classes/jogamp/newt/driver/macosx/WindowDriver.java
+++ b/src/newt/classes/jogamp/newt/driver/macosx/WindowDriver.java
@@ -437,6 +437,8 @@ public class WindowDriver extends WindowImpl implements MutableSurface, DriverCl
         if( ( 0 == oldWindowHandle && 0 != ( STATE_MASK_VISIBLE & flags) ) ||
             0 != ( CHANGE_MASK_PARENTING & flags)  ||
             0 != ( CHANGE_MASK_DECORATION & flags) ||
+            0 != ( CHANGE_MASK_ALWAYSONTOP & flags) ||
+            0 != ( CHANGE_MASK_ALWAYSONBOTTOM & flags) ||
             0 != ( CHANGE_MASK_RESIZABLE & flags)  ||
             0 != ( CHANGE_MASK_FULLSCREEN & flags) ) {
             if(isOffscreenInstance) {
@@ -487,10 +489,6 @@ public class WindowDriver extends WindowImpl implements MutableSurface, DriverCl
                     visibleChanged(true, true);
                 }
             }
-            if( !isOffscreenInstance ) {
-                setAlwaysOnTop0(oldWindowHandle, 0 != ( STATE_MASK_ALWAYSONTOP & flags));
-                setAlwaysOnBottom0(oldWindowHandle, 0 != ( STATE_MASK_ALWAYSONBOTTOM & flags));
-            }
         } else {
             throw new InternalError("Null windowHandle but no re-creation triggered, check visibility: "+getStateMaskString());
         }
@@ -781,14 +779,14 @@ public class WindowDriver extends WindowImpl implements MutableSurface, DriverCl
                     public void run() {
                         initWindow0( parentWinHandle, newWin, pS.getX(), pS.getY(), width, height, reqPixelScale[0] /* HiDPI uniformPixelScale */,
                                      isOpaque,
+                                     !offscreenInstance && 0 != ( STATE_MASK_ALWAYSONTOP & flags),
+                                     !offscreenInstance && 0 != ( STATE_MASK_ALWAYSONBOTTOM & flags),
                                      !offscreenInstance && 0 != ( STATE_MASK_VISIBLE & flags),
                                      surfaceHandle);
                         if( offscreenInstance ) {
                             orderOut0(0!=parentWinHandle ? parentWinHandle : newWin);
                         } else {
                             setTitle0(newWin, getTitle());
-                            setAlwaysOnTop0(newWin, 0 != ( STATE_MASK_ALWAYSONTOP & flags));
-                            setAlwaysOnBottom0(newWin, 0 != ( STATE_MASK_ALWAYSONBOTTOM & flags));
                         }
                     } });
         } catch (final Exception ie) {
@@ -801,7 +799,8 @@ public class WindowDriver extends WindowImpl implements MutableSurface, DriverCl
     private native long createWindow0(int x, int y, int w, int h, boolean fullscreen, int windowStyle, int backingStoreType, long view);
     /** Must be called on Main-Thread */
     private native void initWindow0(long parentWindow, long window, int x, int y, int w, int h, float reqPixelScale,
-                                    boolean opaque, boolean visible, long view);
+                                    boolean opaque, boolean atop, boolean abottom, boolean visible, long view);
+
     private native int getDisplayID0(long window);
     private native void setPixelScale0(long window, long view, float reqPixelScale);
     private native boolean lockSurface0(long window, long view);
@@ -825,10 +824,6 @@ public class WindowDriver extends WindowImpl implements MutableSurface, DriverCl
     private native void setWindowClientTopLeftPointAndSize0(long window, int x, int y, int w, int h, boolean display);
     /** Must be called on Main-Thread */
     private native void setWindowClientTopLeftPoint0(long window, int x, int y, boolean display);
-    /** Must be called on Main-Thread */
-    private native void setAlwaysOnTop0(long window, boolean atop);
-    /** Must be called on Main-Thread */
-    private native void setAlwaysOnBottom0(long window, boolean abottom);
     /** Triggers {@link #sizeScreenPosInsetsChanged(boolean, int, int, int, int, int, int, int, int, boolean)} */
     private native void updateSizePosInsets0(long window, boolean defer);
     private static native Object getLocationOnScreen0(long windowHandle, int src_x, int src_y);
diff --git a/src/newt/native/MacWindow.m b/src/newt/native/MacWindow.m
index ccd907c25..ee012add3 100644
--- a/src/newt/native/MacWindow.m
+++ b/src/newt/native/MacWindow.m
@@ -853,16 +853,16 @@ JNIEXPORT jint JNICALL Java_jogamp_newt_driver_macosx_WindowDriver_getDisplayID0
  */
 JNIEXPORT void JNICALL Java_jogamp_newt_driver_macosx_WindowDriver_initWindow0
   (JNIEnv *env, jobject jthis, jlong parent, jlong window, jint x, jint y, jint w, jint h, jfloat reqPixelScale,
-   jboolean opaque, jboolean visible, jlong jview)
+   jboolean opaque, jboolean atop, jboolean abottom, jboolean visible, jlong jview)
 {
     NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
     NewtMacWindow* myWindow = (NewtMacWindow*) ((intptr_t) window);
     NewtView* myView = (NewtView*) (intptr_t) jview ;
     BOOL fullscreen = myWindow->isFullscreenWindow;
 
-    DBG_PRINT( "initWindow0 - %p (this), %p (parent), %p (window), %d/%d %dx%d, reqPixScale %f, opaque %d, fs %d, visible %d, view %p (START)\n",
+    DBG_PRINT( "initWindow0 - %p (this), %p (parent), %p (window), %d/%d %dx%d, reqPixScale %f, opaque %d, atop %d, abottom %d, fs %d, visible %d, view %p (START)\n",
         (void*)(intptr_t)jthis, (void*)(intptr_t)parent, myWindow, (int)x, (int)y, (int)w, (int)h, (float)reqPixelScale,
-        (int) opaque, (int)fullscreen, (int)visible, myView);
+        (int) opaque, (int)atop, (int)abottom, (int)fullscreen, (int)visible, myView);
 
 NS_DURING
     // HiDPI scaling: Setup - Available >= 10.7
@@ -925,6 +925,7 @@ NS_ENDHANDLER
         [myWindow setOpaque: NO];
         [myWindow setBackgroundColor: [NSColor clearColor]];
     }
+    [myWindow setAlwaysOn: atop bottom:abottom];
 
     // specify we want mouse-moved events
     [myWindow setAcceptsMouseMovedEvents:YES];
@@ -1466,54 +1467,6 @@ JNIEXPORT void JNICALL Java_jogamp_newt_driver_macosx_WindowDriver_setWindowClie
 
 /*
  * Class:     jogamp_newt_driver_macosx_WindowDriver
- * Method:    setAlwaysOnTop0
- * Signature: (JZ)V
- */
-JNIEXPORT void JNICALL Java_jogamp_newt_driver_macosx_WindowDriver_setAlwaysOnTop0
-  (JNIEnv *env, jobject unused, jlong window, jboolean atop)
-{
-    NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
-    NSWindow* win = (NSWindow*) ((intptr_t) window);
-
-    DBG_PRINT( "setAlwaysOnTop0 - window: %p, atop %d (START)\n", win, (int)atop);
-
-    if(atop) {
-        [win setLevel:NSFloatingWindowLevel];
-    } else {
-        [win setLevel:NSNormalWindowLevel];
-    }
-
-    DBG_PRINT( "setAlwaysOnTop0 - window: %p, atop %d (END)\n", win, (int)atop);
-
-    [pool release];
-}
-
-/*
- * Class:     jogamp_newt_driver_macosx_WindowDriver
- * Method:    setAlwaysOnBottom0
- * Signature: (JZ)V
- */
-JNIEXPORT void JNICALL Java_jogamp_newt_driver_macosx_WindowDriver_setAlwaysOnBottom0
-  (JNIEnv *env, jobject unused, jlong window, jboolean abottom)
-{
-    NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
-    NSWindow* win = (NSWindow*) ((intptr_t) window);
-
-    DBG_PRINT( "setAlwaysOnBottom0 - window: %p, abottom %d (START)\n", win, (int)abottom);
-
-    if(abottom) {
-        [win setLevel:NSScreenSaverWindowLevel]; // ??
-    } else {
-        [win setLevel:NSNormalWindowLevel];
-    }
-
-    DBG_PRINT( "setAlwaysOnBottom0 - window: %p, abottom %d (END)\n", win, (int)abottom);
-
-    [pool release];
-}
-
-/*
- * Class:     jogamp_newt_driver_macosx_WindowDriver
  * Method:    getLocationOnScreen0
  * Signature: (JII)Lcom/jogamp/nativewindow/util/Point;
  */
diff --git a/src/newt/native/NewtMacWindow.h b/src/newt/native/NewtMacWindow.h
index 151eb0797..bd088784a 100644
--- a/src/newt/native/NewtMacWindow.h
+++ b/src/newt/native/NewtMacWindow.h
@@ -164,6 +164,8 @@ CGDirectDisplayID NewtScreen_getCGDirectDisplayIDByNSScreen(NSScreen *screen);
 - (void) setRealized: (BOOL)v;
 - (BOOL) isRealized;
 
+- (void) setAlwaysOn: (BOOL)top bottom:(BOOL)bottom;
+
 - (void) updateInsets: (JNIEnv*) env jwin: (jobject) javaWin;
 - (void) updateSizePosInsets: (JNIEnv*) env jwin: (jobject) javaWin defer: (jboolean)defer;
 - (void) attachToParent: (NSWindow*) parent;
diff --git a/src/newt/native/NewtMacWindow.m b/src/newt/native/NewtMacWindow.m
index 70dc5969b..86c4490ed 100644
--- a/src/newt/native/NewtMacWindow.m
+++ b/src/newt/native/NewtMacWindow.m
@@ -932,6 +932,20 @@ NS_ENDHANDLER
     return realized;
 }
 
+- (void) setAlwaysOn: (BOOL)top bottom:(BOOL)bottom
+{
+    if( top ) {
+        DBG_PRINT( "*************** setAlwaysOn -> top\n");
+        [self setLevel: kCGMaximumWindowLevel];
+    } else if ( bottom ) {
+        DBG_PRINT( "*************** setAlwaysOn -> bottom\n");
+        [self setLevel: kCGDesktopIconWindowLevel]; // w/ input
+    } else {
+        DBG_PRINT( "*************** setAlwaysOn -> normal\n");
+        [self setLevel:NSNormalWindowLevel];
+    }
+}
+
 - (void) updateInsets: (JNIEnv*) env jwin: (jobject) javaWin
 {
     NSRect frameRect = [self frame];