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

[<ka...@us...>]

Revision: 3728
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3728&view=rev
Author:   kappa1
Date:     2012-01-22 18:02:34 +0000 (Sun, 22 Jan 2012)
Log Message:
-----------
fix for Display.isActive() so that it works as it should on Linux when using Display.setParent()

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

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java	2012-01-18 12:19:52 UTC (rev 3727)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java	2012-01-22 18:02:34 UTC (rev 3728)
@@ -800,10 +800,10 @@
 				relayEventToParent(event_buffer, KeyPressMask);
 				break;
 			case LinuxEvent.ButtonPress:
-				relayEventToParent(event_buffer, KeyPressMask);
+				if (xembedded) relayEventToParent(event_buffer, KeyPressMask);
 				break;
 			case LinuxEvent.ButtonRelease:
-				relayEventToParent(event_buffer, KeyPressMask);
+				if (xembedded) relayEventToParent(event_buffer, KeyPressMask);
 				break;
 			default:
 				break;
@@ -1038,7 +1038,7 @@
 	}
 
 	private void setFocused(boolean got_focus, int focus_detail) {
-		if (focused == got_focus || focus_detail == NotifyDetailNone || focus_detail == NotifyPointer || focus_detail == NotifyPointerRoot || parent != null)
+		if (focused == got_focus || focus_detail == NotifyDetailNone || focus_detail == NotifyPointer || focus_detail == NotifyPointerRoot || xembedded)
 			return;
 		focused = got_focus;
 

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