X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=sidebyside;f=pdf%2Fxpdf%2Fpdf-document.cc;h=b913be852a9fec45a6c80fbf32fab1520d5a5fa2;hb=a2f683fe644fded868c536909907282555b1b777;hp=2ec9d5e28ca4b423d519d29d0d11fe5a891a37bb;hpb=ac6e61a0860b741e22072696e0ac6a78e386db0d;p=evince.git diff --git a/pdf/xpdf/pdf-document.cc b/pdf/xpdf/pdf-document.cc index 2ec9d5e2..b913be85 100644 --- a/pdf/xpdf/pdf-document.cc +++ b/pdf/xpdf/pdf-document.cc @@ -56,7 +56,7 @@ typedef struct /* full results are only possible for the rendered current page */ int current_page; GArray *current_page_results; - guchar *other_page_flags; /* length n_pages + 1, first element ignored */ + int *other_page_flags; /* length n_pages + 1, first element ignored */ int start_page; /* skip this one as we iterate, since we did it first */ int search_page; /* the page we're searching now */ TextOutputDev *output_dev; @@ -399,61 +399,69 @@ pdf_document_render (EvDocument *document, draw.width, draw.height); } -static void -pdf_document_search_emit_found (PdfDocumentSearch *search) +double +pdf_document_find_get_progress (EvDocumentFind *document_find) { - PdfDocument *pdf_document = search->document; - int n_pages; - int pages_done; - GArray *tmp_results; - int i; + PdfDocumentSearch *search = PDF_DOCUMENT (document_find)->search; + int n_pages, pages_done; + + n_pages = ev_document_get_n_pages (EV_DOCUMENT (document_find)); + if (search->search_page > search->start_page) { + pages_done = search->search_page - search->start_page; + } else if (search->search_page == search->start_page) { + pages_done = n_pages; + } else { + pages_done = n_pages - search->start_page + search->search_page; + } - n_pages = ev_document_get_n_pages (EV_DOCUMENT (search->document)); - if (search->search_page > search->start_page) { - pages_done = search->search_page - search->start_page; - } else if (search->search_page == search->start_page) { - pages_done = n_pages; - } else { - pages_done = n_pages - search->start_page + search->search_page; - } + return pages_done / (double) n_pages; +} - tmp_results = g_array_new (FALSE, FALSE, sizeof (EvFindResult)); - g_array_append_vals (tmp_results, - search->current_page_results->data, - search->current_page_results->len); +int +pdf_document_find_page_has_results (EvDocumentFind *document_find, + int page) +{ + PdfDocumentSearch *search = PDF_DOCUMENT (document_find)->search; - /* Now append a bogus element for each page that has a result in it, - * that is not the current page - */ - i = 1; - while (i <= n_pages) { - if (i != pdf_document->page && - search->other_page_flags[i]) { - EvFindResult result; - - result.page_num = i; - - /* Use bogus coordinates, again we can't get coordinates - * until this is the current page because TextOutputDev - * isn't good enough - */ - result.highlight_area.x = -1; - result.highlight_area.y = -1; - result.highlight_area.width = 1; - result.highlight_area.height = 1; - - g_array_append_val (tmp_results, result); - } + g_return_val_if_fail (search != NULL, FALSE); - ++i; - } + return search->other_page_flags[page]; +} - ev_document_find_found (EV_DOCUMENT_FIND (pdf_document), - (EvFindResult*) tmp_results->data, - tmp_results->len, - pages_done / (double) n_pages); +int +pdf_document_find_get_n_results (EvDocumentFind *document_find) +{ + PdfDocumentSearch *search = PDF_DOCUMENT (document_find)->search; - g_array_free (tmp_results, TRUE); + if (search) { + return search->current_page_results->len; + } else { + return 0; + } +} + +gboolean +pdf_document_find_get_result (EvDocumentFind *document_find, + int n_result, + GdkRectangle *rectangle) +{ + PdfDocument *pdf_document = PDF_DOCUMENT (document_find); + PdfDocumentSearch *search = pdf_document->search; + GdkRectangle r; + + if (search != NULL) { + r = g_array_index (search->current_page_results, + GdkRectangle, n_result); + + rectangle->x = r.x + pdf_document->page_x_offset; + rectangle->y = r.y + pdf_document->page_y_offset; + rectangle->width = r.width; + rectangle->height = r.height; + + return TRUE; + } else { + return FALSE; + } } static void @@ -461,7 +469,7 @@ pdf_document_search_page_changed (PdfDocumentSearch *search) { PdfDocument *pdf_document = search->document; int current_page; - EvFindResult result; + GdkRectangle result; int xMin, yMin, xMax, yMax; current_page = pdf_document->page; @@ -482,12 +490,10 @@ pdf_document_search_page_changed (PdfDocumentSearch *search) gTrue, gTrue, // startAtTop, stopAtBottom gFalse, gFalse, // startAtLast, stopAtLast &xMin, &yMin, &xMax, &yMax)) { - result.page_num = pdf_document->page; - - result.highlight_area.x = xMin; - result.highlight_area.y = yMin; - result.highlight_area.width = xMax - xMin; - result.highlight_area.height = yMax - yMin; + result.x = xMin; + result.y = yMin; + result.width = xMax - xMin; + result.height = yMax - yMin; g_array_append_val (search->current_page_results, result); /* Now find further results */ @@ -496,25 +502,14 @@ pdf_document_search_page_changed (PdfDocumentSearch *search) gFalse, gTrue, gTrue, gFalse, &xMin, &yMin, &xMax, &yMax)) { - - result.page_num = pdf_document->page; - - result.highlight_area.x = xMin; - result.highlight_area.y = yMin; - result.highlight_area.width = xMax - xMin; - result.highlight_area.height = yMax - yMin; + result.x = xMin; + result.y = yMin; + result.width = xMax - xMin; + result.height = yMax - yMin; g_array_append_val (search->current_page_results, result); } } - - /* needed for the initial current page since we don't search - * it in the idle - */ - search->other_page_flags[current_page] = - search->current_page_results->len > 0; - - pdf_document_search_emit_found (search); } static gboolean @@ -522,7 +517,7 @@ pdf_document_search_idle_callback (void *data) { PdfDocumentSearch *search = (PdfDocumentSearch*) data; PdfDocument *pdf_document = search->document; - int n_pages; + int n_pages, changed_page; double xMin, yMin, xMax, yMax; /* Note that PDF page count is 1 through n_pages INCLUSIVE @@ -534,10 +529,6 @@ pdf_document_search_idle_callback (void *data) */ n_pages = ev_document_get_n_pages (EV_DOCUMENT (search->document)); - if (search->search_page == search->start_page) { - goto end_search; - } - if (search->output_dev == 0) { /* First time through here... */ search->output_dev = new TextOutputDev (NULL, gTrue, gFalse, gFalse); @@ -556,8 +547,12 @@ pdf_document_search_idle_callback (void *data) gFalse, gFalse, // startAtLast, stopAtLast &xMin, &yMin, &xMax, &yMax)) { /* This page has results */ - search->other_page_flags[search->search_page] = TRUE; - } + search->other_page_flags[search->search_page] = 1; + } else { + search->other_page_flags[search->search_page] = 0; + } + + changed_page = search->start_page; search->search_page += 1; if (search->search_page > n_pages) { @@ -565,12 +560,13 @@ pdf_document_search_idle_callback (void *data) search->search_page = 1; } - /* We do this even if nothing was found, to update the percent complete */ - pdf_document_search_emit_found (search); - - return TRUE; + if (search->search_page != search->start_page) { + ev_document_find_changed (EV_DOCUMENT_FIND (pdf_document), + changed_page); + return TRUE; + } - end_search: +end_search: /* We're done. */ search->idle = 0; /* will return FALSE to remove */ return FALSE; @@ -583,7 +579,7 @@ pdf_document_find_begin (EvDocumentFind *document, { PdfDocument *pdf_document = PDF_DOCUMENT (document); PdfDocumentSearch *search; - int n_pages; + int n_pages, i; gunichar *ucs4; glong ucs4_len; @@ -618,13 +614,13 @@ pdf_document_find_begin (EvDocumentFind *document, search->current_page_results = g_array_new (FALSE, FALSE, - sizeof (EvFindResult)); + sizeof (GdkRectangle)); n_pages = ev_document_get_n_pages (EV_DOCUMENT (document)); - /* This is an array of bool; with the first value ignored - * so we can index by the based-at-1 page numbers - */ - search->other_page_flags = g_new0 (guchar, n_pages + 1); + search->other_page_flags = g_new0 (int, n_pages + 1); + for (i = 0; i <= n_pages; i++) { + search->other_page_flags[i] = -1; + } search->document = pdf_document; @@ -637,9 +633,7 @@ pdf_document_find_begin (EvDocumentFind *document, search->output_dev = 0; search->start_page = pdf_document->page; - search->search_page = search->start_page + 1; - if (search->search_page > n_pages) - search->search_page = 1; + search->search_page = search->start_page; search->current_page = -1; @@ -1006,6 +1000,8 @@ pdf_document_get_title (PdfDocument *pdf_document) char *title = NULL; Object info; + if (pdf_document->doc == NULL) + return NULL; pdf_document->doc->getDocInfo (&info); if (info.isDict ()) { @@ -1023,10 +1019,10 @@ pdf_document_get_text (EvDocument *document, GdkRectangle *rect) const char *text; int x1, y1, x2, y2; - x1 = rect->x; - y1 = rect->y; - x2 = x1 + rect->width; - y2 = y1 + rect->height; + x1 = rect->x + pdf_document->page_x_offset; + y1 = rect->y + pdf_document->page_y_offset; + x2 = x1 + rect->width + pdf_document->page_x_offset; + y2 = y1 + rect->height + pdf_document->page_y_offset; sel_text = pdf_document->out->getText (x1, y1, x2, y2); text = sel_text->getCString (); @@ -1039,11 +1035,24 @@ pdf_document_get_link (EvDocument *document, int x, int y) { PdfDocument *pdf_document = PDF_DOCUMENT (document); LinkAction *action; + double link_x, link_y; + + if (pdf_document->links == NULL) { + return NULL; + } + + /* Offset */ + link_x = x - pdf_document->page_x_offset; + link_y = y - pdf_document->page_y_offset; + + /* Inverse y */ + link_y = pdf_document->out->getBitmapHeight() - link_y; - y = pdf_document->out->getBitmapHeight() - y; + /* Zoom */ + link_x = link_x / pdf_document->scale; + link_y = link_y / pdf_document->scale; - action = pdf_document->links->find ((double)x / pdf_document->scale, - (double)y / pdf_document->scale); + action = pdf_document->links->find (link_x, link_y); if (action) { return build_link_from_action (pdf_document, action, ""); @@ -1113,6 +1122,9 @@ static void pdf_document_find_iface_init (EvDocumentFindIface *iface) { iface->begin = pdf_document_find_begin; + iface->get_n_results = pdf_document_find_get_n_results; + iface->get_result = pdf_document_find_get_result; + iface->page_has_results = pdf_document_find_page_has_results; iface->cancel = pdf_document_find_cancel; }