From 7ae0f2df39692e82d7955dbcd09c35c36382726c Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Fri, 25 Nov 2011 00:26:23 +0100 Subject: NativeWindow X11GraphicsDevice: Pass 'owner' for close-display operation @ constructor --- src/newt/classes/jogamp/newt/driver/x11/X11Display.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'src/newt/classes/jogamp') diff --git a/src/newt/classes/jogamp/newt/driver/x11/X11Display.java b/src/newt/classes/jogamp/newt/driver/x11/X11Display.java index b9a32c7de..78d828415 100644 --- a/src/newt/classes/jogamp/newt/driver/x11/X11Display.java +++ b/src/newt/classes/jogamp/newt/driver/x11/X11Display.java @@ -85,13 +85,8 @@ public class X11Display extends DisplayImpl { throw e; } - if(X11Util.XINITTHREADS_ALWAYS_ENABLED) { - // Hack: Force non X11Display locking, even w/ AWT and w/o isFirstUIActionOnProcess() - aDevice = new X11GraphicsDevice(handle, AbstractGraphicsDevice.DEFAULT_UNIT, NativeWindowFactory.getNullToolkitLock()); - } else { - // Proper: Use AWT/X11Display locking w/ AWT and X11Display locking only w/o isFirstUIActionOnProcess() - aDevice = new X11GraphicsDevice(handle, AbstractGraphicsDevice.DEFAULT_UNIT); - } + // We use a private non-shared X11 Display instance for EDT window operations and one for exposed animation, eg. OpenGL + aDevice = new X11GraphicsDevice(handle, AbstractGraphicsDevice.DEFAULT_UNIT, NativeWindowFactory.getNullToolkitLock(), false); } protected void closeNativeImpl() { -- cgit v1.2.3