diff options
author | Sven Gothel <[email protected]> | 2011-11-26 18:33:20 +0100 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2011-11-26 18:33:20 +0100 |
commit | 78121938f8b432617bbb9f8e3e259ff1ffa9442e (patch) | |
tree | e4207c4eadde332f85e9b9e43e4c7cfeb2aa3338 /src/nativewindow/classes/javax | |
parent | e3c6a30ade94862a344c86dc0b733716c6fa27f5 (diff) |
Revert some changes: X11Screen/RANDR, X11Util (XInitThreads/XLockDisplay), NEWT XDisplay Locking
Revert X11Screen RANDR commit 8cecd0c2963d982aa119cbb07698e56b9c271188,
ie. use default 'render' display connection, best results on Ubuntu, Solaris, CentOS (no failures).
Revert X11Util (XInitThreads/XLockDisplay) rational logic, commit 0314be79a7a93931a74fe4322bc78e699d7741e9,
X11Util.HAS_XLOCKDISPLAY_BUG:=true and X11Util.XINITTHREADS_ALWAYS_ENABLED:=true.
Which enables always utilizing XInitThreads() either before or after AWT initialization,
as well as disable all XLockDisplay/XUnlockDisplay locks.
Rever NEWT XDisplay X11 basic Locking commit 50100b85ce5fde48788efbc2211b26fb9d7c9dfd,
ie use null locking if X11Util.HAS_XLOCKDISPLAY_BUG and X11Util.XINITTHREADS_ALWAYS_ENABLED.
Diffstat (limited to 'src/nativewindow/classes/javax')
-rw-r--r-- | src/nativewindow/classes/javax/media/nativewindow/NativeWindowFactory.java | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/nativewindow/classes/javax/media/nativewindow/NativeWindowFactory.java b/src/nativewindow/classes/javax/media/nativewindow/NativeWindowFactory.java index adc946f70..9bc8ca9e4 100644 --- a/src/nativewindow/classes/javax/media/nativewindow/NativeWindowFactory.java +++ b/src/nativewindow/classes/javax/media/nativewindow/NativeWindowFactory.java @@ -195,9 +195,10 @@ public abstract class NativeWindowFactory { final ClassLoader cl = NativeWindowFactory.class.getClassLoader(); - // X11 initialization before possible AWT initialization - initNativeImpl(firstUIActionOnProcess, cl); - + if(firstUIActionOnProcess) { + // X11 initialization before possible AWT initialization + initNativeImpl(true, cl); + } isAWTAvailable = false; // may be set to true below if( !Debug.getBooleanProperty("java.awt.headless", true, acc) && @@ -229,6 +230,10 @@ public abstract class NativeWindowFactory { } } } + if(!firstUIActionOnProcess) { + // X11 initialization after possible AWT initialization + initNativeImpl(false, cl); + } registeredFactories = Collections.synchronizedMap(new HashMap<Class<?>, NativeWindowFactory>()); // register our default factory -> NativeWindow |