Fixed breakage of GLJPanel caused by confusion between requested and

chosen GLCapabilities. Separated these out and refactored requested
GLCapabilities into GLDrawableImpl superclass. Removed
setChosenGLCapabilities from the public API and made it protected on
GLDrawableImpl. Removed it from all public GLDrawable implementations
such as GLCanvas and GLJPanel. Fixed bug in Gears demo where mouse
listener was not being hooked up correctly. Tested so far on Windows;
testing on other platforms to follow.


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

1 files changed, 3 insertions, 5 deletions

diff --git a/src/classes/com/sun/opengl/impl/x11/glx/X11GLXDrawable.java b/src/classes/com/sun/opengl/impl/x11/glx/X11GLXDrawable.java
index 702ceb7b4..229686428 100644
--- a/src/classes/com/sun/opengl/impl/x11/glx/X11GLXDrawable.java
+++ b/src/classes/com/sun/opengl/impl/x11/glx/X11GLXDrawable.java
@@ -49,10 +49,9 @@ public abstract class X11GLXDrawable extends GLDrawableImpl {
   protected GLCapabilitiesChooser chooser;
 
   protected X11GLXDrawable(GLDrawableFactory factory, NativeWindow comp, boolean realized,
-                           GLCapabilities capabilities,
+                           GLCapabilities requestedCapabilities,
                            GLCapabilitiesChooser chooser) {
-    super(factory, comp, realized);
-    setChosenGLCapabilities(capabilities);
+    super(factory, comp, requestedCapabilities, realized);
     this.chooser = chooser;
   }
 
@@ -89,7 +88,6 @@ public abstract class X11GLXDrawable extends GLDrawableImpl {
         System.err.println("!!! Fetched XVisualInfo for visual ID 0x" + Long.toHexString(visualID));
         System.err.println("!!! Resulting XVisualInfo: visualid = 0x" + Long.toHexString(infos[0].visualid()));
       }
-
       // FIXME: the storage for the infos array is leaked (should
       // clean it up somehow when we're done with the visual we're
       // returning)
@@ -120,7 +118,7 @@ public abstract class X11GLXDrawable extends GLDrawableImpl {
       } finally {
         getFactory().unlockToolkit();
       }
-      GLCapabilities capabilities = getCapabilities();
+      GLCapabilities capabilities = getRequestedGLCapabilities();
       int chosen = chooser.chooseCapabilities(capabilities, caps, -1);
       if (chosen < 0 || chosen >= caps.length) {
         throw new GLException("GLCapabilitiesChooser specified invalid index (expected 0.." + (caps.length - 1) + ")");