X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a20cd16ca05b72ed8d6fd055c62de115d09b4a48..d624fd67f82a90d74c7f796b241508663367134f:/utils/glcanvas/gtk/glcanvas.cpp diff --git a/utils/glcanvas/gtk/glcanvas.cpp b/utils/glcanvas/gtk/glcanvas.cpp index bbc4c0dfdd..68552f1b16 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 //--------------------------------------------------------------------------- @@ -43,11 +50,14 @@ IMPLEMENT_CLASS(wxGLContext,wxObject) 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" ); } @@ -59,15 +69,17 @@ wxGLContext::wxGLContext( ) { 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" ); } @@ -88,7 +100,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 +109,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 ); } } @@ -135,11 +149,86 @@ wxPalette wxGLContext::CreateDefaultPalette() static gint gtk_glwindow_realized_callback( GtkWidget * WXUNUSED(widget), wxGLCanvas *win ) { - win->m_glContext = new wxGLContext( TRUE, win, wxNullPalette, win->m_glContext ); + wxGLContext *share= win->m_sharedContext; + if (share==NULL && win->m_sharedContextOf) share=win->m_sharedContextOf->GetContext(); + + win->m_glContext = new wxGLContext( TRUE, win, wxNullPalette, share ); + + 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 //--------------------------------------------------------------------------- @@ -156,7 +245,7 @@ wxGLCanvas::wxGLCanvas( wxWindow *parent, wxWindowID id, int *attribList, const wxPalette& palette ) { - Create( parent, NULL, id, pos, size, style, name, attribList, palette ); + Create( parent, NULL, NULL, id, pos, size, style, name, attribList, palette ); } wxGLCanvas::wxGLCanvas( wxWindow *parent, @@ -167,18 +256,36 @@ wxGLCanvas::wxGLCanvas( wxWindow *parent, int *attribList, const wxPalette& palette ) { - Create( parent, shared, id, pos, size, style, name, attribList, palette ); + Create( parent, shared, NULL, id, pos, size, style, name, attribList, palette ); +} + +wxGLCanvas::wxGLCanvas( wxWindow *parent, + const wxGLCanvas *shared, + wxWindowID id, + const wxPoint& pos, const wxSize& size, + long style, const wxString& name, + int *attribList, + const wxPalette& palette ) +{ + Create( parent, NULL, shared, id, pos, size, style, name, attribList, palette ); } bool wxGLCanvas::Create( wxWindow *parent, const wxGLContext *shared, + const wxGLCanvas *shared_context_of, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name, int *attribList, const wxPalette& palette) { - m_glContext = (wxGLContext*)shared; // const_cast + m_sharedContext = (wxGLContext*)shared; // const_cast + m_sharedContextOf = (wxGLCanvas*)shared_context_of; // const_cast + m_glContext = (wxGLContext*) NULL; + + m_exposed = FALSE; + m_noExpose = TRUE; + m_nativeSizeEvent = TRUE; if (!attribList) { @@ -222,12 +329,14 @@ bool wxGLCanvas::Create( wxWindow *parent, Display *dpy = GDK_DISPLAY(); - g_vi = glXChooseVisual( dpy, DefaultScreen(dpy), attribList ); + XVisualInfo *vi = glXChooseVisual( dpy, DefaultScreen(dpy), attribList ); - wxCHECK_MSG( g_vi, FALSE, "required visual couldn't be found" ); + m_vi = vi; // safe for later use + + wxCHECK_MSG( m_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 ); + 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 ); @@ -236,22 +345,34 @@ bool wxGLCanvas::Create( wxWindow *parent, m_glWidget = m_wxwindow; - gtk_signal_connect( GTK_OBJECT(m_glWidget), "realize", + 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(); - /* must be realized for OpenGl output */ - gtk_widget_realize( m_glWidget ); - - XFree( g_vi ); - g_vi = (XVisualInfo*) NULL; - return TRUE; } wxGLCanvas::~wxGLCanvas() { + XVisualInfo *vi = (XVisualInfo *) m_vi; + + if (vi) XFree( vi ); if (m_glContext) delete m_glContext; } @@ -287,12 +408,17 @@ void wxGLCanvas::SetColour( const char *colour ) if (m_glContext) m_glContext->SetColour( colour ); } -GtkWidget *wxGLCanvas::GetConnectWidget() +void wxGLCanvas::OnInternalIdle() { - return m_wxwindow; -} + if (m_glContext && m_exposed) + { + wxPaintEvent event( GetId() ); + event.SetEventObject( this ); + GetEventHandler()->ProcessEvent( event ); -bool wxGLCanvas::IsOwnGtkWindow( GdkWindow *window ) -{ - return (window == m_wxwindow->window); + m_exposed = FALSE; + GetUpdateRegion().Clear(); + } + + wxWindow::OnInternalIdle(); }