michael/lwjgl
michael
/
lwjgl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Updated the display init function so that the OSX version plays nicely with the other versions.

This commit is contained in:
Gregory Pierce 2003-05-10 17:30:58 +00:00
parent bcd0b40bce
commit 585131c442
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/native/macosx/org_lwjgl_Display.cpp
View File

@ -35,7 +35,6 @@
#include <ApplicationServices/ApplicationServices.h> #include <ApplicationServices/ApplicationServices.h>
#include <OpenGL/OpenGL.h> #include <OpenGL/OpenGL.h>
bool modeSet = false;
static long _getDictLong (CFDictionaryRef refDict, CFStringRef key) static long _getDictLong (CFDictionaryRef refDict, CFStringRef key)
{ {
@ -94,8 +93,8 @@ jobjectArray GetAvailableDisplayModesOSX(JNIEnv * env)
// //
for ( i = 0; i < count; i++ ) for ( i = 0; i < count; i++ )
{ {
CFDictionaryRef modeDict = CFArrayGetValueAtIndex( displayModes, i ); CFDictionaryRef mode = CFArrayGetValueAtIndex( displayModes, i );
long bpp = _getDictLong( modeDict, kCGDisplayBitsPerPixel ); long bpp = _getDictLong( mode, kCGDisplayBitsPerPixel );
if ( bpp > 8 ) if ( bpp > 8 )
{ {
@ -143,11 +142,11 @@ jobjectArray GetAvailableDisplayModesOSX(JNIEnv * env)
JNIEXPORT void JNICALL Java_org_lwjgl_Display_init JNIEXPORT void JNICALL Java_org_lwjgl_Display_init
(JNIEnv * env, jclass clazz) (JNIEnv * env, jclass clazz)
{ {
//TODO Get the current display mode from the system //Get the current display mode from the system
// //
int width = 640; int width = CGDisplayPixelsWide( kCGDirectMainDisplay );
int height = 480; int height = CGDisplayPixelsHigh( kCGDirectMainDisplay );
int bpp = 32; int bpp = CGDisplayBitsPerPixel( kCGDirectMainDisplay );
int freq = 60; int freq = 60;
jclass jclass_DisplayMode = env->FindClass("org/lwjgl/DisplayMode"); jclass jclass_DisplayMode = env->FindClass("org/lwjgl/DisplayMode");
@ -195,9 +194,6 @@ JNIEXPORT void JNICALL Java_org_lwjgl_Display_setDisplayMode
jfieldID fid_initialMode = env->GetStaticFieldID(clazz, "mode", "Lorg/lwjgl/DisplayMode;"); jfieldID fid_initialMode = env->GetStaticFieldID(clazz, "mode", "Lorg/lwjgl/DisplayMode;");
env->SetStaticObjectField(clazz, fid_initialMode, newMode); env->SetStaticObjectField(clazz, fid_initialMode, newMode);
env->DeleteLocalRef(newMode); env->DeleteLocalRef(newMode);
modeSet = true;
} }
/* /*