diff --git a/src/gtk-tpdfv.c b/src/gtk-tpdfv.c
index 771dff99871ebd2f2490207790760175caa684e9..ee68357d1253de739f77b7002a4785f2b3f4346b 100644 (file)
--- a/src/gtk-tpdfv.c
+++ b/src/gtk-tpdfv.c
* Private helper functions.
*/
-static gboolean
-tpdfv_init(gtk_tpdfv_t *pdf, const char *filename)
+static void
+tpdfv_open(gtk_tpdfv_t *pdf)
{
GError *err = NULL;
+ if ((! pdf) || (! pdf->filename))
+ return;
+
+ pdf->doc = poppler_document_new_from_file(pdf->filename,
+ /* password = */ NULL, &err);
+ if (! pdf->doc) {
+ fprintf(stderr, "Failed to open PDF: %s.\n", err->message);
+ return;
+ }
+
+ pdf->total_pages = poppler_document_get_n_pages(pdf->doc);
+ if (pdf->current_page_no >= pdf->total_pages)
+ pdf->current_page_no = pdf->total_pages - 1;
+} /* tpdfv_open */
+
+static void
+tpdfv_close(gtk_tpdfv_t *pdf)
+{
+ if (! pdf)
+ return;
+
+ g_object_unref(pdf->doc);
+ pdf->doc = NULL;
+ pdf->current_page = NULL;
+} /* tpdfv_close */
+
+static gboolean
+tpdfv_init(gtk_tpdfv_t *pdf, const char *filename)
+{
if (strstr(filename, "://"))
pdf->filename = strdup(filename);
else {
return FALSE;
}
- pdf->doc = poppler_document_new_from_file(pdf->filename,
- /* password = */ NULL, &err);
- if (! pdf->doc) {
- fprintf(stderr, "Failed to open PDF: %s.\n", err->message);
- return FALSE;
- }
+ pdf->doc = NULL;
+ tpdfv_open(pdf);
pdf->current_page_no = 0;
pdf->current_page = poppler_document_get_page(pdf->doc,
return FALSE;
}
- pdf->total_pages = poppler_document_get_n_pages(pdf->doc);
-
pdf->zoom_mode = TPDFV_ZOOM_CUSTOM;
pdf->zoom_factor = 1.0;
pdf->delta_x = pdf->delta_y = 0.0;
if (! pdf)
return;
- g_object_unref(pdf->doc);
- pdf->doc = NULL;
+ tpdfv_close(pdf);
pdf->current_page = NULL;
free(pdf->filename);
pdf->filename = NULL;
pdf = GTK_TPDFV_GET_PRIVATE(widget);
- if (poppler_page_get_index(pdf->current_page)
- != pdf->current_page_no) {
+ if ((! pdf->current_page) || (poppler_page_get_index(pdf->current_page)
+ != pdf->current_page_no)) {
pdf->current_page = poppler_document_get_page(pdf->doc,
pdf->current_page_no);
return GTK_WIDGET(tpdfv);
} /* gtk_tpdfv_new */
+void
+gtk_tpdfv_reload(GtkWidget *widget)
+{
+ gtk_tpdfv_t *pdf;
+
+ pdf = GTK_TPDFV_GET_PRIVATE(widget);
+ tpdfv_close(pdf);
+ tpdfv_open(pdf);
+ do_redraw(widget);
+} /* gtk_tpdfv_reload */
+
void
gtk_tpdfv_page_up(GtkWidget *widget)
{