summaryrefslogtreecommitdiffstats
path: root/src/nativewindow
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2013-06-13 02:38:31 -0700
committerSven Gothel <[email protected]>2013-06-13 02:38:31 -0700
commit82a165f0af8d07ea1d217485542340a04e4ed447 (patch)
treedcca558415ac9f9401fdc9fb33430da21fe8e812 /src/nativewindow
parent19225a21d8d2a2e09f166f8f1f0411f3f934b9a0 (diff)
parente44dc0c2c9c363cd97e9892fcf42562b2944a4cd (diff)
Merge pull request #66 from neothemachine/master
Add nativewindow.x11.display.default system property handling
Diffstat (limited to 'src/nativewindow')
-rw-r--r--src/nativewindow/classes/jogamp/nativewindow/x11/X11Util.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/nativewindow/classes/jogamp/nativewindow/x11/X11Util.java b/src/nativewindow/classes/jogamp/nativewindow/x11/X11Util.java
index e28aff116..2d9c42e09 100644
--- a/src/nativewindow/classes/jogamp/nativewindow/x11/X11Util.java
+++ b/src/nativewindow/classes/jogamp/nativewindow/x11/X11Util.java
@@ -46,6 +46,7 @@ import jogamp.nativewindow.NWJNILibLoader;
import jogamp.nativewindow.ToolkitProperties;
import com.jogamp.common.util.LongObjectHashMap;
+import com.jogamp.common.util.PropertyAccess;
import com.jogamp.nativewindow.x11.X11GraphicsDevice;
/**
@@ -123,7 +124,7 @@ public class X11Util implements ToolkitProperties {
final boolean isInitOK = initialize0( XERROR_STACKDUMP );
final boolean hasX11_EXTENSION_ATIFGLRXDRI, hasX11_EXTENSION_ATIFGLEXTENSION;
- final long dpy = X11Lib.XOpenDisplay(null);
+ final long dpy = X11Lib.XOpenDisplay(PropertyAccess.getProperty("nativewindow.x11.display.default", true));
if(0 != dpy) {
if(XSYNC_ENABLED) {
X11Lib.XSynchronize(dpy, true);