From 6b9aeb5d0b86d0002db107ad79af550a4e39f07a Mon Sep 17 00:00:00 2001 From: Carlos Garcia Campos Date: Sun, 07 Jan 2007 16:28:00 +0000 Subject: Add image handling support. Fixes bugs #310008 and #325047. Images 2007-01-07 Carlos Garcia Campos * configure.ac: * data/evince-ui.xml: * pdf/ev-poppler.cc: (pdf_document_images_get_images), (pdf_document_document_images_iface_init): * backend/Makefile.am: * backend/ev-document-images.[ch]: * backend/ev-image.[ch]: * lib/ev-file-helpers.[ch]: (ev_tmp_filename): * shell/ev-jobs.[ch]: (ev_job_render_new), (ev_job_render_run), (ev_job_xfer_run): * shell/ev-pixbuf-cache.[ch]: (dispose_cache_job_info), (move_one_job), (copy_job_to_job_info), (add_job_if_needed), (ev_pixbuf_cache_get_image_mapping): * shell/ev-window.c: (view_menu_link_popup), (view_menu_image_popup), (view_menu_popup_cb), (ev_window_dispose), (image_save_dialog_response_cb), (ev_view_popup_cmd_save_image_as), (ev_view_popup_cmd_copy_image): * shell/ev-view-private.h: * shell/ev-view.c: (ev_view_get_image_at_location), (ev_view_do_popup_menu), (ev_view_popup_menu), (ev_view_button_press_event), (ev_view_drag_data_get), (ev_view_drag_motion), (ev_view_drag_data_received), (ev_view_motion_notify_event), (ev_view_button_release_event), (ev_view_finalize), (ev_view_class_init): Add image handling support. Fixes bugs #310008 and #325047. Images selection is not supported yet. svn path=/trunk/; revision=2194 --- (limited to 'backend') diff --git a/backend/Makefile.am b/backend/Makefile.am index 54dbd2c..a09734d 100644 --- a/backend/Makefile.am +++ b/backend/Makefile.am @@ -28,6 +28,8 @@ libevbackend_la_SOURCES= \ ev-link-action.h \ ev-link-dest.c \ ev-link-dest.h \ + ev-image.c \ + ev-image.h \ ev-document.c \ ev-document.h \ ev-document-factory.c \ @@ -38,6 +40,8 @@ libevbackend_la_SOURCES= \ ev-document-fonts.h \ ev-document-links.c \ ev-document-links.h \ + ev-document-images.c \ + ev-document-images.h \ ev-document-security.c \ ev-document-security.h \ ev-document-find.c \ diff --git a/backend/ev-document-images.c b/backend/ev-document-images.c new file mode 100644 index 0000000..117b104 --- /dev/null +++ b/backend/ev-document-images.c @@ -0,0 +1,55 @@ +/* ev-document-images.c + * this file is part of evince, a gnome document_links viewer + * + * Copyright (C) 2006 Carlos Garcia Campos + * + * Evince 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. + * + * Evince 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. + */ + +#include "ev-document-images.h" + +GType +ev_document_images_get_type (void) +{ + static GType type = 0; + + if (G_UNLIKELY (type == 0)) { + const GTypeInfo our_info = { + sizeof (EvDocumentImagesIface), + NULL, + NULL, + }; + + type = g_type_register_static (G_TYPE_INTERFACE, + "EvDocumentImages", + &our_info, (GTypeFlags)0); + } + + return type; +} + +GList * +ev_document_images_get_images (EvDocumentImages *document_images, + gint page) +{ + EvDocumentImagesIface *iface = EV_DOCUMENT_IMAGES_GET_IFACE (document_images); + GList *retval; + + retval = iface->get_images (document_images, page); + + return retval; +} + + diff --git a/backend/ev-document-images.h b/backend/ev-document-images.h new file mode 100644 index 0000000..28eee46 --- /dev/null +++ b/backend/ev-document-images.h @@ -0,0 +1,55 @@ +/* ev-document-images.h + * this file is part of evince, a gnome document viewer + * + * Copyright (C) 2006 Carlos Garcia Campos + * + * Evince 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. + * + * Evince 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. + */ + +#ifndef EV_DOCUMENT_IMAGES_H +#define EV_DOCUMENT_IMAGES_H + +#include +#include + +#include "ev-document.h" + +G_BEGIN_DECLS + +#define EV_TYPE_DOCUMENT_IMAGES (ev_document_images_get_type ()) +#define EV_DOCUMENT_IMAGES(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EV_TYPE_DOCUMENT_IMAGES, EvDocumentImages)) +#define EV_DOCUMENT_IMAGES_IFACE(k) (G_TYPE_CHECK_CLASS_CAST((k), EV_TYPE_DOCUMENT_IMAGES, EvDocumentImagesIface)) +#define EV_IS_DOCUMENT_IMAGES(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EV_TYPE_DOCUMENT_IMAGES)) +#define EV_IS_DOCUMENT_IMAGES_IFACE(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EV_TYPE_DOCUMENT_IMAGES)) +#define EV_DOCUMENT_IMAGES_GET_IFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), EV_TYPE_DOCUMENT_IMAGES, EvDocumentImagesIface)) + +typedef struct _EvDocumentImages EvDocumentImages; +typedef struct _EvDocumentImagesIface EvDocumentImagesIface; + +struct _EvDocumentImagesIface { + GTypeInterface base_iface; + + /* Methods */ + GList *(* get_images) (EvDocumentImages *document_images, + gint page); +}; + +GType ev_document_images_get_type (void) G_GNUC_CONST; +GList *ev_document_images_get_images (EvDocumentImages *document_images, + gint page); + +G_END_DECLS + +#endif /* EV_DOCUMENT_IMAGES_H */ diff --git a/backend/ev-image.c b/backend/ev-image.c new file mode 100644 index 0000000..f906b00 --- /dev/null +++ b/backend/ev-image.c @@ -0,0 +1,167 @@ +/* this file is part of evince, a gnome document viewer + * + * Copyright (C) 2006 Carlos Garcia Campos + * + * Evince 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. + * + * Evince 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. + */ + +#include +#include "ev-file-helpers.h" +#include "ev-image.h" + +struct _EvImagePrivate { + GdkPixbuf *pixbuf; + gchar *tmp_uri; +}; + +#define EV_IMAGE_GET_PRIVATE(object) \ + (G_TYPE_INSTANCE_GET_PRIVATE ((object), EV_TYPE_IMAGE, EvImagePrivate)) + +G_DEFINE_TYPE (EvImage, ev_image, G_TYPE_OBJECT) + +static void +ev_image_finalize (GObject *object) +{ + EvImage *image = EV_IMAGE (object); + + if (image->priv->pixbuf) { + g_object_unref (image->priv->pixbuf); + image->priv->pixbuf = NULL; + } + + if (image->priv->tmp_uri) { + g_unlink (image->priv->tmp_uri); + g_free (image->priv->tmp_uri); + image->priv->tmp_uri = NULL; + } + + (* G_OBJECT_CLASS (ev_image_parent_class)->finalize) (object); +} + +static void +ev_image_class_init (EvImageClass *klass) +{ + GObjectClass *g_object_class; + + g_object_class = G_OBJECT_CLASS (klass); + + g_type_class_add_private (g_object_class, sizeof (EvImagePrivate)); + + g_object_class->finalize = ev_image_finalize; +} + +static void +ev_image_init (EvImage *image) +{ + image->priv = EV_IMAGE_GET_PRIVATE (image); +} + +EvImage * +ev_image_new_from_pixbuf (GdkPixbuf *pixbuf) +{ + EvImage *image; + + g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), NULL); + + image = EV_IMAGE (g_object_new (EV_TYPE_IMAGE, NULL)); + image->priv->pixbuf = g_object_ref (pixbuf); + + return image; +} + +GdkPixbuf * +ev_image_get_pixbuf (EvImage *image) +{ + g_return_val_if_fail (EV_IS_IMAGE (image), NULL); + g_return_val_if_fail (GDK_IS_PIXBUF (image->priv->pixbuf), NULL); + + return image->priv->pixbuf; +} + +const gchar * +ev_image_save_tmp (EvImage *image) +{ + GError *error = NULL; + + g_return_val_if_fail (EV_IS_IMAGE (image), NULL); + g_return_val_if_fail (GDK_IS_PIXBUF (image->priv->pixbuf), NULL); + + if (image->priv->tmp_uri) + return image->priv->tmp_uri; + + image->priv->tmp_uri = ev_tmp_filename ("image"); + gdk_pixbuf_save (image->priv->pixbuf, + image->priv->tmp_uri, "png", &error, + "compression", "3", NULL); + if (!error) + return image->priv->tmp_uri; + + /* Erro saving image */ + g_warning (error->message); + g_error_free (error); + g_free (image->priv->tmp_uri); + image->priv->tmp_uri = NULL; + + return NULL; +} + +const gchar * +ev_image_get_tmp_uri (EvImage *image) +{ + g_return_val_if_fail (EV_IS_IMAGE (image), NULL); + + return image->priv->tmp_uri; +} + +/* EvImageMapping */ +static void +ev_image_mapping_free_foreach (EvImageMapping *mapping) +{ + g_object_unref (mapping->image); + g_free (mapping); +} + +void +ev_image_mapping_free (GList *image_mapping) +{ + if (!image_mapping) + return; + + g_list_foreach (image_mapping, (GFunc) ev_image_mapping_free_foreach, NULL); + g_list_free (image_mapping); +} + +EvImage * +ev_image_mapping_find (GList *image_mapping, + gdouble x, + gdouble y) +{ + GList *list; + + for (list = image_mapping; list; list = list->next) { + EvImageMapping *mapping = list->data; + + if ((x >= mapping->x1) && + (y >= mapping->y1) && + (x <= mapping->x2) && + (y <= mapping->y2)) { + return mapping->image; + } + } + + return NULL; +} + + diff --git a/backend/ev-image.h b/backend/ev-image.h new file mode 100644 index 0000000..6688e7a --- /dev/null +++ b/backend/ev-image.h @@ -0,0 +1,74 @@ +/* this file is part of evince, a gnome document viewer + * + * Copyright (C) 2006 Carlos Garcia Campos + * + * Evince 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. + * + * Evince 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. + */ + +#ifndef __EV_IMAGE_H__ +#define __EV_IMAGE_H__ + +#include +#include + +G_BEGIN_DECLS + +typedef struct _EvImage EvImage; +typedef struct _EvImageClass EvImageClass; +typedef struct _EvImagePrivate EvImagePrivate; + +#define EV_TYPE_IMAGE (ev_image_get_type()) +#define EV_IMAGE(object) (G_TYPE_CHECK_INSTANCE_CAST((object), EV_TYPE_IMAGE, EvImage)) +#define EV_IMAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), EV_TYPE_IMAGE, EvImageClass)) +#define EV_IS_IMAGE(object) (G_TYPE_CHECK_INSTANCE_TYPE((object), EV_TYPE_IMAGE)) +#define EV_IS_IMAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), EV_TYPE_IMAGE)) +#define EV_IMAGE_GET_CLASS(object) (G_TYPE_INSTANCE_GET_CLASS((object), EV_TYPE_IMAGE, EvImageClass)) + +struct _EvImage { + GObject base_instance; + + EvImagePrivate *priv; +}; + +struct _EvImageClass { + GObjectClass base_class; +}; + +GType ev_image_get_type (void) G_GNUC_CONST; +EvImage *ev_image_new_from_pixbuf (GdkPixbuf *pixbuf); + +GdkPixbuf *ev_image_get_pixbuf (EvImage *image); +const gchar *ev_image_save_tmp (EvImage *image); +const gchar *ev_image_get_tmp_uri (EvImage *image); + + +/* Image Mapping stuff */ +typedef struct _EvImageMapping EvImageMapping; +struct _EvImageMapping { + EvImage *image; + gdouble x1; + gdouble y1; + gdouble x2; + gdouble y2; +}; + +void ev_image_mapping_free (GList *image_mapping); +EvImage *ev_image_mapping_find (GList *image_mapping, + gdouble x, + gdouble y); + +G_END_DECLS + +#endif /* __EV_IMAGE_H__ */ -- cgit v0.9.1