XVisualInfo *g_vi = (XVisualInfo*) NULL;
+//-----------------------------------------------------------------------------
+// idle system
+//-----------------------------------------------------------------------------
+
+extern void wxapp_install_idle_handler();
+extern bool g_isIdle;
+
//---------------------------------------------------------------------------
// wxGLContext
//---------------------------------------------------------------------------
wxGLContext::wxGLContext( bool WXUNUSED(isRGB), wxWindow *win, const wxPalette& WXUNUSED(palette) )
{
m_window = win;
- m_widget = ((wxGLCanvas*)win)->m_glWidget;
-
- wxCHECK_RET( g_vi, "invalid visual for OpenGl" );
+ m_widget = win->m_wxwindow;
+
+ wxGLCanvas *gc = (wxGLCanvas*) win;
+ XVisualInfo *vi = (XVisualInfo *) gc->m_vi;
+
+ wxCHECK_RET( vi, "invalid visual for OpenGl" );
- m_glContext = glXCreateContext( GDK_DISPLAY(), g_vi, None, GL_TRUE );
+ m_glContext = glXCreateContext( GDK_DISPLAY(), vi, None, GL_TRUE );
wxCHECK_RET( m_glContext, "Couldn't create OpenGl context" );
}
)
{
m_window = win;
- m_widget = ((wxGLCanvas*)win)->m_glWidget;
-
- wxCHECK_RET( g_vi, "invalid visual for OpenGl" );
+ m_widget = win->m_wxwindow;
+
+ wxGLCanvas *gc = (wxGLCanvas*) win;
+ XVisualInfo *vi = (XVisualInfo *) gc->m_vi;
+
+ wxCHECK_RET( vi, "invalid visual for OpenGl" );
if( other != 0 )
- m_glContext = glXCreateContext( GDK_DISPLAY(), g_vi, other->m_glContext,
- GL_TRUE );
+ m_glContext = glXCreateContext( GDK_DISPLAY(), vi, other->m_glContext, GL_TRUE );
else
- m_glContext = glXCreateContext( GDK_DISPLAY(), g_vi, None, GL_TRUE );
+ m_glContext = glXCreateContext( GDK_DISPLAY(), vi, None, GL_TRUE );
wxCHECK_RET( m_glContext, "Couldn't create OpenGl context" );
}
{
if (m_glContext)
{
- glXSwapBuffers( GDK_DISPLAY(), GDK_WINDOW_XWINDOW( m_widget->window ) );
+ GdkWindow *window = GTK_PIZZA(m_widget)->bin_window;
+ glXSwapBuffers( GDK_DISPLAY(), GDK_WINDOW_XWINDOW( window ) );
}
}
{
if (m_glContext)
{
- glXMakeCurrent( GDK_DISPLAY(), GDK_WINDOW_XWINDOW(m_widget->window), m_glContext );
+ GdkWindow *window = GTK_PIZZA(m_widget)->bin_window;
+ glXMakeCurrent( GDK_DISPLAY(), GDK_WINDOW_XWINDOW(window), m_glContext );
}
}
return wxNullPalette;
}
+//-----------------------------------------------------------------------------
+// "realize" from m_wxwindow
+//-----------------------------------------------------------------------------
+
+static gint
+gtk_glwindow_realized_callback( GtkWidget * WXUNUSED(widget), wxGLCanvas *win )
+{
+ win->m_glContext = new wxGLContext( TRUE, win, wxNullPalette, win->m_sharedContext );
+
+ return FALSE;
+}
+
+//-----------------------------------------------------------------------------
+// "map" from m_wxwindow
+//-----------------------------------------------------------------------------
+
+static gint
+gtk_glwindow_map_callback( GtkWidget * WXUNUSED(widget), wxGLCanvas *win )
+{
+ if (win->m_glContext/* && win->m_exposed*/)
+ {
+ wxPaintEvent event( win->GetId() );
+ event.SetEventObject( win );
+ win->GetEventHandler()->ProcessEvent( event );
+
+ win->m_exposed = FALSE;
+ win->GetUpdateRegion().Clear();
+ }
+
+ return FALSE;
+}
+
+//-----------------------------------------------------------------------------
+// "expose_event" of m_wxwindow
+//-----------------------------------------------------------------------------
+
+static void
+gtk_glwindow_expose_callback( GtkWidget *WXUNUSED(widget), GdkEventExpose *gdk_event, wxGLCanvas *win )
+{
+ if (g_isIdle)
+ wxapp_install_idle_handler();
+
+ win->m_exposed = TRUE;
+
+ win->GetUpdateRegion().Union( gdk_event->area.x,
+ gdk_event->area.y,
+ gdk_event->area.width,
+ gdk_event->area.height );
+}
+
+//-----------------------------------------------------------------------------
+// "draw" of m_wxwindow
+//-----------------------------------------------------------------------------
+
+static void
+gtk_glwindow_draw_callback( GtkWidget *WXUNUSED(widget), GdkRectangle *rect, wxGLCanvas *win )
+{
+ if (g_isIdle)
+ wxapp_install_idle_handler();
+
+ win->m_exposed = TRUE;
+
+ win->GetUpdateRegion().Union( rect->x, rect->y,
+ rect->width, rect->height );
+}
+
+//-----------------------------------------------------------------------------
+// "size_allocate" of m_wxwindow
+//-----------------------------------------------------------------------------
+
+static void
+gtk_glcanvas_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* 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 );
+}
+
//---------------------------------------------------------------------------
// wxGlCanvas
//---------------------------------------------------------------------------
int *attribList,
const wxPalette& palette)
{
- m_needParent = TRUE;
- m_acceptsFocus = TRUE;
-
- if (!PreCreation( parent, pos, size ) ||
- !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
- {
- wxFAIL_MSG( _T("wxGLCanvas creation failed") );
- return FALSE;
- }
-
+ m_sharedContext = (wxGLContext*)shared; // const_cast
+ m_glContext = (wxGLContext*) NULL;
+
+ m_exposed = FALSE;
+ m_noExpose = TRUE;
+ m_nativeSizeEvent = TRUE;
+
if (!attribList)
{
int data[] = { GLX_RGBA,
GLX_DOUBLEBUFFER,
- GLX_DEPTH_SIZE, 1, /* use largest available depth buffer */
+ GLX_DEPTH_SIZE, 1, // use largest available depth buffer
GLX_RED_SIZE, 1,
GLX_GREEN_SIZE, 1,
GLX_BLUE_SIZE, 1,
Display *dpy = GDK_DISPLAY();
- g_vi = glXChooseVisual( dpy, DefaultScreen(dpy), attribList );
+ XVisualInfo *vi = glXChooseVisual( dpy, DefaultScreen(dpy), attribList );
+
+ m_vi = vi; // safe for later use
- GdkVisual *visual = gdkx_visual_get( g_vi->visualid );
- GdkColormap *colormap = gdk_colormap_new( gdkx_visual_get(g_vi->visualid), TRUE );
+ wxCHECK_MSG( m_vi, FALSE, "required visual couldn't be found" );
+
+ GdkVisual *visual = gdkx_visual_get( vi->visualid );
+ GdkColormap *colormap = gdk_colormap_new( gdkx_visual_get(vi->visualid), TRUE );
gtk_widget_push_colormap( colormap );
gtk_widget_push_visual( visual );
+
+ wxScrolledWindow::Create( parent, id, pos, size, style, name );
+
+ m_glWidget = m_wxwindow;
- m_glWidget = gtk_myfixed_new();
- m_widget = m_glWidget;
+ gtk_pizza_set_clear( GTK_PIZZA(m_wxwindow), FALSE );
+ gtk_signal_connect( GTK_OBJECT(m_wxwindow), "realize",
+ GTK_SIGNAL_FUNC(gtk_glwindow_realized_callback), (gpointer) this );
+
+ gtk_signal_connect( GTK_OBJECT(m_wxwindow), "map",
+ GTK_SIGNAL_FUNC(gtk_glwindow_map_callback), (gpointer) this );
+
+ gtk_signal_connect( GTK_OBJECT(m_wxwindow), "expose_event",
+ GTK_SIGNAL_FUNC(gtk_glwindow_expose_callback), (gpointer)this );
+
+ gtk_signal_connect( GTK_OBJECT(m_wxwindow), "draw",
+ GTK_SIGNAL_FUNC(gtk_glwindow_draw_callback), (gpointer)this );
+
+ gtk_signal_connect( GTK_OBJECT(m_widget), "size_allocate",
+ GTK_SIGNAL_FUNC(gtk_glcanvas_size_callback), (gpointer)this );
+
gtk_widget_pop_visual();
gtk_widget_pop_colormap();
- m_parent->DoAddChild( this );
-
- /* must be realized for OpenGl output */
- gtk_widget_realize( m_glWidget );
-
- m_glContext = new wxGLContext( TRUE, this, palette, shared );
-
- XFree( g_vi );
- g_vi = (XVisualInfo*) NULL;
-
- /* we pretend to have a m_wxwindow so that PostCreation hooks
- up the events for expose and draw */
- m_wxwindow = m_glWidget;
- PostCreation();
-
- Show( TRUE );
-
return TRUE;
}
wxGLCanvas::~wxGLCanvas()
{
+ XVisualInfo *vi = (XVisualInfo *) m_vi;
+
+ if (vi)
+ XFree( vi );
+
if (m_glContext) delete m_glContext;
- m_wxwindow = (GtkWidget*) NULL;
}
void wxGLCanvas::SwapBuffers()
if (m_glContext) m_glContext->SetColour( colour );
}
-GtkWidget *wxGLCanvas::GetConnectWidget()
+void wxGLCanvas::OnInternalIdle()
{
- return m_glWidget;
-}
+ if (m_glContext && m_exposed)
+ {
+ wxPaintEvent event( GetId() );
+ event.SetEventObject( this );
+ GetEventHandler()->ProcessEvent( event );
-bool wxGLCanvas::IsOwnGtkWindow( GdkWindow *window )
-{
- return (window == m_glWidget->window);
+ m_exposed = FALSE;
+ GetUpdateRegion().Clear();
+ }
+
+ wxWindow::OnInternalIdle();
}
projects / wxWidgets.git / blobdiff