after a seek, reset error if error==EOF

[wxWidgets.git] / utils / glcanvas / gtk / glcanvas.cpp

diff --git a/utils/glcanvas/gtk/glcanvas.cpp b/utils/glcanvas/gtk/glcanvas.cpp
index d8d12a8ab4bdd86c17211d924900f16d26adc31d..bbc4c0dfddf8d72f1dd79593d06bf1996585ddf8 100644 (file)
--- a/utils/glcanvas/gtk/glcanvas.cpp
+++ b/utils/glcanvas/gtk/glcanvas.cpp
@@ -52,6 +52,26 @@ wxGLContext::wxGLContext( bool WXUNUSED(isRGB), wxWindow *win, const wxPalette&
     wxCHECK_RET( m_glContext, "Couldn't create OpenGl context" );
 }
 
     wxCHECK_RET( m_glContext, "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 = ((wxGLCanvas*)win)->m_glWidget;
+  
+    wxCHECK_RET( g_vi, "invalid visual for OpenGl" );
+    
+    if( other != 0 )
+      m_glContext = glXCreateContext( GDK_DISPLAY(), g_vi, other->m_glContext,
+                                      GL_TRUE );
+    else
+      m_glContext = glXCreateContext( GDK_DISPLAY(), g_vi, None, GL_TRUE );
+    
+    wxCHECK_RET( m_glContext, "Couldn't create OpenGl context" );
+}
+

 wxGLContext::~wxGLContext()
 {
     if (!m_glContext) return;
 wxGLContext::~wxGLContext()
 {
     if (!m_glContext) return;


@@ -109,49 +129,15 @@ wxPalette wxGLContext::CreateDefaultPalette()
 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------

-// "expose_event" of m_glWidget
+// "realize" from m_wxwindow

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-static void gtk_window_expose_callback( GtkWidget *WXUNUSED(widget), GdkEventExpose *gdk_event, wxWindow *win )
+static gint
+gtk_glwindow_realized_callback( GtkWidget * WXUNUSED(widget), wxGLCanvas *win )

 {
 {

-    if (!win->HasVMT()) return;
-
-    win->m_updateRegion.Union( gdk_event->area.x,
-                               gdk_event->area.y,
-                               gdk_event->area.width,
-                               gdk_event->area.height );
-
-    if (gdk_event->count > 0) return;
-
-/*
-    printf( "OnExpose from " );
-    if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
-        printf( win->GetClassInfo()->GetClassName() );
-    printf( ".\n" );
-*/
-
-    wxPaintEvent event( win->GetId() );
-    event.SetEventObject( win );
-    win->GetEventHandler()->ProcessEvent( event );
+    win->m_glContext = new wxGLContext( TRUE, win, wxNullPalette, win->m_glContext );

 
 

-    win->m_updateRegion.Clear();
-}
-
-//-----------------------------------------------------------------------------
-// "draw" of m_glWidget
-//-----------------------------------------------------------------------------
-
-static void gtk_window_draw_callback( GtkWidget *WXUNUSED(widget), GdkRectangle *rect, wxWindow *win )
-{
-    if (!win->HasVMT()) return;
-
-    win->m_updateRegion.Union( rect->x, rect->y, rect->width, rect->height );
-
-    wxPaintEvent event( win->GetId() );
-    event.SetEventObject( win );
-    win->GetEventHandler()->ProcessEvent( event );
-
-    win->m_updateRegion.Clear();
+    return FALSE;

 }
 
 //---------------------------------------------------------------------------
 }
 
 //---------------------------------------------------------------------------


@@ -170,65 +156,97 @@ wxGLCanvas::wxGLCanvas( wxWindow *parent, wxWindowID id,
                         int *attribList, 
                        const wxPalette& palette )
 {
                         int *attribList, 
                        const wxPalette& palette )
 {

-    Create( parent, id, pos, size, style, name, attribList, palette );
+    Create( parent, NULL, id, pos, size, style, name, attribList, palette );
+}
+
+wxGLCanvas::wxGLCanvas( wxWindow *parent, 
+                        const wxGLContext *shared,
+                        wxWindowID id,
+                        const wxPoint& pos, const wxSize& size, 
+                       long style, const wxString& name,
+                        int *attribList, 
+                       const wxPalette& palette )
+{                      
+    Create( parent, shared, id, pos, size, style, name, attribList, palette );

 }
 
 }
 

-bool wxGLCanvas::Create( wxWindow *parent, wxWindowID id,
+bool wxGLCanvas::Create( wxWindow *parent, 
+                         const wxGLContext *shared,
+                         wxWindowID id,

                          const wxPoint& pos, const wxSize& size, 
                         long style, const wxString& name,
                          int *attribList, 
                          const wxPoint& pos, const wxSize& size, 
                         long style, const wxString& name,
                          int *attribList, 

-                        const wxPalette& palette )
+                        const wxPalette& palette)

 {
 {

+    m_glContext = (wxGLContext*)shared;  // const_cast
+    

     if (!attribList)
     {
         int data[] = { GLX_RGBA, 
                       GLX_DOUBLEBUFFER, 
     if (!attribList)
     {
         int data[] = { GLX_RGBA, 
                       GLX_DOUBLEBUFFER, 

-                      GLX_DEPTH_SIZE, 1,
+                      GLX_DEPTH_SIZE, 1,  // use largest available depth buffer
+                      GLX_RED_SIZE, 1, 
+                      GLX_GREEN_SIZE, 1, 
+                      GLX_BLUE_SIZE, 1, 
+                      GLX_ALPHA_SIZE, 0, 

                       None };
        attribList = (int*) data;
     }
                       None };
        attribList = (int*) data;
     }

+    else
+    {
+      int data[512], arg=0, p=0;
+       
+      while( (attribList[arg]!=0) && (p<512) )
+      {
+        switch( attribList[arg++] )
+        {
+          case WX_GL_RGBA: data[p++] = GLX_RGBA; break;
+          case WX_GL_DOUBLEBUFFER: data[p++] = GLX_DOUBLEBUFFER; break;
+          case WX_GL_DEPTH_SIZE: 
+            data[p++]=GLX_DEPTH_SIZE; data[p++]=attribList[arg++]; break;
+          case WX_GL_MIN_RED:
+            data[p++]=GLX_RED_SIZE; data[p++]=attribList[arg++]; break;
+          case WX_GL_MIN_GREEN:
+            data[p++]=GLX_GREEN_SIZE; data[p++]=attribList[arg++]; break;
+          case WX_GL_MIN_BLUE:
+            data[p++]=GLX_BLUE_SIZE; data[p++]=attribList[arg++]; break;
+          default:
+            break;
+        }
+      }       
+      data[p] = 0; 
+
+      attribList = (int*) data;
+    }
+    

     
     Display *dpy = GDK_DISPLAY();
     
     g_vi = glXChooseVisual( dpy, DefaultScreen(dpy), attribList );
     
     
     Display *dpy = GDK_DISPLAY();
     
     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 );
     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();
-    
+    gtk_signal_connect( GTK_OBJECT(m_glWidget), "realize",
+                            GTK_SIGNAL_FUNC(gtk_glwindow_realized_callback), (gpointer) this );

     gtk_widget_pop_visual();
     gtk_widget_pop_colormap();
     
     gtk_widget_pop_visual();
     gtk_widget_pop_colormap();
     

-    wxScrolledWindow::Create( parent, id, pos, size, style, name );
-  
-    GTK_WIDGET_UNSET_FLAGS( m_wxwindow, GTK_CAN_FOCUS );
-    GTK_WIDGET_SET_FLAGS( m_glWidget, GTK_CAN_FOCUS );
-    
-    gtk_myfixed_put( GTK_MYFIXED(m_wxwindow), m_glWidget, 0, 0, m_width, m_height );
-    
-    gtk_signal_connect( GTK_OBJECT(m_glWidget), "expose_event",
-      GTK_SIGNAL_FUNC(gtk_window_expose_callback), (gpointer)this );
-
-    gtk_signal_connect( GTK_OBJECT(m_glWidget), "draw",
-      GTK_SIGNAL_FUNC(gtk_window_draw_callback), (gpointer)this );
-      
-    /* connect to key press and mouse handlers etc. */  
-    ConnectWidget( m_glWidget );
-    

     /* must be realized for OpenGl output */
     gtk_widget_realize( m_glWidget );
     /* must be realized for OpenGl output */
     gtk_widget_realize( m_glWidget );

-    
-    gtk_widget_show( m_glWidget );
-    
-    m_glContext = new wxGLContext( TRUE, this, palette );
-    
+ 

     XFree( g_vi );
     g_vi = (XVisualInfo*) NULL;
     XFree( g_vi );
     g_vi = (XVisualInfo*) NULL;

-    
+

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -246,6 +264,7 @@ void wxGLCanvas::OnSize(wxSizeEvent& WXUNUSED(event))
 {
     int width, height;
     GetClientSize( &width, &height );
 {
     int width, height;
     GetClientSize( &width, &height );

+    

     if (m_glContext && GTK_WIDGET_REALIZED(m_glWidget) )
     {
         SetCurrent(); 
     if (m_glContext && GTK_WIDGET_REALIZED(m_glWidget) )
     {
         SetCurrent(); 


@@ -268,84 +287,12 @@ void wxGLCanvas::SetColour( const char *colour )
     if (m_glContext) m_glContext->SetColour( colour );
 }
 
     if (m_glContext) m_glContext->SetColour( colour );
 }
 

-void wxGLCanvas::DoSetSize( int x, int y, int width, int height, int sizeFlags )
-{
-    if (m_resizing) return; // I don't like recursions
-    m_resizing = TRUE;
-
-    if (m_parent->m_wxwindow == NULL) // i.e. wxNotebook
-    {
-        // don't set the size for children of wxNotebook, just take the values.
-        m_x = x;
-        m_y = y;
-        m_width = width;
-        m_height = height;
-    }
-    else
-    {
-        int old_width = m_width;
-        int old_height = m_height;
-
-        if ((sizeFlags & wxSIZE_USE_EXISTING) == wxSIZE_USE_EXISTING)
-        {
-            if (x != -1) m_x = x;
-            if (y != -1) m_y = y;
-            if (width != -1) m_width = width;
-            if (height != -1) m_height = height;
-        }
-        else
-        {
-            m_x = x;
-            m_y = y;
-            m_width = width;
-            m_height = height;
-        }
-
-        if ((sizeFlags & wxSIZE_AUTO_WIDTH) == wxSIZE_AUTO_WIDTH)
-        {
-             if (width == -1) m_width = 80;
-        }
-
-        if ((sizeFlags & wxSIZE_AUTO_HEIGHT) == wxSIZE_AUTO_HEIGHT)
-        {
-             if (height == -1) m_height = 26;
-        }
-
-        if ((m_minWidth != -1) && (m_width < m_minWidth)) m_width = m_minWidth;
-        if ((m_minHeight != -1) && (m_height < m_minHeight)) m_height = m_minHeight;
-        if ((m_maxWidth != -1) && (m_width > m_maxWidth)) m_width = m_maxWidth;
-        if ((m_maxHeight != -1) && (m_height > m_maxHeight)) m_height = m_maxHeight;
-
-        gtk_myfixed_set_size( GTK_MYFIXED(m_parent->m_wxwindow), 
-                             m_widget, 
-                             m_x, 
-                             m_y,
-                             m_width,
-                             m_height );
-
-        gtk_myfixed_set_size( GTK_MYFIXED(m_wxwindow), 
-                             m_glWidget,
-                             m_x, 
-                             m_y,
-                             m_width,
-                             m_height );
-    }
-
-    m_sizeSet = TRUE;
-
-    wxSizeEvent event( wxSize(m_width,m_height), GetId() );
-    event.SetEventObject( this );
-    GetEventHandler()->ProcessEvent( event );
-
-    m_resizing = FALSE;
-}
-

 GtkWidget *wxGLCanvas::GetConnectWidget()
 {
 GtkWidget *wxGLCanvas::GetConnectWidget()
 {

-    return m_glWidget;
+    return m_wxwindow;

 }
 
 bool wxGLCanvas::IsOwnGtkWindow( GdkWindow *window )
 {
 }
 
 bool wxGLCanvas::IsOwnGtkWindow( GdkWindow *window )
 {

-    return (window == m_glWidget->window);
+    return (window == m_wxwindow->window);

 }
 }