revert my last change

[wxWidgets.git] / src / x11 / glcanvas.cpp

diff --git a/src/x11/glcanvas.cpp b/src/x11/glcanvas.cpp
index 776eb9746c8aea01bb2df8af4abb4a54a9419441..3736c7e91e5877d9899b57214a1d87f413e37232 100644 (file)
--- a/src/x11/glcanvas.cpp
+++ b/src/x11/glcanvas.cpp
@@ -18,9 +18,12 @@
 
 #if wxUSE_GLCANVAS
 
 
 #if wxUSE_GLCANVAS
 

+// #error Sorry, wxGLCanvas does not work yet with wxX11
+

 #include "wx/glcanvas.h"
 #include "wx/utils.h"
 #include "wx/app.h"
 #include "wx/glcanvas.h"
 #include "wx/utils.h"
 #include "wx/app.h"

+#include "wx/log.h"

 
 #ifdef __VMS
 # pragma message disable nosimpint
 
 #ifdef __VMS
 # pragma message disable nosimpint


@@ -61,7 +64,7 @@ wxGLContext::wxGLContext( bool WXUNUSED(isRGB), wxWindow *win,
     
     wxCHECK_RET( vi, "invalid visual for OpenGl" );
     
     
     wxCHECK_RET( vi, "invalid visual for OpenGl" );
     

-    m_glContext = glXCreateContext( (Display *)m_window->GetXDisplay(), vi,
+    m_glContext = glXCreateContext( (Display *)wxGetDisplay(), vi,

                                     None, GL_TRUE);
   
     wxCHECK_RET( m_glContext, "Couldn't create OpenGl context" );
                                     None, GL_TRUE);
   
     wxCHECK_RET( m_glContext, "Couldn't create OpenGl context" );


@@ -82,10 +85,10 @@ wxGLContext::wxGLContext(
     wxCHECK_RET( vi, "invalid visual for OpenGl" );
     
     if( other != 0 )
     wxCHECK_RET( vi, "invalid visual for OpenGl" );
     
     if( other != 0 )

-        m_glContext = glXCreateContext( (Display *)m_window->GetXDisplay(), vi, 
+        m_glContext = glXCreateContext( (Display *)wxGetDisplay(), vi, 

                                         other->m_glContext, GL_TRUE );
     else
                                         other->m_glContext, GL_TRUE );
     else

-        m_glContext = glXCreateContext( (Display *)m_window->GetXDisplay(), vi,
+        m_glContext = glXCreateContext( (Display *)wxGetDisplay(), vi,

                                         None, GL_TRUE );
     
     wxCHECK_RET( m_glContext, "Couldn't create OpenGl context" );
                                         None, GL_TRUE );
     
     wxCHECK_RET( m_glContext, "Couldn't create OpenGl context" );


@@ -97,18 +100,18 @@ wxGLContext::~wxGLContext()
     
     if (m_glContext == glXGetCurrentContext())
     {
     
     if (m_glContext == glXGetCurrentContext())
     {

-        glXMakeCurrent( (Display*) m_window->GetXDisplay(), None, NULL);
+        glXMakeCurrent( (Display*) wxGetDisplay(), None, NULL);

     }
        
     }
        

-    glXDestroyContext( (Display*) m_window->GetXDisplay(), m_glContext );
+    glXDestroyContext( (Display*) wxGetDisplay(), m_glContext );

 }
 
 void wxGLContext::SwapBuffers()
 {
     if (m_glContext)
     {
 }
 
 void wxGLContext::SwapBuffers()
 {
     if (m_glContext)
     {

-        Display* display = (Display*) m_window->GetXDisplay();
-        glXSwapBuffers(display, (Window) m_window->GetXWindow());
+        Display* display = (Display*) wxGetDisplay();
+        glXSwapBuffers(display, (Window) m_window->GetClientAreaWindow());

     }
 }
 
     }
 }
 


@@ -116,8 +119,8 @@ void wxGLContext::SetCurrent()
 {
     if (m_glContext) 
     { 
 {
     if (m_glContext) 
     { 

-        Display* display = (Display*) m_window->GetXDisplay();
-        glXMakeCurrent(display, (Window) m_window->GetXWindow(), 
+        Display* display = (Display*) wxGetDisplay();
+        glXMakeCurrent(display, (Window) m_window->GetClientAreaWindow(), 

                        m_glContext );;
     }
 }
                        m_glContext );;
     }
 }


@@ -133,21 +136,13 @@ void wxGLContext::SetColour(const char *colour)
                       the_colour->Green(),
                       the_colour->Blue());
        } else {
                       the_colour->Green(),
                       the_colour->Blue());
        } else {

-           GLint pix = (GLint)the_colour->m_pixel;
-           if(pix == -1) {
-               XColor exact_def;
-               exact_def.red = (unsigned short)the_colour->Red() << 8;
-               exact_def.green = (unsigned short)the_colour->Green() << 8;
-               exact_def.blue = (unsigned short)the_colour->Blue() << 8;
-               exact_def.flags = DoRed | DoGreen | DoBlue;
-               if(!XAllocColor((Display*) m_window->GetXDisplay(),
-                  (Colormap) wxTheApp->GetMainColormap(m_window->GetXDisplay()),
-                  &exact_def)) {
-                   wxDebugMsg("wxGLCanvas: cannot allocate color\n");
-                   return;
-               }
-               pix = the_colour->m_pixel = exact_def.pixel;
-           }
+            the_colour->CalcPixel(wxTheApp->GetMainColormap(wxGetDisplay()));
+           GLint pix = (GLint)the_colour->GetPixel();
+           if(pix == -1)
+            {
+                wxLogError("wxGLCanvas: cannot allocate color\n");
+               return;
+            }

            glIndexi(pix);
        }
     }
            glIndexi(pix);
        }
     }


@@ -241,12 +236,12 @@ bool wxGLCanvas::Create( wxWindow *parent,
     m_sharedContextOf = (wxGLCanvas*)shared_context_of;  // const_cast
     m_glContext = (wxGLContext*) NULL;
 
     m_sharedContextOf = (wxGLCanvas*)shared_context_of;  // const_cast
     m_glContext = (wxGLContext*) NULL;
 

-    Display* display = (Display*) GetXDisplay();
+    Display* display = (Display*) wxGetDisplay();

 
     // Check for the presence of the GLX extension
     if(!glXQueryExtension(display, NULL, NULL)) {
 
     // Check for the presence of the GLX extension
     if(!glXQueryExtension(display, NULL, NULL)) {

-       wxDebugMsg("wxGLCanvas: GLX extension is missing\n");
-       return false;
+       wxLogDebug("wxGLCanvas: GLX extension is missing\n");
+       return FALSE;

     }
 
     if(attribList) {
     }
 
     if(attribList) {


@@ -294,7 +289,7 @@ bool wxGLCanvas::Create( wxWindow *parent,
       attribList = (int*) data;
       // Get an appropriate visual
       vi = glXChooseVisual(display, DefaultScreen(display), attribList);
       attribList = (int*) data;
       // Get an appropriate visual
       vi = glXChooseVisual(display, DefaultScreen(display), attribList);

-      if(!vi) return false;
+      if(!vi) return FALSE;

       
       // Here we should make sure that vi is the same visual as the
       // one used by the xwindow drawable in wxCanvas.  However,
       
       // Here we should make sure that vi is the same visual as the
       // one used by the xwindow drawable in wxCanvas.  However,


@@ -302,12 +297,12 @@ bool wxGLCanvas::Create( wxWindow *parent,
     } else {
        // By default, we use the visual of xwindow
         // NI: is this really senseful ? opengl in e.g. color index mode ?
     } else {
        // By default, we use the visual of xwindow
         // NI: is this really senseful ? opengl in e.g. color index mode ?

-       XGetWindowAttributes(display, (Window) GetXWindow(), &xwa);
+       XGetWindowAttributes(display, (Window) GetClientAreaWindow(), &xwa);

        vi_templ.visualid = XVisualIDFromVisual(xwa.visual);
        vi = XGetVisualInfo(display, VisualIDMask, &vi_templ, &n);
        vi_templ.visualid = XVisualIDFromVisual(xwa.visual);
        vi = XGetVisualInfo(display, VisualIDMask, &vi_templ, &n);

-       if(!vi) return false;
+       if(!vi) return FALSE;

        glXGetConfig(display, vi, GLX_USE_GL, &val);
        glXGetConfig(display, vi, GLX_USE_GL, &val);

-       if(!val) return false;
+       if(!val) return FALSE;

        // Basically, this is it.  It should be possible to use vi
        // in glXCreateContext() below.  But this fails with Mesa.
        // I notified the Mesa author about it; there may be a fix.
        // Basically, this is it.  It should be possible to use vi
        // in glXCreateContext() below.  But this fails with Mesa.
        // I notified the Mesa author about it; there may be a fix.


@@ -334,7 +329,7 @@ bool wxGLCanvas::Create( wxWindow *parent,
        a_list[n] = None;
        // XFree(vi);
        vi = glXChooseVisual(display, DefaultScreen(display), a_list);
        a_list[n] = None;
        // XFree(vi);
        vi = glXChooseVisual(display, DefaultScreen(display), a_list);

-       if(!vi) return false;
+       if(!vi) return FALSE;

 #endif /* OLD_MESA */
     }
 
 #endif /* OLD_MESA */
     }
 


@@ -355,7 +350,7 @@ bool wxGLCanvas::Create( wxWindow *parent,
 #endif
     SetCurrent();
 
 #endif
     SetCurrent();
 

-    return true;
+    return TRUE;

 }
 
 wxGLCanvas::~wxGLCanvas(void)
 }
 
 wxGLCanvas::~wxGLCanvas(void)


@@ -374,7 +369,7 @@ void wxGLCanvas::SwapBuffers()
     if( m_glContext ) m_glContext->SwapBuffers();
 
     // Display* display = (Display*) GetXDisplay();
     if( m_glContext ) m_glContext->SwapBuffers();
 
     // Display* display = (Display*) GetXDisplay();

-    // if(glx_cx) glXSwapBuffers(display, (Window) GetXWindow());
+    // if(glx_cx) glXSwapBuffers(display, (Window) GetClientAreaWindow());

 }
 
 void wxGLCanvas::SetCurrent()
 }
 
 void wxGLCanvas::SetCurrent()


@@ -382,7 +377,7 @@ void wxGLCanvas::SetCurrent()
     if( m_glContext ) m_glContext->SetCurrent();
 
     // Display* display = (Display*) GetXDisplay();
     if( m_glContext ) m_glContext->SetCurrent();
 
     // Display* display = (Display*) GetXDisplay();

-    // if(glx_cx) glXMakeCurrent(display, (Window) GetXWindow(), glx_cx);
+    // if(glx_cx) glXMakeCurrent(display, (Window) GetClientAreaWindow(), glx_cx);

 }
 
 void wxGLCanvas::SetColour(const char *col)
 }
 
 void wxGLCanvas::SetColour(const char *col)