GNOME.org
 

[eog] Allow handling multiple clipboard data formats from one menu entry

commit dcb56b03e9c9282138b9da94eddcedfc401ab750
Author: Felix Riemann <friemann gnome org>
Date:   Fri Dec 31 18:21:45 2010 +0100

    Allow handling multiple clipboard data formats from one menu entry
    
    The new class "snapshots" the required data from the given EogImage
    and keeps it around for clipboard usage until the clipboard gets reset.

 src/Makefile.am             |    2 +
 src/eog-clipboard-handler.c |  325 +++++++++++++++++++++++++++++++++++++++++++
 src/eog-clipboard-handler.h |   63 +++++++++
 src/eog-window.c            |   10 +-
 4 files changed, 395 insertions(+), 5 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index b3bd975..371333e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -38,6 +38,7 @@ NOINST_H_FILES =			\
 	eog-plugin-engine.h             \
 	uta.h				\
 	eog-close-confirmation-dialog.h	\
+	eog-clipboard-handler.h		\
 	zoom.h
 
 if ENABLE_PYTHON
@@ -107,6 +108,7 @@ libeog_la_SOURCES =			\
 	eog-plugin.c            	\
 	eog-plugin-manager.c            \
 	eog-plugin-engine.c            	\
+	eog-clipboard-handler.c		\
 	uta.c				\
 	zoom.c				\
 	$(BUILT_SOURCES)		\
diff --git a/src/eog-clipboard-handler.c b/src/eog-clipboard-handler.c
new file mode 100644
index 0000000..a600894
--- /dev/null
+++ b/src/eog-clipboard-handler.c
@@ -0,0 +1,325 @@
+/*
+ * eog-clipboard-handler.c
+ * This file is part of eog
+ *
+ * Author: Felix Riemann <friemann gnome org>
+ *
+ * Copyright (C) 2010 GNOME Foundation
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <glib.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gtk/gtk.h>
+#include "eog-clipboard-handler.h"
+
+enum {
+	PROP_0,
+	PROP_PIXBUF,
+	PROP_URI
+};
+
+enum {
+	TARGET_PIXBUF,
+	TARGET_TEXT,
+	TARGET_URI
+};
+
+struct _EogClipboardHandlerPrivate {
+	GdkPixbuf *pixbuf;
+	gchar     *uri;
+};
+
+#define EOG_CLIPBOARD_HANDLER_GET_PRIVATE(object) \
+	(G_TYPE_INSTANCE_GET_PRIVATE ((object), EOG_TYPE_CLIPBOARD_HANDLER, EogClipboardHandlerPrivate))
+
+G_DEFINE_TYPE(EogClipboardHandler, eog_clipboard_handler, G_TYPE_INITIALLY_UNOWNED)
+
+static GdkPixbuf*
+eog_clipboard_handler_get_pixbuf (EogClipboardHandler *handler)
+{
+	g_return_val_if_fail (EOG_IS_CLIPBOARD_HANDLER (handler), NULL);
+
+	return handler->priv->pixbuf;
+}
+
+static const gchar *
+eog_clipboard_handler_get_uri (EogClipboardHandler *handler)
+{
+	g_return_val_if_fail (EOG_IS_CLIPBOARD_HANDLER (handler), NULL);
+
+	return handler->priv->uri;
+}
+
+static void
+eog_clipboard_handler_set_pixbuf (EogClipboardHandler *handler, GdkPixbuf *pixbuf)
+{
+	g_return_if_fail (EOG_IS_CLIPBOARD_HANDLER (handler));
+	g_return_if_fail (pixbuf == NULL || GDK_IS_PIXBUF (pixbuf));
+
+	if (handler->priv->pixbuf == pixbuf)
+		return;
+	
+	if (handler->priv->pixbuf)
+		g_object_unref (handler->priv->pixbuf);
+
+	handler->priv->pixbuf = g_object_ref (pixbuf);
+
+	g_object_notify (G_OBJECT (handler), "pixbuf");
+}
+
+static void
+eog_clipboard_handler_set_uri (EogClipboardHandler *handler, const gchar *uri)
+{
+	g_return_if_fail (EOG_IS_CLIPBOARD_HANDLER (handler));
+
+	if (handler->priv->uri != NULL)
+		g_free (handler->priv->uri);
+
+	handler->priv->uri = g_strdup (uri);
+	g_object_notify (G_OBJECT (handler), "uri");
+}
+
+static void
+eog_clipboard_handler_get_property (GObject *object, guint property_id,
+				    GValue *value, GParamSpec *pspec)
+{
+	EogClipboardHandler *handler;
+
+	g_return_if_fail (EOG_IS_CLIPBOARD_HANDLER (object));
+
+	handler = EOG_CLIPBOARD_HANDLER (object);
+
+	switch (property_id) {
+	case PROP_PIXBUF:
+		g_value_set_object (value,
+				    eog_clipboard_handler_get_pixbuf (handler));
+		break;
+	case PROP_URI:
+		g_value_set_string (value,
+				    eog_clipboard_handler_get_uri (handler));
+		break;
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+	}
+}
+
+static void
+eog_clipboard_handler_set_property (GObject *object, guint property_id,
+				    const GValue *value, GParamSpec *pspec)
+{
+	EogClipboardHandler *handler;
+
+	g_return_if_fail (EOG_IS_CLIPBOARD_HANDLER (object));
+
+	handler = EOG_CLIPBOARD_HANDLER (object);
+
+	switch (property_id) {
+	case PROP_PIXBUF:
+	{
+		GdkPixbuf *pixbuf;
+
+		pixbuf = g_value_get_object (value);
+		eog_clipboard_handler_set_pixbuf (handler, pixbuf);
+		break;
+	}
+	case PROP_URI:
+	{
+		const gchar *uri;
+
+		uri = g_value_get_string (value);
+		eog_clipboard_handler_set_uri (handler, uri);
+		break;
+	}
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+	}
+
+}
+
+static void
+eog_clipboard_handler_dispose (GObject *obj)
+{
+	EogClipboardHandlerPrivate *priv;
+
+	g_return_if_fail (EOG_IS_CLIPBOARD_HANDLER (obj));
+
+	priv = EOG_CLIPBOARD_HANDLER (obj)->priv;
+
+	if (priv->pixbuf != NULL) {
+		g_object_unref (priv->pixbuf);
+		priv->pixbuf = NULL;
+	}
+	if (priv->uri) {
+		g_free (priv->uri);
+		priv->uri = NULL;
+	}
+
+	G_OBJECT_CLASS (eog_clipboard_handler_parent_class)->dispose (obj);
+}
+
+static void
+eog_clipboard_handler_init (EogClipboardHandler *handler)
+{
+	handler->priv = EOG_CLIPBOARD_HANDLER_GET_PRIVATE (handler);
+}
+
+static void
+eog_clipboard_handler_class_init (EogClipboardHandlerClass *klass)
+{
+	GObjectClass *g_obj_class = G_OBJECT_CLASS (klass);
+
+	g_type_class_add_private (klass, sizeof (EogClipboardHandlerPrivate));
+
+	g_obj_class->get_property = eog_clipboard_handler_get_property;
+	g_obj_class->set_property = eog_clipboard_handler_set_property;
+	g_obj_class->dispose = eog_clipboard_handler_dispose;
+
+	g_object_class_install_property (
+		g_obj_class, PROP_PIXBUF,
+		g_param_spec_object ("pixbuf", NULL, NULL, GDK_TYPE_PIXBUF,
+				     G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY |
+				     G_PARAM_STATIC_STRINGS));
+
+	g_object_class_install_property (
+		g_obj_class, PROP_URI,
+		g_param_spec_string ("uri", NULL, NULL, NULL,
+				     G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY |
+				     G_PARAM_STATIC_STRINGS));
+}
+
+EogClipboardHandler*
+eog_clipboard_handler_new (EogImage *img)
+{
+	GObject *obj;
+	GFile *file;
+	GdkPixbuf *pbuf;
+	gchar *uri;
+
+	g_object_ref (img);
+	pbuf = eog_image_get_pixbuf (img);
+	file = eog_image_get_file (img);
+	uri = g_file_get_uri (file);
+	obj = g_object_new (EOG_TYPE_CLIPBOARD_HANDLER,
+			    "pixbuf", pbuf,
+			    "uri", uri,
+			    NULL);
+	g_free (uri);
+	g_object_unref (file);
+	g_object_unref (pbuf);
+	g_object_unref (img);
+
+	return EOG_CLIPBOARD_HANDLER (obj);
+
+}
+
+static void
+eog_clipboard_handler_get_func (GtkClipboard *clipboard,
+				GtkSelectionData *selection,
+				guint info, gpointer owner)
+{
+	EogClipboardHandler *handler;
+
+	g_return_if_fail (EOG_IS_CLIPBOARD_HANDLER (owner));
+
+	handler = EOG_CLIPBOARD_HANDLER (owner);
+
+	switch (info) {
+	case TARGET_PIXBUF:
+	{
+		GdkPixbuf *pixbuf = eog_clipboard_handler_get_pixbuf (handler);
+		g_object_ref (pixbuf);
+		gtk_selection_data_set_pixbuf (selection, pixbuf);
+		g_object_unref (pixbuf);
+		break;
+	}
+	case TARGET_TEXT:
+	{
+		gtk_selection_data_set_text (selection,
+					     eog_clipboard_handler_get_uri (handler),
+					     -1);
+		break;
+	}
+	case TARGET_URI:
+	{
+		gchar *uris[2];
+		uris[0] = g_strdup (eog_clipboard_handler_get_uri (handler));
+		uris[1] = NULL;
+
+		gtk_selection_data_set_uris (selection, uris);
+		g_free (uris[0]);
+		break;
+	}
+	default:
+		g_return_if_reached ();
+	}
+
+}
+
+static void
+eog_clipboard_handler_clear_func (GtkClipboard *clipboard, gpointer owner)
+{
+	g_return_if_fail (EOG_IS_CLIPBOARD_HANDLER (owner));
+
+	g_object_unref (G_OBJECT (owner));
+}
+
+void
+eog_clipboard_handler_copy_to_clipboard (EogClipboardHandler *handler,
+					 GtkClipboard *clipboard)
+{
+	GtkTargetList *tlist;
+	GtkTargetEntry *targets;
+	gint n_targets = 0;
+	gboolean set = FALSE;
+
+	tlist = gtk_target_list_new (NULL, 0);
+
+	if (handler->priv->pixbuf != NULL)
+		gtk_target_list_add_image_targets (tlist, TARGET_PIXBUF, TRUE);
+
+	if (handler->priv->uri != NULL) {
+		gtk_target_list_add_text_targets (tlist, TARGET_TEXT);
+		gtk_target_list_add_uri_targets (tlist, TARGET_URI);
+	}
+
+	targets = gtk_target_table_new_from_list (tlist, &n_targets);
+
+	// We need to take ownership here if nobody else did
+	g_object_ref_sink (handler);
+
+	if (n_targets > 0) {
+		set = gtk_clipboard_set_with_owner (clipboard,
+						    targets, n_targets,
+						    eog_clipboard_handler_get_func,
+						    eog_clipboard_handler_clear_func,
+						    G_OBJECT (handler));
+
+	} 
+	
+	if (!set) {
+		gtk_clipboard_clear (clipboard);
+		g_object_unref (handler);
+	}
+
+	gtk_target_table_free (targets, n_targets);
+	gtk_target_list_unref (tlist);
+}
+
diff --git a/src/eog-clipboard-handler.h b/src/eog-clipboard-handler.h
new file mode 100644
index 0000000..e2d5cfb
--- /dev/null
+++ b/src/eog-clipboard-handler.h
@@ -0,0 +1,63 @@
+/*
+ * eog-clipboard-handler.h
+ * This file is part of eog
+ *
+ * Author: Felix Riemann <friemann gnome org>
+ *
+ * Copyright (C) 2010 GNOME Foundation
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+#ifndef __EOG_CLIPBOARD_HANDLER_H__
+#define __EOG_CLIPBOARD_HANDLER_H__
+
+#include <glib-object.h>
+#include <gtk/gtk.h>
+
+#include "eog-image.h"
+
+G_BEGIN_DECLS
+
+#define EOG_TYPE_CLIPBOARD_HANDLER          (eog_clipboard_handler_get_type ())
+#define EOG_CLIPBOARD_HANDLER(o)            (G_TYPE_CHECK_INSTANCE_CAST ((o), EOG_TYPE_CLIPBOARD_HANDLER, EogClipboardHandler))
+#define EOG_CLIPBOARD_HANDLER_CLASS(k)      (G_TYPE_CHECK_CLASS_CAST((k), EOG_TYPE_CLIPBOARD_HANDLER, EogClipboardHandlerClass))
+#define EOG_IS_CLIPBOARD_HANDLER(o)         (G_TYPE_CHECK_INSTANCE_TYPE ((o), EOG_TYPE_CLIPBOARD_HANDLER))
+#define EOG_IS_CLIPBOARD_HANDLER_CLASS(k)   (G_TYPE_CHECK_CLASS_TYPE ((k), EOG_TYPE_CLIPBOARD_HANDLER))
+#define EOG_CLIPBOARD_HANDLER_GET_CLASS(o)  (G_TYPE_INSTANCE_GET_CLASS ((o), EOG_TYPE_CLIPBOARD_HANDLER, EogClipboardHandlerClass))
+
+typedef struct _EogClipboardHandler EogClipboardHandler;
+typedef struct _EogClipboardHandlerClass EogClipboardHandlerClass;
+typedef struct _EogClipboardHandlerPrivate EogClipboardHandlerPrivate;
+
+struct _EogClipboardHandler {
+	GObject parent;
+
+	EogClipboardHandlerPrivate *priv;
+};
+
+struct _EogClipboardHandlerClass {
+	GObjectClass parent_klass;
+};
+
+GType eog_clipboard_handler_get_type (void) G_GNUC_CONST;
+
+EogClipboardHandler* eog_clipboard_handler_new (EogImage *img);
+
+void eog_clipboard_handler_copy_to_clipboard (EogClipboardHandler *handler,
+					      GtkClipboard *clipboard);
+
+G_END_DECLS
+#endif /* __EOG_CLIPBOARD_HANDLER_H__ */
diff --git a/src/eog-window.c b/src/eog-window.c
index 3e9ce0e..ea97609 100644
--- a/src/eog-window.c
+++ b/src/eog-window.c
@@ -52,6 +52,7 @@
 #include "eog-save-as-dialog-helper.h"
 #include "eog-plugin-engine.h"
 #include "eog-close-confirmation-dialog.h"
+#include "eog-clipboard-handler.h"
 
 #include "eog-enum-types.h"
 
@@ -3329,10 +3330,10 @@ static void
 eog_window_cmd_copy_image (GtkAction *action, gpointer user_data)
 {
 	GtkClipboard *clipboard;
-	GdkPixbuf *pix;
 	EogWindow *window;
 	EogWindowPrivate *priv;
 	EogImage *image;
+	EogClipboardHandler *cbhandler;
 
 	g_return_if_fail (EOG_IS_WINDOW (user_data));
 
@@ -3343,12 +3344,11 @@ eog_window_cmd_copy_image (GtkAction *action, gpointer user_data)
 
 	g_return_if_fail (EOG_IS_IMAGE (image));
 
-	pix = eog_image_get_pixbuf (image);
-
 	clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
-	gtk_clipboard_set_image (clipboard, pix);
 
-	g_object_unref (pix);
+	cbhandler = eog_clipboard_handler_new (image);
+	// cbhandler will self-destruct when it's not needed anymore
+	eog_clipboard_handler_copy_to_clipboard (cbhandler, clipboard);
 }
 
 static void
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]