X-Git-Url: http://pileus.org/git/?p=grits;a=blobdiff_plain;f=src%2Fgtkgl.c;h=19f3219043273e18f82be3b976acf83d911b80ae;hp=af2c62bac5f888263fee7a61ee90e9189f50f2ad;hb=5c17e7d79895982036139dcffb5c17cefb1d4d9f;hpb=9bcf411430cca69197a7756c1ce8ca925456cc93

diff --git a/src/gtkgl.c b/src/gtkgl.c
index af2c62b..19f3219 100644
--- a/src/gtkgl.c
+++ b/src/gtkgl.c
@@ -108,10 +108,17 @@ void gtk_gl_enable(GtkWidget *widget)
 
 	g_object_set_data(G_OBJECT(widget), "glcontext", context);
 
-	/* Fix up colormap */
+	/* Fix up visual/colormap */
+#if GTK_CHECK_VERSION(3,0,0)
+	GdkVisual *visual = gdk_x11_screen_lookup_visual(screen, xvinfo->visualid);
+	gtk_widget_set_visual(widget, visual);
+#else
 	GdkVisual   *visual = gdk_x11_screen_lookup_visual(screen, xvinfo->visualid);
 	GdkColormap *cmap   = gdk_colormap_new(visual, FALSE);
 	gtk_widget_set_colormap(widget, cmap);
+	g_object_unref(cmap);
+#endif
+	XFree(xvinfo);
 
 	/* Disable GTK double buffering */
 	gtk_widget_set_double_buffered(widget, FALSE);
@@ -286,6 +293,8 @@ void gtk_gl_begin(GtkWidget *widget)
 	GtkAllocation alloc;
 	gdk_window_ensure_native(gtk_widget_get_window(widget));
 	gtk_widget_get_allocation(widget, &alloc);
+	gtk_widget_translate_coordinates(widget, gtk_widget_get_toplevel(widget),
+		0, 0, &alloc.x, &alloc.y);
 
 	NSOpenGLContext *ctx  = g_object_get_data(G_OBJECT(widget), "glcontext");
 	GdkWindow       *win  = gtk_widget_get_window(widget);
@@ -296,6 +305,7 @@ void gtk_gl_begin(GtkWidget *widget)
 	[ctx  makeCurrentContext];
 	[ctx  update];
 	[view setFrame:rect];
+	[view setWantsBestResolutionOpenGLSurface:YES];
 }
 
 void gtk_gl_end(GtkWidget *widget)