X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=thumbnailer%2Fevince-thumbnailer.c;h=b3c8285ee3d83debba1e41578b18f0f4a7a21124;hb=accc8f4a998adead7dbb923d7e453bdbd22c0e00;hp=f8368b5126c0f083cbba3fbe88982556680e75f8;hpb=1d6150237848b4c1fede94ce23baa4fd8870fd93;p=evince.git

diff --git a/thumbnailer/evince-thumbnailer.c b/thumbnailer/evince-thumbnailer.c
index f8368b51..b3c8285e 100644
--- a/thumbnailer/evince-thumbnailer.c
+++ b/thumbnailer/evince-thumbnailer.c
@@ -16,57 +16,66 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
-#include <libgnomevfs/gnome-vfs-mime-utils.h>
-#include <libgnomevfs/gnome-vfs-uri.h>
-#include <libgnomevfs/gnome-vfs-utils.h>
-#include <libgnomevfs/gnome-vfs-init.h>
-#include <libgnomevfs/gnome-vfs-ops.h>
+#include <config.h>
 
 #include <ev-document.h>
 #include <ev-document-thumbnails.h>
+#include <ev-async-renderer.h>
 #include <ev-document-factory.h>
+#include <ev-backends-manager.h>
 
+#include <gio/gio.h>
+
+#include <stdlib.h>
 #include <string.h>
 
 #define THUMBNAIL_SIZE 128
 
-static gboolean
-evince_thumbnail_pngenc_get (const char *uri, const char *thumbnail, int size)
+struct AsyncData {
+	EvDocument  *document;
+	const gchar *output;
+	gint         size;
+	gboolean     success;
+};
+
+static EvDocument *
+evince_thumbnailer_get_document (const gchar *uri)
 {
 	EvDocument *document = NULL;
-	EvRenderContext *rc;
-	double width, height;
-	GError *error = NULL;
-	GdkPixbuf *pixbuf;
+	GError     *error = NULL;
 
 	document = ev_document_factory_get_document  (uri, &error);
-
 	if (error) {
 		if (error->domain == EV_DOCUMENT_ERROR &&
-	    	    error->code == EV_DOCUMENT_ERROR_ENCRYPTED) {
+		    error->code == EV_DOCUMENT_ERROR_ENCRYPTED) {
 			/* FIXME: Create a thumb for cryp docs */
 			g_error_free (error);
-			return FALSE;
+			return NULL;
 		}
 		g_error_free (error);
-		return FALSE;
+		return NULL;
 	}
 	
-	if (document == NULL) {
-		return FALSE;
-	}
-
-	if (!EV_IS_DOCUMENT_THUMBNAILS (document)) {
-		return FALSE;
-	}
+	return document;
+}
 
-	ev_document_get_page_size (document, 0, &width, &height);
-	rc = ev_render_context_new (0, 0, THUMBNAIL_SIZE / width);
+static gboolean
+evince_thumbnail_pngenc_get (EvDocument *document, const char *thumbnail, int size)
+{
+	EvRenderContext *rc;
+	double width, height;
+	GdkPixbuf *pixbuf;
+	EvPage *page;
 
-	pixbuf = ev_document_thumbnails_get_thumbnail
-			(EV_DOCUMENT_THUMBNAILS (document), rc, FALSE);
+	page = ev_document_get_page (document, 0);
 	
+	ev_document_get_page_size (document, page, &width, &height);
+
+	rc = ev_render_context_new (page, 0, size / width);
+	pixbuf = ev_document_thumbnails_get_thumbnail (EV_DOCUMENT_THUMBNAILS (document),
+						       rc, FALSE);
 	g_object_unref (rc);
+	g_object_unref (page);
 	
 	if (pixbuf != NULL) {
 		const char *overlaid_icon_name = NULL;
@@ -96,25 +105,41 @@ evince_thumbnail_pngenc_get (const char *uri, const char *thumbnail, int size)
 				g_object_unref  (overlaid_pixbuf);
 			}
 		}
+		
 		if (gdk_pixbuf_save (pixbuf, thumbnail, "png", NULL, NULL)) {
 			g_object_unref  (pixbuf);
-			g_object_unref (document);
 			return TRUE;
-		} else {
-			g_object_unref  (pixbuf);
-			g_object_unref (document);
 		}
+
+		g_object_unref  (pixbuf);
 	}
+	
 	return FALSE;
 }
 
+static gpointer
+evince_thumbnail_pngenc_get_async (struct AsyncData *data)
+{
+	ev_document_doc_mutex_lock ();
+	data->success = evince_thumbnail_pngenc_get (data->document,
+						     data->output,
+						     data->size);
+	ev_document_doc_mutex_unlock ();
+	
+	g_idle_add ((GSourceFunc)gtk_main_quit, NULL);
+	
+	return NULL;
+}
+
 int
 main (int argc, char *argv[])
 {
-	int res;
-	char *input, *output;
-	int size;
-	char *uri;
+	EvDocument *document;
+	const char *input;
+	const char *output;
+	int         size;
+	char       *uri;
+	GFile      *file;
 
 	if (argc <= 2 || argc > 5 || strcmp (argv[1], "-h") == 0 ||
 	    strcmp (argv[1], "--help") == 0) {
@@ -122,12 +147,10 @@ main (int argc, char *argv[])
 		return -1;
 	}
 
-	res = gnome_vfs_init ();
-
 	if (!strcmp (argv[1], "-s")) {
 		input = argv[3];
 		output = argv[4];
-		size = g_strtod (argv[2], NULL);
+		size = atoi (argv[2]);
 	} else {
 		input = argv[1];
 		output = argv[2];
@@ -139,13 +162,59 @@ main (int argc, char *argv[])
 		return -1;
 	}
 
-	uri = gnome_vfs_make_uri_from_shell_arg (input);
+	g_type_init ();
 
-	if (evince_thumbnail_pngenc_get (uri, output, size)) {
-		g_free (uri);
-		return 0;
-	} else {
-		g_free (uri);
+	if (!g_thread_supported ())
+		g_thread_init (NULL);
+
+	ev_backends_manager_init ();
+
+	file = g_file_new_for_commandline_arg (input);
+	uri = g_file_get_uri (file);
+	document = evince_thumbnailer_get_document (uri);
+
+	g_object_unref (file);
+	g_free (uri);
+
+	if (!document) {
+		ev_backends_manager_shutdown ();
+		return -2;
+	}
+
+	if (!EV_IS_DOCUMENT_THUMBNAILS (document)) {
+		g_object_unref (document);
+		ev_backends_manager_shutdown ();
 		return -2;
 	}
+
+	if (EV_IS_ASYNC_RENDERER (document)) {
+		struct AsyncData data;
+
+		gtk_init (&argc, &argv);
+		
+		data.document = document;
+		data.output = output;
+		data.size = size;
+
+		g_thread_create ((GThreadFunc) evince_thumbnail_pngenc_get_async,
+				 &data, FALSE, NULL);
+		
+		gtk_main ();
+
+		g_object_unref (document);
+		ev_backends_manager_shutdown ();
+
+		return data.success ? 0 : -2;
+	}
+
+	if (!evince_thumbnail_pngenc_get (document, output, size)) {
+		g_object_unref (document);
+		ev_backends_manager_shutdown ();
+		return -2;
+	}
+
+	g_object_unref (document);
+	ev_backends_manager_shutdown ();
+
+	return 0;
 }