#include "wx/module.h"
#endif // WX_PRECOMP
-extern "C"
-{
-#include "gtk/gtk.h"
-#include "gdk/gdk.h"
-#include "gdk/gdkx.h"
-}
-
-#include "wx/gtk/win_gtk.h"
-#include "wx/gtk/private.h"
-
-//---------------------------------------------------------------------------
-// global data
-//---------------------------------------------------------------------------
-
-XVisualInfo *g_vi = (XVisualInfo*) NULL;
-
-// ----------------------------------------------------------------------------
-// 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);
-}
-
+#include <gtk/gtk.h>
+#include <gdk/gdkx.h>
#if WXWIN_COMPATIBILITY_2_8
//-----------------------------------------------------------------------------
extern "C" {
-static gint
+static void
gtk_glwindow_realized_callback( GtkWidget *WXUNUSED(widget), wxGLCanvas *win )
{
win->GTKInitImplicitContext();
-
- return FALSE;
}
}
//-----------------------------------------------------------------------------
extern "C" {
-static gint
+static void
gtk_glwindow_map_callback( GtkWidget * WXUNUSED(widget), wxGLCanvas *win )
{
wxPaintEvent event( win->GetId() );
event.SetEventObject( win );
- win->GetEventHandler()->ProcessEvent( event );
+ win->HandleWindowEvent( event );
win->m_exposed = false;
win->GetUpdateRegion().Clear();
-
- return FALSE;
}
}
static gboolean
gtk_glwindow_expose_callback( GtkWidget *WXUNUSED(widget), GdkEventExpose *gdk_event, wxGLCanvas *win )
{
- // don't need to install idle handler, its done from "event" signal
-
win->m_exposed = true;
win->GetUpdateRegion().Union( gdk_event->area.x,
extern "C" {
static void
-gtk_glcanvas_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxGLCanvas *win )
+gtk_glcanvas_size_callback(GtkWidget *WXUNUSED(widget),
+ GtkAllocation * WXUNUSED(alloc),
+ wxGLCanvas *win)
{
- if (g_isIdle)
- wxapp_install_idle_handler();
-
if (!win->m_hasVMT)
return;
wxSizeEvent event( wxSize(win->m_width,win->m_height), win->GetId() );
event.SetEventObject( win );
- win->GetEventHandler()->ProcessEvent( event );
+ win->HandleWindowEvent( event );
+}
+}
+
+//-----------------------------------------------------------------------------
+// emission hook for "parent-set"
+//-----------------------------------------------------------------------------
+
+extern "C" {
+static gboolean
+parent_set_hook(GSignalInvocationHint*, guint, const GValue* param_values, void* data)
+{
+ wxGLCanvas* win = (wxGLCanvas*)data;
+ if (g_value_peek_pointer(¶m_values[0]) == win->m_wxwindow)
+ {
+ const XVisualInfo* xvi = win->GetXVisualInfo();
+ GdkVisual* visual = gtk_widget_get_visual(win->m_wxwindow);
+ if (GDK_VISUAL_XVISUAL(visual)->visualid != xvi->visualid)
+ {
+ GdkScreen* screen = gtk_widget_get_screen(win->m_wxwindow);
+ visual = gdk_x11_screen_lookup_visual(screen, xvi->visualid);
+ GdkColormap* colormap = gdk_colormap_new(visual, false);
+ gtk_widget_set_colormap(win->m_wxwindow, colormap);
+ g_object_unref(colormap);
+ }
+ // remove hook
+ return false;
+ }
+ return true;
}
}
const wxPalette& palette)
: m_createImplicitContext(true)
{
+ m_sharedContext = NULL;
+ m_sharedContextOf = NULL;
+
Create(parent, id, pos, size, style, name, attribList, palette);
}
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);
}
const wxPalette& palette )
: m_createImplicitContext(true)
{
- m_sharedContextOf = wx_const_cast(wxGLCanvas *, shared);
+ m_sharedContext = NULL;
+ m_sharedContextOf = const_cast<wxGLCanvas *>(shared);
Create(parent, id, pos, size, style, name, attribList, palette);
}
long style,
const wxString& name,
const int *attribList,
- const wxPalette& palette)
+ const wxPalette& WXUNUSED_UNLESS_DEBUG(palette))
{
+ wxASSERT_MSG( !palette.IsOk(), _T("palettes not supported") );
+
m_exposed = false;
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") );
- }
+ if ( !InitVisual(attribList) )
+ return false;
- 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
+ // watch for the "parent-set" signal on m_wxwindow so we can set colormap
+ // before m_wxwindow is realized (which will occur before
+ // wxWindow::Create() returns if parent is already visible)
+ unsigned sig_id = g_signal_lookup("parent-set", GTK_TYPE_WIDGET);
+ g_signal_add_emission_hook(sig_id, 0, parent_set_hook, this, NULL);
- wxCHECK_MSG( m_vi, false, _T("required visual couldn't be found") );
- GdkVisual *visual;
- GdkColormap *colormap;
-
- // MR: This needs a fix for lower gtk+ versions too. Might need to rethink logic (FIXME)
-#if defined(__WXGTK20__) && GTK_CHECK_VERSION(2,2,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;
-
- GdkScreen *screen = gtk_widget_get_screen( m_glWidget );
- colormap = gdk_screen_get_default_colormap(screen);
- visual = gdk_colormap_get_visual(colormap);
-
- 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 // GTK+ >= 2.2
- {
- visual = gdkx_visual_get( vi->visualid );
- colormap = gdk_colormap_new( visual, TRUE );
-
- gtk_widget_push_colormap( colormap );
-
- wxWindow::Create( parent, id, pos, size, style, name );
- m_glWidget = m_wxwindow;
- }
-
- gtk_widget_set_double_buffered( m_glWidget, FALSE );
+ gtk_widget_set_double_buffered(m_wxwindow, false);
#if WXWIN_COMPATIBILITY_2_8
g_signal_connect(m_wxwindow, "realize", G_CALLBACK(gtk_glwindow_realized_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)
- {
- gtk_widget_pop_colormap();
- }
-
#if WXWIN_COMPATIBILITY_2_8
// if our parent window is already visible, we had been realized before we
// connected to the "realize" signal and hence our m_glContext hasn't been
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()
+Window wxGLCanvas::GetXWindow() const
{
- 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()
-{
- GdkWindow *window = GTK_PIZZA(m_wxwindow)->bin_window;
- glXSwapBuffers( GDK_DISPLAY(), GDK_WINDOW_XWINDOW( window ) );
+ GdkWindow *window = m_wxwindow->window;
+ return window ? GDK_WINDOW_XWINDOW(window) : 0;
}
void wxGLCanvas::OnInternalIdle()
{
wxPaintEvent event( GetId() );
event.SetEventObject( this );
- GetEventHandler()->ProcessEvent( event );
+ HandleWindowEvent( event );
m_exposed = false;
GetUpdateRegion().Clear();
#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
projects / wxWidgets.git / blobdiff