Factored out the remaining toolkit, and specifically AWT, dependencies

from GLDrawableFactory implementations into NativeWindowFactory
implementations. These dependencies were the up-front selection of the
GraphicsConfiguration and the locking and unlocking of the toolkit,
which are both currently needed only on X11 platforms due to how
OpenGL and the window system interact there. Added X11GraphicsDevice
and X11GraphicsConfiguration classes which are intended to be used by
Newt or potentially other third-party window toolkits. Unified the
separate NativeWindow and AWT GLDrawableFactory implementations in the
GLDrawableFactory class.

Exposed the toolkit locking mechanism through the NativeWindowFactory
and introduced the concept of a default NativeWindowFactory which is
used by the X11 drawable and context implementations. Removed
unnecessary toolkit locking calls from Mac OS X and Windows drawable
and context implementations.

Added a registration mechanism for new NativeWindowFactories, allowing
third parties to plug in new window toolkits orthogonally to the
OpenGL drawable and context code.

The public APIs for the NativeWindowFactory and the GLDrawableFactory,
in particular how they are fetched, changed as a result of these
refactorings. Updated all uses.

Fixed bug in X11OffscreenGLXDrawable introduced during last set of
changes.

Tested demos on Solaris, Mac OS X and Windows.


git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1824 232f8b59-042b-4e1e-8c03-345bb8c30851

1 files changed, 54 insertions, 64 deletions

diff --git a/src/classes/com/sun/opengl/impl/windows/wgl/WindowsOffscreenWGLDrawable.java b/src/classes/com/sun/opengl/impl/windows/wgl/WindowsOffscreenWGLDrawable.java
index 38215fd46..724f64b9c 100644
--- a/src/classes/com/sun/opengl/impl/windows/wgl/WindowsOffscreenWGLDrawable.java
+++ b/src/classes/com/sun/opengl/impl/windows/wgl/WindowsOffscreenWGLDrawable.java
@@ -61,76 +61,66 @@ public class WindowsOffscreenWGLDrawable extends WindowsWGLDrawable {
   }
 
   private void create() {
-    getFactoryImpl().lockToolkit();
-    try {
-        NullWindow nw = (NullWindow) getNativeWindow();
-        GLCapabilities capabilities = getRequestedGLCapabilities();
-        int width = getWidth();
-        int height = getHeight();
-        BITMAPINFO info = BITMAPINFO.create();
-        BITMAPINFOHEADER header = info.bmiHeader();
-        int bitsPerPixel = (capabilities.getRedBits() +
-                            capabilities.getGreenBits() +
-                            capabilities.getBlueBits());
-        header.biSize(header.size());
-        header.biWidth(width);
-        // NOTE: negating the height causes the DIB to be in top-down row
-        // order rather than bottom-up; ends up being correct during pixel
-        // readback
-        header.biHeight(-1 * height);
-        header.biPlanes((short) 1);
-        header.biBitCount((short) bitsPerPixel);
-        header.biXPelsPerMeter(0);
-        header.biYPelsPerMeter(0);
-        header.biClrUsed(0);
-        header.biClrImportant(0);
-        header.biCompression(WGL.BI_RGB);
-        header.biSizeImage(width * height * bitsPerPixel / 8);
+    NullWindow nw = (NullWindow) getNativeWindow();
+    GLCapabilities capabilities = getRequestedGLCapabilities();
+    int width = getWidth();
+    int height = getHeight();
+    BITMAPINFO info = BITMAPINFO.create();
+    BITMAPINFOHEADER header = info.bmiHeader();
+    int bitsPerPixel = (capabilities.getRedBits() +
+                        capabilities.getGreenBits() +
+                        capabilities.getBlueBits());
+    header.biSize(header.size());
+    header.biWidth(width);
+    // NOTE: negating the height causes the DIB to be in top-down row
+    // order rather than bottom-up; ends up being correct during pixel
+    // readback
+    header.biHeight(-1 * height);
+    header.biPlanes((short) 1);
+    header.biBitCount((short) bitsPerPixel);
+    header.biXPelsPerMeter(0);
+    header.biYPelsPerMeter(0);
+    header.biClrUsed(0);
+    header.biClrImportant(0);
+    header.biCompression(WGL.BI_RGB);
+    header.biSizeImage(width * height * bitsPerPixel / 8);
 
-        long hdc = WGL.CreateCompatibleDC(0);
-        if (hdc == 0) {
-          System.out.println("LastError: " + WGL.GetLastError());
-          throw new GLException("Error creating device context for offscreen OpenGL context");
-        }
-        nw.setSurfaceHandle(hdc);
+    long hdc = WGL.CreateCompatibleDC(0);
+    if (hdc == 0) {
+      System.out.println("LastError: " + WGL.GetLastError());
+      throw new GLException("Error creating device context for offscreen OpenGL context");
+    }
+    nw.setSurfaceHandle(hdc);
 
-        hbitmap = WGL.CreateDIBSection(hdc, info, WGL.DIB_RGB_COLORS, 0, 0, 0);
-        if (hbitmap == 0) {
-          WGL.DeleteDC(hdc);
-          hdc = 0;
-          throw new GLException("Error creating offscreen bitmap of width " + width +
-                                ", height " + height);
-        }
-        if ((origbitmap = WGL.SelectObject(hdc, hbitmap)) == 0) {
-          WGL.DeleteObject(hbitmap);
-          hbitmap = 0;
-          WGL.DeleteDC(hdc);
-          hdc = 0;
-          throw new GLException("Error selecting bitmap into new device context");
-        }
-        
-        choosePixelFormat(false);
-    } finally {
-        getFactoryImpl().unlockToolkit();
+    hbitmap = WGL.CreateDIBSection(hdc, info, WGL.DIB_RGB_COLORS, 0, 0, 0);
+    if (hbitmap == 0) {
+      WGL.DeleteDC(hdc);
+      hdc = 0;
+      throw new GLException("Error creating offscreen bitmap of width " + width +
+                            ", height " + height);
     }
+    if ((origbitmap = WGL.SelectObject(hdc, hbitmap)) == 0) {
+      WGL.DeleteObject(hbitmap);
+      hbitmap = 0;
+      WGL.DeleteDC(hdc);
+      hdc = 0;
+      throw new GLException("Error selecting bitmap into new device context");
+    }
+        
+    choosePixelFormat(false);
   }
   
   public void destroy() {
-    getFactoryImpl().lockToolkit();
-    try {
-        NullWindow nw = (NullWindow) getNativeWindow();
-        if (nw.getSurfaceHandle() != 0) {
-          // Must destroy bitmap and device context
-          WGL.SelectObject(nw.getSurfaceHandle(), origbitmap);
-          WGL.DeleteObject(hbitmap);
-          WGL.DeleteDC(nw.getSurfaceHandle());
-          origbitmap = 0;
-          hbitmap = 0;
-          nw.setSurfaceHandle(0);
-          setChosenGLCapabilities(null);
-        }
-    } finally {
-        getFactoryImpl().unlockToolkit();
+    NullWindow nw = (NullWindow) getNativeWindow();
+    if (nw.getSurfaceHandle() != 0) {
+      // Must destroy bitmap and device context
+      WGL.SelectObject(nw.getSurfaceHandle(), origbitmap);
+      WGL.DeleteObject(hbitmap);
+      WGL.DeleteDC(nw.getSurfaceHandle());
+      origbitmap = 0;
+      hbitmap = 0;
+      nw.setSurfaceHandle(0);
+      setChosenGLCapabilities(null);
     }
     super.destroy();
   }