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

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl
In directory sc8-pr-cvs1:/tmp/cvs-serv24717/src/java/org/lwjgl

Modified Files:
	DisplayMode.java 
Log Message:


Index: DisplayMode.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/DisplayMode.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/DisplayMode.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- DisplayMode.java	10 Feb 2003 23:02:32 -0000	1.7
+++ DisplayMode.java	3 Mar 2003 22:12:21 -0000	1.8
@@ -44,8 +44,8 @@
  */
 
 public final class DisplayMode {
-	
-  /** properties of the display mode */
+
+	/** properties of the display mode */
 	public final int width, height, bpp, freq, alpha, depth, stencil;
 
 	/**
@@ -62,18 +62,17 @@
 		this.depth = depth;
 		this.stencil = stencil;
 	}
-	
 
 	/**
-   * Tests for <code>DisplayMode</code> equality
-   * 
+	 * Tests for <code>DisplayMode</code> equality
+	 * 
 	 * @see java.lang.Object#equals(Object)
 	 */
 	public boolean equals(Object obj) {
 		if (obj == null || !(obj instanceof DisplayMode)) {
 			return false;
 		}
-			
+
 		DisplayMode dm = (DisplayMode) obj;
 		return dm.width == width
 			&& dm.height == dm.height
@@ -85,8 +84,8 @@
 	}
 
 	/**
-   * Retrieves the hashcode for this object
-   * 
+	 * Retrieves the hashcode for this object
+	 * 
 	 * @see java.lang.Object#hashCode()
 	 */
 	public int hashCode() {
@@ -94,8 +93,8 @@
 	}
 
 	/**
-   * Retrieves a String representation of this <code>DisplayMode</code>
-   * 
+	 * Retrieves a String representation of this <code>DisplayMode</code>
+	 * 
 	 * @see java.lang.Object#toString()
 	 */
 	public String toString() {

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl
In directory sc8-pr-cvs1:/tmp/cvs-serv17752

Modified Files:
	Display.java 
Log Message:
fix: possible NPE evaded

Index: Display.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/Display.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/Display.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- Display.java	3 Mar 2003 21:48:00 -0000	1.16
+++ Display.java	3 Mar 2003 21:58:17 -0000	1.17
@@ -80,13 +80,13 @@
 	 */
 	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];
     }
+    
+    // We'll use a HashSet to filter out the duplicated modes
+    HashSet modes = new HashSet(unfilteredModes.length);    
     
     modes.addAll(Arrays.asList(unfilteredModes));
     DisplayMode[] filteredModes = new DisplayMode[modes.size()];

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

Modified Files:
	org_lwjgl_Display.cpp 
Log Message:
fix: small beautification

Index: org_lwjgl_Display.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/win32/org_lwjgl_Display.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_Display.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- org_lwjgl_Display.cpp	3 Mar 2003 21:46:52 -0000	1.25
+++ org_lwjgl_Display.cpp	3 Mar 2003 21:51:13 -0000	1.26
@@ -261,7 +261,7 @@
 
 /*
  * Class:     org_lwjgl_Display
- * Method:    getAvailableDisplayModes
+ * Method:    nGetAvailableDisplayModes
  * Signature: ()[Lorg/lwjgl/DisplayMode;
  */
 JNIEXPORT jobjectArray JNICALL Java_org_lwjgl_Display_nGetAvailableDisplayModes

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

Modified Files:
	org_lwjgl_Display.h 
Log Message:
fix: small beautification

Index: org_lwjgl_Display.h
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_Display.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_Display.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- org_lwjgl_Display.h	3 Mar 2003 21:46:35 -0000	1.6
+++ org_lwjgl_Display.h	3 Mar 2003 21:50:59 -0000	1.7
@@ -15,7 +15,7 @@
 /* Inaccessible static: class_000240 */
 /*
  * Class:     org_lwjgl_Display
- * Method:    getAvailableDisplayModes
+ * Method:    nGetAvailableDisplayModes
  * Signature: ()[Lorg/lwjgl/DisplayMode;
  */
 JNIEXPORT jobjectArray JNICALL Java_org_lwjgl_Display_nGetAvailableDisplayModes

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

Modified Files:
	org_lwjgl_Display.cpp 
Log Message:
fix: now enumerates multiple displaydevices, if available

Index: org_lwjgl_Display.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/linux/org_lwjgl_Display.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_Display.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- org_lwjgl_Display.cpp	20 Feb 2003 13:27:20 -0000	1.21
+++ org_lwjgl_Display.cpp	3 Mar 2003 21:49:46 -0000	1.22
@@ -434,10 +434,10 @@
 
 /*
  * 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;

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl
In directory sc8-pr-cvs1:/tmp/cvs-serv12945a

Modified Files:
	Display.java 
Log Message:
fix: now enumerates multiple displaydevices, if available

Index: Display.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/Display.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/Display.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- Display.java	10 Feb 2003 22:57:42 -0000	1.15
+++ Display.java	3 Mar 2003 21:48:00 -0000	1.16
@@ -32,6 +32,8 @@
 
 package org.lwjgl;
 
+import java.util.HashSet;
+import java.util.Arrays;
 /**
  * $Id$
  *
@@ -76,7 +78,31 @@
 	 * 
 	 * @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

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

Modified Files:
	org_lwjgl_Display.cpp 
Log Message:
fix: now enumerates multiple displaydevices, if available

Index: org_lwjgl_Display.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/win32/org_lwjgl_Display.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_Display.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- org_lwjgl_Display.cpp	12 Feb 2003 12:07:50 -0000	1.24
+++ org_lwjgl_Display.cpp	3 Mar 2003 21:46:52 -0000	1.25
@@ -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 @@
  * 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;
+	osvi.dwOSVersionInfoSize = sizeof(osvi);
+	GetVersionEx(&osvi);
+	
+	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);
+}
 
-	// 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 ++;
-	}
+/**
+ * Choose displaymodes using NT codepath (multiple displaydevices)
+ */
+jobjectArray GetAvailableDisplayModesNT(JNIEnv * env) {
+  int i = 0, j = 0, n = 0;
+  int AvailableModes = 0;
 
-	
-	// Allocate an array of DisplayModes big enough
+  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;
-		} 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, 
+						                                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);
+					  }
+				  }
+			  }       
+			}
+    }
+  }
+  return ret;
+}
 
-						env->SetObjectArrayElement(ret, n ++, displayMode);
+/**
+ * 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;
+      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;
+	  }
+  }
+  return ret;
 }
 
 /*

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

Modified Files:
	org_lwjgl_Display.h 
Log Message:
fix: now enumerates multiple displaydevices, if available

Index: org_lwjgl_Display.h
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_Display.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_Display.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- org_lwjgl_Display.h	8 Feb 2003 23:00:36 -0000	1.5
+++ org_lwjgl_Display.h	3 Mar 2003 21:46:35 -0000	1.6
@@ -18,7 +18,7 @@
  * Method:    getAvailableDisplayModes
  * Signature: ()[Lorg/lwjgl/DisplayMode;
  */
-JNIEXPORT jobjectArray JNICALL Java_org_lwjgl_Display_getAvailableDisplayModes
+JNIEXPORT jobjectArray JNICALL Java_org_lwjgl_Display_nGetAvailableDisplayModes
   (JNIEnv *, jclass);
 
 /*