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;
static void gtk_window_expose_callback( GtkWidget *WXUNUSED(widget), GdkEventExpose *gdk_event, wxWindow *win )
{
- if (!win->HasVMT()) return;
+ if (!win->m_hasVMT) return;
- win->m_updateRegion.Union( gdk_event->area.x,
+ win->GetUpdateRegion().Union( gdk_event->area.x,
gdk_event->area.y,
gdk_event->area.width,
gdk_event->area.height );
event.SetEventObject( win );
win->GetEventHandler()->ProcessEvent( event );
- win->m_updateRegion.Clear();
+ win->GetUpdateRegion().Clear();
}
//-----------------------------------------------------------------------------
static void gtk_window_draw_callback( GtkWidget *WXUNUSED(widget), GdkRectangle *rect, wxWindow *win )
{
- if (!win->HasVMT()) return;
+ if (!win->m_hasVMT) return;
- win->m_updateRegion.Union( rect->x, rect->y, rect->width, rect->height );
+ win->GetUpdateRegion().Union( rect->x, rect->y, rect->width, rect->height );
wxPaintEvent event( win->GetId() );
event.SetEventObject( win );
win->GetEventHandler()->ProcessEvent( event );
- win->m_updateRegion.Clear();
+ win->GetUpdateRegion().Clear();
}
//---------------------------------------------------------------------------
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 wxPalette& palette )
+ const wxPalette& palette)
{
if (!attribList)
{
int data[] = { GLX_RGBA,
GLX_DOUBLEBUFFER,
- GLX_DEPTH_SIZE, 1,
+ GLX_DEPTH_SIZE, 1, /* use largest available depth buffer */
None };
attribList = (int*) data;
+ printf( "using default values\n" );
+ }
+ 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();
gtk_widget_push_colormap( colormap );
gtk_widget_push_visual( visual );
- m_glWidget = gtk_drawing_area_new();
- gtk_widget_set_events( m_glWidget,
- GDK_EXPOSURE_MASK |
- GDK_POINTER_MOTION_HINT_MASK |
- GDK_POINTER_MOTION_MASK |
- GDK_BUTTON_MOTION_MASK |
- GDK_BUTTON1_MOTION_MASK |
- GDK_BUTTON2_MOTION_MASK |
- GDK_BUTTON3_MOTION_MASK |
- GDK_BUTTON_PRESS_MASK |
- GDK_BUTTON_RELEASE_MASK |
- GDK_KEY_PRESS_MASK |
- GDK_KEY_RELEASE_MASK |
- GDK_ENTER_NOTIFY_MASK |
- GDK_LEAVE_NOTIFY_MASK );
-
- GTK_WIDGET_SET_FLAGS( m_glWidget, GTK_CAN_FOCUS );
+ m_glWidget = gtk_myfixed_new();
gtk_widget_pop_visual();
gtk_widget_pop_colormap();
wxScrolledWindow::Create( parent, id, pos, size, style, name );
- gtk_myfixed_put( GTK_MYFIXED(m_wxwindow), m_glWidget, 0, 0 );
+ 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 );
/* connect to key press and mouse handlers etc. */
ConnectWidget( 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 );
+ 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 );
+
return TRUE;
}
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);
int old_width = m_width;
int old_height = m_height;
- if ((sizeFlags & wxSIZE_USE_EXISTING) == wxSIZE_USE_EXISTING)
+ if ((sizeFlags & wxSIZE_ALLOW_MINUS_ONE) == 0)
{
if (x != -1) m_x = x;
if (y != -1) m_y = y;
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_move( GTK_MYFIXED(m_parent->m_wxwindow), m_widget, m_x, m_y );
-
- if ((old_width != m_width) || (old_height != m_height))
- {
- gtk_widget_set_usize( m_widget, m_width, m_height );
-
- gtk_drawing_area_size( GTK_DRAWING_AREA(m_glWidget), m_width, m_height );
-
- GtkAllocation allo;
- allo.x = 0;
- allo.y = 0;
- allo.width = m_width;
- allo.height = m_height;
- gtk_widget_size_allocate( m_glWidget, &allo );
- }
+ 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;
projects / wxWidgets.git / blobdiff