From 774138544e1eec3330309ad682fa05154a07ab8d Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Thu, 14 Oct 2010 21:26:43 +0200 Subject: JOGL: Reenable Applet/Webstart/RCP support for JOGL + AWT + X11 Changed GLProfile/NativeWindowFactory/.. initialization methodology: GLProfile: public static synchronized void initSingleton(final boolean firstUIActionOnProcess); NativeWindowFactory: public static synchronized void initSingleton(final boolean firstUIActionOnProcess); +++ Introducing NativeWindow ToolkitLock, implementations are NullToolkitLock JAWTToolkitLock X11JAWTToolkitLock X11ToolkitLock AbstractGraphicsDevice provides generic global toolkit locking methods, implemented by the ToolkitLock interface. ToolkitLock's are aggregated in NativeWindow's DefaultGraphicsDevice to implement it's superclass lock()/unlock() methods. This enables a device specific locking strategy, ie on X11/AWT utilizing JAWT && X11 locking, and maybe none for others (NEWT). No locking is required for X11 / AWT, in case the above mentioned initialization happened as a 'firstUIActionOnProcess'. The ToolkitLock factory is currently a hardcoded part of NativeWindowFactory. We may have to allow 3rd party NativeWindow implementations to register custom ones. +++ com.jogamp.opengl.impl.GLDrawableImpl cleanup: Dealing with all locking code, providing all public methods. Exceptions are commented. Specializations x11/windows/.. only contains platform code. Pulled down access qualifiers if possible public -> protected. com.jogamp.nativewindow.impl.x11.X11Util Wrapping all X11Lib method with the new locking code. com.jogamp.nativewindow.impl.jawt.JAWTUtil Utilize global SunToolkit.awtLock() is available, the fallback to global JAWT.lock(). The latter just invokes the first. javax.media.nativewindow.awt.AWTGraphicsDevice setHandle(long handle) -> setSubType(String type, long handle) which also resets the ToolkitLock respecting the new type. This ensures correct locking after the sub type has been determined, ie AWT using an X11 peer. +++ Misc Changes done on the way .. GLCanvas: Fixed inversed this.drawableHelper.isExternalAnimatorAnimating() condition, which disabled normal repaint. GLJPanel: Removed drawableHelper.isExternalAnimatorAnimating() condition, which disabled painting, since the animation thread just updates the source image. NEWT WindowImpl: When reparenting back to parent and 'refit' child if it's size exceeds it's parent. More 'Fix: Memory consumption' commit 6ced17f0325d5719e992b246ffd156e5b39694b4. NEWTEvent: Removed code to evaluate the 'system event' attribute, need to find a better approach. --- doc/Implementation/runtime-properties.txt | 39 ++++++++++++++++++++++++++----- 1 file changed, 33 insertions(+), 6 deletions(-) (limited to 'doc') diff --git a/doc/Implementation/runtime-properties.txt b/doc/Implementation/runtime-properties.txt index 8a2e3ef7e..616029ed6 100644 --- a/doc/Implementation/runtime-properties.txt +++ b/doc/Implementation/runtime-properties.txt @@ -1,4 +1,23 @@ -../doc/Implementation/properties/jogl.debug.all.txt +../doc/Implementation/runtime-properties-temp/gluegen-rt.debug.txt +---------------------------------------- + jogamp.debug.JNILibLoader + jogamp.debug.JVMUtil + jogamp.debug.Lock + jogamp.debug.ReflectionUtil + + + +../doc/Implementation/runtime-properties-temp/gluegen-rt.ipd.debug.txt +---------------------------------------- + jnlp.launcher.class + jogamp.common.utils.locks.Lock.timeout + jogamp.debug.Lock.TraceLock + sun.boot.library.path + sun.jnlp.applet.launcher + + + +../doc/Implementation/runtime-properties-temp/jogl.debug.all.txt ---------------------------------------- jogl.debug.Animator jogl.debug.BuildMipmap @@ -22,23 +41,26 @@ -../doc/Implementation/properties/jogl.ipd.debug.txt +../doc/Implementation/runtime-properties-temp/jogl.ipd.debug.txt ---------------------------------------- + jogl.1thread jogl.debug.ExtensionAvailabilityCache jogl.debug.GLDrawable.profiling jogl.debug.GLSLCode jogl.debug.GLSLState jogl.debug.TextRenderer jogl.glcontext.forcetracking + jogl.gldrawablefactory.class.name jogl.gljpanel.nohw jogl.gljpanel.noogl jogl.gljpanel.nosw + jogl.screenchange.action jogl.texture.nonpot jogl.texture.notexrect -../doc/Implementation/properties/nativewindow.debug.txt +../doc/Implementation/runtime-properties-temp/nativewindow.debug.txt ---------------------------------------- nativewindow.debug.DefaultCapabilitiesChooser nativewindow.debug.GraphicsConfiguration @@ -48,12 +70,14 @@ -../doc/Implementation/properties/nativewindow.ipd.debug.txt +../doc/Implementation/runtime-properties-temp/nativewindow.ipd.debug.txt ---------------------------------------- + java.awt.headless + nativewindow.ws.name -../doc/Implementation/properties/newt.debug.txt +../doc/Implementation/runtime-properties-temp/newt.debug.txt ---------------------------------------- newt.debug.Display newt.debug.EDT @@ -65,10 +89,13 @@ -../doc/Implementation/properties/newt.ipd.debug.txt +../doc/Implementation/runtime-properties-temp/newt.ipd.debug.txt ---------------------------------------- + newt.MainThread.force newt.test.EDTMainThread newt.test.Window.reparent.incompatible + newt.ws.sheight + newt.ws.swidth -- cgit v1.2.3