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

fix: now enumerates multiple displaydevices, if available

This commit is contained in:
Brian Matzon 2003-03-03 21:49:46 +00:00
parent 12ed458197
commit 12b7c4dd85
4 changed files with 160 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/java/org/lwjgl/Display.java
View File

@ -32,6 +32,8 @@
package org.lwjgl;
import java.util.HashSet;
import java.util.Arrays;
/**
* $Id$
*
@ -76,7 +78,31 @@ public final class Display {
*
* @return an array of all display modes the system reckons it can handle.
*/
public static native DisplayMode[] getAvailableDisplayModes();
public static DisplayMode[] getAvailableDisplayModes() {
DisplayMode[] unfilteredModes = nGetAvailableDisplayModes();
// We'll use a HashSet to filter out the duplicated modes
HashSet modes = new HashSet(unfilteredModes.length);
if (unfilteredModes == null) {
return new DisplayMode[0];
}
modes.addAll(Arrays.asList(unfilteredModes));
DisplayMode[] filteredModes = new DisplayMode[modes.size()];
modes.toArray(filteredModes);
if(Sys.DEBUG) {
System.out.println("Removed " + (unfilteredModes.length - filteredModes.length) + " duplicate displaymodes");
}
return filteredModes;
}
/**
* Native method for getting displaymodes
*/
public static native DisplayMode[] nGetAvailableDisplayModes();
/**
* Create a display with the specified display mode. If the display is

2
src/native/common/org_lwjgl_Display.h
View File

@ -18,7 +18,7 @@ extern "C" {
* Method: getAvailableDisplayModes
* Signature: ()[Lorg/lwjgl/DisplayMode;
*/
JNIEXPORT jobjectArray JNICALL Java_org_lwjgl_Display_getAvailableDisplayModes
JNIEXPORT jobjectArray JNICALL Java_org_lwjgl_Display_nGetAvailableDisplayModes
(JNIEnv *, jclass);
/*

4
src/native/linux/org_lwjgl_Display.cpp
View File

@ -434,10 +434,10 @@ JNIEXPORT void JNICALL Java_org_lwjgl_Display_nDestroy(JNIEnv * env, jclass claz
/*
* Class: org_lwjgl_Display
* Method: getAvailableDisplayModes
* Method: nGetAvailableDisplayModes
* Signature: ()[Lorg/lwjgl/DisplayMode;
*/
JNIEXPORT jobjectArray JNICALL Java_org_lwjgl_Display_getAvailableDisplayModes
JNIEXPORT jobjectArray JNICALL Java_org_lwjgl_Display_nGetAvailableDisplayModes
(JNIEnv * env, jclass clazz)
{
int num_modes, i;

165
src/native/win32/org_lwjgl_Display.cpp
View File

@ -46,11 +46,13 @@
#define DIRECTINPUT_VERSION 0x0300
#include <dinput.h>
#include <hash_map>
#define WINDOWCLASSNAME "LWJGLWINDOW"
void handleMessages();
extern HINSTANCE dll_handle;
jobjectArray GetAvailableDisplayModesNT(JNIEnv * env);
jobjectArray GetAvailableDisplayModes9x(JNIEnv * env);
// Initialise static variables
bool oneShotInitialised = false;
@ -262,53 +264,146 @@ int SetDisplayMode(int width, int height, int bpp, int freq)
* Method: getAvailableDisplayModes
* Signature: ()[Lorg/lwjgl/DisplayMode;
*/
JNIEXPORT jobjectArray JNICALL Java_org_lwjgl_Display_getAvailableDisplayModes
JNIEXPORT jobjectArray JNICALL Java_org_lwjgl_Display_nGetAvailableDisplayModes
(JNIEnv * env, jclass clazz)
{
// Determine whether to use a display name or NULL, which depends on the operating
// system
OSVERSIONINFO osvi;
DEVMODE mode;
// First count the number of display modes.
int i = 0, n = 0;
while (EnumDisplaySettings(NULL, i ++, &mode) != 0) {
// Filter out indexed modes
if (mode.dmBitsPerPel <=8) {
continue;
} else
n ++;
}
osvi.dwOSVersionInfoSize = sizeof(osvi);
GetVersionEx(&osvi);
// Allocate an array of DisplayModes big enough
if (osvi.dwPlatformId == VER_PLATFORM_WIN32_NT) {
#ifdef _DEBUG
printf("Selecting NT display mode check");
#endif
return GetAvailableDisplayModesNT(env);
}
#ifdef _DEBUG
printf("Selecting 9x display mode check");
#endif
return GetAvailableDisplayModes9x(env);
}
/**
* Choose displaymodes using NT codepath (multiple displaydevices)
*/
jobjectArray GetAvailableDisplayModesNT(JNIEnv * env) {
int i = 0, j = 0, n = 0;
int AvailableModes = 0;
DISPLAY_DEVICE DisplayDevice;
DEVMODE DevMode;
DevMode.dmSize = sizeof(DEVMODE);
DisplayDevice.cb = sizeof(DISPLAY_DEVICE);
//enumerate all displays, and all of their displaymodes
while(EnumDisplayDevices(NULL, i++, &DisplayDevice, 0) != 0) {
while(EnumDisplaySettings(DisplayDevice.DeviceName, j++, &DevMode) != 0) {
if (DevMode.dmBitsPerPel <=8) {
continue;
}
AvailableModes++;
}
}
#ifdef _DEBUG
printf("Found %d displaymodes\n", AvailableModes);
#endif
// now that we have the count create the classes, and add 'em all - we'll remove dups in Java
// 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(n * 16, displayModeClass, NULL);
jmethodID displayModeConstructor = env->GetMethodID(displayModeClass, "<init>", "(IIIIIII)V");
jobjectArray ret = env->NewObjectArray(AvailableModes * 16, displayModeClass, NULL);
jmethodID displayModeConstructor = env->GetMethodID(displayModeClass, "<init>", "(IIIIIII)V");
i = 0, j = 0, n = 0;
while(EnumDisplayDevices(NULL, i++, &DisplayDevice, 0) != 0) {
while(EnumDisplaySettings(DisplayDevice.DeviceName, j++, &DevMode) != 0) {
// Filter out indexed modes
if (DevMode.dmBitsPerPel <= 8) {
continue;
} else {
jobject displayMode;
i = n = 0;
while (EnumDisplaySettings(NULL, i ++, &mode) != 0) {
// Filter out indexed modes
if (mode.dmBitsPerPel <= 8) {
continue;
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,
DevMode.dmPelsWidth, DevMode.dmPelsHeight,
DevMode.dmBitsPerPel, DevMode.dmDisplayFrequency,
alphaBits, depthBits, stencilBits);
env->SetObjectArrayElement(ret, n++, displayMode);
}
}
}
}
}
}
return ret;
}
/**
* Choose displaymodes using 9x codepath (single displaydevice)
*/
jobjectArray GetAvailableDisplayModes9x(JNIEnv * env) {
int i = 0, j = 0, n = 0;
int AvailableModes = 0;
DEVMODE DevMode;
DevMode.dmSize = sizeof(DEVMODE);
//enumerate all displaymodes
while(EnumDisplaySettings(NULL, j++, &DevMode) != 0) {
if (DevMode.dmBitsPerPel <=8) {
continue;
}
AvailableModes++;
}
#ifdef _DEBUG
printf("Found %d displaymodes\n", AvailableModes);
#endif
// now that we have the count create the classes, and add 'em all - we'll remove dups in Java
// 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(AvailableModes * 16, displayModeClass, NULL);
jmethodID displayModeConstructor = env->GetMethodID(displayModeClass, "<init>", "(IIIIIII)V");
i = 0, j = 0, n = 0;
while(EnumDisplaySettings(NULL, j++, &DevMode) != 0) {
// Filter out indexed modes
if (DevMode.dmBitsPerPel <= 8) {
continue;
} else {
jobject displayMode;
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,
DevMode.dmPelsWidth, DevMode.dmPelsHeight,
DevMode.dmBitsPerPel, DevMode.dmDisplayFrequency,
alphaBits, depthBits, stencilBits);
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, mode.dmPelsWidth, mode.dmPelsHeight,
mode.dmBitsPerPel, mode.dmDisplayFrequency, alphaBits, depthBits, stencilBits);
env->SetObjectArrayElement(ret, n ++, displayMode);
env->SetObjectArrayElement(ret, n++, displayMode);
}
}
}
}
}
return ret;
}
}
return ret;
}
/*