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

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1079/src/java/org/lwjgl/opengl

Modified Files:
	LinuxDisplay.java 
Log Message:
Linux: Fixed resetDisplayMode in case XRandr is used and the first reported mode is not the initial mode

Index: LinuxDisplay.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- LinuxDisplay.java	31 Jan 2006 12:31:41 -0000	1.39
+++ LinuxDisplay.java	31 Jan 2006 12:48:46 -0000	1.40
@@ -389,11 +389,16 @@
 	}
 
 	private static DisplayMode getCurrentXRandrMode() throws LWJGLException {
-		incDisplay();
+		lockAWT();
 		try {
-			return nGetCurrentXRandrMode();
+			incDisplay();
+			try {
+				return nGetCurrentXRandrMode();
+			} finally {
+				decDisplay();
+			}
 		} finally {
-			decDisplay();
+			unlockAWT();
 		}
 	}
 	

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27103/src/java/org/lwjgl/opengl

Modified Files:
	LinuxDisplay.java 
Log Message:
Linux: Fixed resetDisplayMode in case XRandr is used and the first reported mode is not the initial mode

Index: LinuxDisplay.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- LinuxDisplay.java	4 Jan 2006 07:36:08 -0000	1.38
+++ LinuxDisplay.java	31 Jan 2006 12:31:41 -0000	1.39
@@ -369,7 +369,16 @@
 			DisplayMode[] modes = getAvailableDisplayModes();
 			if (modes == null || modes.length == 0)
 				throw new LWJGLException("No modes available");
-			saved_mode = modes[0];
+			switch (current_displaymode_extension) {
+				case XRANDR:
+					saved_mode = getCurrentXRandrMode();
+					break;
+				case XF86VIDMODE:
+					saved_mode = modes[0];
+					break;
+				default:
+					throw new LWJGLException("Unknown display mode extension: " + current_displaymode_extension);
+			}
 			current_mode = saved_mode;
 			saved_gamma = getCurrentGammaRamp();
 			current_gamma = saved_gamma;
@@ -378,8 +387,18 @@
 			unlockAWT();
 		}
 	}
-	/** Assumes extension != NONE */
-	private static native DisplayMode nInit(int extension) throws LWJGLException;
+
+	private static DisplayMode getCurrentXRandrMode() throws LWJGLException {
+		incDisplay();
+		try {
+			return nGetCurrentXRandrMode();
+		} finally {
+			decDisplay();
+		}
+	}
+	
+	/** Assumes extension == XRANDR */
+	private static native DisplayMode nGetCurrentXRandrMode() throws LWJGLException;
 
 	public void setTitle(String title) {
 		lockAWT();

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

Modified Files:
	common_tools.h 
Log Message:
Linux: Fixed resetDisplayMode in case XRandr is used and the first reported mode is not the initial mode

Index: common_tools.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/common_tools.h,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- common_tools.h	21 Feb 2005 14:46:43 -0000	1.39
+++ common_tools.h	31 Jan 2006 12:31:41 -0000	1.40
@@ -141,6 +141,7 @@
 extern bool putEvent(event_queue_t *queue, jint *event);
 extern void throwGeneralException(JNIEnv * env, const char *exception_name, const char * err);
 extern void throwException(JNIEnv *env, const char *msg);
+extern void throwFormattedException(JNIEnv * env, const char *format, ...);
 extern void throwFMODException(JNIEnv * env, const char * err);
 extern void setDebugEnabled(bool enable);
 extern void printfDebugJava(JNIEnv *env, const char *format, ...);

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

Modified Files:
	display.c 
Log Message:
Linux: Fixed resetDisplayMode in case XRandr is used and the first reported mode is not the initial mode

Index: display.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/display.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- display.c	4 Jan 2006 12:52:25 -0000	1.26
+++ display.c	31 Jan 2006 12:31:41 -0000	1.27
@@ -197,7 +197,7 @@
 	Time config_time;
 	*timestamp = XRRConfigTimes(screen_configuration, &config_time);
 	Rotation current_rotation;
-	XRRConfigRotations(screen_configuration, &current_rotation);
+	XRRConfigCurrentConfiguration(screen_configuration, &current_rotation);
 	status = XRRSetScreenConfigAndRate(disp, screen_configuration, root_window, mode->mode_data.size_index, current_rotation, mode->freq, *timestamp);
 	XRRFreeScreenConfigInfo(screen_configuration);
 	return status;
@@ -359,7 +359,6 @@
 	avail_modes = getDisplayModes(disp, screen, extension, &num_modes);
 	if (avail_modes == NULL) {
 		printfDebugJava(env, "Could not get display modes");
-		XCloseDisplay(disp);
 		return NULL;
 	}
 	// Allocate an array of DisplayModes big enough
@@ -375,6 +374,36 @@
 	return ret;
 }
 
+static jobject getCurrentXRandrMode(JNIEnv * env, Display *disp, int screen) {
+	Drawable root_window = RootWindow(disp, screen);
+	XRRScreenConfiguration *config = XRRGetScreenInfo(disp, root_window);
+	if (config == NULL) {
+		throwException(env, "Could not get current screen configuration.");
+		return NULL;
+	}
+	short rate = XRRConfigCurrentRate(config);
+	Rotation current_rotation;
+	SizeID size_index = XRRConfigCurrentConfiguration(config, &current_rotation);
+	int n_sizes;
+	XRRScreenSize *sizes = XRRConfigSizes(config, &n_sizes);
+	if (size_index >= n_sizes) {
+		throwFormattedException(env, "Xrandr current index (%d) is larger than or equals to the number of sizes (%d).", size_index, n_sizes);
+		XRRFreeScreenConfigInfo(config);
+		return NULL;
+	}
+	XRRScreenSize current_size = sizes[size_index];
+	XRRFreeScreenConfigInfo(config);
+	int bpp = XDefaultDepth(disp, screen);
+	jclass displayModeClass = (*env)->FindClass(env, "org/lwjgl/opengl/DisplayMode");
+	jmethodID displayModeConstructor = (*env)->GetMethodID(env, displayModeClass, "<init>", "(IIII)V");
+	jobject displayMode = (*env)->NewObject(env, displayModeClass, displayModeConstructor, current_size.width, current_size.height, bpp, rate);
+	return displayMode;
+}
+
+JNIEXPORT jobject JNICALL Java_org_lwjgl_opengl_LinuxDisplay_nGetCurrentXRandrMode(JNIEnv *env, jclass unused) {
+	return getCurrentXRandrMode(env, getDisplay(), getCurrentScreen());
+}
+
 JNIEXPORT jobjectArray JNICALL Java_org_lwjgl_opengl_LinuxDisplay_nGetAvailableDisplayModes(JNIEnv *env, jclass clazz, jint extension) {
 	return getAvailableDisplayModes(env, getDisplay(), getCurrentScreen(), extension);
 }