X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/34a34b020f1c8defacb299a0fa5c480fa65b8597..ab1ce969dfb27f5d366ee6a0de3ff2bc0205b56a:/src/gtk1/glcanvas.cpp diff --git a/src/gtk1/glcanvas.cpp b/src/gtk1/glcanvas.cpp index c30dae8354..6fa3c8444b 100644 --- a/src/gtk1/glcanvas.cpp +++ b/src/gtk1/glcanvas.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: gtk/glcanvas.cpp +// Name: src/gtk1/glcanvas.cpp // Purpose: wxGLCanvas, for using OpenGL/Mesa with wxWidgets and GTK // Author: Robert Roebling // Modified by: @@ -9,23 +9,20 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "glcanvas.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#include "wx/setup.h" - #if wxUSE_GLCANVAS #include "wx/glcanvas.h" -#include "wx/frame.h" +#ifndef WX_PRECOMP + #include "wx/app.h" + #include "wx/frame.h" +#endif // WX_PRECOMP + #include "wx/colour.h" #include "wx/module.h" -#include "wx/app.h" extern "C" { @@ -34,7 +31,7 @@ extern "C" #include "gdk/gdkx.h" } -#include "wx/gtk/win_gtk.h" +#include "wx/gtk1/win_gtk.h" // DLL options compatibility check: #include "wx/build.h" @@ -72,19 +69,19 @@ wxGLContext::wxGLContext( bool WXUNUSED(isRGB), wxWindow *win, const wxPalette& wxGLCanvas *gc = (wxGLCanvas*) win; if (wxGLCanvas::GetGLXVersion() >= 13) - { - // GLX >= 1.3 - GLXFBConfig *fbc = gc->m_fbc; - wxCHECK_RET( fbc, _T("invalid GLXFBConfig for OpenGl") ); - m_glContext = glXCreateNewContext( GDK_DISPLAY(), fbc[0], GLX_RGBA_TYPE, None, GL_TRUE ); - } + { + // GLX >= 1.3 + GLXFBConfig *fbc = gc->m_fbc; + wxCHECK_RET( fbc, _T("invalid GLXFBConfig for OpenGl") ); + m_glContext = glXCreateNewContext( GDK_DISPLAY(), fbc[0], GLX_RGBA_TYPE, 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, None, GL_TRUE ); - } + { + // GLX <= 1.2 + XVisualInfo *vi = (XVisualInfo *) gc->m_vi; + wxCHECK_RET( vi, _T("invalid visual for OpenGl") ); + m_glContext = glXCreateContext( GDK_DISPLAY(), vi, None, GL_TRUE ); + } wxCHECK_RET( m_glContext, _T("Couldn't create OpenGl context") ); } @@ -101,23 +98,23 @@ wxGLContext::wxGLContext( wxGLCanvas *gc = (wxGLCanvas*) win; if (wxGLCanvas::GetGLXVersion() >= 13) - { - // GLX >= 1.3 - 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 ); - } + { + // GLX >= 1.3 + 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 ); - } + { + // 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 ); + } if ( !m_glContext ) { @@ -131,12 +128,12 @@ wxGLContext::~wxGLContext() if (m_glContext == glXGetCurrentContext()) { - if (wxGLCanvas::GetGLXVersion() >= 13) - // GLX >= 1.3 - glXMakeContextCurrent( GDK_DISPLAY(), None, None, NULL); - else - // GLX <= 1.2 - glXMakeCurrent( GDK_DISPLAY(), None, NULL); + if (wxGLCanvas::GetGLXVersion() >= 13) + // GLX >= 1.3 + glXMakeContextCurrent( GDK_DISPLAY(), None, None, NULL); + else + // GLX <= 1.2 + glXMakeCurrent( GDK_DISPLAY(), None, NULL); } glXDestroyContext( GDK_DISPLAY(), m_glContext ); @@ -156,13 +153,14 @@ void wxGLContext::SetCurrent() if (m_glContext) { GdkWindow *window = GTK_PIZZA(m_widget)->bin_window; - - if (wxGLCanvas::GetGLXVersion() >= 13) - // GLX >= 1.3 - glXMakeContextCurrent( GDK_DISPLAY(), GDK_WINDOW_XWINDOW(window), GDK_WINDOW_XWINDOW(window), m_glContext ); - else - // GLX <= 1.2 - glXMakeCurrent( GDK_DISPLAY(), GDK_WINDOW_XWINDOW(window), m_glContext ); + + if (wxGLCanvas::GetGLXVersion() >= 13) + // GLX >= 1.3 + glXMakeContextCurrent( GDK_DISPLAY(), GDK_WINDOW_XWINDOW(window), + GDK_WINDOW_XWINDOW(window), m_glContext ); + else + // GLX <= 1.2 + glXMakeCurrent( GDK_DISPLAY(), GDK_WINDOW_XWINDOW(window), m_glContext ); } } @@ -226,7 +224,7 @@ gtk_glwindow_map_callback( GtkWidget * WXUNUSED(widget), wxGLCanvas *win ) event.SetEventObject( win ); win->GetEventHandler()->ProcessEvent( event ); - win->m_exposed = FALSE; + win->m_exposed = false; win->GetUpdateRegion().Clear(); } @@ -245,7 +243,7 @@ gtk_glwindow_expose_callback( GtkWidget *WXUNUSED(widget), GdkEventExpose *gdk_e if (g_isIdle) wxapp_install_idle_handler(); - win->m_exposed = TRUE; + win->m_exposed = true; win->GetUpdateRegion().Union( gdk_event->area.x, gdk_event->area.y, @@ -258,7 +256,6 @@ gtk_glwindow_expose_callback( GtkWidget *WXUNUSED(widget), GdkEventExpose *gdk_e // "draw" of m_wxwindow //----------------------------------------------------------------------------- -#ifndef __WXGTK20__ extern "C" { static void gtk_glwindow_draw_callback( GtkWidget *WXUNUSED(widget), GdkRectangle *rect, wxGLCanvas *win ) @@ -266,13 +263,12 @@ gtk_glwindow_draw_callback( GtkWidget *WXUNUSED(widget), GdkRectangle *rect, wxG if (g_isIdle) wxapp_install_idle_handler(); - win->m_exposed = TRUE; + win->m_exposed = true; win->GetUpdateRegion().Union( rect->x, rect->y, rect->width, rect->height ); } } -#endif //----------------------------------------------------------------------------- // "size_allocate" of m_wxwindow @@ -348,9 +344,9 @@ bool wxGLCanvas::Create( wxWindow *parent, m_sharedContextOf = (wxGLCanvas*)shared_context_of; // const_cast m_glContext = (wxGLContext*) NULL; - m_exposed = FALSE; - m_noExpose = TRUE; - m_nativeSizeEvent = TRUE; + m_exposed = false; + m_noExpose = true; + m_nativeSizeEvent = true; m_fbc = NULL; m_vi = NULL; @@ -358,55 +354,79 @@ bool wxGLCanvas::Create( wxWindow *parent, wxGLCanvas::QueryGLXVersion(); 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") ); - } + { + // 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 + 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; + 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 - wxCHECK_MSG( m_vi, FALSE, _T("required visual couldn't be found") ); - GdkVisual *visual = gdkx_visual_get( vi->visualid ); - GdkColormap *colormap = gdk_colormap_new( visual, TRUE ); + wxCHECK_MSG( m_vi, false, _T("required visual couldn't be found") ); + GdkVisual *visual; + GdkColormap *colormap; - gtk_widget_push_colormap( colormap ); - gtk_widget_push_visual( visual ); + // MR: This needs a fix for lower gtk+ versions too. Might need to rethink logic (FIXME) +#if 0 + if (!gtk_check_version(2,2,0)) + { + wxWindow::Create( parent, id, pos, size, style, name ); - wxWindow::Create( parent, id, pos, size, style, name ); + m_glWidget = m_wxwindow; - m_glWidget = m_wxwindow; + GdkScreen *screen = gtk_widget_get_screen( m_glWidget ); + colormap = gdk_screen_get_default_colormap(screen); + visual = gdk_colormap_get_visual(colormap); -#ifdef __WXGTK20__ - gtk_widget_set_double_buffered( m_glWidget, FALSE ); + if (GDK_VISUAL_XVISUAL(visual)->visualid != vi->visualid) + { + visual = gdk_x11_screen_lookup_visual( screen, vi->visualid ); + colormap = gdk_colormap_new(visual, FALSE); + } + + gtk_widget_set_colormap( m_glWidget, colormap ); + } + else #endif + { + visual = gdkx_visual_get( vi->visualid ); + colormap = gdk_colormap_new( visual, TRUE ); + + gtk_widget_push_colormap( colormap ); + gtk_widget_push_visual( visual ); + + wxWindow::Create( parent, id, pos, size, style, name ); + m_glWidget = m_wxwindow; + } gtk_pizza_set_clear( GTK_PIZZA(m_wxwindow), FALSE ); @@ -419,10 +439,8 @@ bool wxGLCanvas::Create( wxWindow *parent, gtk_signal_connect( GTK_OBJECT(m_wxwindow), "expose_event", GTK_SIGNAL_FUNC(gtk_glwindow_expose_callback), (gpointer)this ); -#ifndef __WXGTK20__ gtk_signal_connect( GTK_OBJECT(m_wxwindow), "draw", GTK_SIGNAL_FUNC(gtk_glwindow_draw_callback), (gpointer)this ); -#endif gtk_signal_connect( GTK_OBJECT(m_widget), "size_allocate", GTK_SIGNAL_FUNC(gtk_glcanvas_size_callback), (gpointer)this ); @@ -439,139 +457,171 @@ bool wxGLCanvas::Create( wxWindow *parent, if (GTK_WIDGET_MAPPED(m_wxwindow)) gtk_glwindow_map_callback( m_wxwindow, this ); - return TRUE; + return true; } wxGLCanvas::~wxGLCanvas() { - GLXFBConfig * fbc = (GLXFBConfig *) m_fbc; - if (fbc && m_canFreeFBC) XFree( fbc ); + GLXFBConfig * fbc = (GLXFBConfig *) m_fbc; + if (fbc && m_canFreeFBC) + XFree( fbc ); + + XVisualInfo *vi = (XVisualInfo *) m_vi; + if (vi && m_canFreeVi) + XFree( vi ); - XVisualInfo *vi = (XVisualInfo *) m_vi; - if (vi && m_canFreeVi) XFree( vi ); - delete m_glContext; } void* wxGLCanvas::ChooseGLVisual(int *attribList) { int data[512]; - GetGLAttribListFromWX( attribList, data ); - attribList = (int*) data; - - Display *dpy = GDK_DISPLAY(); + GetGLAttribListFromWX( attribList, data ); + attribList = (int*) data; - return glXChooseVisual( dpy, DefaultScreen(dpy), attribList ); + Display *dpy = GDK_DISPLAY(); + + return glXChooseVisual( dpy, DefaultScreen(dpy), attribList ); } void* wxGLCanvas::ChooseGLFBC(int *attribList) { - int data[512]; - GetGLAttribListFromWX( attribList, data ); - attribList = (int*) data; + int data[512]; + GetGLAttribListFromWX( attribList, data ); + attribList = (int*) data; - int returned; - return glXChooseFBConfig( GDK_DISPLAY(), DefaultScreen(GDK_DISPLAY()), - attribList, &returned ); + int returned; + return glXChooseFBConfig( GDK_DISPLAY(), DefaultScreen(GDK_DISPLAY()), + attribList, &returned ); } void wxGLCanvas::GetGLAttribListFromWX(int *wx_attribList, int *gl_attribList ) { - if (!wx_attribList) + if (!wx_attribList) { - if (wxGLCanvas::GetGLXVersion() >= 13) - // leave GLX >= 1.3 choose the default attributes - gl_attribList[0] = 0; - else - { - 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; - } + if (wxGLCanvas::GetGLXVersion() >= 13) + // leave GLX >= 1.3 choose the default attributes + gl_attribList[0] = 0; + else + { + 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 { - int arg=0, p=0; - while( (wx_attribList[arg]!=0) && (p<510) ) - { - switch( wx_attribList[arg++] ) + int arg=0, p=0; + while( (wx_attribList[arg]!=0) && (p<510) ) { - 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: - if (wxGLCanvas::GetGLXVersion() <= 12) - gl_attribList[p++] = GLX_DOUBLEBUFFER; - else - // for GLX >= 1.3, GLX_DOUBLEBUFFER format is different (1 <=> True) - // it seems this flag is useless for some hardware opengl implementation. - // but for Mesa 6.2.1, this flag is used so don't ignore it. - 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; + 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: + if (wxGLCanvas::GetGLXVersion() <= 12) + gl_attribList[p++] = GLX_DOUBLEBUFFER; + else + // for GLX >= 1.3, GLX_DOUBLEBUFFER format is different (1 <=> True) + // it seems this flag is useless for some hardware opengl implementation. + // but for Mesa 6.2.1, this flag is used so don't ignore it. + 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; + + gl_attribList[p] = 0; } } void wxGLCanvas::QueryGLXVersion() { - if (m_glxVersion == 0) + if (m_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) - m_glxVersion = 10; // 1.0 by default - else - m_glxVersion = glxMajorVer*10 + glxMinorVer; + // check the GLX version + int glxMajorVer, glxMinorVer; + bool ok = glXQueryVersion(GDK_DISPLAY(), &glxMajorVer, &glxMinorVer); + wxASSERT_MSG( ok, _T("GLX version not found") ); + if (!ok) + m_glxVersion = 10; // 1.0 by default + else + m_glxVersion = glxMajorVer*10 + glxMinorVer; } } int wxGLCanvas::GetGLXVersion() { - wxASSERT_MSG( m_glxVersion>0, _T("GLX version has not been initialized with wxGLCanvas::QueryGLXVersion()") ); - return m_glxVersion; + wxASSERT_MSG( m_glxVersion>0, _T("GLX version has not been initialized with wxGLCanvas::QueryGLXVersion()") ); + return m_glxVersion; } @@ -605,7 +655,7 @@ void wxGLCanvas::OnInternalIdle() event.SetEventObject( this ); GetEventHandler()->ProcessEvent( event ); - m_exposed = FALSE; + m_exposed = false; GetUpdateRegion().Clear(); } @@ -622,41 +672,40 @@ IMPLEMENT_CLASS(wxGLApp, wxApp) wxGLApp::~wxGLApp() { - if (m_glFBCInfo) - XFree(m_glFBCInfo); + if (m_glFBCInfo) + XFree(m_glFBCInfo); if (m_glVisualInfo) XFree(m_glVisualInfo); } bool wxGLApp::InitGLVisual(int *attribList) { - wxGLCanvas::QueryGLXVersion(); + wxGLCanvas::QueryGLXVersion(); - if (wxGLCanvas::GetGLXVersion() >= 13) + if (wxGLCanvas::GetGLXVersion() >= 13) { - // GLX >= 1.3 - if (m_glFBCInfo) - XFree(m_glFBCInfo); - m_glFBCInfo = wxGLCanvas::ChooseGLFBC(attribList); - - if (m_glFBCInfo) - { - if (m_glVisualInfo) - XFree(m_glVisualInfo); - m_glVisualInfo = glXGetVisualFromFBConfig(GDK_DISPLAY(), ((GLXFBConfig *)m_glFBCInfo)[0]); - } - return (m_glFBCInfo != NULL) && (m_glVisualInfo != NULL); + // GLX >= 1.3 + if (m_glFBCInfo) + XFree(m_glFBCInfo); + m_glFBCInfo = wxGLCanvas::ChooseGLFBC(attribList); + + if (m_glFBCInfo) + { + if (m_glVisualInfo) + XFree(m_glVisualInfo); + m_glVisualInfo = glXGetVisualFromFBConfig(GDK_DISPLAY(), ((GLXFBConfig *)m_glFBCInfo)[0]); + } + return (m_glFBCInfo != NULL) && (m_glVisualInfo != NULL); } - else + else { - // GLX <= 1.2 - if (m_glVisualInfo) - XFree(m_glVisualInfo); - m_glVisualInfo = wxGLCanvas::ChooseGLVisual(attribList); - return m_glVisualInfo != NULL; + // GLX <= 1.2 + if (m_glVisualInfo) + XFree(m_glVisualInfo); + m_glVisualInfo = wxGLCanvas::ChooseGLVisual(attribList); + return m_glVisualInfo != NULL; } } #endif // wxUSE_GLCANVAS -