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

Revision: 2877
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=2877&view=rev
Author:   matzon
Date:     2007-08-16 13:29:01 -0700 (Thu, 16 Aug 2007)

Log Message:
-----------
handle alt+space (windows system menu)

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-16 09:46:45 UTC (rev 2876)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java	2007-08-16 20:29:01 UTC (rev 2877)
@@ -715,6 +715,10 @@
 				return true;
 			case WM_SYSKEYDOWN: /* Fall through */
 			case WM_SYSKEYUP: /* Fall through */
+				// handle alt+space (activates the system window menu, just gobble it up)
+				if(wParam == WindowsKeycodes.VK_SPACE) {
+					return true;
+				}
 			case WM_KEYUP:
 				// SysRq apparently only generates WM_KEYUP, so we'll fake a WM_KEYDOWN
 				if (wParam == WindowsKeycodes.VK_SNAPSHOT && keyboard != null &&


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

Revision: 2876
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=2876&view=rev
Author:   elias_naur
Date:     2007-08-16 02:46:45 -0700 (Thu, 16 Aug 2007)

Log Message:
-----------
Windows: Handle WM_SYSCHAR

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-16 08:55:06 UTC (rev 2875)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java	2007-08-16 09:46:45 UTC (rev 2876)
@@ -64,6 +64,7 @@
 	private final static int WM_KEYUP						  = 257;
 	private final static int WM_SYSKEYUP					  = 261;
 	private final static int WM_SYSKEYDOWN					  = 260;
+	private final static int WM_SYSCHAR                          = 262;
 	private final static int WM_CHAR                          = 258;
 
 	private final static int WM_QUIT						  = 0x0012;
@@ -708,6 +709,7 @@
 			case WM_MBUTTONUP:
 				handleMouseButton(2, 0, millis);
 				return true;
+			case WM_SYSCHAR:
 			case WM_CHAR:
 				handleChar(wParam, lParam, millis);
 				return true;


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

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

Log Message:
-----------
Don't allow switching to fullscreen when a custom display mode is in effect. This is a change from before, where the current mode was simply overwritten with the initial (desktop) mode

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

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java	2007-08-16 08:49:14 UTC (rev 2874)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java	2007-08-16 08:55:06 UTC (rev 2875)
@@ -297,8 +297,7 @@
 
 	private static void switchDisplayMode() throws LWJGLException {
 		if (!current_mode.isFullscreen()) {
-			LWJGLUtil.log("Switching to "+initial_mode);
-			setDisplayMode(initial_mode);
+			throw new IllegalStateException("Only modes acquired from getAvailableDisplayModes() can be used for fullscreen display");
 		}
 		display_impl.switchDisplayMode(current_mode);
 	}


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

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

Log Message:
-----------
Revert 2872

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

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java	2007-08-16 08:38:20 UTC (rev 2873)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java	2007-08-16 08:49:14 UTC (rev 2874)
@@ -82,9 +82,6 @@
 	
 	/** Cached window icons, for when Display is recreated */
 	private static ByteBuffer[] cached_icons;
-	
-	/** Display mode used prior to entering fullscreen */
-	private static DisplayMode windowed_display_mode;
 
 	/**
 	 * Y coordinate of the window. Y in window coordinates is from the top of the display down,
@@ -301,7 +298,6 @@
 	private static void switchDisplayMode() throws LWJGLException {
 		if (!current_mode.isFullscreen()) {
 			LWJGLUtil.log("Switching to "+initial_mode);
-			windowed_display_mode = current_mode;
 			setDisplayMode(initial_mode);
 		}
 		display_impl.switchDisplayMode(current_mode);
@@ -477,7 +473,6 @@
 						switchDisplayMode();
 					} else {
 						display_impl.resetDisplayMode();
-						current_mode = windowed_display_mode;
 					}
 					createWindow();
 					makeCurrentAndSetSwapInterval();
@@ -849,7 +844,6 @@
 			destroyPeerInfo();
 			x = y = -1;
 			cached_icons = null;
-			windowed_display_mode = null;
 			reset();
 			removeShutdownHook();
 		}


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

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.