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.sourceforge.net:/tmp/cvs-serv28750

Modified Files:
	org_lwjgl_opengl_Display.cpp 
Log Message:
Added isMinimized = true on a WA_INACTIVE

Index: org_lwjgl_opengl_Display.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_opengl_Display.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- org_lwjgl_opengl_Display.cpp	9 Aug 2004 11:55:48 -0000	1.22
+++ org_lwjgl_opengl_Display.cpp	9 Aug 2004 16:08:51 -0000	1.23
@@ -330,6 +330,7 @@
 				isFocused = true;
 				break;
 			case WA_INACTIVE:
+				isMinimized = true;
 				isFocused = false;
 				break;
 			}

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

Modified Files:
	org_lwjgl_opengl_Display.cpp 
Log Message:
Add a public DisplayMode constructor

Index: org_lwjgl_opengl_Display.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_opengl_Display.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- org_lwjgl_opengl_Display.cpp	2 Aug 2004 14:47:52 -0000	1.21
+++ org_lwjgl_opengl_Display.cpp	9 Aug 2004 11:55:48 -0000	1.22
@@ -615,7 +615,7 @@
 	closeWindow(display_hwnd, display_hdc);
 }
 
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_Display_switchDisplayMode(JNIEnv *env, jclass clazz, jobject mode) {
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_Display_nSwitchDisplayMode(JNIEnv *env, jclass clazz, jobject mode) {
 	switchDisplayMode(env, mode);
 }
 

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

Modified Files:
	Display.java DisplayMode.java 
Log Message:
Add a public DisplayMode constructor

Index: DisplayMode.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/DisplayMode.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- DisplayMode.java	22 Jul 2004 07:38:56 -0000	1.2
+++ DisplayMode.java	9 Aug 2004 11:55:47 -0000	1.3
@@ -46,17 +46,38 @@
 
 	/** properties of the display mode */
 	private final int width, height, bpp, freq;
+	/** If true, this instance can be used for fullscreen modes */
+	private final boolean fullscreen;
 
 	/**
-	 * Construct a display mode.
-	 * 
+	 * Construct a display mode. DisplayModes constructed through the
+	 * public constructor can only be used to specify the dimensions of
+	 * the Display in windowed mode. To get the available DisplayModes for
+	 * fullscreen modes, use Display.getAvailableDisplayModes().
+	 *
+	 * @param width The Display width.
+	 * @param height The Display height.
 	 * @see Display
 	 */
-	private DisplayMode(int width, int height, int bpp, int freq) {
+	public DisplayMode(int width, int height) {
+		this(width, height, 0, 0, false);
+	}
+	
+	DisplayMode(int width, int height, int bpp, int freq) {
+		this(width, height, bpp, freq, true);
+	}
+
+	private DisplayMode(int width, int height, int bpp, int freq, boolean fullscreen) {
 		this.width = width;
 		this.height = height;
 		this.bpp = bpp;
 		this.freq = freq;
+		this.fullscreen = fullscreen;
+	}
+
+	/** True iff this instance can be used for fullscreen modes */
+	boolean isFullscreen() {
+		return fullscreen;
 	}
 
 	public int getWidth() {

Index: Display.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/Display.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- Display.java	29 Jul 2004 15:45:45 -0000	1.20
+++ Display.java	9 Aug 2004 11:55:47 -0000	1.21
@@ -104,10 +104,12 @@
 	}
 
 	/**
-	 * Returns the entire list of display modes as an array, in no
+	 * Returns the entire list of possible fullscreen display modes as an array, in no
 	 * particular order. Any given mode is not guaranteed to be available and
 	 * the only certain way to check is to call create() and make sure it works.
 	 * Only non-palette-indexed modes are returned (ie. bpp will be 16, 24, or 32).
+	 * Only DisplayModes from this call can be used when the Display is in fullscreen
+	 * mode.
 	 *
 	 * @return an array of all display modes the system reckons it can handle.
 	 */
@@ -161,7 +163,7 @@
 			destroyWindow();
 			try {
 				if (fullscreen)
-					switchDisplayMode(mode);
+					switchDisplayMode();
 				createWindow();
 			} catch (LWJGLException e) {
 				destroyContext();
@@ -200,7 +202,13 @@
 
 	private static native void nDestroyWindow();
 
-	private static native void switchDisplayMode(DisplayMode mode) throws LWJGLException;
+	private static void switchDisplayMode() throws LWJGLException {
+		if (!current_mode.isFullscreen())
+			throw new LWJGLException("The current DisplayMode instance cannot be used for fullscreen mode");
+		nSwitchDisplayMode(current_mode);
+	}
+
+	private static native void nSwitchDisplayMode(DisplayMode mode) throws LWJGLException;
 
 	/**
 	 * Reset the display mode to whatever it was when LWJGL was initialized.
@@ -353,6 +361,8 @@
 	 * mode returned by getDisplayMode(). The native cursor position is also reset.
 	 *
 	 * @param fullscreen Specify the fullscreen mode of the context.
+	 * @throws LWJGLException If fullscreen is true, and the current DisplayMode instance is not
+	 *						  from getAvailableDisplayModes() or if the mode switch fails.
 	 */
 	public static void setFullscreen(boolean fullscreen) throws LWJGLException {
 		if (Display.fullscreen != fullscreen) {
@@ -362,7 +372,7 @@
 			destroyWindow();
 			try {
 				if (fullscreen)
-					switchDisplayMode(current_mode);
+					switchDisplayMode();
 				else
 					resetDisplayMode();
 				createWindow();
@@ -537,7 +547,7 @@
 		if (isCreated())
 			throw new IllegalStateException("Only one LWJGL context may be instantiated at any one time.");
 		if (fullscreen)
-			switchDisplayMode(current_mode);
+			switchDisplayMode();
 		try {
 			GLContext.loadOpenGLLibrary();
 			try {

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

Modified Files:
	org_lwjgl_opengl_Display.h 
Log Message:
Add a public DisplayMode constructor

Index: org_lwjgl_opengl_Display.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_Display.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- org_lwjgl_opengl_Display.h	24 Jul 2004 19:44:40 -0000	1.3
+++ org_lwjgl_opengl_Display.h	9 Aug 2004 11:55:48 -0000	1.4
@@ -14,7 +14,6 @@
 /* Inaccessible static: title */
 /* Inaccessible static: fullscreen */
 /* Inaccessible static: vsync */
-/* Inaccessible static: vbo_tracker */
 /* Inaccessible static: context */
 /* Inaccessible static: timeLate */
 /*
@@ -43,10 +42,10 @@
 
 /*
  * Class:     org_lwjgl_opengl_Display
- * Method:    switchDisplayMode
+ * Method:    nSwitchDisplayMode
  * Signature: (Lorg/lwjgl/opengl/DisplayMode;)V
  */
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_Display_switchDisplayMode
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_Display_nSwitchDisplayMode
   (JNIEnv *, jclass, jobject);
 
 /*

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

Modified Files:
	org_lwjgl_opengl_Display.cpp 
Log Message:
Add a public DisplayMode constructor

Index: org_lwjgl_opengl_Display.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_opengl_Display.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- org_lwjgl_opengl_Display.cpp	2 Aug 2004 14:32:51 -0000	1.15
+++ org_lwjgl_opengl_Display.cpp	9 Aug 2004 11:55:48 -0000	1.16
@@ -602,7 +602,7 @@
 	return getAvailableDisplayModes(env);
 }
 
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_Display_switchDisplayMode(JNIEnv *env, jclass clazz, jobject mode) {
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_Display_nSwitchDisplayMode(JNIEnv *env, jclass clazz, jobject mode) {
 	switchDisplayMode(env, mode);
 }