java-game-lib-cvs Mailing List for Lightweight Java Game Library

Update of /cvsroot/java-game-lib/LWJGL/src/native/macosx
In directory sc8-pr-cvs1:/tmp/cvs-serv31694/native/macosx

Modified Files:
	org_lwjgl_opengl_BaseGL.cpp org_lwjgl_Display.cpp 
	RenderingContext.h RenderingContext.cpp 
Log Message:
Added changes to support the selection of display modes on OSX in multiple monitor configurations. Currently defaults to only getting the display modes of display[0] - the primary display since lwjgl doesn't yet support clean multi monitor configuration programatically.
This code based off the Apple provided sample code at http://developer.apple.com/samplecode/Sample_Code/Graphics_2D/Mode.htm

Index: org_lwjgl_opengl_BaseGL.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/macosx/org_lwjgl_opengl_BaseGL.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/macosx/org_lwjgl_opengl_BaseGL.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- org_lwjgl_opengl_BaseGL.cpp	1 Jan 2003 03:58:03 -0000	1.4
+++ org_lwjgl_opengl_BaseGL.cpp	30 Jan 2003 18:56:55 -0000	1.5
@@ -42,9 +42,6 @@
 #include "RenderingContext.h"
 #include "org_lwjgl_opengl_BaseGL.h"
 
-
-
-
 /*
  * Class:     org_lwjgl_opengl_BaseGL
  * Method:    nCreate

Index: org_lwjgl_Display.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/macosx/org_lwjgl_Display.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/macosx/org_lwjgl_Display.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- org_lwjgl_Display.cpp	1 Jan 2003 03:58:03 -0000	1.7
+++ org_lwjgl_Display.cpp	30 Jan 2003 18:56:56 -0000	1.8
@@ -36,6 +36,20 @@
 
 RenderingContext * renderingContext;
 
+static int numberForKey( CFDictionaryRef desc, CFStringRef key )
+{
+    CFNumberRef			value;
+    int				num = 0;
+
+    if ( (value = CFDictionaryGetValue(desc, key)) == NULL )
+    {
+        return 0;
+    }
+
+    CFNumberGetValue( value, kCFNumberIntType, &num );
+    return num;
+}
+
 /*
  * Class:     org_lwjgl_Display
  * Method:    getAvailableDisplayModes
@@ -44,7 +58,54 @@
 JNIEXPORT jobjectArray JNICALL Java_org_lwjgl_Display_getAvailableDisplayModes
   (JNIEnv * env, jclass clazz)
 {
-	return NULL;
+      CGDirectDisplayID * displays = renderingContext->enumerateDisplays();
+      CFArrayRef modeList = renderingContext->enumerateDisplayModes( displays[0] );
+
+      // count the display modes
+      //
+      int cnt = CFArrayGetCount( modeList );
+
+      // Allocate an array of DisplayModes big enough
+      jclass displayModeClass = env->FindClass("org/lwjgl/DisplayMode");
+
+      // Note the * 16 - this is because we are manufacturing available alpha/depth/stencil combos.
+      jobjectArray ret = env->NewObjectArray(cnt * 16, displayModeClass, NULL);
+      jmethodID displayModeConstructor = env->GetMethodID(displayModeClass, "<init>", "(IIIIIII)V");
+
+      CFDictionaryRef mode;
+      for ( int i=0; i< cnt; i++ )
+      {
+          mode = CFArrayGetValueAtIndex( modeList, i );
+
+          int width = numberForKey( mode, kCGDisplayWidth );
+          int height = numberForKey( mode, kCGDisplayHeight );
+          int bpp = numberForKey( mode, kCGDisplayBitsPerPixel );
+          int refreshRate = numberForKey( mode, kCGDisplayRefreshRate );
+
+          if ( bpp <= 8 )
+          {
+              continue;
+          }
+          else
+          {
+              jobject displayMode;
+
+              for ( int depthBits = 0; depthBits <= 24; depthBits += 8 )
+              {
+                  for ( int stencilBits = 0; stencilBits <= 8; stencilBits += 8 )
+                  {
+                      for ( int alphaBits = 0; alphaBits <= 8; alphaBits += 8 )
+                      {
+                          displayMode = env->NewObject(displayModeClass, displayModeConstructor,
+                                                       width, height, bpp, refreshRate,
+                                                       alphaBits, depthBits, stencilBits );
+
+                          env->SetObjectArrayElement( ret, i, displayMode );
+                      }
+                  }
+              }
+          }
+      }      
 }
 
 /*
@@ -66,6 +127,10 @@
 
       jfieldID fid_handle = env->GetStaticFieldID(clazz, "handle", "I");
       env->SetStaticIntField(clazz, fid_handle, (jint) renderingContext->windowPtr );
+
+#ifdef _DEBUG
+      printf("Display created\n");
+#endif      
 
       return JNI_TRUE;
 }

Index: RenderingContext.h
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/macosx/RenderingContext.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/macosx/RenderingContext.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- RenderingContext.h	2 Jan 2003 05:44:15 -0000	1.5
+++ RenderingContext.h	30 Jan 2003 18:56:56 -0000	1.6
@@ -45,6 +45,7 @@
 
 #include "extgl.h"
 #include <Carbon/Carbon.h>
+#include <ApplicationServices/ApplicationServices.h>
 
 class RenderingContext
 {
@@ -59,6 +60,8 @@
 
     bool createDisplay( int width, int height, int bpp, int freq );
     void destroyDisplay();
+    CGDirectDisplayID * enumerateDisplays();
+    CFArrayRef enumerateDisplayModes( CGDirectDisplayID display );
 
     bool createGL( int colorBits, int alphaBits, int depthBits, int stencilBits );
     void destroyGL();

Index: RenderingContext.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/macosx/RenderingContext.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/macosx/RenderingContext.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- RenderingContext.cpp	2 Jan 2003 05:44:15 -0000	1.5
+++ RenderingContext.cpp	30 Jan 2003 18:56:56 -0000	1.6
@@ -41,6 +41,10 @@
 
 #include "RenderingContext.h"
 
+#define kMaxDisplays		16
+
+CGDirectDisplayID display[kMaxDisplays];
+
 RenderingContext::RenderingContext()
 {
 }
@@ -78,6 +82,41 @@
     //
     DisposeWindow( windowPtr );
 }
+
+CGDirectDisplayID * RenderingContext::enumerateDisplays()
+{
+
+    CGDisplayCount numDisplays;
+    CGDisplayErr err;
+
+    err = CGGetActiveDisplayList( kMaxDisplays,
+                                  display,
+                                  &numDisplays );
+
+    if ( err != CGDisplayNoErr )
+    {
+        printf("Cannot get displays (%d). \n", err );
+    }
+
+    return display;
+}
+
+CFArrayRef RenderingContext::enumerateDisplayModes( CGDirectDisplayID display )
+{
+    CFArrayRef modeList;
+
+    modeList = CGDisplayAvailableModes( display );
+    if ( modeList = NULL )
+    {
+        printf("Error. Display requested is invalid.\n");
+        return NULL;
+    }
+
+    return modeList;
+}
+
+
+
 
 bool RenderingContext::createGL( int colorBits, int alphaBits, int depthBits, int stencilBits )
 {