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-serv26802/src/native/win32

Modified Files:
	org_lwjgl_opengl_BaseGL.cpp org_lwjgl_Window.cpp 
Log Message:


Index: org_lwjgl_opengl_BaseGL.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/win32/org_lwjgl_opengl_BaseGL.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_opengl_BaseGL.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- org_lwjgl_opengl_BaseGL.cpp	20 May 2003 12:20:13 -0000	1.21
+++ org_lwjgl_opengl_BaseGL.cpp	4 Jun 2003 22:10:23 -0000	1.22
@@ -47,89 +47,89 @@
 
 HGLRC			hglrc = NULL;						// OpenGL rendering context
 
-static int findPixelFormat(JNIEnv *env, unsigned int flags, int bpp, int alpha, int depth, int stencil) {
-	PIXELFORMATDESCRIPTOR pfd = { 
-		sizeof(PIXELFORMATDESCRIPTOR),   // size of this pfd 
-		1,                     // version number 
-		flags,         // RGBA type 
-		PFD_TYPE_RGBA,
-		(BYTE)bpp,       
-		0, 0, 0, 0, 0, 0,      // color bits ignored 
-		(BYTE)alpha,       
-		0,                     // shift bit ignored 
-		0,                     // no accumulation buffer 
-		0, 0, 0, 0,            // accum bits ignored 
-		(BYTE)depth,       
-		(BYTE)stencil,     
-		0,                     // No auxiliary buffer 
-		PFD_MAIN_PLANE,        // main layer
-		0,                     // reserved 
-		0, 0, 0                // layer masks ignored
-	};
-
-	// get the best available match of pixel format for the device context  
-	int iPixelFormat = ChoosePixelFormat(hdc, &pfd);
-	if (iPixelFormat == 0) {
-		throwException(env, "Failed to choose pixel format");
-		return -1;
-	}
-
-#ifdef _DEBUG
-	printf("Pixel format is %d\n", iPixelFormat);
-#endif
-
-	// make that the pixel format of the device context 
-	if (SetPixelFormat(hdc, iPixelFormat, &pfd) == FALSE) {
-		printf("Failed to set pixel format\n");
-		throwException(env, "Failed to choose pixel format");
-		return -1;
-	}
-
-	// 3. Check the chosen format matches or exceeds our specifications
-	PIXELFORMATDESCRIPTOR desc;
-	if (DescribePixelFormat(hdc, iPixelFormat, sizeof(PIXELFORMATDESCRIPTOR), &desc) == 0) {
-		throwException(env, "Could not describe pixel format");
-		return -1;
-	}
-
-	if (desc.cColorBits < bpp) {
-		throwException(env, "This application requires a greater colour depth");
-		return -1;
-	}
-
-	if (desc.cAlphaBits < alpha) {
-		throwException(env, "This application requires a greater alpha depth");
-		return -1;
-	}
-
-	if (desc.cStencilBits < stencil) {
-		throwException(env, "This application requires a greater stencil depth");
-		return -1;
-	}
-
-	if (desc.cDepthBits < depth) {
-		throwException(env, "This application requires a greater depth buffer depth");
-		return -1;
-	}
-
-	if ((desc.dwFlags & PFD_GENERIC_FORMAT) != 0 || (desc.dwFlags & PFD_GENERIC_ACCELERATED) != 0) {
-		throwException(env, "Mode not supported by hardware");
-		return -1;
-	}
-
-	if ((desc.dwFlags & flags) != flags) {
-		throwException(env, "Capabilities not supported");
-		return -1;
-	}
-
-	// 4. Initialise other things now
-	if (extgl_Open() != 0) {
-		throwException(env, "Failed to open extgl");
-		return -1;
-	}
-	return iPixelFormat;
-}
-
+static int findPixelFormat(JNIEnv *env, unsigned int flags, int bpp, int alpha, int depth, int stencil) {
+	PIXELFORMATDESCRIPTOR pfd = { 
+		sizeof(PIXELFORMATDESCRIPTOR),   // size of this pfd 
+		1,                     // version number 
+		flags,         // RGBA type 
+		PFD_TYPE_RGBA,
+		(BYTE)bpp,       
+		0, 0, 0, 0, 0, 0,      // color bits ignored 
+		(BYTE)alpha,       
+		0,                     // shift bit ignored 
+		0,                     // no accumulation buffer 
+		0, 0, 0, 0,            // accum bits ignored 
+		(BYTE)depth,       
+		(BYTE)stencil,     
+		0,                     // No auxiliary buffer 
+		PFD_MAIN_PLANE,        // main layer
+		0,                     // reserved 
+		0, 0, 0                // layer masks ignored
+	};
+
+	// get the best available match of pixel format for the device context  
+	int iPixelFormat = ChoosePixelFormat(hdc, &pfd);
+	if (iPixelFormat == 0) {
+		throwException(env, "Failed to choose pixel format");
+		return -1;
+	}
+
+#ifdef _DEBUG
+	printf("Pixel format is %d\n", iPixelFormat);
+#endif
+
+	// make that the pixel format of the device context 
+	if (SetPixelFormat(hdc, iPixelFormat, &pfd) == FALSE) {
+		printf("Failed to set pixel format\n");
+		throwException(env, "Failed to choose pixel format");
+		return -1;
+	}
+
+	// 3. Check the chosen format matches or exceeds our specifications
+	PIXELFORMATDESCRIPTOR desc;
+	if (DescribePixelFormat(hdc, iPixelFormat, sizeof(PIXELFORMATDESCRIPTOR), &desc) == 0) {
+		throwException(env, "Could not describe pixel format");
+		return -1;
+	}
+
+	if (desc.cColorBits < bpp) {
+		throwException(env, "This application requires a greater colour depth");
+		return -1;
+	}
+
+	if (desc.cAlphaBits < alpha) {
+		throwException(env, "This application requires a greater alpha depth");
+		return -1;
+	}
+
+	if (desc.cStencilBits < stencil) {
+		throwException(env, "This application requires a greater stencil depth");
+		return -1;
+	}
+
+	if (desc.cDepthBits < depth) {
+		throwException(env, "This application requires a greater depth buffer depth");
+		return -1;
+	}
+
+	if ((desc.dwFlags & PFD_GENERIC_FORMAT) != 0 || (desc.dwFlags & PFD_GENERIC_ACCELERATED) != 0) {
+		throwException(env, "Mode not supported by hardware");
+		return -1;
+	}
+
+	if ((desc.dwFlags & flags) != flags) {
+		throwException(env, "Capabilities not supported");
+		return -1;
+	}
+
+	// 4. Initialise other things now
+	if (extgl_Open() != 0) {
+		throwException(env, "Failed to open extgl");
+		return -1;
+	}
+	return iPixelFormat;
+}
+
 /*
  * Class:     org_lwjgl_opengl_BaseGL
  * Method:    nCreate
@@ -155,12 +155,12 @@
 	unsigned int flags = PFD_DRAW_TO_WINDOW |   // support window 
 		PFD_SUPPORT_OPENGL |   // support OpenGL 
 		PFD_DOUBLEBUFFER;      // double buffered 
-
-	int iPixelFormat = findPixelFormat(env, flags, bpp, alpha, depth, stencil);
-	if (iPixelFormat == -1) {
-		closeWindow();
-		return;
-	}
+
+	int iPixelFormat = findPixelFormat(env, flags, bpp, alpha, depth, stencil);
+	if (iPixelFormat == -1) {
+		closeWindow();
+		return;
+	}
 	// Create a rendering context
 	hglrc = wglCreateContext(hdc);
 	if (hglrc == NULL) {
@@ -214,5 +214,5 @@
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_BaseGL_swapBuffers
   (JNIEnv *, jobject) 
 {
-	SwapBuffers(wglGetCurrentDC());
+	wglSwapLayerBuffers(hdc, WGL_SWAP_MAIN_PLANE);
 }

Index: org_lwjgl_Window.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/win32/org_lwjgl_Window.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_Window.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- org_lwjgl_Window.cpp	20 May 2003 12:20:13 -0000	1.9
+++ org_lwjgl_Window.cpp	4 Jun 2003 22:10:24 -0000	1.10
@@ -313,7 +313,8 @@
 	printf("Created window\n");
 #endif
 
-	ShowWindow(hwnd, SW_SHOWNORMAL);
+	//ShowWindow(hwnd, SW_SHOWNORMAL);
+	ShowWindow(hwnd, SW_SHOW);
 	UpdateWindow(hwnd);
 	SetForegroundWindow(hwnd);
 	SetFocus(hwnd);
@@ -389,4 +390,32 @@
   (JNIEnv * env, jobject obj)
 {
 	handleMessages(env, obj);
+}
+
+
+/*
+ * Class:     org_lwjgl_Window
+ * Method:    minimize
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_org_lwjgl_Window_minimize
+  (JNIEnv * env, jobject obj)
+{
+	if (isMinimized)
+		return;
+	ShowWindow(hwnd, SW_MINIMIZE);
+}
+
+/*
+ * Class:     org_lwjgl_Window
+ * Method:    minimize
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_org_lwjgl_Window_restore
+  (JNIEnv * env, jobject obj)
+{
+	if (!isMinimized)
+		return;
+
+	ShowWindow(hwnd, SW_RESTORE);
 }

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

Modified Files:
	org_lwjgl_Window.h 
Log Message:


Index: org_lwjgl_Window.h
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_Window.h
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_Window.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- org_lwjgl_Window.h	30 Mar 2003 19:26:38 -0000	1.2
+++ org_lwjgl_Window.h	4 Jun 2003 21:46:13 -0000	1.3
@@ -16,13 +16,29 @@
 JNIEXPORT void JNICALL Java_org_lwjgl_Window_nSetTitle
   (JNIEnv *, jobject, jstring);
 
-/*
- * Class:     org_lwjgl_Window
- * Method:    tick
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_Window_tick
-  (JNIEnv *, jobject);
+/*
+ * Class:     org_lwjgl_Window
+ * Method:    tick
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_org_lwjgl_Window_tick
+  (JNIEnv *, jobject);
+
+/*
+ * Class:     org_lwjgl_Window
+ * Method:    minimize
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_org_lwjgl_Window_minimize
+  (JNIEnv *, jobject);
+
+/*
+ * Class:     org_lwjgl_Window
+ * Method:    restore
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_org_lwjgl_Window_restore
+  (JNIEnv *, jobject);
 
 #ifdef __cplusplus
 }

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

Modified Files:
	Window.java 
Log Message:


Index: Window.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/Window.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/Window.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- Window.java	20 May 2003 12:20:10 -0000	1.9
+++ Window.java	4 Jun 2003 21:49:46 -0000	1.10
@@ -54,10 +54,10 @@
 	private int y;
 	
 	/** Width of the window */
-	private final int width;
+	private int width;
 	
 	/** Height of the window */
-	private final int height;
+	private int height;
 	
 	/** Title of the window */
 	private String title;
@@ -66,6 +66,9 @@
 	 * Construct a Window. Some OSs may not support non-fullscreen windows; in
 	 * which case the window will be fullscreen regardless.
 	 * 
+	 * A fullscreen window MUST track changes to the display settings and change its
+	 * width and height accordingly.
+	 * 
 	 * In this abstract base class, no actual window peer is constructed. This should be
 	 * done in specialised derived classes.
 	 * 
@@ -140,6 +143,23 @@
 	public final boolean isMinimized() {
 		return minimized;
 	}
+	
+	/**
+	 * Minimize the game and allow the operating system's default display to become
+	 * visible. It is NOT the responsibility of LWJGL's native code to restore the display
+	 * to its normal display settings.
+	 * 
+	 * If the display is already minimized then this is a no-op.
+	 */
+	public final native void minimize();
+	
+	/**
+	 * Restore the game and hide the operating system away. It is NOT the responsibility of
+	 * LWJGL's native code to restore the display to its game display settings.
+	 * 
+	 * If the display is not minimized then this is a no-op/
+	 */
+	public final native void restore();
 	
 	/**
 	 * Determine if the window's contents have been damaged by external events.