GNOME.org
 

Re: [gtk-vnc-devel] PATCH: 1/2: Remove gtkglext/opengl related code

This patch removes all the gtkglext/opengl related code. This code has
quite alot of complexity, so removing it made the following impl of cairo
simpler to understand & debug.

 configure.ac         |   24 --
 examples/Makefile.am |    4 
 src/Makefile.am      |    6 
 src/vncdisplay.c     |  491 ++++-----------------------------------------------
 4 files changed, 45 insertions(+), 480 deletions(-)

Daniel
-- 
|: Red Hat, Engineering, London   -o-   http://people.redhat.com/berrange/ :|
|: http://libvirt.org  -o-  http://virt-manager.org  -o-  http://ovirt.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: GnuPG: 7D3B9505  -o-  F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

diff -r f1d5c8fae2e9 configure.ac
--- a/configure.ac	Fri Sep 05 13:32:03 2008 +0100
+++ b/configure.ac	Sun Sep 07 16:18:01 2008 +0100
@@ -7,11 +7,8 @@
 AC_SUBST(GTK_REQUIRED)
 GNUTLS_REQUIRED=1.4.0
 AC_SUBST(GNUTLS_REQUIRED)
-GTKGLEXT_REQUIRED=1.2.0
-AC_SUBST(GTKGLEXT_REQUIRED)
 
 PYGTK_REQUIRED=2.0.0
-GTKGLEXT_REQUIRED=1.2.0
 VIEW_REQUIRED=0.6.0
 GTHREAD_REQUIRED=2.0.0
 PYTHON_REQUIRED=2.4
@@ -102,27 +99,6 @@
 PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_REQUIRED)
 AC_SUBST(GTK_CFLAGS)
 AC_SUBST(GTK_LIBS)
-
-AC_ARG_WITH(gtkglext,
-[  --with-gtkglext         enable gtkgl support],
-[case "${withval}" in
-   yes|no) ;;
-   *)	   AC_MSG_ERROR([bad value ${withval} for gtkglext option]) ;;
- esac],[withval=yes])
-
-WITH_GTKGLEXT=0
-if test "${withval}" = "yes"; then
-  PKG_CHECK_MODULES(GTKGLEXT, gtkglext-1.0 >= $GTKGLEXT_REQUIRED,
-	            [WITH_GTKGLEXT=1], [WITH_GTKGLEXT=0])
-fi
-AC_DEFINE_UNQUOTED(WITH_GTKGLEXT,[$WITH_GTKGLEXT], [Whether to use gtkglext])
-AC_SUBST(GTKGLEXT_CFLAGS)
-AC_SUBST(GTKGLEXT_LIBS)
-if test $WITH_GTKGLEXT -eq 0; then
-  with_scaling="no"
-else
-  with_scaling="yes"
-fi
 
 AC_ARG_WITH(libview,
 [  --with-libview          enable libview support in gvncviewer],
diff -r f1d5c8fae2e9 examples/Makefile.am
--- a/examples/Makefile.am	Fri Sep 05 13:32:03 2008 +0100
+++ b/examples/Makefile.am	Sun Sep 07 16:18:01 2008 +0100
@@ -6,9 +6,9 @@
 endif
 
 gvncviewer_SOURCES = gvncviewer.c
-gvncviewer_LDADD = ../src/libgtk-vnc-1.0.la @GTK_CFLAGS@ @GTKGLEXT_LIBS@ \
+gvncviewer_LDADD = ../src/libgtk-vnc-1.0.la @GTK_CFLAGS@ \
 		   @VIEW_LIBS@
-gvncviewer_CFLAGS = @GTK_CFLAGS@ @GTKGLEXT_CFLAGS@ @WARNING_CFLAGS@ \
+gvncviewer_CFLAGS = @GTK_CFLAGS@ @WARNING_CFLAGS@ \
 		    @VIEW_CFLAGS@ -I$(top_srcdir)/src/
 
 EXTRA_DIST = gvncviewer.py
diff -r f1d5c8fae2e9 src/Makefile.am
--- a/src/Makefile.am	Fri Sep 05 13:32:03 2008 +0100
+++ b/src/Makefile.am	Sun Sep 07 16:18:01 2008 +0100
@@ -3,9 +3,9 @@
 
 lib_LTLIBRARIES = libgtk-vnc-1.0.la
 
-libgtk_vnc_1_0_la_LIBADD = @GTK_LIBS@ @GTKGLEXT_LIBS@ @GNUTLS_LIBS@ \
+libgtk_vnc_1_0_la_LIBADD = @GTK_LIBS@ @GNUTLS_LIBS@ \
 			   @GTHREAD_LIBS@
-libgtk_vnc_1_0_la_CFLAGS = @GTK_CFLAGS@ @GTKGLEXT_CFLAGS@ @GNUTLS_CFLAGS@ \
+libgtk_vnc_1_0_la_CFLAGS = @GTK_CFLAGS@ @GNUTLS_CFLAGS@ \
 			   @GTHREAD_CFLAGS@ @WARNING_CFLAGS@ \
 			   -DSYSCONFDIR=\""$(sysconfdir)"\" \
                            -DG_LOG_DOMAIN=\"gtk-vnc\"
@@ -48,7 +48,7 @@
 gtkvnc_la_LIBADD = libgtk-vnc-1.0.la @PYGTK_LIBS@
 # Auto-generated C code for Python binding is full of compiler warnings :-(
 #gtkvnc_la_CFLAGS = @GTK_CFLAGS@ @WARNING_CFLAGS@ @PYTHON_INCLUDES@ @PYGTK_CFLAGS@
-gtkvnc_la_CFLAGS = @GTK_CFLAGS@ @GTKGLEXT_CFLAGS@ @PYTHON_INCLUDES@ \
+gtkvnc_la_CFLAGS = @GTK_CFLAGS@ @PYTHON_INCLUDES@ \
 		   @PYGTK_CFLAGS@
 gtkvnc_la_LDFLAGS = -module -avoid-version -fPIC
 gtkvnc_la_SOURCES = vncmodule.c vncmodule.defs.c
diff -r f1d5c8fae2e9 src/vncdisplay.c
--- a/src/vncdisplay.c	Fri Sep 05 13:32:03 2008 +0100
+++ b/src/vncdisplay.c	Sun Sep 07 16:18:01 2008 +0100
@@ -26,11 +26,6 @@
 #include <unistd.h>
 #include <pwd.h>
 
-#if WITH_GTKGLEXT
-#include <gtk/gtkgl.h>
-#include <GL/gl.h>
-#endif
-
 #define VNC_DISPLAY_GET_PRIVATE(obj) \
       (G_TYPE_INSTANCE_GET_PRIVATE((obj), VNC_TYPE_DISPLAY, VncDisplayPrivate))
 
@@ -43,19 +38,6 @@
 	GdkImage *image;
 	GdkCursor *null_cursor;
 	GdkCursor *remote_cursor;
-
-#if WITH_GTKGLEXT
-	int gl_enabled;
-	GdkGLConfig *gl_config;
-	GdkGLDrawable *gl_drawable;
-	GdkGLContext *gl_context;
-	uint8_t *gl_tex_data;
-	int gl_texture_width;
-	int gl_texture_height;
-	int gl_width;
-	int gl_height;
-	GLuint gl_tex;
-#endif
 
 	struct gvnc_framebuffer fb;
 	struct coroutine coroutine;
@@ -283,6 +265,8 @@
 	int x, y, w, h;
 	GdkRectangle drawn;
 	GdkRegion *clear, *copy;
+	int mx = 0, my = 0;
+	int ww, wh;
 
 	GVNC_DEBUG("Expose %dx%d @ %d,%d\n",
 		   expose->area.x,
@@ -291,120 +275,52 @@
 		   expose->area.height);
 
 	if (priv->image == NULL) {
-#if WITH_GTKGLEXT
-		if (priv->gl_tex_data == NULL)
-#endif
-		{
-			GdkGC *gc = gdk_gc_new(widget->window);
-			gdk_draw_rectangle(widget->window, gc, TRUE,
-					   expose->area.x, expose->area.y,
-					   expose->area.width,
-					   expose->area.height);
-			g_object_unref(gc);
-			return TRUE;
-		}
+		GdkGC *gc = gdk_gc_new(widget->window);
+		gdk_draw_rectangle(widget->window, gc, TRUE,
+				   expose->area.x, expose->area.y,
+				   expose->area.width,
+				   expose->area.height);
+		g_object_unref(gc);
+		return TRUE;
 	}
 
-#if WITH_GTKGLEXT
-	if (priv->gl_enabled) {
-		float rx, ry;
-		int wx = 0, wy = 0;
-		int ww = priv->gl_width, wh = priv->gl_height;
-		double scale_x, scale_y;
+	gdk_drawable_get_size(widget->window, &ww, &wh);
+	if (ww > priv->fb.width)
+		mx = (ww - priv->fb.width) / 2;
+	if (wh > priv->fb.height)
+		my = (wh - priv->fb.height) / 2;
 
-		scale_x = (double)priv->gl_width / priv->fb.width;
-		scale_y = (double)priv->gl_height / priv->fb.height;
+	x = MIN(expose->area.x - mx, priv->fb.width);
+	y = MIN(expose->area.y - my, priv->fb.height);
+	w = MIN(expose->area.x + expose->area.width - mx, priv->fb.width);
+	h = MIN(expose->area.y + expose->area.height - my, priv->fb.height);
+	x = MAX(0, x);
+	y = MAX(0, y);
+	w = MAX(0, w);
+	h = MAX(0, h);
 
-		x = expose->area.x / scale_x;
-		y = expose->area.y / scale_y;
-		w = expose->area.width / scale_x;
-		h = expose->area.height / scale_y;
+	w -= x;
+	h -= y;
 
-		y -= 5;
-		h += 10;
-		if (y < 0)
-			y = 0;
+	drawn.x = x + mx;
+	drawn.y = y + my;
+	drawn.width = w;
+	drawn.height = h;
 
-		x -= 5;
-		w += 10;
-		if (x < 0)
-			x = 0;
+	clear = gdk_region_rectangle(&expose->area);
+	copy = gdk_region_rectangle(&drawn);
+	gdk_region_subtract(clear, copy);
 
-		x = MIN(x, priv->fb.width);
-		y = MIN(y, priv->fb.height);
-		w = MIN(x + w, priv->fb.width);
-		h = MIN(y + h, priv->fb.height);
-		w -= x;
-		h -= y;
+	gdk_gc_set_clip_region(priv->gc, copy);
+	gdk_draw_image(widget->window, priv->gc, priv->image,
+		       x, y, x + mx, y + my, w, h);
 
-		gdk_gl_drawable_gl_begin(priv->gl_drawable, priv->gl_context);
-		glBindTexture(GL_TEXTURE_2D, priv->gl_tex);
-		glPixelStorei(GL_UNPACK_ROW_LENGTH, priv->fb.width);
-		glTexSubImage2D(GL_TEXTURE_2D, 0,
-				x, y, w, h,
-				GL_BGRA_EXT,
-				GL_UNSIGNED_BYTE,
-				priv->gl_tex_data +
-				y * 4 * priv->fb.width +
-				x * 4);
-		rx = (float)priv->fb.width  / priv->gl_texture_width;
-		ry = (float)priv->fb.height / priv->gl_texture_height;
-		
-		glEnable(GL_TEXTURE_2D);
-		glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_DECAL);
-		glBegin(GL_QUADS);
-		glTexCoord2f(0,ry);  glVertex3f(wx, wy, 0);
-		glTexCoord2f(0,0);  glVertex3f(wx, wy+wh, 0);
-		glTexCoord2f(rx,0);  glVertex3f(wx+ww, wy+wh, 0);
-		glTexCoord2f(rx,ry);  glVertex3f(wx+ww, wy, 0);
-		glEnd();		
-		glDisable(GL_TEXTURE_2D);
-		glFlush();
-		gdk_gl_drawable_gl_end(priv->gl_drawable);
-	} else
-#endif
-	{
-		int mx = 0, my = 0;
-		int ww, wh;
+	gdk_gc_set_clip_region(priv->gc, clear);
+	gdk_draw_rectangle(widget->window, priv->gc, TRUE, expose->area.x, expose->area.y,
+			   expose->area.width, expose->area.height);
 
-		gdk_drawable_get_size(widget->window, &ww, &wh);
-		if (ww > priv->fb.width)
-			mx = (ww - priv->fb.width) / 2;
-		if (wh > priv->fb.height)
-			my = (wh - priv->fb.height) / 2;
-
-		x = MIN(expose->area.x - mx, priv->fb.width);
-		y = MIN(expose->area.y - my, priv->fb.height);
-		w = MIN(expose->area.x + expose->area.width - mx, priv->fb.width);
-		h = MIN(expose->area.y + expose->area.height - my, priv->fb.height);
-		x = MAX(0, x);
-		y = MAX(0, y);
-		w = MAX(0, w);
-		h = MAX(0, h);
-
-		w -= x;
-		h -= y;
-
-		drawn.x = x + mx;
-		drawn.y = y + my;
-		drawn.width = w;
-		drawn.height = h;
-
-		clear = gdk_region_rectangle(&expose->area);
-		copy = gdk_region_rectangle(&drawn);
-		gdk_region_subtract(clear, copy);
-
-		gdk_gc_set_clip_region(priv->gc, copy);
-		gdk_draw_image(widget->window, priv->gc, priv->image,
-			       x, y, x + mx, y + my, w, h);
-
-		gdk_gc_set_clip_region(priv->gc, clear);
-		gdk_draw_rectangle(widget->window, priv->gc, TRUE, expose->area.x, expose->area.y,
-				   expose->area.width, expose->area.height);
-
-		gdk_region_destroy(clear);
-		gdk_region_destroy(copy);
-	}
+	gdk_region_destroy(clear);
+	gdk_region_destroy(copy);
 
 	return TRUE;
 }
@@ -580,14 +496,6 @@
 	if (priv->read_only)
 		return FALSE;
 
-#if WITH_GTKGLEXT
-	if (priv->gl_enabled) {
-		motion->x *= priv->fb.width;
-		motion->x /= priv->gl_width;
-		motion->y *= priv->fb.height;
-		motion->y /= priv->gl_height;
-	} else
-#endif
 	{
 		int ww, wh;
 		int mw = 0, mh = 0;
@@ -811,40 +719,12 @@
         return TRUE;
 }
 
-#if WITH_GTKGLEXT
-static void realize_event(GtkWidget *widget)
-{
-	VncDisplayPrivate *priv = VNC_DISPLAY(widget)->priv;
-
-	GTK_WIDGET_CLASS (vnc_display_parent_class)->realize(widget);
-
-	if (priv->gl_config == NULL)
-		return;
-
-	priv->gl_drawable = gtk_widget_get_gl_drawable(widget);
-	priv->gl_context = gtk_widget_get_gl_context(widget);
-}
-#endif
-
 static gboolean on_update(void *opaque, int x, int y, int w, int h)
 {
 	GtkWidget *widget = GTK_WIDGET(opaque);
 	VncDisplay *obj = VNC_DISPLAY(widget);
 	VncDisplayPrivate *priv = obj->priv;
 
-#if WITH_GTKGLEXT
-	if (priv->gl_enabled) {
-		double scale_x, scale_y;
-
-		scale_x = (double)priv->gl_width / priv->fb.width;
-		scale_y = (double)priv->gl_height / priv->fb.height;
-
-		x *= scale_x;
-		y *= scale_y;
-		w *= scale_x;
-		h *= scale_y;
-	} else
-#endif
 	{
 		int ww, wh;
 		int mw = 0, mh = 0;
@@ -898,55 +778,6 @@
 		gtk_widget_set_size_request(GTK_WIDGET(obj), width, height);
 }
 
-#if WITH_GTKGLEXT
-static int pow_of_2(int value)
-{
-	int i;
-	for (i = 0; value >= (1 << i); i++);
-	return (1 << i);
-}
-
-static void setup_gl_image(VncDisplay *obj, gint width, gint height)
-{
-	VncDisplayPrivate *priv = VNC_DISPLAY(obj)->priv;
-	void *dummy;
-
-	priv->gl_texture_width = pow_of_2(width);
-	priv->gl_texture_height = pow_of_2(height);
-
-	gdk_gl_drawable_gl_begin(priv->gl_drawable, priv->gl_context);
-
-	glGenTextures(1, &priv->gl_tex);
-	glBindTexture(GL_TEXTURE_2D, priv->gl_tex);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-
-	dummy = g_malloc(priv->gl_texture_width*priv->gl_texture_height*4);
-	memset(dummy, 0, priv->gl_texture_width*priv->gl_texture_height*4);
-	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB,
-		     priv->gl_texture_width, priv->gl_texture_height, 0,
-		     GL_RGB, GL_UNSIGNED_BYTE,
-		     dummy);
-	g_free(dummy);
-	
-	gdk_gl_drawable_gl_end(priv->gl_drawable);
-
-	priv->gl_tex_data = g_malloc(width * height * 4);
-
-	priv->fb.red_mask = 0xFF;
-	priv->fb.green_mask = 0xFF;
-	priv->fb.blue_mask = 0xFF;
-	priv->fb.red_shift = 16;
-	priv->fb.green_shift = 8;
-	priv->fb.blue_shift = 0;
-	priv->fb.depth = 32;
-	priv->fb.bpp = 4;
-	priv->fb.width = width;
-	priv->fb.height = height;
-	priv->fb.linesize = priv->fb.width * priv->fb.bpp;
-	priv->fb.data = (uint8_t *)priv->gl_tex_data;
-}
-#endif
 
 static gboolean emit_signal_auth_cred(gpointer opaque)
 {
@@ -1023,17 +854,6 @@
 		priv->image = NULL;
 	}
 
-#if WITH_GTKGLEXT
-	if (priv->gl_tex_data) {
-		gdk_gl_drawable_gl_begin(priv->gl_drawable,
-					 priv->gl_context);
-		glDeleteTextures(1, &priv->gl_tex);
-		gdk_gl_drawable_gl_end(priv->gl_drawable);
-		g_free(priv->gl_tex_data);
-		priv->gl_tex_data = NULL;
-	}
-#endif
-
 	if (priv->gc == NULL) {
 		priv->null_cursor = create_null_cursor();
 		if (priv->local_pointer)
@@ -1043,12 +863,7 @@
 		priv->gc = gdk_gc_new(GTK_WIDGET(obj)->window);
 	}
 
-#if WITH_GTKGLEXT
-	if (priv->gl_enabled)
-		setup_gl_image(obj, width, height);
-	else
-#endif
-		setup_gdk_image(obj, width, height);
+	setup_gdk_image(obj, width, height);
 
 	gvnc_set_local(priv->gvnc, &priv->fb);
 
@@ -1096,155 +911,6 @@
 
 	return TRUE;
 }
-
-#if WITH_GTKGLEXT
-static void build_gl_image_from_gdk(uint32_t *data, GdkImage *image)
-{
-	GdkVisual *visual;
-	int i, j;
-	uint8_t *row;
-
-	visual = image->visual;
-	row = image->mem;
-	for (j = 0; j < image->height; j++) {
-		uint8_t *src = row;
-		for (i = 0; i < image->width; i++) {
-			uint32_t pixel = 0;
-			switch (image->bpp) {
-			case 1:
-				pixel = *(uint8_t *)src;
-				break;
-			case 2:
-				pixel = *(uint16_t *)src;
-				break;
-			case 4:
-				pixel = *(uint32_t *)src;
-				break;
-			}
-			*data = ((pixel & visual->red_mask) >> visual->red_shift) << (24 - visual->red_prec) |
-				((pixel & visual->green_mask) >> visual->green_shift) << (16 - visual->green_prec) |
-				((pixel & visual->blue_mask) >> visual->blue_shift) << (8 - visual->blue_prec);
-			src += image->bpp;
-			data++;
-		}
-		row += image->bpl;
-
-	}
-}
-
-static void build_gdk_image_from_gl(GdkImage *image, uint32_t *data)
-{
-	GdkVisual *visual;
-	int i, j;
-	uint8_t *row;
-
-	visual = image->visual;
-	row = image->mem;
-	for (j = 0; j < image->height; j++) {
-		uint8_t *dst = row;
-		for (i = 0; i < image->width; i++) {
-			uint32_t pixel;
-
-			pixel = (((*data >> (24 - visual->red_prec)) << visual->red_shift) & visual->red_mask) |
-				(((*data >> (16 - visual->green_prec)) << visual->green_shift) & visual->green_mask) |
-				(((*data >> (8 - visual->blue_prec)) << visual->blue_shift) & visual->blue_mask);
-
-			switch (image->bpp) {
-			case 1:
-				*(uint8_t *)dst = pixel;
-				break;
-			case 2:
-				*(uint16_t *)dst = pixel;
-				break;
-			case 4:
-				*(uint32_t *)dst = pixel;
-				break;
-			}
-			dst += image->bpp;
-			data++;
-		}
-		row += image->bpl;
-	}
-}
-
-static void scale_display(VncDisplay *obj, gint width, gint height)
-{
-	VncDisplayPrivate *priv = VNC_DISPLAY(obj)->priv;
-
-	if (priv->gl_drawable == NULL)
-		return;
-
-	if (priv->gl_enabled == 0) {
-		GdkImage *image;
-
-		priv->gl_enabled = 1;
-
-		image = priv->image;
-		priv->image = NULL;
-	
-		do_resize(obj, priv->fb.width, priv->fb.height, TRUE);
-		build_gl_image_from_gdk((uint32_t *)priv->fb.data, image);
-
-		g_object_unref(image);
-	}
-
-	priv->gl_width = width;
-	priv->gl_height = height;
-
-	gdk_gl_drawable_gl_begin(priv->gl_drawable, priv->gl_context);
-	glClearColor (0.0, 0.0, 0.0, 0.0);
-	glShadeModel(GL_FLAT);
-	glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
-    
-	glViewport(0, 0, priv->gl_width, priv->gl_height);
-	glMatrixMode(GL_PROJECTION);
-	glLoadIdentity();
-	glOrtho(0.0, priv->gl_width, 0.0, priv->gl_height, -1, 1);
-	glMatrixMode(GL_MODELVIEW);
-	glLoadIdentity();
-	gdk_gl_drawable_gl_end(priv->gl_drawable);
-}
-
-static void rescale_display(VncDisplay *obj, gint width, gint height)
-{
-	VncDisplayPrivate *priv = obj->priv;
-
-	if (priv->allow_scaling && 
-	    (priv->fb.width != width ||
-	     priv->fb.height != height))
-		scale_display(obj, width, height);
-	else if (priv->gl_enabled) {
-		void *data;
-		priv->gl_enabled = 0;
-
-		data = priv->gl_tex_data;
-		priv->gl_tex_data = NULL;
-
-		do_resize(GTK_WIDGET(obj), priv->fb.width, priv->fb.height, TRUE);
-
-		build_gdk_image_from_gl(priv->image, (uint32_t *)data);
-		gdk_gl_drawable_gl_begin(priv->gl_drawable,
-					 priv->gl_context);
-		glDeleteTextures(1, &priv->gl_tex);
-		gdk_gl_drawable_gl_end(priv->gl_drawable);
-		g_free(data);
-	}
-}
-
-static gboolean configure_event(GtkWidget *widget, GdkEventConfigure *configure)
-{
-	VncDisplay *obj = VNC_DISPLAY(widget);
-	VncDisplayPrivate *priv = obj->priv;
-
-	if (priv->fb.data == NULL)
-		return FALSE;
-
-	rescale_display(VNC_DISPLAY(widget),
-			configure->width, configure->height);
-	
-	return FALSE;
-}
-#endif
 
 static gboolean on_pointer_type_change(void *opaque, int absolute)
 {
@@ -1500,13 +1166,6 @@
 		obj->priv->image = NULL;
 	}
 
-#if WITH_GTKGLEXT
-	if (obj->priv->gl_tex_data)
-		g_free(obj->priv->gl_tex_data);
-	obj->priv->gl_tex_data = NULL;
-	obj->priv->gl_enabled = 0;
-#endif
-
 	g_object_unref(G_OBJECT(data));
 	return FALSE;
 }
@@ -1681,15 +1340,6 @@
 		gvnc_shutdown(priv->gvnc);
 	}
 
-#if WITH_GTKGLEXT
-	if (priv->gl_tex_data) {
-		gdk_gl_drawable_gl_begin(priv->gl_drawable,
-					 priv->gl_context);
-		glDeleteTextures(1, &priv->gl_tex);
-		gdk_gl_drawable_gl_end(priv->gl_drawable);
-	}
-#endif
-
 	if (widget->window) {
 		gint width, height;
 
@@ -1778,24 +1428,6 @@
 	gvnc_free(priv->gvnc);
 	display->priv->gvnc = NULL;
 
-#if WITH_GTKGLEXT
-	if (priv->gl_enabled) {
-		gdk_gl_drawable_gl_begin(priv->gl_drawable,
-					 priv->gl_context);
-		glDeleteTextures(1, &priv->gl_tex);
-		gdk_gl_drawable_gl_end(priv->gl_drawable);
-		if (priv->gl_tex_data) {
-			g_free(priv->gl_tex_data);
-			priv->gl_tex_data = NULL;
-		}
-	}
-
-	if (priv->gl_config) {
-		g_object_unref(G_OBJECT(priv->gl_config));
-		priv->gl_config = NULL;
-	}
-#endif
-
 	if (priv->image) {
 		g_object_unref(priv->image);
 		priv->image = NULL;
@@ -1822,11 +1454,6 @@
 	gtkwidget_class->enter_notify_event = enter_event;
 	gtkwidget_class->leave_notify_event = leave_event;
 	gtkwidget_class->focus_out_event = focus_event;
-#if WITH_GTKGLEXT
-	gtkwidget_class->realize = realize_event;
-	gtkwidget_class->configure_event = configure_event;
-#endif
-
 
 	object_class->finalize = vnc_display_finalize;
 	object_class->get_property = vnc_display_get_property;
@@ -2151,23 +1778,6 @@
 	priv->preferable_auths = g_slist_append (priv->preferable_auths, GUINT_TO_POINTER (GVNC_AUTH_TLS));
 	priv->preferable_auths = g_slist_append (priv->preferable_auths, GUINT_TO_POINTER (GVNC_AUTH_VNC));
 	priv->preferable_auths = g_slist_append (priv->preferable_auths, GUINT_TO_POINTER (GVNC_AUTH_NONE));
-
-#if WITH_GTKGLEXT
-	if (gtk_gl_init_check(NULL, NULL)) {
-		priv->gl_config = gdk_gl_config_new_by_mode(GDK_GL_MODE_RGB |
-							    GDK_GL_MODE_DEPTH);
-		if (!gtk_widget_set_gl_capability(widget,
-						  priv->gl_config,
-						  NULL,
-						  TRUE,
-						  GDK_GL_RGBA_TYPE)) {
-			g_warning("Could not enable OpenGL");
-			g_object_unref(G_OBJECT(priv->gl_config));
-			priv->gl_config = NULL;
-		}
-	} else
-		priv->gl_config = NULL;
-#endif
 
 	priv->gvnc = gvnc_new(&vnc_display_ops, obj);
 }
@@ -2376,32 +1986,11 @@
 	obj->priv->shared_flag = shared;
 }
 
-#if WITH_GTKGLEXT
-gboolean vnc_display_set_scaling(VncDisplay *obj, gboolean enable)
-{
-	GtkWidget *widget = GTK_WIDGET(obj);
-	gint width, height;
-
-	g_return_val_if_fail (VNC_IS_DISPLAY (obj), FALSE);
-	if (obj->priv->gl_config == NULL)
-		return FALSE;
-	
-	obj->priv->allow_scaling = enable;
-	if (gvnc_is_open(obj->priv->gvnc) && widget->window) {
-		gdk_drawable_get_size(widget->window, &width, &height);
-		rescale_display(obj, width, height);
-		gtk_widget_queue_draw_area(widget, 0, 0, width, height);
-	}
-
-	return TRUE;
-}
-#else
 gboolean vnc_display_set_scaling(VncDisplay *obj G_GNUC_UNUSED,
 	gboolean enable G_GNUC_UNUSED)
 {
 	return FALSE;
 }
-#endif
 
 void vnc_display_set_force_size(VncDisplay *obj, gboolean enabled)
 {
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]