[PATCH 07/25] Add a framebuffer implementation based on a GdkImage

["Daniel P. Berrange" <berrange redhat com>]

Subclass the VncBaseFramebuffer class to add an implementation
which uses a GdkImage as its local storage
---
 src/Makefile.am           |    1 +
 src/vncimageframebuffer.c |  179 +++++++++++++++++++++++++++++++++++++++++++++
 src/vncimageframebuffer.h |   74 +++++++++++++++++++
 3 files changed, 254 insertions(+), 0 deletions(-)
 create mode 100644 src/vncimageframebuffer.c
 create mode 100644 src/vncimageframebuffer.h

diff --git a/src/Makefile.am b/src/Makefile.am
index 5c0dbdb..bd361bd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -26,6 +26,7 @@ libgtk_vnc_1_0_la_SOURCES = blt.h blt1.h \
 	vncframebuffer.h vncframebuffer.c \
 	vncbaseframebufferblt.h \
 	vncbaseframebuffer.h vncbaseframebuffer.c \
+	vncimageframebuffer.h vncimageframebuffer.c \
 	vncconnection.h vncconnection.c \
 	vncdisplay.h vncdisplay.c \
         vncmarshal.h vncmarshal.c \
diff --git a/src/vncimageframebuffer.c b/src/vncimageframebuffer.c
new file mode 100644
index 0000000..1a71707
--- /dev/null
+++ b/src/vncimageframebuffer.c
@@ -0,0 +1,179 @@
+/*
+ * GTK VNC Widget
+ *
+ * Copyright (C) 2006  Anthony Liguori <anthony codemonkey ws>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.0 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
+ */
+
+#include <config.h>
+
+#include <string.h>
+
+#include "vncimageframebuffer.h"
+#include "utils.h"
+
+#define VNC_IMAGE_FRAMEBUFFER_GET_PRIVATE(obj)				\
+	(G_TYPE_INSTANCE_GET_PRIVATE((obj), VNC_TYPE_IMAGE_FRAMEBUFFER, VncImageFramebufferPrivate))
+
+struct _VncImageFramebufferPrivate {
+	GdkImage *image;
+};
+
+
+G_DEFINE_TYPE(VncImageFramebuffer, vnc_image_framebuffer, VNC_TYPE_BASE_FRAMEBUFFER);
+
+
+enum {
+	PROP_0,
+	PROP_IMAGE,
+};
+
+
+static void vnc_image_framebuffer_get_property(GObject *object,
+					       guint prop_id,
+					       GValue *value,
+					       GParamSpec *pspec)
+{
+	VncImageFramebuffer *framebuffer = VNC_IMAGE_FRAMEBUFFER(object);
+	VncImageFramebufferPrivate *priv = framebuffer->priv;
+
+	switch (prop_id) {
+	case PROP_IMAGE:
+		g_value_set_object(value, priv->image);
+		break;
+
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
+	}
+}
+
+static void vnc_image_framebuffer_set_property(GObject *object,
+					       guint prop_id,
+					       const GValue *value,
+					       GParamSpec *pspec)
+{
+	VncImageFramebuffer *framebuffer = VNC_IMAGE_FRAMEBUFFER(object);
+	VncImageFramebufferPrivate *priv = framebuffer->priv;
+
+	switch (prop_id) {
+	case PROP_IMAGE:
+		if (priv->image)
+			g_object_unref(G_OBJECT(priv->image));
+		priv->image = g_value_get_object(value);
+		g_object_ref(G_OBJECT(priv->image));
+		break;
+
+        default:
+            G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
+        }
+}
+
+static void vnc_image_framebuffer_finalize (GObject *object)
+{
+	VncImageFramebuffer *fb = VNC_IMAGE_FRAMEBUFFER(object);
+	VncImageFramebufferPrivate *priv = fb->priv;
+
+	if (priv->image)
+		g_object_unref(priv->image);
+
+	G_OBJECT_CLASS(vnc_image_framebuffer_parent_class)->finalize (object);
+}
+
+static void vnc_image_framebuffer_class_init(VncImageFramebufferClass *klass)
+{
+	GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+	object_class->finalize = vnc_image_framebuffer_finalize;
+	object_class->get_property = vnc_image_framebuffer_get_property;
+	object_class->set_property = vnc_image_framebuffer_set_property;
+
+	g_object_class_install_property(object_class,
+					PROP_IMAGE,
+					g_param_spec_object("image",
+							    "The client image",
+							    "The client image for the framebuffer",
+							    GDK_TYPE_IMAGE,
+							    G_PARAM_READABLE |
+							    G_PARAM_WRITABLE |
+							    G_PARAM_CONSTRUCT_ONLY |
+							    G_PARAM_STATIC_NAME |
+							    G_PARAM_STATIC_NICK |
+							    G_PARAM_STATIC_BLURB));
+
+	g_type_class_add_private(klass, sizeof(VncImageFramebufferPrivate));
+}
+
+
+void vnc_image_framebuffer_init(VncImageFramebuffer *fb)
+{
+	VncImageFramebufferPrivate *priv;
+
+	priv = fb->priv = VNC_IMAGE_FRAMEBUFFER_GET_PRIVATE(fb);
+
+	memset(priv, 0, sizeof(*priv));
+}
+
+
+VncImageFramebuffer *vnc_image_framebuffer_new(GdkImage *image,
+					       const VncPixelFormat *remoteFormat)
+{
+        VncPixelFormat localFormat;
+
+	GVNC_DEBUG("Visual mask: %3d %3d %3d\n      shift: %3d %3d %3d",
+		   image->visual->red_mask,
+		   image->visual->green_mask,
+		   image->visual->blue_mask,
+		   image->visual->red_shift,
+		   image->visual->green_shift,
+		   image->visual->blue_shift);
+
+	localFormat.red_max = image->visual->red_mask >> image->visual->red_shift;
+	localFormat.green_max = image->visual->green_mask >> image->visual->green_shift;
+	localFormat.blue_max = image->visual->blue_mask >> image->visual->blue_shift;
+	localFormat.red_shift = image->visual->red_shift;
+	localFormat.green_shift = image->visual->green_shift;
+	localFormat.blue_shift = image->visual->blue_shift;
+	localFormat.depth = image->depth;
+	localFormat.bits_per_pixel = image->bpp * 8;
+	localFormat.byte_order = image->byte_order == GDK_LSB_FIRST ? G_LITTLE_ENDIAN : G_BIG_ENDIAN;
+
+	return VNC_IMAGE_FRAMEBUFFER(g_object_new(VNC_TYPE_IMAGE_FRAMEBUFFER,
+						  "image", image,
+						  "buffer", (guint8 *)image->mem,
+						  "width", image->width,
+						  "height", image->height,
+						  "rowstride", image->bpl,
+						  "local-format", &localFormat,
+						  "remote-format", remoteFormat,
+						  NULL));
+}
+
+
+GdkImage *vnc_image_framebuffer_get_image(VncImageFramebuffer *fb)
+{
+	VncImageFramebufferPrivate *priv = fb->priv;
+
+	return priv->image;
+}
+
+
+/*
+ * Local variables:
+ *  c-indent-level: 8
+ *  c-basic-offset: 8
+ *  tab-width: 8
+ * End:
+ */
diff --git a/src/vncimageframebuffer.h b/src/vncimageframebuffer.h
new file mode 100644
index 0000000..e86f816
--- /dev/null
+++ b/src/vncimageframebuffer.h
@@ -0,0 +1,74 @@
+/*
+ * GTK VNC Widget
+ *
+ * Copyright (C) 2006  Anthony Liguori <anthony codemonkey ws>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.0 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
+ */
+
+#ifndef VNC_IMAGE_FRAMEBUFFER_H
+#define VNC_IMAGE_FRAMEBUFFER_H
+
+#include <gdk/gdk.h>
+
+#include <vncbaseframebuffer.h>
+
+G_BEGIN_DECLS
+
+#define VNC_TYPE_IMAGE_FRAMEBUFFER            (vnc_image_framebuffer_get_type ())
+#define VNC_IMAGE_FRAMEBUFFER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), VNC_TYPE_IMAGE_FRAMEBUFFER, VncImageFramebuffer))
+#define VNC_IMAGE_FRAMEBUFFER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), VNC_TYPE_IMAGE_FRAMEBUFFER, VncImageFramebufferClass))
+#define VNC_IS_IMAGE_FRAMEBUFFER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), VNC_TYPE_IMAGE_FRAMEBUFFER))
+#define VNC_IS_IMAGE_FRAMEBUFFER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), VNC_TYPE_IMAGE_FRAMEBUFFER))
+#define VNC_IMAGE_FRAMEBUFFER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), VNC_TYPE_IMAGE_FRAMEBUFFER, VncImageFramebufferClass))
+
+
+typedef struct _VncImageFramebuffer VncImageFramebuffer;
+typedef struct _VncImageFramebufferPrivate VncImageFramebufferPrivate;
+typedef struct _VncImageFramebufferClass VncImageFramebufferClass;
+
+struct _VncImageFramebuffer
+{
+	VncBaseFramebuffer parent;
+
+	VncImageFramebufferPrivate *priv;
+};
+
+struct _VncImageFramebufferClass
+{
+	VncBaseFramebufferClass parent_class;
+
+};
+
+
+GType vnc_image_framebuffer_get_type(void) G_GNUC_CONST;
+
+VncImageFramebuffer *vnc_image_framebuffer_new(GdkImage *image,
+					       const VncPixelFormat *remoteFormat);
+
+GdkImage *vnc_image_framebuffer_get_image(VncImageFramebuffer *fb);
+
+
+G_END_DECLS
+
+#endif /* VNC_IMAGE_FRAMEBUFFER_H */
+
+/*
+ * Local variables:
+ *  c-indent-level: 8
+ *  c-basic-offset: 8
+ *  tab-width: 8
+ * End:
+ */
-- 
1.6.5.2