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

Revision: 2860
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=2860&view=rev
Author:   elias_naur
Date:     2007-07-28 14:28:33 -0700 (Sat, 28 Jul 2007)

Log Message:
-----------
Bumped Sys.JNI_VERSION

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

Modified: trunk/LWJGL/src/java/org/lwjgl/Sys.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/Sys.java	2007-07-28 21:19:58 UTC (rev 2859)
+++ trunk/LWJGL/src/java/org/lwjgl/Sys.java	2007-07-28 21:28:33 UTC (rev 2860)
@@ -57,7 +57,7 @@
 	private static final String VERSION = "1.1";
 
 	/** Current version of the JNI library */
-	static final int JNI_VERSION = 10;
+	static final int JNI_VERSION = 11;
 
 	/** The implementation instance to delegate platform specific behavior to */
 	private final static SysImplementation implementation;


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

Revision: 2859
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=2859&view=rev
Author:   elias_naur
Date:     2007-07-28 14:19:58 -0700 (Sat, 28 Jul 2007)

Log Message:
-----------
Windows: Don't be too aggressive in clipping the cursor. Fixes a problem where the window is moved out of the screen when clicking the title bar while having the mouse grabbed

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-07-28 20:46:17 UTC (rev 2858)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java	2007-07-28 21:19:58 UTC (rev 2859)
@@ -220,6 +220,8 @@
 			setForegroundWindow(getHwnd());
 			setFocus(getHwnd());
 			did_maximize = true;
+			if (isFullscreen)
+				checkCursorClip();
 		} else if (isFullscreen) {
 			showWindow(getHwnd(), SW_SHOWMINNOACTIVE);
 			resetDisplayMode();
@@ -629,7 +631,7 @@
 			return false;
 	}
 
-	private boolean doHandleMessage(long hwnd, int msg, long wParam, long lParam, long millis) {
+	private void checkCursorClip() {
 		if ((isFullscreen || (mouse != null && mouse.isGrabbed())) && !isMinimized && isFocused) {
 			try {
 				setupCursorClipping(getHwnd());
@@ -639,6 +641,14 @@
 		} else {
 			resetCursorClipping();
 		}
+	}
+
+	private void setMinimized(boolean m) {
+		isMinimized = m;
+		checkCursorClip();
+	}
+
+	private boolean doHandleMessage(long hwnd, int msg, long wParam, long lParam, long millis) {
 		switch (msg) {
 			// disable screen saver and monitor power down messages which wreak havoc
 			case WM_ACTIVATE:
@@ -656,10 +666,10 @@
 				switch ((int)wParam) {
 					case SIZE_RESTORED:
 					case SIZE_MAXIMIZED:
-						isMinimized = false;
+						setMinimized(false);
 						break;
 					case SIZE_MINIMIZED:
-						isMinimized = true;
+						setMinimized(true);
 						break;
 				}
 				return false;
@@ -667,6 +677,7 @@
 				int xPos = (int)(short)(lParam & 0xFFFF);
 				int yPos = transformY(getHwnd(), (int)(short)((lParam >> 16) & 0xFFFF));
 				handleMouseMoved(xPos, yPos, millis);
+				checkCursorClip();
 				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.

Revision: 2858
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=2858&view=rev
Author:   elias_naur
Date:     2007-07-28 13:46:17 -0700 (Sat, 28 Jul 2007)

Log Message:
-----------
Windows: Removed an unused parameter from WindowsDisplay.clipCursor

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java
    trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Display.c

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java	2007-07-20 21:24:03 UTC (rev 2857)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java	2007-07-28 20:46:17 UTC (rev 2858)
@@ -161,7 +161,7 @@
 	static void resetCursorClipping() {
 		if (cursor_clipped) {
 			try {
-				clipCursor(0, null);
+				clipCursor(null);
 			} catch (LWJGLException e) {
 				LWJGLUtil.log("Failed to reset cursor clipping: " + e);
 			}
@@ -192,9 +192,9 @@
 		cursor_clipped = true;
 		getGlobalClientRect(hwnd, rect);
 		rect.copyToBuffer(rect_buffer);
-		clipCursor(hwnd, rect_buffer);
+		clipCursor(rect_buffer);
 	}
-	private static native void clipCursor(long hwnd, IntBuffer rect) throws LWJGLException;
+	private static native void clipCursor(IntBuffer rect) throws LWJGLException;
 
 	public void switchDisplayMode(DisplayMode mode) throws LWJGLException {
 		nSwitchDisplayMode(mode);

Modified: trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Display.c
===================================================================
--- trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Display.c	2007-07-20 21:24:03 UTC (rev 2857)
+++ trunk/LWJGL/src/native/windows/org_lwjgl_opengl_Display.c	2007-07-28 20:46:17 UTC (rev 2858)
@@ -257,8 +257,7 @@
 	buffer[3] = rect->right;
 }
 
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_WindowsDisplay_clipCursor(JNIEnv *env, jclass unused, jlong hwnd_ptr, jobject handle_buffer) {
-	HWND hwnd = (HWND)(INT_PTR)hwnd_ptr;
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_WindowsDisplay_clipCursor(JNIEnv *env, jclass unused, jobject handle_buffer) {
 	RECT clip_rect;
 	LPRECT clip_rect_ptr;
 	if (handle_buffer != NULL) {


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