X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e8b04eb349f772582534d3e466983ada85f2460d..77902671753529da1345efb71ff6017cb882bedc:/utils/glcanvas/gtk/glcanvas.cpp?ds=sidebyside

diff --git a/utils/glcanvas/gtk/glcanvas.cpp b/utils/glcanvas/gtk/glcanvas.cpp
index 6021bcec7d..735da31179 100644
--- a/utils/glcanvas/gtk/glcanvas.cpp
+++ b/utils/glcanvas/gtk/glcanvas.cpp
@@ -34,6 +34,13 @@ extern "C" {
 
 XVisualInfo *g_vi = (XVisualInfo*) NULL;
 
+//-----------------------------------------------------------------------------
+// idle system
+//-----------------------------------------------------------------------------
+
+extern void wxapp_install_idle_handler();
+extern bool g_isIdle;
+
 //---------------------------------------------------------------------------
 // wxGLContext
 //---------------------------------------------------------------------------
@@ -88,7 +95,8 @@ void wxGLContext::SwapBuffers()
 {
     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 ) );
     }
 }
 
@@ -96,7 +104,8 @@ void wxGLContext::SetCurrent()
 {
     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 );
     }
 }
 
@@ -128,6 +137,73 @@ wxPalette wxGLContext::CreateDefaultPalette()
     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 );
+
+    XFree( g_vi );
+    g_vi = (XVisualInfo*) NULL;
+
+    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
 //---------------------------------------------------------------------------
@@ -166,21 +242,17 @@ bool wxGLCanvas::Create( wxWindow *parent,
                          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_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, 
@@ -220,44 +292,41 @@ bool wxGLCanvas::Create( wxWindow *parent,
     
     g_vi = glXChooseVisual( dpy, DefaultScreen(dpy), attribList );
     
+    wxCHECK_MSG( g_vi, FALSE, "required visual couldn't be found" );
+
     GdkVisual *visual = gdkx_visual_get( g_vi->visualid );
     GdkColormap *colormap = gdk_colormap_new( gdkx_visual_get(g_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), "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;
-
-//    gdk_window_set_back_pixmap( m_glWidget->window, None, 0 );
-     
-    /* 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()
 {
     if (m_glContext) delete m_glContext;
-    m_wxwindow = (GtkWidget*) NULL;
 }
 
 void wxGLCanvas::SwapBuffers()
@@ -269,10 +338,10 @@ void wxGLCanvas::OnSize(wxSizeEvent& WXUNUSED(event))
 {
     int width, height;
     GetClientSize( &width, &height );
+    
     if (m_glContext && GTK_WIDGET_REALIZED(m_glWidget) )
     {
         SetCurrent(); 
-//        gdk_window_set_back_pixmap( gtk_widget_get_parent_window(m_glWidget), None, 0 );
 	
         glViewport(0, 0, (GLint)width, (GLint)height );
         glMatrixMode(GL_PROJECTION);
@@ -292,12 +361,17 @@ void wxGLCanvas::SetColour( const char *colour )
     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();
 }