X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f41bc3e3f3fda37fba548440b230288c5eed0953..7dbe942aaaa9a8f32c9f901bdcf83d7941362b71:/src/x11/glcanvas.cpp diff --git a/src/x11/glcanvas.cpp b/src/x11/glcanvas.cpp index c7bf78eb39..dc1ae653ba 100644 --- a/src/x11/glcanvas.cpp +++ b/src/x11/glcanvas.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: glcanvas.cpp -// Purpose: wxGLCanvas, for using OpenGL with wxWindows 2.0 for Motif. +// Purpose: wxGLCanvas, for using OpenGL with wxWidgets // Uses the GLX extension. // Author: Julian Smart and Wolfram Gloger // Modified by: @@ -10,10 +10,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "glcanvas.h" -#endif - #include "wx/setup.h" #if wxUSE_GLCANVAS @@ -21,15 +17,29 @@ #include "wx/glcanvas.h" #include "wx/utils.h" #include "wx/app.h" +#include "wx/log.h" #ifdef __VMS # pragma message disable nosimpint #endif -#include +#include #ifdef __VMS # pragma message enable nosimpint #endif -#include "wx/motif/private.h" +#include "wx/x11/private.h" + +// DLL options compatibility check: +#include "wx/build.h" +WX_CHECK_BUILD_OPTIONS("wxGL") + +static inline WXWindow wxGetClientAreaWindow(wxWindow* win) +{ +#ifdef __WXMOTIF__ + return win->GetClientXWindow(); +#else + return win->GetClientAreaWindow(); +#endif +} #ifdef OLD_MESA // workaround for bug in Mesa's glx.c @@ -59,12 +69,12 @@ wxGLContext::wxGLContext( bool WXUNUSED(isRGB), wxWindow *win, wxGLCanvas *gc = (wxGLCanvas*) win; XVisualInfo *vi = (XVisualInfo *) gc->m_vi; - wxCHECK_RET( vi, "invalid visual for OpenGl" ); + wxCHECK_RET( vi, wxT("invalid visual for OpenGL") ); m_glContext = glXCreateContext( (Display *)wxGetDisplay(), vi, None, GL_TRUE); - wxCHECK_RET( m_glContext, "Couldn't create OpenGl context" ); + wxCHECK_RET( m_glContext, wxT("Couldn't create OpenGL context") ); } wxGLContext::wxGLContext( @@ -79,7 +89,7 @@ wxGLContext::wxGLContext( wxGLCanvas *gc = (wxGLCanvas*) win; XVisualInfo *vi = (XVisualInfo *) gc->m_vi; - wxCHECK_RET( vi, "invalid visual for OpenGl" ); + wxCHECK_RET( vi, wxT("invalid visual for OpenGL") ); if( other != 0 ) m_glContext = glXCreateContext( (Display *)wxGetDisplay(), vi, @@ -88,7 +98,7 @@ wxGLContext::wxGLContext( m_glContext = glXCreateContext( (Display *)wxGetDisplay(), vi, None, GL_TRUE ); - wxCHECK_RET( m_glContext, "Couldn't create OpenGl context" ); + wxCHECK_RET( m_glContext, wxT("Couldn't create OpenGL context") ); } wxGLContext::~wxGLContext() @@ -108,7 +118,7 @@ void wxGLContext::SwapBuffers() if (m_glContext) { Display* display = (Display*) wxGetDisplay(); - glXSwapBuffers(display, (Window) m_window->GetClientAreaWindow()); + glXSwapBuffers(display, (Window) wxGetClientAreaWindow(m_window)); } } @@ -117,31 +127,39 @@ void wxGLContext::SetCurrent() if (m_glContext) { Display* display = (Display*) wxGetDisplay(); - glXMakeCurrent(display, (Window) m_window->GetClientAreaWindow(), + glXMakeCurrent(display, (Window) wxGetClientAreaWindow(m_window), m_glContext );; } } -void wxGLContext::SetColour(const char *colour) +void wxGLContext::SetColour(const wxChar *colour) { - wxColour *the_colour = wxTheColourDatabase->FindColour(colour); - if(the_colour) { - GLboolean b; - glGetBooleanv(GL_RGBA_MODE, &b); - if(b) { - glColor3ub(the_colour->Red(), - the_colour->Green(), - the_colour->Blue()); - } else { - the_colour->CalcPixel(wxTheApp->GetMainColormap(wxGetDisplay())); - GLint pix = (GLint)the_colour->GetPixel(); - if(pix == -1) + wxColour the_colour = wxTheColourDatabase->Find(colour); + if(the_colour.Ok()) + { + GLboolean b; + glGetBooleanv(GL_RGBA_MODE, &b); + if(b) + { + glColor3ub(the_colour.Red(), + the_colour.Green(), + the_colour.Blue()); + } + else + { +#ifdef __WXMOTIF__ + the_colour.AllocColour(m_window->GetXDisplay()); +#else + the_colour.CalcPixel(wxTheApp->GetMainColormap(wxGetDisplay())); +#endif + GLint pix = (GLint)the_colour.GetPixel(); + if(pix == -1) { - wxLogError("wxGLCanvas: cannot allocate color\n"); - return; + wxLogError(wxT("wxGLCanvas: cannot allocate color\n")); + return; } - glIndexi(pix); - } + glIndexi(pix); + } } } @@ -237,8 +255,8 @@ bool wxGLCanvas::Create( wxWindow *parent, // Check for the presence of the GLX extension if(!glXQueryExtension(display, NULL, NULL)) { - wxDebugMsg("wxGLCanvas: GLX extension is missing\n"); - return false; + wxLogDebug(wxT("wxGLCanvas: GLX extension is missing\n")); + return FALSE; } if(attribList) { @@ -286,7 +304,7 @@ bool wxGLCanvas::Create( wxWindow *parent, 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, @@ -294,12 +312,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 ? - XGetWindowAttributes(display, (Window) GetClientAreaWindow(), &xwa); + XGetWindowAttributes(display, (Window)wxGetClientAreaWindow(this), &xwa); 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); - 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. @@ -326,13 +344,13 @@ bool wxGLCanvas::Create( wxWindow *parent, a_list[n] = None; // XFree(vi); vi = glXChooseVisual(display, DefaultScreen(display), a_list); - if(!vi) return false; + if(!vi) return FALSE; #endif /* OLD_MESA */ } m_vi = vi; // safe for later use - wxCHECK_MSG( m_vi, FALSE, "required visual couldn't be found" ); + wxCHECK_MSG( m_vi, FALSE, wxT("required visual couldn't be found") ); // Create the GLX context and make it current @@ -347,7 +365,7 @@ bool wxGLCanvas::Create( wxWindow *parent, #endif SetCurrent(); - return true; + return TRUE; } wxGLCanvas::~wxGLCanvas(void) @@ -377,7 +395,7 @@ void wxGLCanvas::SetCurrent() // if(glx_cx) glXMakeCurrent(display, (Window) GetClientAreaWindow(), glx_cx); } -void wxGLCanvas::SetColour(const char *col) +void wxGLCanvas::SetColour(const wxChar *col) { if( m_glContext ) m_glContext->SetColour(col); }