#include "wx/glcanvas.h"
-#include "wx/frame.h"
-#include "wx/colour.h"
-#include "wx/module.h"
-#include "wx/app.h"
+#ifndef WX_PRECOMP
+ #include "wx/app.h"
+ #include "wx/frame.h"
+ #include "wx/colour.h"
+ #include "wx/module.h"
+#endif // WX_PRECOMP
extern "C"
{
}
#include "wx/gtk/win_gtk.h"
+#include "wx/gtk/private.h"
// DLL options compatibility check:
#include "wx/build.h"
IMPLEMENT_CLASS(wxGLContext,wxObject)
-wxGLContext::wxGLContext( bool WXUNUSED(isRGB), wxWindow *win, const wxPalette& WXUNUSED(palette) )
+wxGLContext::wxGLContext(wxWindow* win, const wxGLContext* other)
{
- m_window = win;
- m_widget = win->m_wxwindow;
-
- 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 );
- }
- 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 );
- }
-
- wxCHECK_RET( m_glContext, _T("Couldn't create OpenGl context") );
-}
-
-wxGLContext::wxGLContext(
- bool WXUNUSED(isRGB), wxWindow *win,
- const wxPalette& WXUNUSED(palette),
- const wxGLContext *other /* for sharing display lists */
-)
-{
- m_window = win;
- m_widget = win->m_wxwindow;
-
wxGLCanvas *gc = (wxGLCanvas*) win;
if (wxGLCanvas::GetGLXVersion() >= 13)
glXDestroyContext( GDK_DISPLAY(), m_glContext );
}
-void wxGLContext::SwapBuffers()
+void wxGLContext::SetCurrent(const wxGLCanvas& win) const
{
if (m_glContext)
{
- GdkWindow *window = GTK_PIZZA(m_widget)->bin_window;
- glXSwapBuffers( GDK_DISPLAY(), GDK_WINDOW_XWINDOW( window ) );
- }
-}
-
-void wxGLContext::SetCurrent()
-{
- if (m_glContext)
- {
- GdkWindow *window = GTK_PIZZA(m_widget)->bin_window;
+ GdkWindow *window = GTK_PIZZA(win.m_wxwindow)->bin_window;
if (wxGLCanvas::GetGLXVersion() >= 13)
// GLX >= 1.3
- glXMakeContextCurrent( GDK_DISPLAY(), GDK_WINDOW_XWINDOW(window),
- GDK_WINDOW_XWINDOW(window), m_glContext );
+ 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 );
}
}
-void wxGLContext::SetColour(const wxChar *colour)
-{
- wxColour col = wxTheColourDatabase->Find(colour);
- if (col.Ok())
- {
- float r = (float)(col.Red()/256.0);
- float g = (float)(col.Green()/256.0);
- float b = (float)(col.Blue()/256.0);
- glColor3f( r, g, b);
- }
-}
-
-void wxGLContext::SetupPixelFormat()
-{
-}
-
-void wxGLContext::SetupPalette( const wxPalette& WXUNUSED(palette) )
-{
-}
-
-wxPalette wxGLContext::CreateDefaultPalette()
-{
- return wxNullPalette;
-}
//-----------------------------------------------------------------------------
// "realize" from m_wxwindow
static gint
gtk_glwindow_realized_callback( GtkWidget *WXUNUSED(widget), wxGLCanvas *win )
{
- if ( !win->m_glContext )
+ if (!win->m_glContext && win->m_createImplicitContext)
{
wxGLContext *share = win->m_sharedContext;
if ( !share && win->m_sharedContextOf )
share = win->m_sharedContextOf->GetContext();
- win->m_glContext = new wxGLContext( TRUE, win, wxNullPalette, share );
+ win->m_glContext = new wxGLContext(win, share);
}
return FALSE;
static gint
gtk_glwindow_map_callback( GtkWidget * WXUNUSED(widget), wxGLCanvas *win )
{
- if (win->m_glContext/* && win->m_exposed*/)
+ // CF: Can the "if" line be removed, and the code unconditionally (always) be run?
+ if (win->m_glContext || !win->m_createImplicitContext)
{
wxPaintEvent event( win->GetId() );
event.SetEventObject( win );
win->GetEventHandler()->ProcessEvent( event );
- win->m_exposed = FALSE;
+ win->m_exposed = false;
win->GetUpdateRegion().Clear();
}
static void
gtk_glwindow_expose_callback( GtkWidget *WXUNUSED(widget), GdkEventExpose *gdk_event, wxGLCanvas *win )
{
- if (g_isIdle)
- wxapp_install_idle_handler();
+ // don't need to install idle handler, its done from "event" signal
- win->m_exposed = TRUE;
+ win->m_exposed = true;
win->GetUpdateRegion().Union( gdk_event->area.x,
gdk_event->area.y,
EVT_SIZE(wxGLCanvas::OnSize)
END_EVENT_TABLE()
+wxGLCanvas::wxGLCanvas( wxWindow *parent, wxWindowID id,
+ int *attribList,
+ const wxPoint& pos, const wxSize& size,
+ long style, const wxString& name,
+ const wxPalette& palette )
+ : m_createImplicitContext(false)
+{
+ Create( parent, NULL, NULL, id, pos, size, style, name, attribList, palette );
+}
+
wxGLCanvas::wxGLCanvas( wxWindow *parent, wxWindowID id,
const wxPoint& pos, const wxSize& size,
long style, const wxString& name,
int *attribList,
const wxPalette& palette )
+ : m_createImplicitContext(true)
{
Create( parent, NULL, NULL, id, pos, size, style, name, attribList, palette );
}
long style, const wxString& name,
int *attribList,
const wxPalette& palette )
+ : m_createImplicitContext(true)
{
Create( parent, shared, NULL, id, pos, size, style, name, attribList, palette );
}
long style, const wxString& name,
int *attribList,
const wxPalette& palette )
+ : m_createImplicitContext(true)
{
Create( parent, NULL, shared, id, pos, size, style, name, attribList, palette );
}
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;
if (wxTheApp->m_glFBCInfo != NULL)
{
fbc = (GLXFBConfig *) wxTheApp->m_glFBCInfo;
- m_canFreeFBC = FALSE; // owned by wxTheApp - don't free upon destruction
+ m_canFreeFBC = false; // owned by wxTheApp - don't free upon destruction
}
else
{
fbc = (GLXFBConfig *) wxGLCanvas::ChooseGLFBC(attribList);
- m_canFreeFBC = TRUE;
+ m_canFreeFBC = true;
}
m_fbc = fbc; // save for later use
- wxCHECK_MSG( m_fbc, FALSE, _T("required FBConfig couldn't be found") );
+ 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
+ m_canFreeVi = false; // owned by wxTheApp - don't free upon destruction
}
else
{
// GLX <= 1.2
vi = (XVisualInfo *) ChooseGLVisual(attribList);
- m_canFreeVi = TRUE;
+ m_canFreeVi = true;
}
m_vi = vi; // save for later use
- wxCHECK_MSG( m_vi, FALSE, _T("required visual couldn't be found") );
+ wxCHECK_MSG( m_vi, false, _T("required visual couldn't be found") );
GdkVisual *visual;
GdkColormap *colormap;
gtk_widget_set_double_buffered( m_glWidget, FALSE );
- gtk_pizza_set_clear( GTK_PIZZA(m_wxwindow), FALSE );
-
- g_signal_connect (m_wxwindow, "realize",
- G_CALLBACK (gtk_glwindow_realized_callback),
- this);
- g_signal_connect (m_wxwindow, "map",
- G_CALLBACK (gtk_glwindow_map_callback),
- this);
- g_signal_connect (m_wxwindow, "expose_event",
- G_CALLBACK (gtk_glwindow_expose_callback),
- this);
- g_signal_connect (m_widget, "size_allocate",
- G_CALLBACK (gtk_glcanvas_size_callback),
- this);
+ g_signal_connect(m_wxwindow, "realize", G_CALLBACK(gtk_glwindow_realized_callback), this);
+ g_signal_connect(m_wxwindow, "map", G_CALLBACK(gtk_glwindow_map_callback), this);
+ g_signal_connect(m_wxwindow, "expose_event", G_CALLBACK(gtk_glwindow_expose_callback), this);
+ g_signal_connect(m_widget, "size_allocate", G_CALLBACK(gtk_glcanvas_size_callback), this);
if (gtk_check_version(2,2,0) != NULL)
{
if (GTK_WIDGET_MAPPED(m_wxwindow))
gtk_glwindow_map_callback( m_wxwindow, this );
- return TRUE;
+ return true;
}
wxGLCanvas::~wxGLCanvas()
void wxGLCanvas::SwapBuffers()
{
- if (m_glContext)
- m_glContext->SwapBuffers();
+ GdkWindow *window = GTK_PIZZA(m_wxwindow)->bin_window;
+ glXSwapBuffers( GDK_DISPLAY(), GDK_WINDOW_XWINDOW( window ) );
}
void wxGLCanvas::OnSize(wxSizeEvent& WXUNUSED(event))
{
}
+void wxGLCanvas::SetCurrent(const wxGLContext& RC) const
+{
+ RC.SetCurrent(*this);
+}
+
void wxGLCanvas::SetCurrent()
{
if (m_glContext)
- m_glContext->SetCurrent();
+ m_glContext->SetCurrent(*this);
}
void wxGLCanvas::SetColour( const wxChar *colour )
{
- if (m_glContext)
- m_glContext->SetColour( colour );
+ wxColour col = wxTheColourDatabase->Find(colour);
+ if (col.Ok())
+ {
+ float r = (float)(col.Red()/256.0);
+ float g = (float)(col.Green()/256.0);
+ float b = (float)(col.Blue()/256.0);
+ glColor3f( r, g, b);
+ }
}
void wxGLCanvas::OnInternalIdle()
{
- if (m_glContext && m_exposed)
+ if (/*m_glContext &&*/ m_exposed)
{
wxPaintEvent event( GetId() );
event.SetEventObject( this );
GetEventHandler()->ProcessEvent( event );
- m_exposed = FALSE;
+ m_exposed = false;
GetUpdateRegion().Clear();
}
projects / wxWidgets.git / blobdiff