diff options
Diffstat (limited to 'src')
5 files changed, 7 insertions, 7 deletions
diff --git a/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXDrawableFactory.java b/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXDrawableFactory.java index d2c555a1c..ced46d5b1 100644 --- a/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXDrawableFactory.java +++ b/src/jogl/classes/jogamp/opengl/x11/glx/X11GLXDrawableFactory.java @@ -172,7 +172,7 @@ public class X11GLXDrawableFactory extends GLDrawableFactoryImpl { } public SharedResourceRunner.Resource createSharedResource(String connection) { - X11GraphicsDevice sharedDevice = new X11GraphicsDevice(X11Util.createDisplay(connection), AbstractGraphicsDevice.DEFAULT_UNIT); + X11GraphicsDevice sharedDevice = new X11GraphicsDevice(X11Util.openDisplay(connection), AbstractGraphicsDevice.DEFAULT_UNIT); sharedDevice.setCloseDisplay(true); sharedDevice.lock(); try { diff --git a/src/jogl/classes/jogamp/opengl/x11/glx/awt/X11AWTGLXGraphicsConfigurationFactory.java b/src/jogl/classes/jogamp/opengl/x11/glx/awt/X11AWTGLXGraphicsConfigurationFactory.java index 5fcc8e4d1..9ee20d8ea 100644 --- a/src/jogl/classes/jogamp/opengl/x11/glx/awt/X11AWTGLXGraphicsConfigurationFactory.java +++ b/src/jogl/classes/jogamp/opengl/x11/glx/awt/X11AWTGLXGraphicsConfigurationFactory.java @@ -86,7 +86,7 @@ public class X11AWTGLXGraphicsConfigurationFactory extends GLGraphicsConfigurati long displayHandle = X11SunJDKReflection.graphicsDeviceGetDisplay(device); boolean owner = false; if(0==displayHandle) { - displayHandle = X11Util.createDisplay(null); + displayHandle = X11Util.openDisplay(null); owner = true; if(DEBUG) { System.err.println(Thread.currentThread().getName() + " - X11AWTGLXGraphicsConfigurationFactory: create local X11 display"); @@ -102,7 +102,7 @@ public class X11AWTGLXGraphicsConfigurationFactory extends GLGraphicsConfigurati if(DEBUG) { System.err.println(Thread.currentThread().getName() + " - X11AWTGLXGraphicsConfigurationFactory: create X11 display @ "+displayName+" / 0x"+Long.toHexString(displayHandle)); } - displayHandle = X11Util.createDisplay(displayName); + displayHandle = X11Util.openDisplay(displayName); owner = true; } ((AWTGraphicsDevice)awtScreen.getDevice()).setSubType(NativeWindowFactory.TYPE_X11, displayHandle); diff --git a/src/nativewindow/classes/jogamp/nativewindow/x11/X11Util.java b/src/nativewindow/classes/jogamp/nativewindow/x11/X11Util.java index 0964dbeb0..b81db2538 100644 --- a/src/nativewindow/classes/jogamp/nativewindow/x11/X11Util.java +++ b/src/nativewindow/classes/jogamp/nativewindow/x11/X11Util.java @@ -329,7 +329,7 @@ public class X11Util { } /** Returns this created named display. */ - public static long createDisplay(String name) { + public static long openDisplay(String name) { name = validateDisplayName(name); long dpy = XOpenDisplay(name); if(0==dpy) { diff --git a/src/newt/classes/jogamp/newt/driver/x11/X11Display.java b/src/newt/classes/jogamp/newt/driver/x11/X11Display.java index 86fd8df40..a48689097 100644 --- a/src/newt/classes/jogamp/newt/driver/x11/X11Display.java +++ b/src/newt/classes/jogamp/newt/driver/x11/X11Display.java @@ -65,12 +65,12 @@ public class X11Display extends DisplayImpl { } protected void createNativeImpl() { - long handle = X11Util.createDisplay(name); + long handle = X11Util.openDisplay(name); if( 0 == handle ) { throw new RuntimeException("Error creating display(Win): "+name); } if(USE_SEPARATE_DISPLAY_FOR_EDT) { - edtDisplayHandle = X11Util.createDisplay(name); + edtDisplayHandle = X11Util.openDisplay(name); if( 0 == edtDisplayHandle ) { X11Util.closeDisplay(handle); throw new RuntimeException("Error creating display(EDT): "+name); diff --git a/src/newt/classes/jogamp/newt/driver/x11/X11Screen.java b/src/newt/classes/jogamp/newt/driver/x11/X11Screen.java index 63fa46c9c..5655ef0c7 100644 --- a/src/newt/classes/jogamp/newt/driver/x11/X11Screen.java +++ b/src/newt/classes/jogamp/newt/driver/x11/X11Screen.java @@ -212,7 +212,7 @@ public class X11Screen extends ScreenImpl { throw new RuntimeException("Invalid resolution index: ! 0 < "+resIdx+" < "+resNumber+", screenMode["+screenModeIdx+"] "+screenMode); } - long dpy = X11Util.createDisplay(display.getName()); + long dpy = X11Util.openDisplay(display.getName()); if( 0 == dpy ) { throw new RuntimeException("Error creating display: "+display.getName()); } |