NEWT OSX: Add native ScreenMode impl. - TODO: Programmatically set the rotation! (How to ?)

Get/Set ScreenMode impl on OSX.
Set is limited to resolution and size, since I don't know how to change the rotation.

4 files changed, 242 insertions, 14 deletions

diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh
index f8205b637..d37adae94 100755
--- a/make/scripts/tests.sh
+++ b/make/scripts/tests.sh
@@ -70,6 +70,7 @@ function jrun() {
     #D_ARGS="-Djogamp.common.utils.locks.Lock.timeout=600000 -Djogamp.debug.Lock -Djogamp.debug.Lock.TraceLock -Dnativewindow.debug.ToolkitLock.TraceLock"
     #D_ARGS="-Djogamp.common.utils.locks.Lock.timeout=600000 -Djogamp.debug.Lock -Dnativewindow.debug.X11Util"
     #D_ARGS="-Dnewt.debug.EDT -Djogamp.common.utils.locks.Lock.timeout=600000 -Djogl.debug.Animator -Dnewt.debug.Display -Dnewt.debug.Screen"
+    #D_ARGS="-Dnewt.debug.Screen"
     #D_ARGS="-Dnewt.debug.Window -Djogamp.common.utils.locks.Lock.timeout=600000 -Djogl.debug.Animator"
     #D_ARGS="-Djogl.debug.Animator -Dnewt.debug=all"
     #D_ARGS="-Dnewt.debug.EDT -Dnewt.debug.Display -Dnativewindow.debug.X11Util -Djogl.debug.GLDrawable -Djogl.debug.GLCanvas"
@@ -173,7 +174,7 @@ function testswt() {
 #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestMainVersionGLWindowNEWT $*
 #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestShutdownCompleteNEWT $*
 #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestShutdownSharedNEWT $*
-testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestInitConcurrentNEWT $*
+#testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestInitConcurrentNEWT $*
 #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLProfile01NEWT $*
 #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLDebug00NEWT $*
 #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLDebug01NEWT $*
@@ -198,7 +199,7 @@ testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestInitConcurrentNEWT $*
 #testnoawt com.jogamp.opengl.test.junit.newt.TestDisplayLifecycle02NEWT
 #testnoawt com.jogamp.opengl.test.junit.newt.parenting.TestParenting01NEWT $*
 #testnoawt com.jogamp.opengl.test.junit.newt.parenting.TestParenting02NEWT $*
-#testnoawt com.jogamp.opengl.test.junit.newt.TestScreenMode00NEWT
+testnoawt com.jogamp.opengl.test.junit.newt.TestScreenMode00NEWT
 #testnoawt com.jogamp.opengl.test.junit.newt.TestScreenMode00bNEWT
 #testnoawt com.jogamp.opengl.test.junit.newt.TestScreenMode01NEWT
 #testnoawt com.jogamp.opengl.test.junit.newt.TestScreenMode01bNEWT
diff --git a/src/newt/classes/jogamp/newt/driver/macosx/MacScreen.java b/src/newt/classes/jogamp/newt/driver/macosx/MacScreen.java
index 67a3f8e92..7785a5078 100644
--- a/src/newt/classes/jogamp/newt/driver/macosx/MacScreen.java
+++ b/src/newt/classes/jogamp/newt/driver/macosx/MacScreen.java
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 2011 JogAmp Community. All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
@@ -33,9 +34,14 @@
 
 package jogamp.newt.driver.macosx;
 
-import com.jogamp.newt.*;
+import java.util.List;
+
+import javax.media.nativewindow.DefaultGraphicsScreen;
+
 import jogamp.newt.ScreenImpl;
-import javax.media.nativewindow.*;
+
+import com.jogamp.newt.ScreenMode;
+import com.jogamp.newt.util.ScreenModeUtil;
 
 public class MacScreen extends ScreenImpl {
     static {
@@ -54,4 +60,52 @@ public class MacScreen extends ScreenImpl {
 
     private static native int getWidthImpl0(int scrn_idx);
     private static native int getHeightImpl0(int scrn_idx);
+    
+    private int[] getScreenModeIdx(int idx) {
+        int[] modeProps = getScreenMode0(screen_idx, idx);
+        if (null == modeProps || 0 == modeProps.length) {
+            return null;
+        }
+        if(modeProps.length < ScreenModeUtil.NUM_SCREEN_MODE_PROPERTIES_ALL) {
+            throw new RuntimeException("properties array too short, should be >= "+ScreenModeUtil.NUM_SCREEN_MODE_PROPERTIES_ALL+", is "+modeProps.length);
+        }
+        return modeProps;
+    }
+
+    private int nativeModeIdx;
+    
+    protected int[] getScreenModeFirstImpl() {
+        nativeModeIdx = 0;
+        return getScreenModeNextImpl();
+    }
+
+    protected int[] getScreenModeNextImpl() {
+        int[] modeProps = getScreenModeIdx(nativeModeIdx);
+        if (null != modeProps && 0 < modeProps.length) {
+            nativeModeIdx++;
+            return modeProps;
+        }
+        return null;
+    }
+
+    protected ScreenMode getCurrentScreenModeImpl() {
+        int[] modeProps = getScreenModeIdx(-1);
+        if (null != modeProps && 0 < modeProps.length) {
+            return ScreenModeUtil.streamIn(modeProps, 0);
+        }
+        return null;
+    }
+    
+    protected boolean setCurrentScreenModeImpl(final ScreenMode screenMode) {
+        final List<ScreenMode> screenModes = this.getScreenModesOrig();
+        final int screenModeIdx = screenModes.indexOf(screenMode);
+        if(0>screenModeIdx) {
+            throw new RuntimeException("ScreenMode not element of ScreenMode list: "+screenMode);
+        }
+        final int nativeModeIdx = getScreenModesIdx2NativeIdx().get(screenModeIdx);
+        return setScreenMode0(screen_idx, nativeModeIdx);
+    }
+    
+    private native int[] getScreenMode0(int screen_index, int mode_index);
+    private native boolean setScreenMode0(int screen_index, int mode_idx);
 }
diff --git a/src/newt/classes/jogamp/newt/driver/windows/WindowsScreen.java b/src/newt/classes/jogamp/newt/driver/windows/WindowsScreen.java
index 6566d72ec..ef06667ce 100644
--- a/src/newt/classes/jogamp/newt/driver/windows/WindowsScreen.java
+++ b/src/newt/classes/jogamp/newt/driver/windows/WindowsScreen.java
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 2010 JogAmp Community. All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
@@ -32,12 +33,13 @@
  */
 package jogamp.newt.driver.windows;
 
+import javax.media.nativewindow.DefaultGraphicsScreen;
+
 import jogamp.newt.ScreenImpl;
+
 import com.jogamp.newt.ScreenMode;
 import com.jogamp.newt.util.ScreenModeUtil;
 
-import javax.media.nativewindow.*;
-
 public class WindowsScreen extends ScreenImpl {
 
     static {
diff --git a/src/newt/native/MacWindow.m b/src/newt/native/MacWindow.m
index e39ff0310..5bd0707d4 100644
--- a/src/newt/native/MacWindow.m
+++ b/src/newt/native/MacWindow.m
@@ -38,6 +38,7 @@
 
 #import "MouseEvent.h"
 #import "KeyEvent.h"
+#import "ScreenMode.h"
 
 #import <ApplicationServices/ApplicationServices.h>
 
@@ -237,6 +238,13 @@ JNIEXPORT void JNICALL Java_jogamp_newt_driver_macosx_MacDisplay_stopNSApplicati
     [pool release];
 }
 
+static NSScreen * NewtScreen_getNSScreenByIndex(int screen_idx) {
+    NSArray *screens = [NSScreen screens];
+    if(screen_idx<0) screen_idx=0;
+    if(screen_idx>=[screens count]) screen_idx=0;
+    return (NSScreen *) [screens objectAtIndex: screen_idx];
+}
+
 /*
  * Class:     jogamp_newt_driver_macosx_MacScreen
  * Method:    getWidthImpl
@@ -247,10 +255,7 @@ JNIEXPORT jint JNICALL Java_jogamp_newt_driver_macosx_MacScreen_getWidthImpl0
 {
     NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
 
-    NSArray *screens = [NSScreen screens];
-    if(screen_idx<0) screen_idx=0;
-    if(screen_idx>=[screens count]) screen_idx=0;
-    NSScreen *screen = (NSScreen *) [screens objectAtIndex: screen_idx];
+    NSScreen *screen = NewtScreen_getNSScreenByIndex((int)screen_idx);
     NSRect rect = [screen frame];
 
     [pool release];
@@ -268,10 +273,7 @@ JNIEXPORT jint JNICALL Java_jogamp_newt_driver_macosx_MacScreen_getHeightImpl0
 {
     NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
 
-    NSArray *screens = [NSScreen screens];
-    if(screen_idx<0) screen_idx=0;
-    if(screen_idx>=[screens count]) screen_idx=0;
-    NSScreen *screen = (NSScreen *) [screens objectAtIndex: screen_idx];
+    NSScreen *screen = NewtScreen_getNSScreenByIndex((int)screen_idx);
     NSRect rect = [screen frame];
 
     [pool release];
@@ -279,6 +281,175 @@ JNIEXPORT jint JNICALL Java_jogamp_newt_driver_macosx_MacScreen_getHeightImpl0
     return (jint) (rect.size.height);
 }
 
+static CGDirectDisplayID NewtScreen_getCGDirectDisplayIDByNSScreen(NSScreen *screen) {
+    // Mind: typedef uint32_t CGDirectDisplayID; - however, we assume it's 64bit on 64bit ?!
+    NSDictionary * dict = [screen deviceDescription];
+    NSNumber * val = (NSNumber *) [dict objectForKey: @"NSScreenNumber"];
+    // [NSNumber integerValue] returns NSInteger which is 32 or 64 bit native size
+    return (CGDirectDisplayID) [val integerValue];
+}
+
+/**
+ * Only in >= 10.6:
+ *   CGDisplayModeGetWidth(mode)
+ *   CGDisplayModeGetRefreshRate(mode)
+ *   CGDisplayModeGetHeight(mode)
+ */
+static long GetDictionaryLong(CFDictionaryRef theDict, const void* key) 
+{
+    long value = 0;
+    CFNumberRef numRef;
+    numRef = (CFNumberRef)CFDictionaryGetValue(theDict, key); 
+    if (numRef != NULL)
+        CFNumberGetValue(numRef, kCFNumberLongType, &value);    
+    return value;
+}
+#define CGDDGetModeWidth(mode) GetDictionaryLong((mode), kCGDisplayWidth)
+#define CGDDGetModeHeight(mode) GetDictionaryLong((mode), kCGDisplayHeight)
+#define CGDDGetModeRefreshRate(mode) GetDictionaryLong((mode), kCGDisplayRefreshRate)
+#define CGDDGetModeBitsPerPixel(mode) GetDictionaryLong((mode), kCGDisplayBitsPerPixel)
+
+// Duplicate each Mode by all possible rotations (4):
+// For each real-mode: [mode, 0], [mode, 90], [mode, 180], [mode, 270]
+#define ROTMODES_PER_REALMODE 4
+
+/*
+ * Class:     jogamp_newt_driver_macosx_MacScreen
+ * Method:    getScreenMode0
+ * Signature: (II)[I
+ */
+JNIEXPORT jintArray JNICALL Java_jogamp_newt_driver_macosx_MacScreen_getScreenMode0
+  (JNIEnv *env, jobject obj, jint scrn_idx, jint mode_idx)
+{
+    NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
+
+    int prop_num = NUM_SCREEN_MODE_PROPERTIES_ALL;
+    NSScreen *screen = NewtScreen_getNSScreenByIndex((int)scrn_idx);
+    CGDirectDisplayID display = NewtScreen_getCGDirectDisplayIDByNSScreen(screen);
+
+    CFArrayRef availableModes = CGDisplayAvailableModes(display);
+    CFIndex numberOfAvailableModes = CFArrayGetCount(availableModes);
+    CFIndex numberOfAvailableModesRots = ROTMODES_PER_REALMODE * numberOfAvailableModes; 
+    CFDictionaryRef mode = NULL;
+    int currentCCWRot = (int)CGDisplayRotation(display);
+    jint ccwRot = 0;
+
+#ifdef VERBOSE_ON
+    if(0 >= mode_idx) {
+        // only for current mode (-1) and first mode (scanning)
+        DBG_PRINT( "getScreenMode0: scrn %d (%p, %p), mode %d, avail: %d/%d, current rot %d ccw\n",  
+            (int)scrn_idx, screen, (void*)(intptr_t)display, (int)mode_idx, (int)numberOfAvailableModes, (int)numberOfAvailableModesRots, currentCCWRot);
+    }
+#endif
+
+    if(numberOfAvailableModesRots<=mode_idx) {
+        // n/a - end of modes
+        DBG_PRINT( "getScreenMode0: end of modes: mode %d, avail: %d/%d\n",
+            (int)mode_idx, (int)numberOfAvailableModes, (int)numberOfAvailableModesRots);
+        [pool release];
+        return (*env)->NewIntArray(env, 0);
+    } else if(-1 < mode_idx) {
+        // only at initialization time, where index >= 0
+        prop_num++; // add 1st extra prop, mode_idx
+        mode = (CFDictionaryRef)CFArrayGetValueAtIndex(availableModes, mode_idx / ROTMODES_PER_REALMODE);
+        ccwRot = mode_idx % ROTMODES_PER_REALMODE * 90;
+    } else {
+        // current mode
+        mode = CGDisplayCurrentMode(display);
+        ccwRot = currentCCWRot;
+    }
+    // mode = CGDisplayModeRetain(mode); // 10.6 on CGDisplayModeRef
+
+    CGSize screenDim = CGDisplayScreenSize(display);
+    int mWidth = CGDDGetModeWidth(mode);
+    int mHeight = CGDDGetModeHeight(mode);
+
+    // swap width and height, since OSX reflects rotated dimension, we don't
+    if ( 90 == currentCCWRot || 270 == currentCCWRot ) {
+        int tempWidth = mWidth;
+        mWidth = mHeight;
+        mHeight = tempWidth;
+    }
+
+    jint prop[ prop_num ];
+    int propIndex = 0;
+    int propIndexRes = 0;
+
+    if( -1 < mode_idx ) {
+        prop[propIndex++] = mode_idx;
+    }
+    prop[propIndex++] = 0; // set later for verification of iterator
+    propIndexRes = propIndex;
+    prop[propIndex++] = mWidth;
+    prop[propIndex++] = mHeight;
+    prop[propIndex++] = CGDDGetModeBitsPerPixel(mode);
+    prop[propIndex++] = (jint) screenDim.width;
+    prop[propIndex++] = (jint) screenDim.height;
+    prop[propIndex++] = CGDDGetModeRefreshRate(mode);
+    prop[propIndex++] = ccwRot;
+    prop[propIndex - NUM_SCREEN_MODE_PROPERTIES_ALL] = ( -1 < mode_idx ) ? propIndex-1 : propIndex ; // count == NUM_SCREEN_MODE_PROPERTIES_ALL
+
+    DBG_PRINT( "getScreenMode0: Mode %d/%d (%d): %dx%d, %d bpp, %dx%d mm, %d Hz, rot %d ccw\n",
+        (int)mode_idx, (int)numberOfAvailableModesRots, (int)numberOfAvailableModes, 
+        (int)prop[propIndexRes+0], (int)prop[propIndexRes+1], (int)prop[propIndexRes+2], 
+        (int)prop[propIndexRes+3], (int)prop[propIndexRes+4], (int)prop[propIndexRes+5], (int)prop[propIndexRes+6]);
+
+    jintArray properties = (*env)->NewIntArray(env, prop_num);
+    if (properties == NULL) {
+        NewtCommon_throwNewRuntimeException(env, "Could not allocate int array of size %d", prop_num);
+    }
+    (*env)->SetIntArrayRegion(env, properties, 0, prop_num, prop);
+    
+    // CGDisplayModeRelease(mode); // 10.6 on CGDisplayModeRef
+    [pool release];
+
+    return properties;
+}
+
+/*
+ * Class:     jogamp_newt_driver_macosx_MacScreen
+ * Method:    setScreenMode0
+ * Signature: (II)Z
+ */
+JNIEXPORT jboolean JNICALL Java_jogamp_newt_driver_macosx_MacScreen_setScreenMode0
+  (JNIEnv *env, jobject object, jint scrn_idx, jint mode_idx)
+{
+    jboolean res = JNI_TRUE;
+    NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
+
+    NSScreen *screen = NewtScreen_getNSScreenByIndex((int)scrn_idx);
+    CGDirectDisplayID display = NewtScreen_getCGDirectDisplayIDByNSScreen(screen);
+
+    CFArrayRef availableModes = CGDisplayAvailableModes(display);
+    CFIndex numberOfAvailableModes = CFArrayGetCount(availableModes);
+    CFIndex numberOfAvailableModesRots = ROTMODES_PER_REALMODE * numberOfAvailableModes;
+
+    CFDictionaryRef mode = (CFDictionaryRef)CFArrayGetValueAtIndex(availableModes, mode_idx / ROTMODES_PER_REALMODE);
+    // mode = CGDisplayModeRetain(mode); // 10.6 on CGDisplayModeRef
+
+    int ccwRot = mode_idx % ROTMODES_PER_REALMODE * 90;
+    DBG_PRINT( "setScreenMode0: scrn %d (%p, %p), mode %d, rot %d ccw, avail: %d/%d\n",  
+        (int)scrn_idx, screen, (void*)(intptr_t)display, (int)mode_idx, ccwRot, (int)numberOfAvailableModes, (int)numberOfAvailableModesRots);
+
+    if(ccwRot!=0) {
+        // FIXME: How to rotate the display/screen on OSX programmatically ?
+        DBG_PRINT( "setScreenMode0: Don't know how to rotate screen on OS X: rot %d ccw\n", ccwRot);
+        res = JNI_FALSE;
+    }
+    if(JNI_TRUE == res) {
+        CGError err = CGDisplaySwitchToMode(display, mode);
+        if(kCGErrorSuccess != err) {
+            DBG_PRINT( "setScreenMode0: SetMode failed: %d\n", (int)err);
+            res = JNI_FALSE;
+        }
+    }
+
+    // CGDisplayModeRelease(mode); // 10.6 on CGDisplayModeRef
+    [pool release];
+
+    return res;
+}
+
 /*
  * Class:     jogamp_newt_driver_macosx_MacWindow
  * Method:    initIDs