]> git.saurik.com Git - wxWidgets.git/blobdiff - src/gtk1/glcanvas.cpp
wxGTK1 compilation fixes after last changes
[wxWidgets.git] / src / gtk1 / glcanvas.cpp
index 9179b7a0c2ad20cafabf24ba899c0f1c25953459..b90d59baaea70bc4f476e9fdcd5eb7262e54ed6d 100644 (file)
@@ -33,12 +33,6 @@ extern "C"
 #include "wx/gtk1/win_gtk.h"
 #include "wx/gtk1/private.h"
 
-//---------------------------------------------------------------------------
-// global data
-//---------------------------------------------------------------------------
-
-XVisualInfo *g_vi = (XVisualInfo*) NULL;
-
 //-----------------------------------------------------------------------------
 // idle system
 //-----------------------------------------------------------------------------
@@ -46,73 +40,6 @@ XVisualInfo *g_vi = (XVisualInfo*) NULL;
 extern void wxapp_install_idle_handler();
 extern bool g_isIdle;
 
-// ----------------------------------------------------------------------------
-// helper functions
-// ----------------------------------------------------------------------------
-
-// wrapper around glXMakeContextCurrent/glXMakeCurrent depending on GLX
-// version
-static void wxMakeContextCurrent(GLXDrawable drawable, GLXContext context)
-{
-    if (wxGLCanvas::GetGLXVersion() >= 13)
-        glXMakeContextCurrent( GDK_DISPLAY(), drawable, drawable, context);
-    else // GLX <= 1.2 doesn't have glXMakeContextCurrent()
-        glXMakeCurrent( GDK_DISPLAY(), drawable, context);
-}
-
-//---------------------------------------------------------------------------
-// wxGLContext
-//---------------------------------------------------------------------------
-
-IMPLEMENT_CLASS(wxGLContext,wxObject)
-
-wxGLContext::wxGLContext(wxWindow* win, const wxGLContext* other)
-{
-    wxGLCanvas *gc = (wxGLCanvas*) win;
-
-    if (wxGLCanvas::GetGLXVersion() >= 13)
-    {
-        GLXFBConfig *fbc = gc->m_fbc;
-        wxCHECK_RET( fbc, _T("invalid GLXFBConfig for OpenGl") );
-        m_glContext = glXCreateNewContext( GDK_DISPLAY(), fbc[0], GLX_RGBA_TYPE,
-                                           other ? other->m_glContext : None,
-                                           GL_TRUE );
-    }
-    else // GLX <= 1.2
-    {
-        XVisualInfo *vi = (XVisualInfo *) gc->m_vi;
-        wxCHECK_RET( vi, _T("invalid visual for OpenGl") );
-        m_glContext = glXCreateContext( GDK_DISPLAY(), vi,
-                                        other ? other->m_glContext : None,
-                                        GL_TRUE );
-    }
-
-    wxASSERT_MSG( m_glContext, _T("Couldn't create OpenGl context") );
-}
-
-wxGLContext::~wxGLContext()
-{
-    if ( !m_glContext )
-        return;
-
-    if ( m_glContext == glXGetCurrentContext() )
-        wxMakeContextCurrent(None, NULL);
-
-    glXDestroyContext( GDK_DISPLAY(), m_glContext );
-}
-
-void wxGLContext::SetCurrent(const wxGLCanvas& win) const
-{
-    if ( !m_glContext )
-        return;
-
-    GdkWindow *window = GTK_PIZZA(win.m_wxwindow)->bin_window;
-    wxCHECK_RET( window, _T("window must be shown") );
-
-    wxMakeContextCurrent(GDK_WINDOW_XWINDOW(window), m_glContext);
-}
-
-
 #if WXWIN_COMPATIBILITY_2_8
 
 //-----------------------------------------------------------------------------
@@ -141,7 +68,7 @@ gtk_glwindow_map_callback( GtkWidget * WXUNUSED(widget), wxGLCanvas *win )
 {
     wxPaintEvent event( win->GetId() );
     event.SetEventObject( win );
-    win->GetEventHandler()->ProcessEvent( event );
+    win->HandleWindowEvent( event );
 
     win->GetUpdateRegion().Clear();
 
@@ -199,7 +126,7 @@ gtk_glcanvas_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, w
 
     wxSizeEvent event( wxSize(win->m_width,win->m_height), win->GetId() );
     event.SetEventObject( win );
-    win->GetEventHandler()->ProcessEvent( event );
+    win->HandleWindowEvent( event );
 }
 }
 
@@ -250,7 +177,7 @@ wxGLCanvas::wxGLCanvas(wxWindow *parent,
                        const wxPalette& palette)
     : m_createImplicitContext(true)
 {
-    m_sharedContext = wx_const_cast(wxGLContext *, shared);
+    m_sharedContext = const_cast<wxGLContext *>(shared);
 
     Create(parent, id, pos, size, style, name, attribList, palette);
 }
@@ -264,7 +191,7 @@ wxGLCanvas::wxGLCanvas(wxWindow *parent,
                        const wxPalette& palette )
     : m_createImplicitContext(true)
 {
-    m_sharedContextOf = wx_const_cast(wxGLCanvas *, shared);
+    m_sharedContextOf = const_cast<wxGLCanvas *>(shared);
 
     Create(parent, id, pos, size, style, name, attribList, palette);
 }
@@ -282,53 +209,12 @@ bool wxGLCanvas::Create(wxWindow *parent,
 {
     m_noExpose = true;
     m_nativeSizeEvent = true;
-    m_fbc = NULL;
-    m_vi = NULL;
-
-    if (wxGLCanvas::GetGLXVersion() >= 13)
-    {
-        // GLX >= 1.3 uses a GLXFBConfig
-        GLXFBConfig * fbc = NULL;
-        if (wxTheApp->m_glFBCInfo != NULL)
-        {
-            fbc = (GLXFBConfig *) wxTheApp->m_glFBCInfo;
-            m_canFreeFBC = false; // owned by wxTheApp - don't free upon destruction
-        }
-        else
-        {
-            fbc = (GLXFBConfig *) wxGLCanvas::ChooseGLFBC(attribList);
-            m_canFreeFBC = true;
-        }
-        m_fbc = fbc;  // save for later use
-        wxCHECK_MSG( m_fbc, false, _T("required FBConfig couldn't be found") );
-    }
-
-    XVisualInfo *vi = NULL;
-    if (wxTheApp->m_glVisualInfo != NULL)
-    {
-        vi = (XVisualInfo *)wxTheApp->m_glVisualInfo;
-        m_canFreeVi = false; // owned by wxTheApp - don't free upon destruction
-    }
-    else
-    {
-        if (wxGLCanvas::GetGLXVersion() >= 13)
-        // GLX >= 1.3
-            vi = glXGetVisualFromFBConfig(GDK_DISPLAY(), m_fbc[0]);
-        else
-            // GLX <= 1.2
-            vi = (XVisualInfo *) ChooseGLVisual(attribList);
-
-        m_canFreeVi = true;
-    }
 
-    m_vi = vi;  // save for later use
+    if ( !InitVisual(attribList) )
+        return false;
 
-    wxCHECK_MSG( m_vi, false, _T("required visual couldn't be found") );
-    GdkVisual *visual;
-    GdkColormap *colormap;
-
-    visual = gdkx_visual_get( vi->visualid );
-    colormap = gdk_colormap_new( visual, TRUE );
+    GdkVisual *visual = gdkx_visual_get( GetXVisualInfo()->visualid );
+    GdkColormap *colormap = gdk_colormap_new( visual, TRUE );
 
     gtk_widget_push_colormap( colormap );
     gtk_widget_push_visual( visual );
@@ -373,167 +259,10 @@ bool wxGLCanvas::Create(wxWindow *parent,
     return true;
 }
 
-wxGLCanvas::~wxGLCanvas()
-{
-    GLXFBConfig * fbc = (GLXFBConfig *) m_fbc;
-    if (fbc && m_canFreeFBC)
-        XFree( fbc );
-
-    XVisualInfo *vi = (XVisualInfo *) m_vi;
-    if (vi && m_canFreeVi)
-        XFree( vi );
-}
-
-void* wxGLCanvas::ChooseGLVisual(const int *attribList)
-{
-    int data[512];
-    GetGLAttribListFromWX( attribList, data );
-
-    Display *dpy = GDK_DISPLAY();
-
-    return glXChooseVisual( dpy, DefaultScreen(dpy), data );
-}
-
-void* wxGLCanvas::ChooseGLFBC(const int *attribList)
-{
-    int data[512];
-    GetGLAttribListFromWX( attribList, data );
-
-    int returned;
-    return glXChooseFBConfig( GDK_DISPLAY(), DefaultScreen(GDK_DISPLAY()),
-                              data, &returned );
-}
-
-
-void
-wxGLCanvas::GetGLAttribListFromWX(const int *wx_attribList, int *gl_attribList)
-{
-    if ( !wx_attribList )
-    {
-        if (wxGLCanvas::GetGLXVersion() >= 13)
-        {
-            // leave GLX >= 1.3 choose the default attributes
-            gl_attribList[0] = 0;
-        }
-        else // GLX < 1.3
-        {
-            int i = 0;
-            // default settings if attriblist = 0
-            gl_attribList[i++] = GLX_RGBA;
-            gl_attribList[i++] = GLX_DOUBLEBUFFER;
-            gl_attribList[i++] = GLX_DEPTH_SIZE;   gl_attribList[i++] = 1;
-            gl_attribList[i++] = GLX_RED_SIZE;     gl_attribList[i++] = 1;
-            gl_attribList[i++] = GLX_GREEN_SIZE;   gl_attribList[i++] = 1;
-            gl_attribList[i++] = GLX_BLUE_SIZE;    gl_attribList[i++] = 1;
-            gl_attribList[i++] = GLX_ALPHA_SIZE;   gl_attribList[i++] = 0;
-            gl_attribList[i++] = None;
-        }
-    }
-    else // have non-default attributes
-    {
-        int arg=0, p=0;
-        while( (wx_attribList[arg]!=0) && (p<510) )
-        {
-            switch( wx_attribList[arg++] )
-            {
-                case WX_GL_RGBA:
-                    if (wxGLCanvas::GetGLXVersion() <= 12)
-                    {
-                        // for GLX >= 1.3, GLX_RGBA is useless (setting this flags will crash on most opengl implm)
-                        gl_attribList[p++] = GLX_RGBA;
-                    }
-                    break;
-                case WX_GL_BUFFER_SIZE:
-                    gl_attribList[p++] = GLX_BUFFER_SIZE;
-                    gl_attribList[p++] = wx_attribList[arg++];
-                    break;
-                case WX_GL_LEVEL:
-                    gl_attribList[p++] = GLX_LEVEL;
-                    gl_attribList[p++] = wx_attribList[arg++];
-                    break;
-                case WX_GL_DOUBLEBUFFER:
-                    gl_attribList[p++] = GLX_DOUBLEBUFFER;
-                    gl_attribList[p++] = 1;
-                    break;
-                case WX_GL_STEREO:
-                    gl_attribList[p++] = GLX_STEREO;
-                    break;
-                case WX_GL_AUX_BUFFERS:
-                    gl_attribList[p++] = GLX_AUX_BUFFERS;
-                    gl_attribList[p++] = wx_attribList[arg++];
-                    break;
-                case WX_GL_MIN_RED:
-                    gl_attribList[p++] = GLX_RED_SIZE;
-                    gl_attribList[p++] = wx_attribList[arg++];
-                    break;
-                case WX_GL_MIN_GREEN:
-                    gl_attribList[p++] = GLX_GREEN_SIZE;
-                    gl_attribList[p++] = wx_attribList[arg++];
-                    break;
-                case WX_GL_MIN_BLUE:
-                    gl_attribList[p++] = GLX_BLUE_SIZE;
-                    gl_attribList[p++] = wx_attribList[arg++];
-                    break;
-                case WX_GL_MIN_ALPHA:
-                    gl_attribList[p++] = GLX_ALPHA_SIZE;
-                    gl_attribList[p++] = wx_attribList[arg++];
-                    break;
-                case WX_GL_DEPTH_SIZE:
-                    gl_attribList[p++] = GLX_DEPTH_SIZE;
-                    gl_attribList[p++] = wx_attribList[arg++];
-                    break;
-                case WX_GL_STENCIL_SIZE:
-                    gl_attribList[p++] = GLX_STENCIL_SIZE;
-                    gl_attribList[p++] = wx_attribList[arg++];
-                    break;
-                case WX_GL_MIN_ACCUM_RED:
-                    gl_attribList[p++] = GLX_ACCUM_RED_SIZE;
-                    gl_attribList[p++] = wx_attribList[arg++];
-                    break;
-                case WX_GL_MIN_ACCUM_GREEN:
-                    gl_attribList[p++] = GLX_ACCUM_GREEN_SIZE;
-                    gl_attribList[p++] = wx_attribList[arg++];
-                    break;
-                case WX_GL_MIN_ACCUM_BLUE:
-                    gl_attribList[p++] = GLX_ACCUM_BLUE_SIZE;
-                    gl_attribList[p++] = wx_attribList[arg++];
-                    break;
-                case WX_GL_MIN_ACCUM_ALPHA:
-                    gl_attribList[p++] = GLX_ACCUM_ALPHA_SIZE;
-                    gl_attribList[p++] = wx_attribList[arg++];
-                    break;
-                default:
-                    break;
-            }
-        }
-
-        gl_attribList[p] = 0;
-    }
-}
-
-/* static */
-int wxGLCanvas::GetGLXVersion()
-{
-    static int s_glxVersion = 0;
-    if ( s_glxVersion == 0 )
-    {
-        // check the GLX version
-        int glxMajorVer, glxMinorVer;
-        bool ok = glXQueryVersion(GDK_DISPLAY(), &glxMajorVer, &glxMinorVer);
-        wxASSERT_MSG( ok, _T("GLX version not found") );
-        if (!ok)
-            s_glxVersion = 10; // 1.0 by default
-        else
-            s_glxVersion = glxMajorVer*10 + glxMinorVer;
-    }
-
-    return s_glxVersion;
-}
-
-void wxGLCanvas::SwapBuffers()
+Window wxGLCanvas::GetXWindow() const
 {
     GdkWindow *window = GTK_PIZZA(m_wxwindow)->bin_window;
-    glXSwapBuffers( GDK_DISPLAY(), GDK_WINDOW_XWINDOW( window ) );
+    return window ? GDK_WINDOW_XWINDOW(window) : 0;
 }
 
 void wxGLCanvas::OnInternalIdle()
@@ -542,7 +271,7 @@ void wxGLCanvas::OnInternalIdle()
     {
         wxPaintEvent event( GetId() );
         event.SetEventObject( this );
-        GetEventHandler()->ProcessEvent( event );
+        HandleWindowEvent( event );
 
         GetUpdateRegion().Clear();
     }
@@ -566,33 +295,4 @@ void wxGLCanvas::GTKInitImplicitContext()
 
 #endif // WXWIN_COMPATIBILITY_2_8
 
-//---------------------------------------------------------------------------
-// wxGLApp
-//---------------------------------------------------------------------------
-
-bool wxGLApp::InitGLVisual(const int *attribList)
-{
-    if ( wxGLCanvas::GetGLXVersion() >= 13 )
-    {
-        if (m_glFBCInfo)
-            XFree(m_glFBCInfo);
-        m_glFBCInfo = wxGLCanvas::ChooseGLFBC(attribList);
-
-        if ( !m_glFBCInfo )
-            return false;
-
-        if (m_glVisualInfo)
-            XFree(m_glVisualInfo);
-        m_glVisualInfo = glXGetVisualFromFBConfig(GDK_DISPLAY(), ((GLXFBConfig *)m_glFBCInfo)[0]);
-    }
-    else // GLX <= 1.2
-    {
-        if (m_glVisualInfo)
-            XFree(m_glVisualInfo);
-        m_glVisualInfo = wxGLCanvas::ChooseGLVisual(attribList);
-    }
-
-    return m_glVisualInfo != NULL;
-}
-
 #endif // wxUSE_GLCANVAS