From b8aebf2e1ba5b4f9ff1e1256b28acb3e23947c51 Mon Sep 17 00:00:00 2001 From: Carlos Garcia Campos Date: Mon, 14 Apr 2008 17:07:39 +0000 Subject: Add EvPage so that we can hold a reference to the backend page. Form 2008-04-14 Carlos Garcia Campos * libdocument/Makefile.am: * libdocument/ev-page.[ch]: * libdocument/ev-render-context.[ch]: (ev_render_context_dispose), (ev_render_context_new), (ev_render_context_set_page): * libdocument/ev-form-field.[ch]: (ev_form_field_init), (ev_form_field_finalize), (ev_form_field_class_init): * libdocument/ev-document-forms.[ch]: (ev_document_forms_get_form_fields): * libdocument/ev-document.[ch]: (ev_document_get_page), (ev_document_get_page_size), (ev_document_get_page_label): * shell/ev-jobs.[ch]: (ev_job_thumbnail_dispose), (ev_job_render_run), (ev_job_thumbnail_new), (ev_job_thumbnail_run), (ev_job_print_run): * shell/ev-page-cache.c: (ev_page_cache_new): * shell/ev-pixbuf-cache.c: (job_page_ready_cb), (job_finished_cb), (check_job_size_and_unref), (add_job): * shell/ev-sidebar-thumbnails.c: (add_range): * shell/ev-view.c: (ev_view_form_field_get_region), (ev_view_form_field_button_create_widget), (ev_view_form_field_text_save), (ev_view_form_field_choice_save), (ev_view_handle_form_field), (ev_view_size_allocate), (get_selected_text): * shell/ev-window.c: (ev_window_refresh_window_thumbnail): * backend/pdf/ev-poppler.cc: (pdf_document_get_page_size), (pdf_document_get_page), (pdf_document_get_page_label), (pdf_document_render), (pdf_document_get_info), (pdf_document_document_iface_init), (pdf_document_thumbnails_get_thumbnail), (pdf_document_thumbnails_get_dimensions), (pdf_document_file_exporter_do_page), (pdf_selection_render_selection), (pdf_selection_get_selected_text), (pdf_selection_get_selection_region), (pdf_selection_get_selection_map), (pdf_document_forms_get_form_fields), (pdf_document_forms_form_field_text_get_text), (pdf_document_forms_form_field_text_set_text), (pdf_document_forms_form_field_button_set_state), (pdf_document_forms_form_field_button_get_state), (pdf_document_forms_form_field_choice_get_item), (pdf_document_forms_form_field_choice_get_n_items), (pdf_document_forms_form_field_choice_is_item_selected), (pdf_document_forms_form_field_choice_select_item), (pdf_document_forms_form_field_choice_toggle_item), (pdf_document_forms_form_field_choice_unselect_all), (pdf_document_forms_form_field_choice_set_text), (pdf_document_forms_form_field_choice_get_text): * backend/ps/ev-spectre.c: (ps_document_get_page), (ps_document_get_page_size), (ps_document_get_page_label), (ps_document_render), (ps_document_document_iface_init), (ps_document_file_exporter_do_page): * backend/tiff/tiff-document.c: (tiff_document_get_page_size), (tiff_document_render), (tiff_document_render_pixbuf), (tiff_document_file_exporter_do_page): * backend/pixbuf/pixbuf-document.c: (pixbuf_document_get_page_size): * backend/comics/comics-document.c: (comics_document_get_page_size), (comics_document_render_pixbuf): * backend/djvu/djvu-document.c: (djvu_document_get_page_size), (djvu_document_render), (djvu_selection_get_selected_text), (djvu_document_thumbnails_get_thumbnail), (djvu_document_file_exporter_do_page), (djvu_document_find_get_result): * backend/dvi/dvi-document.c: (dvi_document_get_page_size), (dvi_document_render), (dvi_document_thumbnails_get_dimensions), (dvi_document_thumbnails_get_thumbnail), (dvi_document_file_exporter_do_page): * backend/impress/impress-document.c: (impress_document_get_page_size), (impress_document_render_pixbuf): * thumbnailer/evince-thumbnailer.c: (evince_thumbnail_pngenc_get): Add EvPage so that we can hold a reference to the backend page. Form fields keep now a reference to the poppler page improving performance since we don't have to create/destroy the poppler field for every form operation. This will be needed for annotations too. svn path=/trunk/; revision=3004 --- (limited to 'backend/djvu/djvu-document.c') diff --git a/backend/djvu/djvu-document.c b/backend/djvu/djvu-document.c index f4caa7f..392a7dc 100644 --- a/backend/djvu/djvu-document.c +++ b/backend/djvu/djvu-document.c @@ -195,17 +195,14 @@ djvu_document_get_n_pages (EvDocument *document) } static void -djvu_document_get_page_size (EvDocument *document, - int page, - double *width, - double *height) +document_get_page_size (DjvuDocument *djvu_document, + gint page, + double *width, + double *height) { - DjvuDocument *djvu_document = DJVU_DOCUMENT (document); - ddjvu_pageinfo_t info; + ddjvu_pageinfo_t info; ddjvu_status_t r; - g_return_if_fail (djvu_document->d_document); - while ((r = ddjvu_document_get_pageinfo(djvu_document->d_document, page, &info)) < DDJVU_JOB_OK) djvu_handle_events(djvu_document, TRUE); @@ -216,6 +213,20 @@ djvu_document_get_page_size (EvDocument *document, *height = info.height * SCALE_FACTOR; } +static void +djvu_document_get_page_size (EvDocument *document, + EvPage *page, + double *width, + double *height) +{ + DjvuDocument *djvu_document = DJVU_DOCUMENT (document); + + g_return_if_fail (djvu_document->d_document); + + document_get_page_size (djvu_document, page->index, + width, height); +} + static cairo_surface_t * djvu_document_render (EvDocument *document, EvRenderContext *rc) @@ -231,7 +242,7 @@ djvu_document_render (EvDocument *document, double page_width, page_height, tmp; static const cairo_user_data_key_t key; - d_page = ddjvu_page_create_by_pageno (djvu_document->d_document, rc->page); + d_page = ddjvu_page_create_by_pageno (djvu_document->d_document, rc->page->index); while (!ddjvu_page_decoding_done (d_page)) djvu_handle_events(djvu_document, TRUE); @@ -364,7 +375,7 @@ djvu_selection_get_selected_text (EvSelection *selection, rectangle.x2 = points->x2 / SCALE_FACTOR; rectangle.y2 = (height - points->y1) / SCALE_FACTOR; - text = djvu_text_copy (djvu_document, rc->page, &rectangle); + text = djvu_text_copy (djvu_document, rc->page->index, &rectangle); if (text == NULL) text = g_strdup (""); @@ -423,10 +434,10 @@ djvu_document_thumbnails_get_thumbnail (EvDocumentThumbnails *document, gdk_pixbuf_fill (pixbuf, 0xffffffff); pixels = gdk_pixbuf_get_pixels (pixbuf); - while (ddjvu_thumbnail_status (djvu_document->d_document, rc->page, 1) < DDJVU_JOB_OK) + while (ddjvu_thumbnail_status (djvu_document->d_document, rc->page->index, 1) < DDJVU_JOB_OK) djvu_handle_events(djvu_document, TRUE); - ddjvu_thumbnail_render (djvu_document->d_document, rc->page, + ddjvu_thumbnail_render (djvu_document->d_document, rc->page->index, &thumb_width, &thumb_height, djvu_document->thumbs_format, gdk_pixbuf_get_rowstride (pixbuf), @@ -472,7 +483,7 @@ djvu_document_file_exporter_do_page (EvFileExporter *exporter, { DjvuDocument *djvu_document = DJVU_DOCUMENT (exporter); - g_string_append_printf (djvu_document->opts, "%d,", (rc->page) + 1); + g_string_append_printf (djvu_document->opts, "%d,", (rc->page->index) + 1); } static void @@ -587,8 +598,7 @@ djvu_document_find_get_result (EvDocumentFind *document_find, if (r == NULL) return FALSE; - djvu_document_get_page_size (EV_DOCUMENT (djvu_document), - page, &width, &height); + document_get_page_size (djvu_document, page, &width, &height); rectangle->x1 = r->x1 * SCALE_FACTOR; rectangle->y1 = height - r->y2 * SCALE_FACTOR; rectangle->x2 = r->x2 * SCALE_FACTOR; -- cgit v0.9.1