[gtk-vnc] Turn VncPixelFormat into a boxed type

From: Daniel P. Berrange <dberrange src gnome org>
To: commits-list gnome org
Cc:
Subject: [gtk-vnc] Turn VncPixelFormat into a boxed type
Date: Sun, 21 Mar 2010 14:09:59 +0000 (UTC)
commit 1ee093bd3223963ee8dd9ef9caa8a0cb2a6695ba
Author: Daniel P. Berrange <berrange redhat com>
Date:   Sun Mar 21 13:06:22 2010 +0000

    Turn VncPixelFormat into a boxed type
    
    To allow introspection to work with VncPixelFormat properties,
    this struct needs to be a boxed type

 src/Makefile.am             |    2 +-
 src/libgvnc_sym.version     |    5 ++
 src/vncbaseframebuffer.c    |  154 ++++++++++++++++++++++++------------------
 src/vncbaseframebufferblt.h |   10 ++--
 src/vncpixelformat.c        |   71 ++++++++++++++++++++
 src/vncpixelformat.h        |    8 ++
 6 files changed, 178 insertions(+), 72 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 5ec4e79..dce4255 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -40,7 +40,7 @@ libgvnc_1_0_la_SOURCES = \
 			coroutine.h \
 			d3des.h d3des.c \
 			dh.h dh.c \
-			vncpixelformat.h \
+			vncpixelformat.h vncpixelformat.c \
 			vncframebuffer.h vncframebuffer.c \
 			vncbaseframebufferblt.h \
 			vncbaseframebuffer.h vncbaseframebuffer.c \
diff --git a/src/libgvnc_sym.version b/src/libgvnc_sym.version
index 15e9046..47c474d 100644
--- a/src/libgvnc_sym.version
+++ b/src/libgvnc_sym.version
@@ -60,6 +60,11 @@
 	vnc_util_set_debug;
 	vnc_util_get_debug;
 
+	vnc_pixel_format_new;
+	vnc_pixel_format_copy;
+	vnc_pixel_format_free;
+	vnc_pixel_format_get_type;
+
     local:
 	*;
 };
diff --git a/src/vncbaseframebuffer.c b/src/vncbaseframebuffer.c
index f8eb2b2..d689e84 100644
--- a/src/vncbaseframebuffer.c
+++ b/src/vncbaseframebuffer.c
@@ -53,8 +53,8 @@ struct _VncBaseFramebufferPrivate {
 	guint16 height;
 	int rowstride;
 
-	VncPixelFormat localFormat;
-	VncPixelFormat remoteFormat;
+	VncPixelFormat *localFormat;
+	VncPixelFormat *remoteFormat;
 
 	/* TRUE if the following derived data needs reinitializing */
 	gboolean reinitRenderFuncs;
@@ -75,7 +75,7 @@ struct _VncBaseFramebufferPrivate {
 };
 
 #define VNC_BASE_FRAMEBUFFER_AT(priv, x, y) \
-	((priv)->buffer + ((y) * (priv)->rowstride) + ((x) * ((priv)->localFormat.bits_per_pixel/8)))
+	((priv)->buffer + ((y) * (priv)->rowstride) + ((x) * ((priv)->localFormat->bits_per_pixel/8)))
 
 
 static void vnc_base_framebuffer_interface_init (gpointer g_iface,
@@ -122,11 +122,11 @@ static void vnc_base_framebuffer_get_property(GObject *object,
 		break;
 
 	case PROP_LOCAL_FORMAT:
-		g_value_set_pointer(value, &priv->localFormat);
+		g_value_set_boxed(value, priv->localFormat);
 		break;
 
 	case PROP_REMOTE_FORMAT:
-		g_value_set_pointer(value, &priv->remoteFormat);
+		g_value_set_boxed(value, priv->remoteFormat);
 		break;
 
 	default:
@@ -164,16 +164,16 @@ static void vnc_base_framebuffer_set_property(GObject *object,
 		break;
 
 	case PROP_LOCAL_FORMAT:
-		memcpy(&priv->localFormat,
-		       g_value_get_pointer(value),
-		       sizeof(priv->localFormat));
+		if (priv->localFormat)
+			vnc_pixel_format_free(priv->localFormat);
+		priv->localFormat = g_value_dup_boxed(value);
 		priv->reinitRenderFuncs = TRUE;
 		break;
 
 	case PROP_REMOTE_FORMAT:
-		memcpy(&priv->remoteFormat,
-		       g_value_get_pointer(value),
-		       sizeof(priv->remoteFormat));
+		if (priv->remoteFormat)
+			vnc_pixel_format_free(priv->remoteFormat);
+		priv->remoteFormat = g_value_dup_boxed(value);
 		priv->reinitRenderFuncs = TRUE;
 		break;
 
@@ -183,10 +183,27 @@ static void vnc_base_framebuffer_set_property(GObject *object,
 }
 
 
+static void vnc_base_framebuffer_finalize(GObject *object)
+{
+	VncBaseFramebuffer *ab = VNC_BASE_FRAMEBUFFER(object);
+	VncBaseFramebufferPrivate *priv = ab->priv;
+
+	VNC_DEBUG("Finalize VncBaseFramebuffer=%p", ab);
+
+	if (priv->localFormat)
+		vnc_pixel_format_free(priv->localFormat);
+	if (priv->remoteFormat)
+		vnc_pixel_format_free(priv->remoteFormat);
+
+	G_OBJECT_CLASS(vnc_base_framebuffer_parent_class)->finalize (object);
+}
+
+
 static void vnc_base_framebuffer_class_init(VncBaseFramebufferClass *klass)
 {
 	GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
+	object_class->finalize = vnc_base_framebuffer_finalize;
 	object_class->get_property = vnc_base_framebuffer_get_property;
 	object_class->set_property = vnc_base_framebuffer_set_property;
 
@@ -243,27 +260,29 @@ static void vnc_base_framebuffer_class_init(VncBaseFramebufferClass *klass)
 
 	g_object_class_install_property(object_class,
 					PROP_LOCAL_FORMAT,
-					g_param_spec_pointer("local-format",
-							     "Local pixel format",
-							     "The local pixel format of the framebuffer",
-							     G_PARAM_READABLE |
-							     G_PARAM_WRITABLE |
-							     G_PARAM_CONSTRUCT_ONLY |
-							     G_PARAM_STATIC_NAME |
-							     G_PARAM_STATIC_NICK |
-							     G_PARAM_STATIC_BLURB));
+					g_param_spec_boxed("local-format",
+							   "Local pixel format",
+							   "The local pixel format of the framebuffer",
+							   VNC_TYPE_PIXEL_FORMAT,
+							   G_PARAM_READABLE |
+							   G_PARAM_WRITABLE |
+							   G_PARAM_CONSTRUCT_ONLY |
+							   G_PARAM_STATIC_NAME |
+							   G_PARAM_STATIC_NICK |
+							   G_PARAM_STATIC_BLURB));
 
 	g_object_class_install_property(object_class,
 					PROP_REMOTE_FORMAT,
-					g_param_spec_pointer("remote-format",
-							     "Remote pixel format",
-							     "The remote pixel format of the framebuffer",
-							     G_PARAM_READABLE |
-							     G_PARAM_WRITABLE |
-							     G_PARAM_CONSTRUCT_ONLY |
-							     G_PARAM_STATIC_NAME |
-							     G_PARAM_STATIC_NICK |
-							     G_PARAM_STATIC_BLURB));
+					g_param_spec_boxed("remote-format",
+							   "Remote pixel format",
+							   "The remote pixel format of the framebuffer",
+							   VNC_TYPE_PIXEL_FORMAT,
+							   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(VncBaseFramebufferPrivate));
 }
@@ -277,6 +296,9 @@ void vnc_base_framebuffer_init(VncBaseFramebuffer *fb)
 
 	memset(priv, 0, sizeof(*priv));
 	priv->reinitRenderFuncs = TRUE;
+
+	priv->localFormat = vnc_pixel_format_new();
+	priv->remoteFormat = vnc_pixel_format_new();
 }
 
 
@@ -339,7 +361,7 @@ static const VncPixelFormat *vnc_base_framebuffer_get_local_format(VncFramebuffe
 	VncBaseFramebuffer *fb = VNC_BASE_FRAMEBUFFER(iface);
 	VncBaseFramebufferPrivate *priv = fb->priv;
 
-	return &priv->localFormat;
+	return priv->localFormat;
 }
 
 
@@ -348,7 +370,7 @@ static const VncPixelFormat *vnc_base_framebuffer_get_remote_format(VncFramebuff
 	VncBaseFramebuffer *fb = VNC_BASE_FRAMEBUFFER(iface);
 	VncBaseFramebufferPrivate *priv = fb->priv;
 
-	return &priv->remoteFormat;
+	return priv->remoteFormat;
 }
 
 
@@ -376,7 +398,7 @@ static guint8 vnc_base_framebuffer_swap_rfb_8(VncBaseFramebufferPrivate *priv G_
 /* local host native format -> X server image format */
 static guint16 vnc_base_framebuffer_swap_img_16(VncBaseFramebufferPrivate *priv, guint16 pixel)
 {
-	if (G_BYTE_ORDER != priv->localFormat.byte_order)
+	if (G_BYTE_ORDER != priv->localFormat->byte_order)
 		return  (((pixel >> 8) & 0xFF) << 0) |
 			(((pixel >> 0) & 0xFF) << 8);
 	else
@@ -387,7 +409,7 @@ static guint16 vnc_base_framebuffer_swap_img_16(VncBaseFramebufferPrivate *priv,
 /* VNC server RFB  format ->  local host native format */
 static guint16 vnc_base_framebuffer_swap_rfb_16(VncBaseFramebufferPrivate *priv, guint16 pixel)
 {
-	if (priv->remoteFormat.byte_order != G_BYTE_ORDER)
+	if (priv->remoteFormat->byte_order != G_BYTE_ORDER)
 		return  (((pixel >> 8) & 0xFF) << 0) |
 			(((pixel >> 0) & 0xFF) << 8);
 	else
@@ -398,7 +420,7 @@ static guint16 vnc_base_framebuffer_swap_rfb_16(VncBaseFramebufferPrivate *priv,
 /* local host native format -> X server image format */
 static guint32 vnc_base_framebuffer_swap_img_32(VncBaseFramebufferPrivate *priv, guint32 pixel)
 {
-	if (G_BYTE_ORDER != priv->localFormat.byte_order)
+	if (G_BYTE_ORDER != priv->localFormat->byte_order)
 		return  (((pixel >> 24) & 0xFF) <<  0) |
 			(((pixel >> 16) & 0xFF) <<  8) |
 			(((pixel >>  8) & 0xFF) << 16) |
@@ -411,7 +433,7 @@ static guint32 vnc_base_framebuffer_swap_img_32(VncBaseFramebufferPrivate *priv,
 /* VNC server RFB  format ->  local host native format */
 static guint32 vnc_base_framebuffer_swap_rfb_32(VncBaseFramebufferPrivate *priv, guint32 pixel)
 {
-	if (priv->remoteFormat.byte_order != G_BYTE_ORDER)
+	if (priv->remoteFormat->byte_order != G_BYTE_ORDER)
 		return  (((pixel >> 24) & 0xFF) <<  0) |
 			(((pixel >> 16) & 0xFF) <<  8) |
 			(((pixel >>  8) & 0xFF) << 16) |
@@ -528,7 +550,7 @@ static void vnc_base_framebuffer_blt_fast(VncBaseFramebufferPrivate *priv,
         guint8 *dst = VNC_BASE_FRAMEBUFFER_AT(priv, x, y);
         guint16 i;
         for (i = 0; i < height; i++) {
-                memcpy(dst, src, width * (priv->localFormat.bits_per_pixel / 8));
+                memcpy(dst, src, width * (priv->localFormat->bits_per_pixel / 8));
                 dst += priv->rowstride;
                 src += rowstride;
         }
@@ -544,63 +566,63 @@ static void vnc_base_framebuffer_reinit_render_funcs(VncBaseFramebuffer *fb)
 	if (!priv->reinitRenderFuncs)
 		return;
 
-	if (priv->localFormat.bits_per_pixel == priv->remoteFormat.bits_per_pixel &&
-	    priv->localFormat.red_max == priv->remoteFormat.red_max &&
-	    priv->localFormat.green_max == priv->remoteFormat.green_max &&
-	    priv->localFormat.blue_max == priv->remoteFormat.blue_max &&
-	    priv->localFormat.red_shift == priv->remoteFormat.red_shift &&
-	    priv->localFormat.green_shift == priv->remoteFormat.green_shift &&
-	    priv->localFormat.blue_shift == priv->remoteFormat.blue_shift &&
-	    priv->localFormat.byte_order == G_BYTE_ORDER &&
-	    priv->remoteFormat.byte_order == G_BYTE_ORDER)
+	if (priv->localFormat->bits_per_pixel == priv->remoteFormat->bits_per_pixel &&
+	    priv->localFormat->red_max == priv->remoteFormat->red_max &&
+	    priv->localFormat->green_max == priv->remoteFormat->green_max &&
+	    priv->localFormat->blue_max == priv->remoteFormat->blue_max &&
+	    priv->localFormat->red_shift == priv->remoteFormat->red_shift &&
+	    priv->localFormat->green_shift == priv->remoteFormat->green_shift &&
+	    priv->localFormat->blue_shift == priv->remoteFormat->blue_shift &&
+	    priv->localFormat->byte_order == G_BYTE_ORDER &&
+	    priv->remoteFormat->byte_order == G_BYTE_ORDER)
 		priv->perfect_match = TRUE;
 	else
 		priv->perfect_match = FALSE;
 
-	depth = priv->remoteFormat.depth;
+	depth = priv->remoteFormat->depth;
 	if (depth == 32)
 		depth = 24;
 
-	priv->rm = priv->localFormat.red_max & priv->remoteFormat.red_max;
-	priv->gm = priv->localFormat.green_max & priv->remoteFormat.green_max;
-	priv->bm = priv->localFormat.blue_max & priv->remoteFormat.blue_max;
+	priv->rm = priv->localFormat->red_max & priv->remoteFormat->red_max;
+	priv->gm = priv->localFormat->green_max & priv->remoteFormat->green_max;
+	priv->bm = priv->localFormat->blue_max & priv->remoteFormat->blue_max;
 	VNC_DEBUG("Mask local: %3d %3d %3d\n"
 		   "    remote: %3d %3d %3d\n"
 		   "    merged: %3d %3d %3d",
-		   priv->localFormat.red_max, priv->localFormat.green_max, priv->localFormat.blue_max,
-		   priv->remoteFormat.red_max, priv->remoteFormat.green_max, priv->remoteFormat.blue_max,
+		   priv->localFormat->red_max, priv->localFormat->green_max, priv->localFormat->blue_max,
+		   priv->remoteFormat->red_max, priv->remoteFormat->green_max, priv->remoteFormat->blue_max,
 		   priv->rm, priv->gm, priv->bm);
 
 	/* Setup shifts assuming matched bpp (but not necessarily match rgb order)*/
-	priv->rrs = priv->remoteFormat.red_shift;
-	priv->grs = priv->remoteFormat.green_shift;
-	priv->brs = priv->remoteFormat.blue_shift;
+	priv->rrs = priv->remoteFormat->red_shift;
+	priv->grs = priv->remoteFormat->green_shift;
+	priv->brs = priv->remoteFormat->blue_shift;
 
-	priv->rls = priv->localFormat.red_shift;
-	priv->gls = priv->localFormat.green_shift;
-	priv->bls = priv->localFormat.blue_shift;
+	priv->rls = priv->localFormat->red_shift;
+	priv->gls = priv->localFormat->green_shift;
+	priv->bls = priv->localFormat->blue_shift;
 
 	/* This adjusts for remote having more bpp than local */
-	for (n = priv->remoteFormat.red_max; n > priv->localFormat.red_max ; n>>= 1)
+	for (n = priv->remoteFormat->red_max; n > priv->localFormat->red_max ; n>>= 1)
 		priv->rrs++;
-	for (n = priv->remoteFormat.green_max; n > priv->localFormat.green_max ; n>>= 1)
+	for (n = priv->remoteFormat->green_max; n > priv->localFormat->green_max ; n>>= 1)
 		priv->grs++;
-	for (n = priv->remoteFormat.blue_max; n > priv->localFormat.blue_max ; n>>= 1)
+	for (n = priv->remoteFormat->blue_max; n > priv->localFormat->blue_max ; n>>= 1)
 		priv->brs++;
 
 	/* This adjusts for remote having less bpp than remote */
-	for (n = priv->localFormat.red_max ; n > priv->remoteFormat.red_max ; n>>= 1)
+	for (n = priv->localFormat->red_max ; n > priv->remoteFormat->red_max ; n>>= 1)
 		priv->rls++;
-	for (n = priv->localFormat.green_max ; n > priv->remoteFormat.green_max ; n>>= 1)
+	for (n = priv->localFormat->green_max ; n > priv->remoteFormat->green_max ; n>>= 1)
 		priv->gls++;
-	for (n = priv->localFormat.blue_max ; n > priv->remoteFormat.blue_max ; n>>= 1)
+	for (n = priv->localFormat->blue_max ; n > priv->remoteFormat->blue_max ; n>>= 1)
 		priv->bls++;
 	VNC_DEBUG("Pixel shifts\n   right: %3d %3d %3d\n    left: %3d %3d %3d",
 		   priv->rrs, priv->grs, priv->brs,
 		   priv->rls, priv->gls, priv->bls);
 
-	i = priv->remoteFormat.bits_per_pixel / 8;
-	j = priv->localFormat.bits_per_pixel / 8;
+	i = priv->remoteFormat->bits_per_pixel / 8;
+	j = priv->localFormat->bits_per_pixel / 8;
 
 	if (i == 4) i = 3;
 	if (j == 4) j = 3;
@@ -672,7 +694,7 @@ static void vnc_base_framebuffer_copyrect(VncFramebuffer *iface,
 	dst = VNC_BASE_FRAMEBUFFER_AT(priv, dstx, dsty);
 	src = VNC_BASE_FRAMEBUFFER_AT(priv, srcx, srcy);
 	for (i = 0; i < height; i++) {
-		memmove(dst, src, width * (priv->localFormat.bits_per_pixel  / 8));
+		memmove(dst, src, width * (priv->localFormat->bits_per_pixel  / 8));
 		dst += rowstride;
 		src += rowstride;
 	}
diff --git a/src/vncbaseframebufferblt.h b/src/vncbaseframebufferblt.h
index 419d3ca..398229d 100644
--- a/src/vncbaseframebufferblt.h
+++ b/src/vncbaseframebufferblt.h
@@ -42,7 +42,7 @@
 
 #define SWAP_RFB(priv, pixel) SPLICE(vnc_base_framebuffer_swap_rfb_, SRC)(priv, pixel)
 #define SWAP_IMG(priv, pixel) SPLICE(vnc_base_framebuffer_swap_img_, DST)(priv, pixel)
-#define COMPONENT(color, pixel) ((SWAP_RFB(priv, pixel) >> priv->remoteFormat.SPLICE(color, _shift) & priv->remoteFormat.SPLICE(color, _max)))
+#define COMPONENT(color, pixel) ((SWAP_RFB(priv, pixel) >> priv->remoteFormat->SPLICE(color, _shift) & priv->remoteFormat->SPLICE(color, _max)))
 
 static void SET_PIXEL(VncBaseFramebufferPrivate *priv,
 		      dst_pixel_t *dp, src_pixel_t sp)
@@ -152,13 +152,13 @@ static void RGB24_BLT(VncBaseFramebufferPrivate *priv,
 
 		for (i = 0; i < width; i++) {
 			/*
-			 * We use priv->remoteFormat.XXX_shift instead of usual priv->Xls
+			 * We use priv->remoteFormat->XXX_shift instead of usual priv->Xls
 			 * because the source pixel component is a full 8 bits in
 			 * size, and so doesn't need the adjusted shift
 			 */
-			*dp = (((sp[0] * priv->remoteFormat.red_max) / 255) << priv->remoteFormat.red_shift) |
-				(((sp[1] * priv->remoteFormat.green_max) / 255) << priv->remoteFormat.green_shift) |
-				(((sp[2] * priv->remoteFormat.blue_max) / 255) << priv->remoteFormat.blue_shift);
+			*dp = (((sp[0] * priv->remoteFormat->red_max) / 255) << priv->remoteFormat->red_shift) |
+				(((sp[1] * priv->remoteFormat->green_max) / 255) << priv->remoteFormat->green_shift) |
+				(((sp[2] * priv->remoteFormat->blue_max) / 255) << priv->remoteFormat->blue_shift);
 			dp++;
 			sp += 3;
 		}
diff --git a/src/vncpixelformat.c b/src/vncpixelformat.c
new file mode 100644
index 0000000..f8b307e
--- /dev/null
+++ b/src/vncpixelformat.c
@@ -0,0 +1,71 @@
+/*
+ * GTK VNC Widget
+ *
+ * Copyright (C) 2010 Daniel P. Berrange <dan berrange com>
+ *
+ * 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 "vncpixelformat.h"
+
+GType vnc_pixel_format_get_type(void)
+{
+	static GType pixel_format_type = 0;
+
+	if (G_UNLIKELY(pixel_format_type == 0)) {
+		pixel_format_type = g_boxed_type_register_static
+			("VncPixelFormat",
+			 (GBoxedCopyFunc)vnc_pixel_format_copy,
+			 (GBoxedFreeFunc)vnc_pixel_format_free);
+	}
+
+	return pixel_format_type;
+}
+
+
+VncPixelFormat *vnc_pixel_format_new(void)
+{
+	VncPixelFormat *format;
+
+	format = g_slice_new0(VncPixelFormat);
+
+	return format;
+}
+
+
+VncPixelFormat *vnc_pixel_format_copy(VncPixelFormat *srcFormat)
+{
+	VncPixelFormat *format;
+
+	format = g_slice_dup(VncPixelFormat, srcFormat);
+
+	return format;
+}
+
+
+void vnc_pixel_format_free(VncPixelFormat *format)
+{
+	g_slice_free(VncPixelFormat, format);
+}
+
+/*
+ * Local variables:
+ *  c-indent-level: 8
+ *  c-basic-offset: 8
+ *  tab-width: 8
+ * End:
+ */
diff --git a/src/vncpixelformat.h b/src/vncpixelformat.h
index ddbecf3..555c1ea 100644
--- a/src/vncpixelformat.h
+++ b/src/vncpixelformat.h
@@ -23,9 +23,11 @@
 #define VNC_PIXEL_FORMAT_H
 
 #include <glib.h>
+#include <glib-object.h>
 
 G_BEGIN_DECLS
 
+#define VNC_TYPE_PIXEL_FORMAT            (vnc_pixel_format_get_type ())
 
 typedef struct _VncPixelFormat VncPixelFormat;
 
@@ -42,6 +44,12 @@ struct _VncPixelFormat {
 	guint8 blue_shift;
 };
 
+GType vnc_pixel_format_get_type(void);
+
+VncPixelFormat *vnc_pixel_format_new(void);
+VncPixelFormat *vnc_pixel_format_copy(VncPixelFormat *format);
+void vnc_pixel_format_free(VncPixelFormat *format);
+
 G_END_DECLS
 
 #endif /* VNC_PIXEL_FORMAT_H */
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]