From 6e76e2c06a3b0781707b0d9bc0f2c839a0de6334 Mon Sep 17 00:00:00 2001 From: kappa1 Date: Sun, 22 Jan 2012 18:02:34 +0000 Subject: [PATCH] fix for Display.isActive() so that it works as it should on Linux when using Display.setParent() --- src/java/org/lwjgl/opengl/LinuxDisplay.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/java/org/lwjgl/opengl/LinuxDisplay.java b/src/java/org/lwjgl/opengl/LinuxDisplay.java index 237a3d13..f86e76f6 100644 --- a/src/java/org/lwjgl/opengl/LinuxDisplay.java +++ b/src/java/org/lwjgl/opengl/LinuxDisplay.java @@ -800,10 +800,10 @@ final class LinuxDisplay implements DisplayImplementation { 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 @@ final class LinuxDisplay implements DisplayImplementation { } 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;