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)

5 files changed, 198 insertions, 90 deletions

diff --git a/src/newt/classes/jogamp/newt/DisplayImpl.java b/src/newt/classes/jogamp/newt/DisplayImpl.java
index 92add6a4e..ee370029e 100644
--- a/src/newt/classes/jogamp/newt/DisplayImpl.java
+++ b/src/newt/classes/jogamp/newt/DisplayImpl.java
@@ -39,6 +39,7 @@ import com.jogamp.newt.NewtFactory;
 import com.jogamp.newt.event.NEWTEvent;
 import com.jogamp.newt.event.NEWTEventConsumer;
 
+import jogamp.newt.driver.awt.AWTEDTUtil;
 import jogamp.newt.event.NEWTEventTask;
 import com.jogamp.newt.util.EDTUtil;
 import com.jogamp.newt.util.MainThread;
@@ -171,12 +172,24 @@ public abstract class DisplayImpl extends Display {
     protected void createEDTUtil() {
         if(NewtFactory.useEDT()) {
             if ( ! DEBUG_TEST_EDT_MAINTHREAD ) {
-                Thread current = Thread.currentThread();
+                final Thread current = Thread.currentThread();
                 edtUtil = new DefaultEDTUtil(current.getThreadGroup(), "Display-"+getFQName(), dispatchMessagesRunnable);
             } else {
                 // Begin JAU EDT Test ..
-                MainThread.addPumpMessage(this, dispatchMessagesRunnable); 
-                edtUtil = MainThread.getSingleton();
+                final Display f_dpy = this;                
+                final Runnable dispatchRunner = new Runnable() {
+                      public void run() {
+                          if(null!=f_dpy.getGraphicsDevice()) {
+                              f_dpy.dispatchMessages();
+                          } } };
+                        
+                if(NativeWindowFactory.isAWTAvailable()) {
+                    AWTEDTUtil.addPumpMessage(this, dispatchRunner); 
+                    edtUtil = AWTEDTUtil.getSingleton();
+                } else {
+                    MainThread.addPumpMessage(this, dispatchRunner); 
+                    edtUtil = MainThread.getSingleton();                
+                }
                 // End JAU EDT Test ..
             }
             if(DEBUG) {
diff --git a/src/newt/classes/jogamp/newt/WindowImpl.java b/src/newt/classes/jogamp/newt/WindowImpl.java
index 9d54954b0..77e69fef7 100644
--- a/src/newt/classes/jogamp/newt/WindowImpl.java
+++ b/src/newt/classes/jogamp/newt/WindowImpl.java
@@ -478,6 +478,13 @@ public abstract class WindowImpl implements Window, NEWTEventConsumer
         sb.append(0 != ( FLAG_IS_UNDECORATED & flags));
         sb.append(", ");
         
+        if( 0 != ( FLAG_CHANGE_ALWAYSONTOP & flags) ) {
+            sb.append("*");
+        }
+        sb.append("ALWAYSONTOP_");
+        sb.append(0 != ( FLAG_IS_ALWAYSONTOP & flags));
+        sb.append(", ");
+        
         if( 0 != ( FLAG_CHANGE_VISIBILITY & flags) ) {
             sb.append("*");
         }
diff --git a/src/newt/classes/jogamp/newt/driver/awt/AWTEDTUtil.java b/src/newt/classes/jogamp/newt/driver/awt/AWTEDTUtil.java
index 0737e3281..cca1e321c 100644
--- a/src/newt/classes/jogamp/newt/driver/awt/AWTEDTUtil.java
+++ b/src/newt/classes/jogamp/newt/driver/awt/AWTEDTUtil.java
@@ -29,13 +29,25 @@
 package jogamp.newt.driver.awt;
 
 import java.awt.EventQueue;
+import java.lang.reflect.InvocationTargetException;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Timer;
+import java.util.TimerTask;
+
 import javax.media.nativewindow.NativeWindowException;
+
+import com.jogamp.newt.Display;
 import com.jogamp.newt.util.EDTUtil;
 import jogamp.newt.Debug;
 
 public class AWTEDTUtil implements EDTUtil {
     public static final boolean DEBUG = Debug.debug("EDT");
 
+    private static Timer pumpMessagesTimer=null;
+    private static TimerTask pumpMessagesTimerTask=null;
+    private static final Map<Display, Runnable> pumpMessageDisplayMap = new HashMap<Display, Runnable>();
     private static AWTEDTUtil singletonMainThread = new AWTEDTUtil(); // one singleton MainThread
 
     public static AWTEDTUtil getSingleton() {
@@ -47,11 +59,11 @@ public class AWTEDTUtil implements EDTUtil {
     }
 
     final public void reset() {
-        // nop
+        // nop AWT is always running
     }
 
     final public void start() {
-        // nop
+        // nop AWT is always running
     }
 
     final public boolean isCurrentThreadEDT() {
@@ -63,20 +75,10 @@ public class AWTEDTUtil implements EDTUtil {
     }
 
     final public void invokeStop(Runnable r) {
-        invokeImpl(true, r, true);
+        invoke(true, r); // AWT is always running
     }
 
     final public void invoke(boolean wait, Runnable r) {
-        invokeImpl(wait, r, false);
-    }
-
-    /**
-     * Public access to provide simple dispatching from other EDTUtil implementations
-     * @param wait true if invokeLater
-     * @param r the Runnable action
-     * @param stop true if EDT shall stop (ignored with AWT)
-     */
-    final public void invokeImpl(boolean wait, Runnable r, boolean stop) {
         if(r == null) {
             return;
         }
@@ -98,9 +100,42 @@ public class AWTEDTUtil implements EDTUtil {
     }
 
     final public void waitUntilIdle() {
+        // wait until previous events are processed, at least ..
+        try {
+            EventQueue.invokeAndWait( new Runnable() {
+                public void run() { }
+            });
+        } catch (Exception e) { }
     }
 
     final public void waitUntilStopped() {
+        // nop: AWT is always running
+    }
+
+    public static void addPumpMessage(Display dpy, Runnable pumpMessage) {
+        if(DEBUG) {
+            System.err.println("AWTEDTUtil.addPumpMessage(): "+Thread.currentThread().getName()+" - dpy "+dpy);
+        }
+        
+        synchronized (pumpMessageDisplayMap) {
+            if(null == pumpMessagesTimer) {
+                // AWT pump messages .. MAIN_THREAD uses main thread
+                pumpMessagesTimer = new Timer();
+                pumpMessagesTimerTask = new TimerTask() {
+                    public void run() {
+                        synchronized(pumpMessageDisplayMap) {
+                            for(Iterator<Runnable> i = pumpMessageDisplayMap.values().iterator(); i.hasNext(); ) {
+                                AWTEDTUtil.getSingleton().invoke(true, i.next());
+                                // AWTEDTUtil.getSingleton().invoke(false, i.next());
+                                // i.next().run();
+                            }
+                        }
+                    }
+                };
+                pumpMessagesTimer.scheduleAtFixedRate(pumpMessagesTimerTask, 0, defaultEDTPollGranularity);
+            }
+            pumpMessageDisplayMap.put(dpy, pumpMessage);
+        }
     }
 
 }
diff --git a/src/newt/classes/jogamp/newt/driver/macosx/MacDisplay.java b/src/newt/classes/jogamp/newt/driver/macosx/MacDisplay.java
index db8577562..572d37efe 100644
--- a/src/newt/classes/jogamp/newt/driver/macosx/MacDisplay.java
+++ b/src/newt/classes/jogamp/newt/driver/macosx/MacDisplay.java
@@ -37,6 +37,8 @@ import javax.media.nativewindow.*;
 import javax.media.nativewindow.macosx.*;
 import com.jogamp.newt.*;
 import jogamp.newt.*;
+import jogamp.newt.driver.awt.AWTEDTUtil;
+
 import com.jogamp.newt.util.MainThread;
 
 public class MacDisplay extends DisplayImpl {
@@ -62,7 +64,7 @@ public class MacDisplay extends DisplayImpl {
     }
 
     protected void dispatchMessagesNative() {
-        dispatchMessages0();
+        // nop
     }
     
     protected void createNativeImpl() {
@@ -71,20 +73,26 @@ public class MacDisplay extends DisplayImpl {
 
     protected void closeNativeImpl() { }
 
+    /**
     @Override
     protected void createEDTUtil() {
-        if(NewtFactory.useEDT()) {
+        if(NewtFactory.useEDT()) {            
             final Display f_dpy = this;
-            MainThread.addPumpMessage(this, 
-                                  new Runnable() {
-                                      public void run() {
-                                          if(null!=f_dpy.getGraphicsDevice()) {
-                                              f_dpy.dispatchMessages();
-                                          } } } );
-            edtUtil = MainThread.getSingleton();
-            edtUtil.start();
+            final Runnable dispatchRunner = new Runnable() {
+                  public void run() {
+                      if(null!=f_dpy.getGraphicsDevice()) {
+                          f_dpy.dispatchMessages();
+                      } } };
+                    
+            if(NativeWindowFactory.isAWTAvailable()) {
+                AWTEDTUtil.addPumpMessage(this, dispatchRunner); 
+                edtUtil = AWTEDTUtil.getSingleton();
+            } else {
+                MainThread.addPumpMessage(this, dispatchRunner); 
+                edtUtil = MainThread.getSingleton();                
+            }
         }
-    }
+    } */
 
     protected void releaseEDTUtil() {
         if(null!=edtUtil) { 
@@ -93,8 +101,12 @@ public class MacDisplay extends DisplayImpl {
             edtUtil=null;
         }
     }
+    
+    public static void runNSApplication() {
+        runNSApplication0();
+    }
 
     private static native boolean initNSApplication0();
-    protected native void dispatchMessages0();
+    private static native void runNSApplication0();
 }
 
diff --git a/src/newt/classes/jogamp/newt/driver/macosx/MacWindow.java b/src/newt/classes/jogamp/newt/driver/macosx/MacWindow.java
index 1f471b9b5..3265da1c1 100644
--- a/src/newt/classes/jogamp/newt/driver/macosx/MacWindow.java
+++ b/src/newt/classes/jogamp/newt/driver/macosx/MacWindow.java
@@ -40,10 +40,11 @@ import com.jogamp.common.util.locks.RecursiveLock;
 
 import com.jogamp.newt.event.*;
 
-import jogamp.nativewindow.jawt.JAWTUtil;
+import jogamp.nativewindow.macosx.OSXUtil;
 import jogamp.newt.*;
 
 import javax.media.nativewindow.util.Insets;
+import javax.media.nativewindow.util.InsetsImmutable;
 import javax.media.nativewindow.util.Point;
 
 public class MacWindow extends WindowImpl {
@@ -160,6 +161,7 @@ public class MacWindow extends WindowImpl {
         try {
             if(DEBUG_IMPLEMENTATION) { System.err.println("MacWindow.CloseAction "+Thread.currentThread().getName()); }
             if (getWindowHandle() != 0) {
+                orderOut0(getWindowHandle());
                 close0(getWindowHandle());
             }
         } catch (Throwable t) {
@@ -182,9 +184,6 @@ public class MacWindow extends WindowImpl {
 
     @Override
     protected int lockSurfaceImpl() {
-        if(NativeWindowFactory.isAWTAvailable()) {
-            JAWTUtil.lockToolkit();
-        }
         nsViewLock.lock();
         return LOCK_SUCCESS;
     }
@@ -192,9 +191,6 @@ public class MacWindow extends WindowImpl {
     @Override
     protected void unlockSurfaceImpl() {
         nsViewLock.unlock();
-        if(NativeWindowFactory.isAWTAvailable()) {
-            JAWTUtil.unlockToolkit();
-        }
     }
 
     @Override
@@ -212,7 +208,8 @@ public class MacWindow extends WindowImpl {
         // FIXME: move nsViewLock up to window lock
         nsViewLock.lock();
         try {
-            makeKey0(getWindowHandle());
+            makeKeyAndOrderFront0(getWindowHandle());            
+            // makeKey0(getWindowHandle());
         } finally {
             nsViewLock.unlock();
         }
@@ -221,33 +218,64 @@ public class MacWindow extends WindowImpl {
     protected boolean reconfigureWindowImpl(int x, int y, int width, int height, int flags) {
         nsViewLock.lock();
         try {
+            int _x = x, _y = y;
+            if(0 == ( FLAG_IS_UNDECORATED & flags) && 0<=_x && 0<=_y) {
+                final InsetsImmutable i = getInsets();         
+                
+                // client position -> top-level window position
+                _x -= i.getLeftWidth() ;
+                _y -= i.getTopHeight() ;
+                if( 0 > _x ) { _x = 0; }
+                if( 0 > _y ) { _y = 0; }            
+            }        
+            final NativeWindow parent = getParent();
+            if(null != parent) {
+                final Point p = parent.getLocationOnScreen(null);
+                _x += p.getX();
+                _y += p.getY();
+            }
+            
             if(DEBUG_IMPLEMENTATION) {
-                System.err.println("MacWindow reconfig: "+x+"/"+y+" "+width+"x"+height+", "+
+                System.err.println("MacWindow reconfig: "+x+"/"+y+" -> "+_x+"/"+_y+" - "+width+"x"+height+", "+
                                    getReconfigureFlagsAsString(null, flags));
             }
             
-            if( 0 != ( FLAG_CHANGE_VISIBILITY & flags) ) {
-                if (0 != ( FLAG_IS_VISIBLE & flags)) {
-                    createWindow(false, x, y, width, height, 0 != ( FLAG_IS_FULLSCREEN & flags));
-                } else {
-                    if (getWindowHandle() != 0) {
+            if( getWindowHandle() == 0 ) {
+                if( 0 != ( FLAG_IS_VISIBLE & flags) ) {
+                    createWindow(false, _x, _y, width, height, 0 != ( FLAG_IS_FULLSCREEN & flags));
+                    this.x = x;
+                    this.y = y;
+                    visibleChanged(true); // no native event ..
+                } /* else { ?? } */
+            } else {
+                if( 0 != ( FLAG_CHANGE_VISIBILITY & flags) ) {
+                    if( 0 != ( FLAG_IS_VISIBLE & flags) ) {
+                        makeKeyAndOrderFront0(getWindowHandle());
+                        visibleChanged(true); // no native event ..
+                        enqueueWindowEvent(false, WindowEvent.EVENT_WINDOW_GAINED_FOCUS);
+                    } else {
                         orderOut0(getWindowHandle());
+                        visibleChanged(false); // no native event ..
+                        enqueueWindowEvent(false, WindowEvent.EVENT_WINDOW_LOST_FOCUS);
                     }
-                }
-                visibleChanged(0 != ( FLAG_IS_VISIBLE & flags));
-            } else {            
-                if( 0 != ( FLAG_CHANGE_DECORATION & flags) ||
-                    0 != ( FLAG_CHANGE_PARENTING & flags) ||
-                    0 != ( FLAG_CHANGE_FULLSCREEN & flags) ) {
+                } else if( 0 != ( FLAG_CHANGE_DECORATION & flags) ||
+                           0 != ( FLAG_CHANGE_PARENTING & flags) ||
+                           0 != ( FLAG_CHANGE_FULLSCREEN & flags) ) {
                     createWindow(true, x, y, width, height, 0 != ( FLAG_IS_FULLSCREEN & flags));
-                } else {
-                    if(x>=0 || y>=0) {
-                        setFrameTopLeftPoint0(getParentWindowHandle(), getWindowHandle(), x, y);
-                    }
-                    if(width>0 || height>0) {
-                        setContentSize0(getWindowHandle(), width, height);
-                    }
                 }
+                if(x>=0 || y>=0) {
+                    setFrameTopLeftPoint0(getParentWindowHandle(), getWindowHandle(), _x, _y);
+                    this.x = x;
+                    this.y = y;
+                    enqueueWindowEvent(false, WindowEvent.EVENT_WINDOW_MOVED);
+                }
+                if(width>0 || height>0) {
+                    setContentSize0(getWindowHandle(), width, height);
+                    this.width = width;
+                    this.height = height;
+                    enqueueWindowEvent(false, WindowEvent.EVENT_WINDOW_RESIZED);
+                }
+                setAlwaysOnTop0(getWindowHandle(), 0 != ( FLAG_IS_ALWAYSONTOP & flags));
             }
         } finally {
             nsViewLock.unlock();
@@ -256,7 +284,7 @@ public class MacWindow extends WindowImpl {
     }
 
     protected Point getLocationOnScreenImpl(int x, int y) {
-        return null;
+        return OSXUtil.GetLocationOnScreen(getWindowHandle(), x, y);
     }
     
     protected void updateInsetsImpl(Insets insets) {
@@ -368,48 +396,60 @@ public class MacWindow extends WindowImpl {
         width=(width>0)?width:this.width;
         height=(height>0)?height:this.height;
         
+        final NativeWindow parent = getParent();
+        if(null != parent) {
+            final Point p = parent.getLocationOnScreen(null);
+            x += p.getX();
+            y += p.getY();
+        }
+        
         try {
-            //runOnEDTIfAvail(true, new Runnable() {
-            //    public void run() {
-                    if(0!=getWindowHandle()) {
-                        // save the view .. close the window
-                        surfaceHandle = changeContentView0(getParentWindowHandle(), getWindowHandle(), 0);
-                        if(recreate && 0==surfaceHandle) {
-                            throw new NativeWindowException("Internal Error - recreate, window but no view");
-                        }
-                        close0(getWindowHandle());
-                        setWindowHandle(0);
-                    } else {
-                        surfaceHandle = 0;
-                    }
-                    setWindowHandle(createWindow0(getParentWindowHandle(),
-                                                 x, y, width, height, fullscreen,
-                                                 (isUndecorated() ?
-                                                 NSBorderlessWindowMask :
-                                                 NSTitledWindowMask|NSClosableWindowMask|NSMiniaturizableWindowMask|NSResizableWindowMask),
-                                                 NSBackingStoreBuffered, 
-                                                 getScreen().getIndex(), surfaceHandle));
-                    if (getWindowHandle() == 0) {
-                        throw new NativeWindowException("Could create native window "+Thread.currentThread().getName()+" "+this);
-                    }
-                    surfaceHandle = contentView0(getWindowHandle());
-                    setTitle0(getWindowHandle(), getTitle());
-                    makeKeyAndOrderFront0(getWindowHandle());
-             //   } } );
+            if(0!=getWindowHandle()) {
+                // save the view .. close the window
+                surfaceHandle = changeContentView0(getParentWindowHandle(), getWindowHandle(), 0);
+                if(recreate && 0==surfaceHandle) {
+                    throw new NativeWindowException("Internal Error - recreate, window but no view");
+                }
+                orderOut0(getWindowHandle());
+                close0(getWindowHandle());
+                setWindowHandle(0);
+            } else {
+                surfaceHandle = 0;
+            }
+            setWindowHandle(createWindow0(getParentWindowHandle(),
+                                         x, y, width, height,
+                                         config.getChosenCapabilities().isBackgroundOpaque(),
+                                         fullscreen,
+                                         (isUndecorated() ?
+                                         NSBorderlessWindowMask :
+                                         NSTitledWindowMask|NSClosableWindowMask|NSMiniaturizableWindowMask|NSResizableWindowMask),
+                                         NSBackingStoreBuffered, 
+                                         getScreen().getIndex(), surfaceHandle));
+            if (getWindowHandle() == 0) {
+                throw new NativeWindowException("Could create native window "+Thread.currentThread().getName()+" "+this);
+            }
+            surfaceHandle = contentView0(getWindowHandle());
+            setTitle0(getWindowHandle(), getTitle());
+            makeKeyAndOrderFront0(getWindowHandle());
         } catch (Exception ie) {
             ie.printStackTrace();
         }
-
-        if(recreate) {
-            enqueueWindowEvent(false, WindowEvent.EVENT_WINDOW_MOVED);
-            enqueueWindowEvent(false, WindowEvent.EVENT_WINDOW_RESIZED);
-            enqueueWindowEvent(false, WindowEvent.EVENT_WINDOW_GAINED_FOCUS);
+    }
+    
+    @Override
+    protected void positionChanged(int newX, int newY) {
+        final NativeWindow parent = getParent();
+        if(null != parent) {
+            final Point p = parent.getLocationOnScreen(null);
+            newX -= p.getX();
+            newY -= p.getY();
         }
+        super.positionChanged(newX, newY);
     }
     
     protected static native boolean initIDs0();
     private native long createWindow0(long parentWindowHandle, int x, int y, int w, int h,
-                                     boolean fullscreen, int windowStyle,
+                                     boolean opaque, boolean fullscreen, int windowStyle,
                                      int backingStoreType,
                                      int screen_idx, long view);
     private native void makeKeyAndOrderFront0(long window);
@@ -418,7 +458,8 @@ public class MacWindow extends WindowImpl {
     private native void close0(long window);
     private native void setTitle0(long window, String title);
     private native long contentView0(long window);
-    private native long changeContentView0(long parentWindowHandle, long window, long view);
+    private native long changeContentView0(long parentWindowOrViewHandle, long window, long view);
     private native void setContentSize0(long window, int w, int h);
     private native void setFrameTopLeftPoint0(long parentWindowHandle, long window, int x, int y);
+    private native void setAlwaysOnTop0(long window, boolean atop);
 }