From e8096c18ba580156072e8c84103bee6f6d3f0bfc Mon Sep 17 00:00:00 2001 From: Jonathan Blandford Date: Thu, 31 Mar 2005 15:34:35 +0000 Subject: Remove pixbuf backend for now Thu Mar 31 01:21:58 2005 Jonathan Blandford * Makefile.am: Remove pixbuf backend for now * configure.ac: Require poppler-glib instead of just poppler. * backend/ev-document-thumbnails.h: Add a comment * backend/ev-document.h: * backend/ev-document.c: (ev_document_class_init), (ev_document_load), (ev_document_get_link), (ev_document_get_links): Remove 3 methods and add get_links. Also, made 0 based. * backend/ev-jobs.c: (ev_job_render_new), (ev_job_render_run): * backend/ev-jobs.h: now EvJobRender can grab the links for a document. * backend/ev-link.c: (ev_link_set_title), (ev_link_mapping_free_foreach), (ev_link_mapping_free), (ev_link_mapping_find): * backend/ev-link.h: Allow NULL titles. Also, introduce a mapping link. * backend/ev-page-cache.c: (ev_page_cache_init), (_ev_page_cache_new), (ev_page_cache_set_current_page), (ev_page_cache_get_size), (ev_page_cache_next_page), (ev_page_cache_prev_page): Fix to be 0 based. * pdf/Makefile.am: * pdf/ev-poppler.h: * pdf/ev-poppler.cc: New backend. * ps/ps-document.c: (ps_document_init), (ps_document_set_page), (ps_document_get_page), (ps_document_document_iface_init): * shell/ev-pixbuf-cache.h: * shell/ev-pixbuf-cache.c: (ev_pixbuf_cache_init), (dispose_cache_job_info), (job_finished_cb), (move_one_job), (ev_pixbuf_cache_update_range), (copy_job_to_job_info), (add_job_if_needed), (ev_pixbuf_cache_set_page_range), (ev_pixbuf_cache_get_pixbuf), (ev_pixbuf_cache_get_link_mapping): Fix up code to grab a page cache per each doc. Also, fix to be 0 based. * shell/ev-sidebar-thumbnails.c: (ev_sidebar_tree_selection_changed), (page_changed_cb), (ev_sidebar_thumbnails_set_document): Fix to be 0 based. * shell/ev-view.c: (status_message_from_link), (find_page_at_location), (get_link_at_location), (ev_view_motion_notify_event), (ev_view_button_release_event), (ev_view_init): Use the new link code. Fix to be 0 based. * shell/ev-window.c: (update_action_sensitivity), (document_supports_sidebar): 0 based. --- (limited to 'backend/ev-document.c') diff --git a/backend/ev-document.c b/backend/ev-document.c index 6238ac5..080af0b 100644 --- a/backend/ev-document.c +++ b/backend/ev-document.c @@ -27,17 +27,9 @@ static void ev_document_class_init (gpointer g_class); -enum -{ - PAGE_CHANGED, - SCALE_CHANGED, - LAST_SIGNAL -}; -static guint signals[LAST_SIGNAL] = { 0 }; GMutex *ev_doc_mutex = NULL; - #define LOG(x) GType ev_document_get_type (void) @@ -75,26 +67,6 @@ ev_document_error_quark (void) static void ev_document_class_init (gpointer g_class) { - signals[PAGE_CHANGED] = - g_signal_new ("page_changed", - EV_TYPE_DOCUMENT, - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (EvDocumentIface, page_changed), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, - 0); - - signals[SCALE_CHANGED] = - g_signal_new ("scale_changed", - EV_TYPE_DOCUMENT, - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (EvDocumentIface, scale_changed), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, - 0); - g_object_interface_install_property (g_class, g_param_spec_string ("title", "Document Title", @@ -140,8 +112,11 @@ ev_document_load (EvDocument *document, gboolean retval; LOG ("ev_document_load"); retval = iface->load (document, uri, error); + /* Call this to make the initial cached copy */ - ev_document_get_page_cache (document); + if (retval) + ev_document_get_page_cache (document); + return retval; } @@ -205,16 +180,6 @@ ev_document_get_page (EvDocument *document) } void -ev_document_set_target (EvDocument *document, - GdkDrawable *target) -{ - EvDocumentIface *iface = EV_DOCUMENT_GET_IFACE (document); - - LOG ("ev_document_set_target"); - iface->set_target (document, target); -} - -void ev_document_set_scale (EvDocument *document, double scale) { @@ -225,17 +190,6 @@ ev_document_set_scale (EvDocument *document, } void -ev_document_set_page_offset (EvDocument *document, - int x, - int y) -{ - EvDocumentIface *iface = EV_DOCUMENT_GET_IFACE (document); - - LOG ("ev_document_set_page_offset"); - iface->set_page_offset (document, x, y); -} - -void ev_document_get_page_size (EvDocument *document, int page, int *width, @@ -269,25 +223,29 @@ ev_document_get_link (EvDocument *document, EvLink *retval; LOG ("ev_document_get_link"); + if (iface->get_link == NULL) + return NULL; retval = iface->get_link (document, x, y); return retval; } -void -ev_document_render (EvDocument *document, - int clip_x, - int clip_y, - int clip_width, - int clip_height) +GList * +ev_document_get_links (EvDocument *document) { EvDocumentIface *iface = EV_DOCUMENT_GET_IFACE (document); + GList *retval; + + LOG ("ev_document_get_link"); + if (iface->get_links == NULL) + return NULL; + retval = iface->get_links (document); - LOG ("ev_document_render"); - iface->render (document, clip_x, clip_y, clip_width, clip_height); + return retval; } + GdkPixbuf * ev_document_render_pixbuf (EvDocument *document) { @@ -302,15 +260,3 @@ ev_document_render_pixbuf (EvDocument *document) return retval; } - -void -ev_document_page_changed (EvDocument *document) -{ - g_signal_emit (G_OBJECT (document), signals[PAGE_CHANGED], 0); -} - -void -ev_document_scale_changed (EvDocument *document) -{ - g_signal_emit (G_OBJECT (document), signals[SCALE_CHANGED], 0); -} -- cgit v0.9.1