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

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

Revision: 2999
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=2999&view=rev
Author:   elias_naur
Date:     2008-04-09 11:44:25 -0700 (Wed, 09 Apr 2008)

Log Message:
-----------
Linux: Moved input focus handling to LinuxDisplay. Bumped Sys.JNI_VERSION

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/Sys.java
    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/Sys.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/Sys.java	2008-04-09 18:25:30 UTC (rev 2998)
+++ trunk/LWJGL/src/java/org/lwjgl/Sys.java	2008-04-09 18:44:25 UTC (rev 2999)
@@ -57,7 +57,7 @@
 	private static final String VERSION = "2.0a3";
 
 	/** Current version of the JNI library */
-	static final int JNI_VERSION = 13;
+	static final int JNI_VERSION = 15;
 
 	/** The implementation instance to delegate platform specific behavior to */
 	private final static SysImplementation implementation;

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java	2008-04-09 18:25:30 UTC (rev 2998)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java	2008-04-09 18:44:25 UTC (rev 2999)
@@ -627,6 +627,8 @@
 		while (LinuxEvent.getPending(getDisplay()) > 0) {
 			event_buffer.nextEvent(getDisplay());
 			long event_window = event_buffer.getWindow();
+			if (event_buffer.getType() == LinuxEvent.ButtonPress && parent != null)
+				setInputFocus(getDisplay(), getWindow(), event_buffer.getButtonTime());
 			if (event_window != getWindow() || event_buffer.filterEvent(event_window) ||
 					(mouse != null && mouse.filterEvent(grab, shouldWarpPointer(), event_buffer)) ||
 					 (keyboard != null && keyboard.filterEvent(event_buffer)))

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxMouse.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxMouse.java	2008-04-09 18:25:30 UTC (rev 2998)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxMouse.java	2008-04-09 18:44:25 UTC (rev 2999)
@@ -280,8 +280,6 @@
 			case LinuxEvent.ButtonPress: /* Fall through */
 			case LinuxEvent.ButtonRelease:
 				handleButtonEvent(grab, event.getButtonTime(), event.getButtonType(), (byte)event.getButtonButton());
-				if (Display.getParent() != null)
-					LinuxDisplay.setInputFocus(display, window, event.getButtonTime());
 				return true;
 			case LinuxEvent.MotionNotify:
 				handlePointerMotion(grab, warp_pointer, event.getButtonTime(), event.getButtonRoot(), event.getButtonXRoot(), event.getButtonYRoot(), event.getButtonX(), event.getButtonY());


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