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

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

Modified Files:
	org_lwjgl_Display.cpp 
Log Message:
More fixes

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.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- org_lwjgl_Display.cpp	10 Sep 2003 22:41:17 -0000	1.46
+++ org_lwjgl_Display.cpp	10 Sep 2003 22:55:25 -0000	1.47
@@ -156,7 +156,7 @@
 	DevMode.dmSize = sizeof(DEVMODE);
   
 	//enumerate all displaymodes
-	while(EnumDisplaySettingsEx(NULL, j++, &DevMode, 0) != 0) {
+	while(EnumDisplaySettings(NULL, j++, &DevMode) != 0) {
 		if (DevMode.dmBitsPerPel > 8) {
 			AvailableModes++;
 		}
@@ -174,7 +174,7 @@
 	jmethodID displayModeConstructor = env->GetMethodID(displayModeClass, "<init>", "(IIII)V");  
   
 	i = 0, j = 0, n = 0;
-	while(EnumDisplaySettingsEx(NULL, j++, &DevMode, 0) != 0) {
+	while(EnumDisplaySettings(NULL, j++, &DevMode) != 0) {
 		// Filter out indexed modes
 		if (DevMode.dmBitsPerPel > 8) {
 			jobject displayMode;

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

Modified Files:
	org_lwjgl_Display.cpp 
Log Message:
Fixed compile error

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.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- org_lwjgl_Display.cpp	10 Sep 2003 22:39:46 -0000	1.45
+++ org_lwjgl_Display.cpp	10 Sep 2003 22:41:17 -0000	1.46
@@ -68,7 +68,7 @@
 	GetVersionEx(&osvi);
 	
 	if (osvi.dwPlatformId == VER_PLATFORM_WIN32_NT && osvi.dwMajorVersion >= 5 ||
-            osvi.swPlatformId == VER_PLATFORM_WIN32_WINDOWS && osvi.dwMinorVersion >= 10) {
+            osvi.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS && osvi.dwMinorVersion >= 10) {
 #ifdef _DEBUG
 		printf("Selecting extended display mode check\n");
 #endif	

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

Modified Files:
	org_lwjgl_Display.cpp 
Log Message:
Repaired gamma code.

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.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- org_lwjgl_Display.cpp	10 Sep 2003 22:35:06 -0000	1.44
+++ org_lwjgl_Display.cpp	10 Sep 2003 22:39:46 -0000	1.45
@@ -281,7 +281,7 @@
 JNIEXPORT void JNICALL Java_org_lwjgl_Display_resetDisplayMode
   (JNIEnv * env, jclass clazz)
 {
-	/*
+
 	// Return device gamma to normal
 	HDC screenDC = GetDC(NULL);
 	try {
@@ -294,7 +294,7 @@
 		printf("Exception occurred in SetDeviceGammaRamp\n");
 	}	
 	ReleaseDC(NULL, screenDC);	
-	*/
+
 	if (modeSet) {
 		modeSet = false;
 		// Under Win32, all we have to do is:
@@ -309,7 +309,6 @@
  * Temporarily reset display settings. This is called when the window is minimized.
  */
 void tempResetDisplayMode() {
-	/*
 	// Return device gamma to normal
 	HDC screenDC = GetDC(NULL);
 	try {
@@ -322,7 +321,7 @@
 		printf("Exception occurred in SetDeviceGammaRamp\n");
 	}	
 	ReleaseDC(NULL, screenDC);	
-	*/
+
 	if (modeSet) {
 #ifdef _DEBUG
 		printf("Attempting to temporarily reset the display mode\n");
@@ -338,7 +337,6 @@
  */
 void tempRestoreDisplayMode() {
 	// Restore gamma
-	/*
 	HDC screenDC = GetDC(NULL);
 	try { 
 		if (!SetDeviceGammaRamp(screenDC, currentGamma)) {
@@ -350,7 +348,7 @@
 		printf("Exception occurred in SetDeviceGammaRamp\n");
 	}	
 	ReleaseDC(NULL, screenDC);
-	*/
+
 	if (!modeSet) {
 
 #ifdef _DEBUG
@@ -389,7 +387,7 @@
 {
 
 	return JNI_FALSE;
-	/*
+
 	const float *gammaRamp = (const float *)env->GetDirectBufferAddress(gammaRampBuffer);
 	// Turn array of floats into array of RGB WORDs
 
@@ -418,7 +416,6 @@
 	ReleaseDC(NULL, screenDC);
 
 	return ret;
-	*/
 }
 
 
@@ -452,7 +449,6 @@
 	env->SetStaticObjectField(clazz, fid_initialMode, newMode);
 	env->DeleteLocalRef(newMode);
 
-	/*
 	// Get the default gamma ramp
 	try {
 		if (GetDeviceGammaRamp(screenDC, originalGamma) == FALSE) {
@@ -463,7 +459,7 @@
 	} catch (...) {
 		printf("Exception occurred in GetDeviceGammaRamp\n");
 	}
-	*/
+
 	ReleaseDC(NULL, screenDC);
 }
 

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

Modified Files:
	Keyboard.java 
Log Message:
Lazy initialization.

Index: Keyboard.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/input/Keyboard.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/input/Keyboard.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- Keyboard.java	23 Aug 2003 09:45:21 -0000	1.28
+++ Keyboard.java	10 Sep 2003 22:39:26 -0000	1.29
@@ -252,9 +252,8 @@
 	/** The current state of the key being examined in the event queue */
 	public static boolean state;
 	
-	static {
-		initialize();
-	}
+	/** One time initialization */
+	private static boolean initialized;
 	
 	/**
 	 * Keyboard cannot be constructed.
@@ -268,6 +267,7 @@
 	private static void initialize() {
 		System.loadLibrary(Sys.getLibraryName());
 		initIDs();
+		initialized = true;
 	}
 	
 	/**
@@ -282,6 +282,8 @@
 	 * @throws Exception if the keyboard could not be created for any reason
 	 */
 	public static void create() throws Exception {
+		if (!initialized)
+			initialize();
 		if (created)
 			return;
 		if (!nCreate())

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

Modified Files:
	org_lwjgl_Display.cpp 
Log Message:
Fixed display mode code paths

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.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- org_lwjgl_Display.cpp	2 Sep 2003 11:30:36 -0000	1.43
+++ org_lwjgl_Display.cpp	10 Sep 2003 22:35:06 -0000	1.44
@@ -44,8 +44,8 @@
 
 #define WINDOWCLASSNAME "LWJGLWINDOW"
 
-jobjectArray GetAvailableDisplayModesNT(JNIEnv * env);
-jobjectArray GetAvailableDisplayModes9x(JNIEnv * env);
+jobjectArray GetAvailableDisplayModesEx(JNIEnv * env);
+jobjectArray GetAvailableDisplayModes(JNIEnv * env);
 bool modeSet = false; // Whether we've done a display mode change
 WORD* originalGamma = new WORD[256 * 3]; // Original gamma settings
 WORD* currentGamma = new WORD[256 * 3]; // Current gamma settings
@@ -67,23 +67,24 @@
 	osvi.dwOSVersionInfoSize = sizeof(osvi);
 	GetVersionEx(&osvi);
 	
-	if (osvi.dwPlatformId == VER_PLATFORM_WIN32_NT) {
+	if (osvi.dwPlatformId == VER_PLATFORM_WIN32_NT && osvi.dwMajorVersion >= 5 ||
+            osvi.swPlatformId == VER_PLATFORM_WIN32_WINDOWS && osvi.dwMinorVersion >= 10) {
 #ifdef _DEBUG
-  printf("Selecting NT display mode check\n");
+		printf("Selecting extended display mode check\n");
 #endif	
-    return GetAvailableDisplayModesNT(env);
-  }
-  
+		return GetAvailableDisplayModesEx(env);
+	} else {
 #ifdef _DEBUG
-  printf("Selecting 9x display mode check");
+		printf("Selecting standard display mode check");
 #endif	
-  return GetAvailableDisplayModes9x(env);
+		return GetAvailableDisplayModes(env);
+	}
 }
 
 /**
- * Choose displaymodes using NT codepath (multiple displaydevices)
+ * Choose displaymodes using extended codepath (multiple displaydevices)
  */
-jobjectArray GetAvailableDisplayModesNT(JNIEnv * env) {
+jobjectArray GetAvailableDisplayModesEx(JNIEnv * env) {
 	int i = 0, j = 0, n = 0;
 	int AvailableModes = 0;
 
@@ -142,9 +143,9 @@
 }
 
 /**
- * Choose displaymodes using 9x codepath (single displaydevice)
+ * Choose displaymodes using standard codepath (single displaydevice)
  */
-jobjectArray GetAvailableDisplayModes9x(JNIEnv * env) {
+jobjectArray GetAvailableDisplayModes(JNIEnv * env) {
 	int i = 0, j = 0, n = 0;
 	int AvailableModes = 0;