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-serv16742/src/java/org/lwjgl/opengl

Modified Files:
	MacOSXContextImplementation.java MacOSXDisplay.java 
	MacOSXGLCanvas.java 
Log Message:
Mac OS X: Added a workaround for the 'white screen' problem

Index: MacOSXContextImplementation.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/MacOSXContextImplementation.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- MacOSXContextImplementation.java	23 Feb 2005 12:12:47 -0000	1.3
+++ MacOSXContextImplementation.java	28 Apr 2005 12:55:23 -0000	1.4
@@ -81,6 +81,18 @@
 
 	private static native void clearDrawable(ByteBuffer handle) throws LWJGLException;
 
+	static void resetView(PeerInfo peer_info, Context context) throws LWJGLException {
+		ByteBuffer peer_handle = peer_info.lockAndGetHandle();
+		try {
+			synchronized (context) {
+				clearDrawable(context.getHandle());
+				setView(peer_handle, context.getHandle());
+			}
+		} finally {
+			peer_info.unlock();
+		}
+	}
+	
 	public void makeCurrent(PeerInfo peer_info, ByteBuffer handle) throws LWJGLException {
 		ByteBuffer peer_handle = peer_info.lockAndGetHandle();
 		try {

Index: MacOSXDisplay.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/MacOSXDisplay.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- MacOSXDisplay.java	12 Apr 2005 11:45:06 -0000	1.27
+++ MacOSXDisplay.java	28 Apr 2005 12:55:23 -0000	1.28
@@ -208,7 +208,36 @@
 	}
 
 	public void update() {
-		if (frame.getCanvas().syncShouldUpdateContext()) {
+		boolean should_update = frame.getCanvas().syncShouldUpdateContext();
+		/*
+		 * Workaround for the "white screen in fullscreen mode" problem
+		 *
+		 * Sometimes, switching from windowed mode to fullscreen or simply creating the Display
+		 * in fullscreen mode will result in the context not being bound to the window correctly.
+		 * The program runs fine, but the canvas background (white) is shown instead of the context
+		 * front buffer.
+		 *
+		 * I've discovered that re-binding the context with another setView() won't fix the problem, while a
+		 * clearDrawable() followed by a setView() does work. A straightforward workaround would be
+		 * to simply run the combination at every update(). This is not sufficient, since the clearDrawable()
+		 * call makes the the background appear shortly, causing visual artifacts.
+		 * What we really need is a way to detect that a setView() failed, and then do the magic combo. I've not
+		 * been able to find such a detection so alternatively I'm triggering the combo if the display is fullscreen
+		 * (I've not seen the white screen problem in windowed mode) and if the canvas has gotten a paint message or
+		 * if its update flag was set.
+		 *
+		 * My testing seems to indicate that the workaround works, since I've not seen the problem after the fix.
+		 *
+		 * - elias
+		 */
+		if (Display.isFullscreen() && (frame.getCanvas().syncCanvasPainted() || should_update)) {
+			try {
+				MacOSXContextImplementation.resetView(Display.getContext().getPeerInfo(), Display.getContext());
+			} catch (LWJGLException e) {
+				LWJGLUtil.log("Failed to reset context: " + e);
+			}
+		}
+		if (should_update) {
 			Display.getContext().update();
 			/* This is necessary to make sure the context won't "forget" about the view size */
 			GL11.glViewport(0, 0, frame.getCanvas().syncGetWidth(), frame.getCanvas().syncGetHeight());

Index: MacOSXGLCanvas.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/MacOSXGLCanvas.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- MacOSXGLCanvas.java	23 Feb 2005 11:11:07 -0000	1.7
+++ MacOSXGLCanvas.java	28 Apr 2005 12:55:23 -0000	1.8
@@ -50,6 +50,7 @@
 	private int width;
 	private int height;
 	private boolean context_update;
+	private boolean canvas_painted;
 	private boolean dirty;
 
 	public void update(Graphics g) {
@@ -59,6 +60,7 @@
 	public void paint(Graphics g) {
 		synchronized ( this ) {
 			dirty = true;
+			canvas_painted = true;
 		}
 	}
 
@@ -75,6 +77,15 @@
 		setUpdate();
 	}
 
+	public boolean syncCanvasPainted() {
+		boolean result;
+		synchronized (this) {
+			result = canvas_painted;
+			canvas_painted = false;
+		}
+		return result;
+	}
+
 	public boolean syncIsDirty() {
 		boolean result;
 		synchronized ( this ) {

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

Modified Files:
	Mouse.java 
Log Message:
Removed cached width and height from Mouse

Index: Mouse.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/input/Mouse.java,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -d -r1.82 -r1.83
--- Mouse.java	28 Apr 2005 10:52:03 -0000	1.82
+++ Mouse.java	28 Apr 2005 11:57:38 -0000	1.83
@@ -59,9 +59,6 @@
  * @version $Revision$
  */
 public class Mouse {
-	/** Mouse constraint */
-	private static int width, height;
-
 	/** Has the mouse been created? */
 	private static boolean		created;
 
@@ -299,8 +296,8 @@
 			x = poll_coord1;
 			y = poll_coord2;
 		}
-		x = Math.min(width - 1, Math.max(0, x));
-		y = Math.min(height - 1, Math.max(0, y));
+		x = Math.min(Display.getDisplayMode().getWidth() - 1, Math.max(0, x));
+		y = Math.min(Display.getDisplayMode().getHeight() - 1, Math.max(0, y));
 		dwheel += poll_dwheel;
 		read();
 	}
@@ -373,8 +370,8 @@
 				event_x = readBuffer.get();
 				event_y = readBuffer.get();
 			}
-			event_x = Math.min(width - 1, Math.max(0, event_x));
-			event_y = Math.min(height - 1, Math.max(0, event_y));
+			event_x = Math.min(Display.getDisplayMode().getWidth() - 1, Math.max(0, event_x));
+			event_y = Math.min(Display.getDisplayMode().getHeight() - 1, Math.max(0, event_y));
 			event_dwheel = readBuffer.get();
 			return true;
 		} else

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

Modified Files:
	Mouse.java 
Log Message:
Remove unused code

Index: Mouse.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/input/Mouse.java,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -d -r1.81 -r1.82
--- Mouse.java	28 Apr 2005 10:36:51 -0000	1.81
+++ Mouse.java	28 Apr 2005 10:52:03 -0000	1.82
@@ -209,8 +209,6 @@
 
 	private static void resetMouse() {
 		dx = dy = dwheel = 0;
-		width = Display.getDisplayMode().getWidth();
-		height = Display.getDisplayMode().getHeight();
 		readBuffer.position(readBuffer.limit());
 	}
 

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

Modified Files:
	Mouse.java 
Log Message:
Fon't reset the cursor position in resetMouse()

Index: Mouse.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/input/Mouse.java,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -d -r1.80 -r1.81
--- Mouse.java	28 Apr 2005 10:31:32 -0000	1.80
+++ Mouse.java	28 Apr 2005 10:36:51 -0000	1.81
@@ -212,7 +212,6 @@
 		width = Display.getDisplayMode().getWidth();
 		height = Display.getDisplayMode().getHeight();
 		readBuffer.position(readBuffer.limit());
-		setCursorPosition(width/2, height/2);
 	}
 
 	/**

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

Modified Files:
	Mouse.java 
Log Message:
Allow setCursorPosition when mouse is grabbed

Index: Mouse.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/input/Mouse.java,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -d -r1.79 -r1.80
--- Mouse.java	28 Apr 2005 09:57:44 -0000	1.79
+++ Mouse.java	28 Apr 2005 10:31:32 -0000	1.80
@@ -174,22 +174,21 @@
 	}
 
 	/**
-	 * Set the position of the native cursor. This method is only valid when
-	 * the cursor is not grabbed and native cursors are supported.
+	 * Set the position of the cursor. If the cursor is not grabbed,
+	 * the native cursor is moved to the new position.
 	 *
 	 * @param x The x coordinate of the new cursor position in OpenGL coordinates relative
 	 *			to the window origin.
 	 * @param y The y coordinate of the new cursor position in OpenGL coordinates relative
 	 *			to the window origin.
 	 */
-	public static void setCursorPosition(int x, int y) {
-		if ((Cursor.getCapabilities() & Cursor.CURSOR_ONE_BIT_TRANSPARENCY) == 0)
-			throw new IllegalStateException("Mouse doesn't support native cursors");
-		if (isGrabbed())
-			throw new IllegalStateException("Cursor is grabbed");
+	public static void setCursorPosition(int new_x, int new_y) {
 		if (!isCreated())
 			throw new IllegalStateException("Mouse is not created");
-		Display.getImplementation().setCursorPosition(x, y);
+		x = event_x = new_x;
+		y = event_y = new_y;
+		if (!isGrabbed() && (Cursor.getCapabilities() & Cursor.CURSOR_ONE_BIT_TRANSPARENCY) != 0)
+			Display.getImplementation().setCursorPosition(x, y);
 	}
 	
 	/**
@@ -212,11 +211,8 @@
 		dx = dy = dwheel = 0;
 		width = Display.getDisplayMode().getWidth();
 		height = Display.getDisplayMode().getHeight();
-		x = width / 2;
-		y = height / 2;
 		readBuffer.position(readBuffer.limit());
-		if (!isGrabbed() && (Cursor.getCapabilities() & Cursor.CURSOR_ONE_BIT_TRANSPARENCY) != 0)
-			setCursorPosition(x, y);
+		setCursorPosition(width/2, height/2);
 	}
 
 	/**

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

Modified Files:
	org_lwjgl_input_Mouse.c 
Log Message:
Fix cursor jumping after Mouse.setGrabbed()

Index: org_lwjgl_input_Mouse.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_input_Mouse.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- org_lwjgl_input_Mouse.c	12 Apr 2005 11:45:06 -0000	1.35
+++ org_lwjgl_input_Mouse.c	28 Apr 2005 09:57:45 -0000	1.36
@@ -201,6 +201,7 @@
 
 static void reset(void) {
 	initEventQueue(&event_queue, EVENT_SIZE);
+	accum_dx = accum_dy = 0;
 }
 
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_LinuxDisplay_nCreateMouse
@@ -360,7 +361,6 @@
 	
 	setGrab(new_grab == JNI_TRUE ? true : false);
 	reset();
-	accum_dx = accum_dy = 0;
 	XQueryPointer(getDisplay(), getCurrentWindow(), &root_return, &child_return, &root_x, &root_y, &win_x, &win_y, &mask_return);
 	doHandlePointerMotion(root_x, root_y, win_x, win_y);
 }

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

Modified Files:
	Mouse.java 
Log Message:
Fix cursor jumping after Mouse.setGrabbed()

Index: Mouse.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/input/Mouse.java,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -d -r1.78 -r1.79
--- Mouse.java	12 Apr 2005 11:56:59 -0000	1.78
+++ Mouse.java	28 Apr 2005 09:57:44 -0000	1.79
@@ -214,9 +214,9 @@
 		height = Display.getDisplayMode().getHeight();
 		x = width / 2;
 		y = height / 2;
-		readBuffer.clear();
+		readBuffer.position(readBuffer.limit());
 		if (!isGrabbed() && (Cursor.getCapabilities() & Cursor.CURSOR_ONE_BIT_TRANSPARENCY) != 0)
-		setCursorPosition(x, y);
+			setCursorPosition(x, y);
 	}
 
 	/**