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

Revision: 3000
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3000&view=rev
Author:   elias_naur
Date:     2008-04-09 16:40:18 -0700 (Wed, 09 Apr 2008)

Log Message:
-----------
Linux: Removed grab/ungrabServer logic and replace it with catching of any X errors occruing because of a XSetInputFocus race

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

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java	2008-04-09 18:44:25 UTC (rev 2999)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java	2008-04-09 23:40:18 UTC (rev 3000)
@@ -752,15 +752,7 @@
 			if (focused_at_least_once)
 				releaseInput();
 			if (parent != null && parent.isFocusOwner()) {
-				// Normally, a real time stamp from an event should be passed to XSetInputFocus instead of CurrentTime, but we don't get timestamps
-				// from awt. Instead we grab the server and check if the focus changed to avoid a race where our window is made unviewable while focusing it.
-				grabServer(getDisplay());
-				try {
-					if (nGetInputFocus(getDisplay()) == current_focus)
-						setInputFocus(getDisplay(), getWindow(), CurrentTime);
-				} finally {
-					ungrabServer(getDisplay());
-				}
+				setInputFocusUnsafe();
 			}
 		}
 	}
@@ -768,6 +760,17 @@
 	private static native void grabServer(long display);
 	private static native void ungrabServer(long display);
 
+	private static void setInputFocusUnsafe() {
+		setInputFocus(getDisplay(), getWindow(), CurrentTime);
+		try {
+			checkXError(getDisplay());
+		} catch (LWJGLException e) {
+			// Since we don't have any event timings for XSetInputFocus, a race condition might give a BadMatch, which we'll catch ang ignore
+			LWJGLUtil.log("Got exception while trying to focus: " + e);
+		}
+	}
+	private static native void checkXError(long display) throws LWJGLException;
+
 	private void releaseInput() {
 		if (isLegacyFullscreen() || input_released)
 			return;

Modified: trunk/LWJGL/src/native/linux/org_lwjgl_opengl_Display.c
===================================================================
--- trunk/LWJGL/src/native/linux/org_lwjgl_opengl_Display.c	2008-04-09 18:44:25 UTC (rev 2999)
+++ trunk/LWJGL/src/native/linux/org_lwjgl_opengl_Display.c	2008-04-09 23:40:18 UTC (rev 3000)
@@ -79,7 +79,7 @@
 static bool async_x_error;
 static char error_message[ERR_MSG_SIZE];
 
-bool checkXError(JNIEnv *env, Display *disp) {
+static bool checkXError(JNIEnv *env, Display *disp) {
 	XSync(disp, False);
 	if (async_x_error) {
 		async_x_error = false;
@@ -113,6 +113,12 @@
 	return (intptr_t)display_connection;
 }
 
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_LinuxDisplay_checkXError(JNIEnv *env, jclass unused, jlong display_ptr) {
+	Display *disp = (Display *)(intptr_t)display_ptr;
+	XSync(disp, False);
+	checkXError(env, disp);
+}
+
 JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_LinuxDisplay_nGetDefaultScreen(JNIEnv *env, jclass unused, jlong display_ptr) {
 	Display *disp = (Display *)(intptr_t)display_ptr;
 	return XDefaultScreen(disp);


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

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.

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

Log Message:
-----------
Windows: When parented, take focus on mouse click

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	2008-04-09 18:09:15 UTC (rev 2997)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java	2008-04-09 18:25:30 UTC (rev 2998)
@@ -611,6 +611,8 @@
 	private void handleMouseButton(int button, int state, long millis) {
 		if (mouse != null)
 			mouse.handleMouseButton((byte)button, (byte)state, millis);
+		if (parent != null && !isFocused)
+			setFocus(getHwnd());
 	}
 
 	private boolean shouldGrab() {


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

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

Log Message:
-----------
Linux: When parented, take focus on click

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java
    trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxMouse.java
    trunk/LWJGL/src/native/linux/org_lwjgl_opengl_Display.c

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java	2008-04-08 18:03:20 UTC (rev 2996)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java	2008-04-09 18:09:15 UTC (rev 2997)
@@ -50,6 +50,7 @@
 
 final class LinuxDisplay implements DisplayImplementation {
 	/* X11 constants */
+	public final static int CurrentTime = 0;
 	public final static int GrabSuccess = 0;
 	public final static int AutoRepeatModeOff  = 0;
 	public final static int AutoRepeatModeOn = 1;
@@ -620,7 +621,7 @@
 		return peer_info;
 	}
 	
-	private native static void setInputFocus(long display, long window);
+	static native void setInputFocus(long display, long window, long time);
 
 	private void processEvents() {
 		while (LinuxEvent.getPending(getDisplay()) > 0) {
@@ -754,7 +755,7 @@
 				grabServer(getDisplay());
 				try {
 					if (nGetInputFocus(getDisplay()) == current_focus)
-						setInputFocus(getDisplay(), getWindow());
+						setInputFocus(getDisplay(), getWindow(), CurrentTime);
 				} finally {
 					ungrabServer(getDisplay());
 				}

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxMouse.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxMouse.java	2008-04-08 18:03:20 UTC (rev 2996)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxMouse.java	2008-04-09 18:09:15 UTC (rev 2997)
@@ -280,6 +280,8 @@
 			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());

Modified: trunk/LWJGL/src/native/linux/org_lwjgl_opengl_Display.c
===================================================================
--- trunk/LWJGL/src/native/linux/org_lwjgl_opengl_Display.c	2008-04-08 18:03:20 UTC (rev 2996)
+++ trunk/LWJGL/src/native/linux/org_lwjgl_opengl_Display.c	2008-04-09 18:09:15 UTC (rev 2997)
@@ -338,10 +338,10 @@
 	XUngrabServer(disp);
 }
 
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_LinuxDisplay_setInputFocus(JNIEnv *env, jclass clazz, jlong display, jlong window_ptr) {
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_LinuxDisplay_setInputFocus(JNIEnv *env, jclass clazz, jlong display, jlong window_ptr, jlong time) {
 	Display *disp = (Display *)(intptr_t)display;
 	Window window = (Window)window_ptr;
-	XSetInputFocus(disp, window, RevertToParent, CurrentTime);
+	XSetInputFocus(disp, window, RevertToParent, time);
 }
 
 JNIEXPORT jlong JNICALL Java_org_lwjgl_opengl_LinuxDisplay_nCreateWindow(JNIEnv *env, jclass clazz, jlong display, jint screen, jobject peer_info_handle, jobject mode, jint window_mode, jint x, jint y, jboolean undecorated, jlong parent_handle) {


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

You too can put on another 3 inches http://www.muboomes.com/