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

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

Revision: 3020
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3020&view=rev
Author:   elias_naur
Date:     2008-04-13 11:43:27 -0700 (Sun, 13 Apr 2008)

Log Message:
-----------
Applet focus fixes

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-13 18:26:22 UTC (rev 3019)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java	2008-04-13 18:43:27 UTC (rev 3020)
@@ -468,7 +468,7 @@
 	private boolean isAncestorXEmbedded(long window) throws LWJGLException {
 		long xembed_atom = internAtom("_XEMBED_INFO", true);
 		if (xembed_atom != None) {
-			long w = parent_window;
+			long w = window;
 			while (w != None) {
 				if (hasProperty(getDisplay(), w, xembed_atom))
 					return true;

Modified: trunk/LWJGL/src/native/linux/org_lwjgl_opengl_Display.c
===================================================================
--- trunk/LWJGL/src/native/linux/org_lwjgl_opengl_Display.c	2008-04-13 18:26:22 UTC (rev 3019)
+++ trunk/LWJGL/src/native/linux/org_lwjgl_opengl_Display.c	2008-04-13 18:43:27 UTC (rev 3020)
@@ -85,8 +85,11 @@
 	JNIEnv *env = getThreadEnv();
 	if (env != NULL) {
 		jclass org_lwjgl_LinuxDisplay_class = (*env)->FindClass(env, "org/lwjgl/opengl/LinuxDisplay");
-		if (org_lwjgl_LinuxDisplay_class == NULL)
+		if (org_lwjgl_LinuxDisplay_class == NULL) {
+			// Don't propagate error
+			(*env)->ExceptionClear(env);
 			return 0;
+		}
 		jmethodID handler_method = (*env)->GetStaticMethodID(env, org_lwjgl_LinuxDisplay_class, "globalErrorHandler", "(JJJJJJJ)I");
 		if (handler_method == NULL)
 			return 0;


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