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

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

Revision: 2590
          http://svn.sourceforge.net/java-game-lib/?rev=2590&view=rev
Author:   elias_naur
Date:     2006-10-23 03:24:03 -0700 (Mon, 23 Oct 2006)

Log Message:
-----------
Linux: Simplified LinuxMouse

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

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java	2006-10-20 12:55:01 UTC (rev 2589)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java	2006-10-23 10:24:03 UTC (rev 2590)
@@ -718,12 +718,16 @@
 			if (new_grab != grab) {
 				grab = new_grab;
 				updateInputGrab();
-				mouse.changeGrabbed(grab, pointer_grabbed, shouldGrab());
+				mouse.changeGrabbed(grab, shouldWarpPointer());
 			}
 		} finally {
 			unlockAWT();
 		}
 	}
+
+	private boolean shouldWarpPointer() {
+		return pointer_grabbed && shouldGrab();
+	}
 	
 	public int getNativeCursorCapabilities() {
 		lockAWT();
@@ -980,7 +984,7 @@
 
 	private void handlePointerMotionEvent(long millis, long root_window, int x_root, int y_root, int x, int y, int state) {
 		if (mouse != null)
-			mouse.handlePointerMotion(grab, pointer_grabbed, shouldGrab(), millis, root_window, x_root, y_root, x, y);
+			mouse.handlePointerMotion(grab, shouldWarpPointer(), millis, root_window, x_root, y_root, x, y);
 	}
 
 	private void handleWarpEvent(int x, int y) {

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxMouse.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxMouse.java	2006-10-20 12:55:01 UTC (rev 2589)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxMouse.java	2006-10-23 10:24:03 UTC (rev 2590)
@@ -135,9 +135,9 @@
 	}
 	private static native void nSendWarpEvent(long display, long window, int center_x, int center_y);
 
-	private void doHandlePointerMotion(boolean grab, boolean pointer_grabbed, boolean should_grab, long root_window, int root_x, int root_y, int win_x, int win_y, long nanos) {
+	private void doHandlePointerMotion(boolean grab, boolean warp_pointer, long root_window, int root_x, int root_y, int win_x, int win_y, long nanos) {
 		setCursorPos(grab, win_x, win_y, nanos);
-		if (!pointer_grabbed || !should_grab)
+		if (!warp_pointer)
 			return;
 		int root_window_height = nGetWindowHeight(display, root_window);
 		int root_window_width = nGetWindowWidth(display, root_window);
@@ -165,10 +165,10 @@
 		}
 	}
 
-	public void changeGrabbed(boolean grab, boolean pointer_grabbed, boolean should_grab) {
+	public void changeGrabbed(boolean grab, boolean warp_pointer) {
 		reset();
 		long root_window = nQueryPointer(display, window, query_pointer_buffer);
-		doHandlePointerMotion(grab, pointer_grabbed, should_grab, root_window, query_pointer_buffer.get(0), query_pointer_buffer.get(1), query_pointer_buffer.get(2), query_pointer_buffer.get(3), last_event_nanos);
+		doHandlePointerMotion(grab, warp_pointer, root_window, query_pointer_buffer.get(0), query_pointer_buffer.get(1), query_pointer_buffer.get(2), query_pointer_buffer.get(3), last_event_nanos);
 	}
 
 	public int getButtonCount() {
@@ -188,8 +188,8 @@
 	}
 	private static native void nWarpCursor(long display, long window, int x, int y);
 
-	public void handlePointerMotion(boolean grab, boolean pointer_grabbed, boolean should_grab, long millis, long root_window, int x_root, int y_root, int x, int y) {
-	    doHandlePointerMotion(grab, pointer_grabbed, should_grab, root_window, x_root, y_root, x, y, millis*1000000);
+	public void handlePointerMotion(boolean grab, boolean warp_pointer, long millis, long root_window, int x_root, int y_root, int x, int y) {
+	    doHandlePointerMotion(grab, warp_pointer, root_window, x_root, y_root, x, y, millis*1000000);
 	}
 	
 	private void handleButton(boolean grab, int button, byte state, long nanos) {


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