diff --git a/src/gtk-tpdfv.c b/src/gtk-tpdfv.c
index b04d2c6f9cb3ffb177e039dc45f10fa268b3f84d..4398719385557f7144ca42c674bdf66acfd47630 100644 (file)
--- a/src/gtk-tpdfv.c
+++ b/src/gtk-tpdfv.c
#include <stdlib.h>
#include <string.h>
+#define TPDFV_MIN(a, b) ((a) <= (b) ? (a) : (b))
+#define TPDFV_MAX(a, b) ((a) >= (b) ? (a) : (b))
+
+typedef enum {
+ TPDFV_ZOOM_CUSTOM = 0,
+ TPDFV_ZOOM_WIDTH,
+ TPDFV_ZOOM_HEIGHT,
+ TPDFV_ZOOM_FIT,
+} tpdfv_zoommode_t;
+
typedef struct {
char *filename;
int current_page_no;
int total_pages;
+ tpdfv_zoommode_t zoom_mode;
double zoom_factor;
double delta_x;
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;
return TRUE;
cairo_clip(cr);
/* zoom, scrolling */
- cairo_scale(cr, pdf->zoom_factor, pdf->zoom_factor);
+ if (pdf->zoom_mode == TPDFV_ZOOM_CUSTOM) {
+ cairo_scale(cr, pdf->zoom_factor, pdf->zoom_factor);
+ }
+ else {
+ gdouble width;
+ gdouble height;
+
+ gdouble page_width = 0.0;
+ gdouble page_height = 0.0;
+
+ double zoom_factor = 1.0;
+
+ poppler_page_get_size(pdf->current_page, &page_width, &page_height);
+ width = (gdouble)tpdfv->allocation.width;
+ height = (gdouble)tpdfv->allocation.height;
+
+ if (pdf->zoom_mode == TPDFV_ZOOM_WIDTH) {
+ zoom_factor = (double)(width / page_width);
+ }
+ else if (pdf->zoom_mode == TPDFV_ZOOM_HEIGHT) {
+ zoom_factor = (double)(height / page_height);
+ }
+ else if (pdf->zoom_mode == TPDFV_ZOOM_FIT) {
+ zoom_factor = (double)TPDFV_MIN(width / page_width,
+ height / page_height);
+ }
+ else {
+ assert(0);
+ }
+
+ cairo_scale(cr, zoom_factor, zoom_factor);
+ }
+
cairo_translate(cr, pdf->delta_x, pdf->delta_y);
poppler_page_render(pdf->current_page, cr);
pdf = GTK_TPDFV_GET_PRIVATE(widget);
pdf->zoom_factor *= 1.2;
+ pdf->zoom_mode = TPDFV_ZOOM_CUSTOM;
do_redraw(widget);
} /* gtk_tpdfv_zoom_in */
if (pdf->zoom_factor > DBL_EPSILON * 2.0) {
pdf->zoom_factor /= 1.2;
+ pdf->zoom_mode = TPDFV_ZOOM_CUSTOM;
do_redraw(widget);
}
} /* gtk_tpdfv_zoom_out */
pdf = GTK_TPDFV_GET_PRIVATE(widget);
pdf->zoom_factor = 1.0;
+ pdf->zoom_mode = TPDFV_ZOOM_CUSTOM;
do_redraw(widget);
} /* gtk_tpdfv_zoom_1 */
+void
+gtk_tpdfv_zoom_width(GtkWidget *widget)
+{
+ gtk_tpdfv_t *pdf;
+
+ pdf = GTK_TPDFV_GET_PRIVATE(widget);
+ pdf->zoom_mode = TPDFV_ZOOM_WIDTH;
+ do_redraw(widget);
+} /* gtk_tpdfv_zoom_width */
+
+void
+gtk_tpdfv_zoom_height(GtkWidget *widget)
+{
+ gtk_tpdfv_t *pdf;
+
+ pdf = GTK_TPDFV_GET_PRIVATE(widget);
+ pdf->zoom_mode = TPDFV_ZOOM_HEIGHT;
+ do_redraw(widget);
+} /* gtk_tpdfv_zoom_width */
+
+void
+gtk_tpdfv_zoom_fit(GtkWidget *widget)
+{
+ gtk_tpdfv_t *pdf;
+
+ pdf = GTK_TPDFV_GET_PRIVATE(widget);
+ pdf->zoom_mode = TPDFV_ZOOM_FIT;
+ do_redraw(widget);
+} /* gtk_tpdfv_zoom_width */
+
void
gtk_tpdfv_scroll_up(GtkWidget *widget)
{