X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fev-jobs.c;h=e9f29eb681949ede515e4cf9688bfd1a64d80716;hb=363996497c9b439597d46f002e995055e368d7a8;hp=be1d3bc3b45548d2de13ca17345cdb968c1ad38a;hpb=bca369672136e5ff831ece9832afd42085808fba;p=evince.git diff --git a/shell/ev-jobs.c b/shell/ev-jobs.c index be1d3bc3..e9f29eb6 100644 --- a/shell/ev-jobs.c +++ b/shell/ev-jobs.c @@ -2,8 +2,17 @@ #include "ev-job-queue.h" #include "ev-document-thumbnails.h" #include "ev-document-links.h" +#include "ev-document-factory.h" +#include "ev-file-helpers.h" +#include "ev-document-fonts.h" +#include "ev-selection.h" #include "ev-async-renderer.h" +#include +#include +#include +#include + static void ev_job_init (EvJob *job); static void ev_job_class_init (EvJobClass *class); static void ev_job_links_init (EvJobLinks *job); @@ -12,8 +21,8 @@ static void ev_job_render_init (EvJobRender *job); static void ev_job_render_class_init (EvJobRenderClass *class); static void ev_job_thumbnail_init (EvJobThumbnail *job); static void ev_job_thumbnail_class_init (EvJobThumbnailClass *class); -static void ev_job_load_init (EvJobLoad *job); -static void ev_job_load_class_init (EvJobLoadClass *class); +static void ev_job_xfer_init (EvJobXfer *job); +static void ev_job_xfer_class_init (EvJobXferClass *class); enum { @@ -27,7 +36,8 @@ G_DEFINE_TYPE (EvJob, ev_job, G_TYPE_OBJECT) G_DEFINE_TYPE (EvJobLinks, ev_job_links, EV_TYPE_JOB) G_DEFINE_TYPE (EvJobRender, ev_job_render, EV_TYPE_JOB) G_DEFINE_TYPE (EvJobThumbnail, ev_job_thumbnail, EV_TYPE_JOB) -G_DEFINE_TYPE (EvJobLoad, ev_job_load, EV_TYPE_JOB) +G_DEFINE_TYPE (EvJobFonts, ev_job_fonts, EV_TYPE_JOB) +G_DEFINE_TYPE (EvJobXfer, ev_job_xfer, EV_TYPE_JOB) static void ev_job_init (EvJob *job) { /* Do Nothing */ } @@ -108,6 +118,21 @@ ev_job_render_dispose (GObject *object) job->pixbuf = NULL; } + if (job->rc) { + g_object_unref (job->rc); + job->rc = NULL; + } + + if (job->selection) { + g_object_unref (job->selection); + job->selection = NULL; + } + + if (job->selection_region) { + gdk_region_destroy (job->selection_region); + job->selection_region = NULL; + } + (* G_OBJECT_CLASS (ev_job_render_parent_class)->dispose) (object); } @@ -148,38 +173,6 @@ ev_job_thumbnail_class_init (EvJobThumbnailClass *class) oclass->dispose = ev_job_thumbnail_dispose; } -static void ev_job_load_init (EvJobLoad *job) { /* Do Nothing */ } - -static void -ev_job_load_dispose (GObject *object) -{ - EvJobLoad *job; - - job = EV_JOB_LOAD (object); - - if (job->uri) { - g_free (job->uri); - job->uri = NULL; - } - - if (job->error) { - g_error_free (job->error); - job->error = NULL; - } - - (* G_OBJECT_CLASS (ev_job_load_parent_class)->dispose) (object); -} - -static void -ev_job_load_class_init (EvJobLoadClass *class) -{ - GObjectClass *oclass; - - oclass = G_OBJECT_CLASS (class); - - oclass->dispose = ev_job_load_dispose; -} - /* Public functions */ void ev_job_finished (EvJob *job) @@ -213,23 +206,37 @@ ev_job_links_run (EvJobLinks *job) EvJob * -ev_job_render_new (EvDocument *document, - gint page, - double scale, - gint width, - gint height, - gboolean include_links) +ev_job_render_new (EvDocument *document, + EvRenderContext *rc, + gint width, + gint height, + EvRectangle *selection_points, + GdkColor *text, + GdkColor *base, + gboolean include_links, + gboolean include_text, + gboolean include_selection) { EvJobRender *job; + g_return_val_if_fail (EV_IS_RENDER_CONTEXT (rc), NULL); + if (include_selection) + g_return_val_if_fail (selection_points != NULL, NULL); + job = g_object_new (EV_TYPE_JOB_RENDER, NULL); EV_JOB (job)->document = g_object_ref (document); - job->page = page; - job->scale = scale; + job->rc = g_object_ref (rc); job->target_width = width; job->target_height = height; + job->text = *text; + job->base = *base; job->include_links = include_links; + job->include_text = include_text; + job->include_selection = include_selection; + + if (include_selection) + job->selection_points = *selection_points; if (EV_IS_ASYNC_RENDERER (document)) { EV_JOB (job)->async = TRUE; @@ -258,15 +265,32 @@ ev_job_render_run (EvJobRender *job) if (EV_JOB (job)->async) { EvAsyncRenderer *renderer = EV_ASYNC_RENDERER (EV_JOB (job)->document); - ev_async_renderer_render_pixbuf (renderer, job->page, job->scale); + ev_async_renderer_render_pixbuf (renderer, job->rc->page, job->rc->scale, + job->rc->rotation); g_signal_connect (EV_JOB (job)->document, "render_finished", G_CALLBACK (render_finished_cb), job); } else { - job->pixbuf = ev_document_render_pixbuf (EV_JOB (job)->document, - job->page, - job->scale); - if (job->include_links) - job->link_mapping = ev_document_get_links (EV_JOB (job)->document, job->page); + job->pixbuf = ev_document_render_pixbuf (EV_JOB (job)->document, job->rc); + if (job->include_links && EV_IS_DOCUMENT_LINKS (EV_JOB (job)->document)) + job->link_mapping = + ev_document_links_get_links (EV_DOCUMENT_LINKS (EV_JOB (job)->document), + job->rc->page); + if (job->include_text && EV_IS_SELECTION (EV_JOB (job)->document)) + job->text_mapping = + ev_selection_get_selection_map (EV_SELECTION (EV_JOB (job)->document), + job->rc); + if (job->include_selection && EV_IS_SELECTION (EV_JOB (job)->document)) { + ev_selection_render_selection (EV_SELECTION (EV_JOB (job)->document), + job->rc, + &(job->selection), + &(job->selection_points), + NULL, + &(job->text), &(job->base)); + job->selection_region = + ev_selection_get_selection_region (EV_SELECTION (EV_JOB (job)->document), + job->rc, + &(job->selection_points)); + } EV_JOB (job)->finished = TRUE; } @@ -275,9 +299,10 @@ ev_job_render_run (EvJobRender *job) } EvJob * -ev_job_thumbnail_new (EvDocument *document, - gint page, - gint requested_width) +ev_job_thumbnail_new (EvDocument *document, + gint page, + int rotation, + gint requested_width) { EvJobThumbnail *job; @@ -285,6 +310,7 @@ ev_job_thumbnail_new (EvDocument *document, EV_JOB (job)->document = g_object_ref (document); job->page = page; + job->rotation = rotation; job->requested_width = requested_width; return EV_JOB (job); @@ -300,6 +326,7 @@ ev_job_thumbnail_run (EvJobThumbnail *job) job->thumbnail = ev_document_thumbnails_get_thumbnail (EV_DOCUMENT_THUMBNAILS (EV_JOB (job)->document), job->page, + job->rotation, job->requested_width, TRUE); EV_JOB (job)->finished = TRUE; @@ -307,37 +334,136 @@ ev_job_thumbnail_run (EvJobThumbnail *job) ev_document_doc_mutex_unlock (); } +static void ev_job_fonts_init (EvJobFonts *job) { /* Do Nothing */ } + +static void ev_job_fonts_class_init (EvJobFontsClass *class) { /* Do Nothing */ } + EvJob * -ev_job_load_new (EvDocument *document, - const gchar *uri) +ev_job_fonts_new (EvDocument *document) { - EvJobLoad *job; + EvJobFonts *job; - job = g_object_new (EV_TYPE_JOB_LOAD, NULL); + job = g_object_new (EV_TYPE_JOB_FONTS, NULL); EV_JOB (job)->document = g_object_ref (document); - job->uri = g_strdup (uri); return EV_JOB (job); } void -ev_job_load_run (EvJobLoad *job) +ev_job_fonts_run (EvJobFonts *job) { - g_return_if_fail (EV_IS_JOB_LOAD (job)); + EvDocumentFonts *fonts; + + g_return_if_fail (EV_IS_JOB_FONTS (job)); ev_document_doc_mutex_lock (); + fonts = EV_DOCUMENT_FONTS (EV_JOB (job)->document); + job->scan_completed = !ev_document_fonts_scan (fonts, 20); + + EV_JOB (job)->finished = TRUE; + + ev_document_doc_mutex_unlock (); +} + +static void ev_job_xfer_init (EvJobXfer *job) { /* Do Nothing */ } + +static void +ev_job_xfer_dispose (GObject *object) +{ + EvJobXfer *job = EV_JOB_XFER (object); + + if (job->uri) { + g_free (job->uri); + job->uri = NULL; + } + + if (job->local_uri) { + g_free (job->local_uri); + job->local_uri = NULL; + } + if (job->error) { - g_error_free (job->error); + g_error_free (job->error); job->error = NULL; } - - ev_document_load (EV_JOB(job)->document, job->uri, &job->error); + + if (job->dest) { + g_object_unref (job->dest); + job->dest = NULL; + } + + (* G_OBJECT_CLASS (ev_job_xfer_parent_class)->dispose) (object); +} + +static void +ev_job_xfer_class_init (EvJobXferClass *class) +{ + GObjectClass *oclass; + + oclass = G_OBJECT_CLASS (class); + + oclass->dispose = ev_job_xfer_dispose; +} + + +EvJob * +ev_job_xfer_new (const gchar *uri, EvLinkDest *dest) +{ + EvJobXfer *job; + + job = g_object_new (EV_TYPE_JOB_XFER, NULL); + + job->uri = g_strdup (uri); + if (dest) + job->dest = g_object_ref (dest); + + return EV_JOB (job); +} + +void +ev_job_xfer_run (EvJobXfer *job) +{ + GnomeVFSURI *source_uri; + GnomeVFSURI *target_uri; + + g_return_if_fail (EV_IS_JOB_XFER (job)); + if (job->error) { + g_error_free (job->error); + job->error = NULL; + } + + source_uri = gnome_vfs_uri_new (job->uri); + if (!gnome_vfs_uri_is_local (source_uri) && !job->local_uri) { + char *tmp_name; + char *base_name; + + /* We'd like to keep extension of source uri since + * it helps to resolve some mime types, say cbz */ + + tmp_name = ev_tmp_filename (); + base_name = gnome_vfs_uri_extract_short_name (source_uri); + job->local_uri = g_strconcat ("file:", tmp_name, "-", base_name, NULL); + g_free (base_name); + g_free (tmp_name); + + target_uri = gnome_vfs_uri_new (job->local_uri); + + gnome_vfs_xfer_uri (source_uri, target_uri, + GNOME_VFS_XFER_DEFAULT | GNOME_VFS_XFER_FOLLOW_LINKS, + GNOME_VFS_XFER_ERROR_MODE_ABORT, + GNOME_VFS_XFER_OVERWRITE_MODE_REPLACE, + NULL, + job); + gnome_vfs_uri_unref (target_uri); + } + gnome_vfs_uri_unref (source_uri); + + EV_JOB(job)->document = ev_document_factory_get_document (job->local_uri ? job->local_uri : job->uri, &job->error); EV_JOB (job)->finished = TRUE; - ev_document_doc_mutex_unlock (); + return; } -