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

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

Revision: 2617
          http://svn.sourceforge.net/java-game-lib/?rev=2617&view=rev
Author:   elias_naur
Date:     2006-10-28 15:06:24 -0700 (Sat, 28 Oct 2006)

Log Message:
-----------
Fixed AWTUtil.setCursorPosition. Added check to LinuxAWTInput.

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/opengl/AWTUtil.java
    trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxAWTInput.java
    trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXDisplay.java

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/AWTUtil.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/AWTUtil.java	2006-10-27 08:15:31 UTC (rev 2616)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/AWTUtil.java	2006-10-28 22:06:24 UTC (rev 2617)
@@ -108,8 +108,9 @@
 
 	public static void setCursorPosition(Component component, Robot robot, int x, int y) {
 		if (robot != null) {
-			int transformed_x = component.getX() + x;
-			int transformed_y = component.getY() + component.getHeight() - 1 - y;
+			Point location = component.getLocationOnScreen();
+			int transformed_x = location.x + x;
+			int transformed_y = location.y + component.getHeight() - 1 - y;
 			robot.mouseMove(transformed_x, transformed_y);
 		}
 	}

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxAWTInput.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxAWTInput.java	2006-10-27 08:15:31 UTC (rev 2616)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxAWTInput.java	2006-10-28 22:06:24 UTC (rev 2617)
@@ -117,7 +117,7 @@
 		try {
 			LinuxPeerInfo linux_peer_info = (LinuxPeerInfo)peer_info;
 			long new_window = linux_peer_info.getDrawable();
-			if (new_window != cached_window) {
+			if (cached_mouse == null || new_window != cached_window) {
 				ungrabInput();
 				cached_window = new_window;
 				try {

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXDisplay.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXDisplay.java	2006-10-27 08:15:31 UTC (rev 2616)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXDisplay.java	2006-10-28 22:06:24 UTC (rev 2617)
@@ -321,7 +321,7 @@
 	}
 
 	public void setCursorPosition(int x, int y) {
-		AWTUtil.setCursorPosition(frame, robot, x, y);
+		AWTUtil.setCursorPosition(frame.getCanvas(), robot, x, y);
 	}
 
 	public void setNativeCursor(Object handle) throws LWJGLException {


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