[Java-game-lib-cvs] SF.net SVN: java-game-lib: [2873] trunk/LWJGL/src/java/org/lwjgl/opengl/ WindowsDisplay.java

[<eli...@us...>]

Revision: 2873
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=2873&view=rev
Author:   elias_naur
Date:     2007-08-16 01:38:20 -0700 (Thu, 16 Aug 2007)

Log Message:
-----------
Windows: Make cursor visible when grabbed and not focused

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java	2007-08-15 20:14:29 UTC (rev 2872)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java	2007-08-16 08:38:20 UTC (rev 2873)
@@ -221,12 +221,13 @@
 			setFocus(getHwnd());
 			did_maximize = true;
 			if (isFullscreen)
-				checkCursorClip();
+				updateClipping();
 		} else if (isFullscreen) {
 			showWindow(getHwnd(), SW_SHOWMINNOACTIVE);
 			resetDisplayMode();
 		} else
-			checkCursorClip();
+			updateClipping();
+		updateCursor();
 		inAppActivate = false;
 	}
 	private static native void showWindow(long hwnd, int mode);
@@ -402,11 +403,7 @@
 		
 	public void grabMouse(boolean grab) {
 		mouse.grab(grab, shouldGrab());
-		try {
-			updateCursor();
-		} catch (LWJGLException e) {
-			LWJGLUtil.log("Failed to update cursor: " + e);
-		}
+		updateCursor();
 	}
 
 	public int getNativeCursorCapabilities() {
@@ -427,11 +424,15 @@
 		updateCursor();
 	}
 
-	private void updateCursor() throws LWJGLException {
-		if (mouse != null && mouse.isGrabbed())
-			nSetNativeCursor(getHwnd(), mouse.getBlankCursor());
-		else
-			nSetNativeCursor(getHwnd(), current_cursor);
+	private void updateCursor() {
+		try {
+			if (mouse != null && shouldGrab())
+				nSetNativeCursor(getHwnd(), mouse.getBlankCursor());
+			else
+				nSetNativeCursor(getHwnd(), current_cursor);
+		} catch (LWJGLException e) {
+			LWJGLUtil.log("Failed to update cursor: " + e);
+		}
 	}
 	static native void nSetNativeCursor(long hwnd, Object handle) throws LWJGLException;
 
@@ -584,7 +585,7 @@
 	}
 
 	private boolean shouldGrab() {
-		return !isMinimized && isFocused;
+		return !isMinimized && isFocused && mouse != null && mouse.isGrabbed();
 	}
 
 	private void handleMouseMoved(int x, int y, long millis) {
@@ -632,7 +633,12 @@
 			return false;
 	}
 
-	private void checkCursorClip() {
+	private void checkCursorState() {
+		updateCursor();
+		updateClipping();
+	}
+
+	private void updateClipping() {
 		if ((isFullscreen || (mouse != null && mouse.isGrabbed())) && !isMinimized && isFocused) {
 			try {
 				setupCursorClipping(getHwnd());
@@ -646,7 +652,7 @@
 
 	private void setMinimized(boolean m) {
 		isMinimized = m;
-		checkCursorClip();
+		checkCursorState();
 	}
 
 	private boolean doHandleMessage(long hwnd, int msg, long wParam, long lParam, long millis) {
@@ -678,7 +684,7 @@
 				int xPos = (int)(short)(lParam & 0xFFFF);
 				int yPos = transformY(getHwnd(), (int)(short)((lParam >> 16) & 0xFFFF));
 				handleMouseMoved(xPos, yPos, millis);
-				checkCursorClip();
+				checkCursorState();
 				return true;
 			case WM_MOUSEWHEEL:
 				int dwheel = (int)(short)((wParam >> 16) & 0xFFFF);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.