X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=blobdiff_plain;f=src%2Fplugins%2Fpdf_viewer%2Fpoppler_viewer.c;h=5df4661c6a195b00840620403899adf82f29dba9;hp=c02068192312a8eb9d054b36e91e8fc224396849;hb=c38d063474e079cad014292a128c63d7d018b748;hpb=2736853ffb6e4ccde158f1bd30f2cdb1ad6ce0fb diff --git a/src/plugins/pdf_viewer/poppler_viewer.c b/src/plugins/pdf_viewer/poppler_viewer.c index c02068192..5df4661c6 100644 --- a/src/plugins/pdf_viewer/poppler_viewer.c +++ b/src/plugins/pdf_viewer/poppler_viewer.c @@ -31,6 +31,7 @@ #include "gtk/inputdialog.h" #include "mimeview.h" #include "summaryview.h" +#include "file-utils.h" #ifndef POPPLER_WITH_GDK #include "stdbool.h" #endif @@ -82,7 +83,7 @@ static void pdf_viewer_button_rotate_left_cb(GtkButton *button, PdfViewer *viewe static void pdf_viewer_spin_change_page_cb(GtkSpinButton *button, PdfViewer *viewer); static void pdf_viewer_spin_zoom_scroll_cb(GtkSpinButton *button, PdfViewer *viewer); /* Show/Hide the index pane */ -static void pdf_viewer_show_document_index_cb(GtkButton *button, PdfViewer *viewer); +static void pdf_viewer_show_document_index_cb(GtkToggleButton *button, PdfViewer *viewer); static void pdf_viewer_button_print_cb(GtkButton *button, PdfViewer *viewer); static void pdf_viewer_button_document_info_cb(GtkButton *button, PdfViewer *viewer); @@ -90,7 +91,7 @@ static void pdf_viewer_show_controls(PdfViewer *viewer, gboolean show); static gboolean pdf_viewer_scroll_page(MimeViewer *_viewer, gboolean up); static void pdf_viewer_scroll_one_line(MimeViewer *_viewer, gboolean up); -/** Claws-Mail Plugin functions*/ +/** Claws Mail Plugin functions */ gint plugin_init(gchar **error); const gchar *plugin_name(void); const gchar *plugin_desc(void); @@ -273,24 +274,26 @@ static void pdf_viewer_scroll_to(PdfViewer *viewer, gfloat x, gfloat y) vadj = gtk_scrolled_window_get_vadjustment( GTK_SCROLLED_WINDOW(viewer->scrollwin)); - if (y < vadj->value) { - vadj->value = y; + if (y < gtk_adjustment_get_value(vadj)) { + gtk_adjustment_set_value(vadj, y); } else { - while(y > vadj->value + vadj->page_size) { - vadj->value += vadj->page_size; + while(y > gtk_adjustment_get_value(vadj) + gtk_adjustment_get_page_size(vadj)) { + gtk_adjustment_set_value(vadj, + gtk_adjustment_get_value(vadj) + gtk_adjustment_get_page_size(vadj)); } } hadj = gtk_scrolled_window_get_hadjustment( GTK_SCROLLED_WINDOW(viewer->scrollwin)); - if (x < hadj->value) { - hadj->value = x; + if (x < gtk_adjustment_get_value(hadj)) { + gtk_adjustment_set_value(hadj, x); } else { - while(x > hadj->value + hadj->page_size) { - hadj->value += hadj->page_size; + while(x > gtk_adjustment_get_value(hadj) + gtk_adjustment_get_page_size(hadj)) { + gtk_adjustment_set_value(hadj, + gtk_adjustment_get_value(hadj) + gtk_adjustment_get_page_size(hadj)); } } @@ -447,7 +450,7 @@ static gboolean pdf_viewer_text_search(MimeViewer *_viewer, gboolean backward, if (viewer->page_results != NULL) { debug_print("page_results %p\n", viewer->page_results); /* store results for this page */ - gint num_res = 0; + guint num_res = 0; PageResult *res = g_new0(PageResult, 1); res->results = viewer->page_results; res->page_num = i; @@ -813,6 +816,7 @@ static void pdf_viewer_button_zoom_out_cb(GtkButton *button, PdfViewer *viewer) static void pdf_viewer_button_press_events_cb(GtkWidget *widget, GdkEventButton *event, PdfViewer *viewer) { gchar *uri; + GdkWindow *gdkwin; #ifdef HAVE_POPPLER_DEST_NAMED PopplerDest *dest; #endif @@ -898,10 +902,10 @@ static void pdf_viewer_button_press_events_cb(GtkWidget *widget, GdkEventButton if (((MimeViewer *)viewer)->mimeview && ((MimeViewer *)viewer)->mimeview->messageview && ((MimeViewer *)viewer)->mimeview->messageview->window && - ((MimeViewer *)viewer)->mimeview->messageview->window->window) - gdk_window_set_cursor (((MimeViewer *)viewer)->mimeview->messageview->window->window, NULL); + (gdkwin = gtk_widget_get_window(((MimeViewer *)viewer)->mimeview->messageview->window)) != NULL) + gdk_window_set_cursor (gdkwin, NULL); else - gdk_window_set_cursor (mainwindow_get_mainwindow()->window->window, NULL); + gdk_window_set_cursor (gtk_widget_get_window(mainwindow_get_mainwindow()->window), NULL); } /* Init document to be scrolled with left mouse click */ @@ -910,10 +914,10 @@ static void pdf_viewer_button_press_events_cb(GtkWidget *widget, GdkEventButton if (((MimeViewer *)viewer)->mimeview && ((MimeViewer *)viewer)->mimeview->messageview && ((MimeViewer *)viewer)->mimeview->messageview->window && - ((MimeViewer *)viewer)->mimeview->messageview->window->window) - gdk_window_set_cursor (((MimeViewer *)viewer)->mimeview->messageview->window->window, hand_cur); + (gdkwin = gtk_widget_get_window(((MimeViewer *)viewer)->mimeview->messageview->window)) != NULL) + gdk_window_set_cursor (gdkwin, hand_cur); else - gdk_window_set_cursor (mainwindow_get_mainwindow()->window->window, hand_cur); + gdk_window_set_cursor (gtk_widget_get_window(mainwindow_get_mainwindow()->window), hand_cur); viewer->last_x = event->x; viewer->last_y = event->y; @@ -924,21 +928,24 @@ static void pdf_viewer_button_press_events_cb(GtkWidget *widget, GdkEventButton /* Set the normal cursor*/ static void pdf_viewer_mouse_scroll_destroy_cb(GtkWidget *widget, GdkEventButton *event, PdfViewer *viewer) { + GdkWindow *gdkwin; if (event->button == 1) { viewer->pdf_view_scroll = FALSE; if (((MimeViewer *)viewer)->mimeview && ((MimeViewer *)viewer)->mimeview->messageview && ((MimeViewer *)viewer)->mimeview->messageview->window && - ((MimeViewer *)viewer)->mimeview->messageview->window->window) - gdk_window_set_cursor (((MimeViewer *)viewer)->mimeview->messageview->window->window, NULL); + (gdkwin = gtk_widget_get_window(((MimeViewer *)viewer)->mimeview->messageview->window)) != NULL) + gdk_window_set_cursor (gdkwin, NULL); else - gdk_window_set_cursor (mainwindow_get_mainwindow()->window->window, NULL); + gdk_window_set_cursor (gtk_widget_get_window(mainwindow_get_mainwindow()->window), NULL); } } static void pdf_viewer_move_events_cb(GtkWidget *widget, GdkEventMotion *event, PdfViewer *viewer) { + GdkWindow *gdkwin; + /* Grab the document and scroll it with mouse */ if (viewer->pdf_view_scroll) { @@ -946,18 +953,24 @@ static void pdf_viewer_move_events_cb(GtkWidget *widget, GdkEventMotion *event, viewer->pdf_view_hadj = gtk_scrolled_window_get_hadjustment(GTK_SCROLLED_WINDOW(viewer->scrollwin)); if (event->x < viewer->last_x - && viewer->pdf_view_hadj->value < (viewer->pdf_view_hadj->upper - viewer->pdf_view_hadj->page_size)) { + && gtk_adjustment_get_value(viewer->pdf_view_hadj) < (gtk_adjustment_get_upper(viewer->pdf_view_hadj) - gtk_adjustment_get_page_size(viewer->pdf_view_hadj))) { if (viewer->last_dir_x == -1) { - viewer->pdf_view_hadj->value += viewer->last_x - event->x; + gtk_adjustment_set_value(viewer->pdf_view_hadj, + gtk_adjustment_get_value(viewer->pdf_view_hadj) + + viewer->last_x + - event->x); g_signal_emit_by_name(G_OBJECT(viewer->pdf_view_hadj), "value_changed", 0); } viewer->last_dir_x = -1; } else if (event->x > viewer->last_x - && viewer->pdf_view_hadj->value > 0.0) { + && gtk_adjustment_get_value(viewer->pdf_view_hadj) > 0.0) { if (viewer->last_dir_x == +1) { - viewer->pdf_view_hadj->value += viewer->last_x - event->x; + gtk_adjustment_set_value(viewer->pdf_view_hadj, + gtk_adjustment_get_value(viewer->pdf_view_hadj) + + viewer->last_x + - event->x); g_signal_emit_by_name(G_OBJECT(viewer->pdf_view_hadj), "value_changed", 0); } @@ -965,18 +978,24 @@ static void pdf_viewer_move_events_cb(GtkWidget *widget, GdkEventMotion *event, } if (event->y < viewer->last_y - && viewer->pdf_view_vadj->value < (viewer->pdf_view_vadj->upper - viewer->pdf_view_vadj->page_size)) { + && gtk_adjustment_get_value(viewer->pdf_view_vadj) < (gtk_adjustment_get_upper(viewer->pdf_view_vadj) - gtk_adjustment_get_page_size(viewer->pdf_view_vadj))) { if (viewer->last_dir_y == -1) { - viewer->pdf_view_vadj->value += viewer->last_y - event->y; + gtk_adjustment_set_value(viewer->pdf_view_vadj, + gtk_adjustment_get_value(viewer->pdf_view_vadj) + + viewer->last_y + - event->y); g_signal_emit_by_name(G_OBJECT(viewer->pdf_view_vadj), "value_changed", 0); } viewer->last_dir_y = -1; } else if (event->y > viewer->last_y - && viewer->pdf_view_vadj->value > 0.0) { + && gtk_adjustment_get_value(viewer->pdf_view_vadj) > 0.0) { if (viewer->last_dir_y == +1) { - viewer->pdf_view_vadj->value += viewer->last_y - event->y; + gtk_adjustment_set_value(viewer->pdf_view_vadj, + gtk_adjustment_get_value(viewer->pdf_view_vadj) + + viewer->last_y + - event->y); g_signal_emit_by_name(G_OBJECT(viewer->pdf_view_vadj), "value_changed", 0); } @@ -1002,6 +1021,7 @@ static void pdf_viewer_move_events_cb(GtkWidget *widget, GdkEventMotion *event, ccur = FALSE; viewer->in_link = FALSE; for (l = viewer->link_map; l; l = g_list_next (l)) { + gint upper; PopplerLinkMapping *lmapping; lmapping = (PopplerLinkMapping *)l->data; @@ -1011,39 +1031,40 @@ static void pdf_viewer_move_events_cb(GtkWidget *widget, GdkEventMotion *event, y2 = lmapping->area.y2; gtk_widget_size_request(viewer->pdf_view, &size); + upper = gtk_adjustment_get_upper(viewer->pdf_view_hadj); switch (viewer->rotate) { case 0: case 360: - if (size.width != viewer->pdf_view_hadj->upper) - x = (event->x - (viewer->pdf_view_hadj->upper - size.width) / 2) / viewer->zoom; + if (size.width != upper) + x = (event->x - (upper - size.width) / 2) / viewer->zoom; else x = event->x / viewer->zoom; - y = (viewer->pdf_view_vadj->upper - event->y) / viewer->zoom; + y = (upper - event->y) / viewer->zoom; break; case 90: - if (size.width != viewer->pdf_view_hadj->upper) - y = (event->x - (viewer->pdf_view_hadj->upper - size.width) / 2) / viewer->zoom; + if (size.width != upper) + y = (event->x - (upper - size.width) / 2) / viewer->zoom; else y = event->x / viewer->zoom; x = (event->y) / viewer->zoom; break; case 180: - if (size.width != viewer->pdf_view_hadj->upper) - x = ((viewer->pdf_view_hadj->upper - event->x) - ((viewer->pdf_view_hadj->upper - size.width) / 2)) / viewer->zoom; + if (size.width != upper) + x = ((upper - event->x) - ((upper - size.width) / 2)) / viewer->zoom; else - x = ((viewer->pdf_view_hadj->upper - event->x) - (viewer->pdf_view_hadj->upper - size.width)) / viewer->zoom; + x = ((upper - event->x) - (upper - size.width)) / viewer->zoom; y = (event->y) / viewer->zoom; break; case 270: - if (size.width != viewer->pdf_view_hadj->upper) - y = ((viewer->pdf_view_hadj->upper - event->x) - ((viewer->pdf_view_hadj->upper - size.width) / 2)) / viewer->zoom; + if (size.width != upper) + y = ((upper - event->x) - ((upper - size.width) / 2)) / viewer->zoom; else - y = ((viewer->pdf_view_hadj->upper - event->x) - (viewer->pdf_view_hadj->upper - size.width)) / viewer->zoom; + y = ((upper - event->x) - (upper - size.width)) / viewer->zoom; - x = (viewer->pdf_view_vadj->upper - event->y) / viewer->zoom; + x = (upper - event->y) / viewer->zoom; break; } @@ -1052,10 +1073,10 @@ static void pdf_viewer_move_events_cb(GtkWidget *widget, GdkEventMotion *event, if (((MimeViewer *)viewer)->mimeview && ((MimeViewer *)viewer)->mimeview->messageview && ((MimeViewer *)viewer)->mimeview->messageview->window && - ((MimeViewer *)viewer)->mimeview->messageview->window->window) - gdk_window_set_cursor (((MimeViewer *)viewer)->mimeview->messageview->window->window, link_cur); + (gdkwin = gtk_widget_get_window(((MimeViewer *)viewer)->mimeview->messageview->window)) != NULL) + gdk_window_set_cursor (gdkwin, link_cur); else - gdk_window_set_cursor (mainwindow_get_mainwindow()->window->window, link_cur); + gdk_window_set_cursor (gtk_widget_get_window(mainwindow_get_mainwindow()->window), link_cur); viewer->link_action = lmapping->action; ccur = TRUE; @@ -1064,10 +1085,10 @@ static void pdf_viewer_move_events_cb(GtkWidget *widget, GdkEventMotion *event, if (((MimeViewer *)viewer)->mimeview && ((MimeViewer *)viewer)->mimeview->messageview && ((MimeViewer *)viewer)->mimeview->messageview->window && - ((MimeViewer *)viewer)->mimeview->messageview->window->window) - gdk_window_set_cursor (((MimeViewer *)viewer)->mimeview->messageview->window->window, NULL); + (gdkwin = gtk_widget_get_window(((MimeViewer *)viewer)->mimeview->messageview->window)) != NULL) + gdk_window_set_cursor (gdkwin, NULL); else - gdk_window_set_cursor (mainwindow_get_mainwindow()->window->window, NULL); + gdk_window_set_cursor (gtk_widget_get_window(mainwindow_get_mainwindow()->window), NULL); } } g_free(l); @@ -1086,17 +1107,28 @@ static gboolean pdf_viewer_scroll_cb(GtkWidget *widget, GdkEventScroll *event, in_scroll_cb = TRUE; + if ((event->state & GDK_CONTROL_MASK) == GDK_CONTROL_MASK) { + if (event->direction == GDK_SCROLL_UP) { + pdf_viewer_button_zoom_in_cb(NULL, viewer); + } else { + pdf_viewer_button_zoom_out_cb(NULL, viewer); + } + in_scroll_cb = FALSE; + return TRUE; + } + if (event->direction == GDK_SCROLL_UP && - adj->value == adj->lower && + gtk_adjustment_get_value(adj) == gtk_adjustment_get_lower(adj) && cur_p > 1) { gtk_spin_button_spin(GTK_SPIN_BUTTON(viewer->cur_page), GTK_SPIN_STEP_BACKWARD, 1); - adj->value = adj->upper - adj->page_size; + gtk_adjustment_set_value(adj, + gtk_adjustment_get_upper(adj) - gtk_adjustment_get_page_size(adj)); handled = TRUE; } else if (event->direction == GDK_SCROLL_DOWN && - adj->value + adj->page_size == adj->upper && + gtk_adjustment_get_value(adj) + gtk_adjustment_get_page_size(adj) == gtk_adjustment_get_upper(adj) && cur_p < viewer->num_pages) { gtk_spin_button_spin(GTK_SPIN_BUTTON(viewer->cur_page), GTK_SPIN_STEP_FORWARD, 1); - adj->value = 0.0; + gtk_adjustment_set_value(adj, 0.0); handled = TRUE; } in_scroll_cb = FALSE; @@ -1105,13 +1137,13 @@ static gboolean pdf_viewer_scroll_cb(GtkWidget *widget, GdkEventScroll *event, static void pdf_viewer_button_zoom_fit_cb(GtkButton *button, PdfViewer *viewer) { - GtkAllocation *allocation; + GtkAllocation allocation; double xratio, yratio; - allocation = &(viewer->scrollwin->allocation); - debug_print("width: %d\n", allocation->width); - debug_print("height: %d\n", allocation->height); - xratio = allocation->width / viewer->width; - yratio = allocation->height / viewer->height; + gtk_widget_get_allocation(viewer->scrollwin, &allocation); + debug_print("width: %d\n", allocation.width); + debug_print("height: %d\n", allocation.height); + xratio = allocation.width / viewer->width; + yratio = allocation.height / viewer->height; if (xratio >= yratio) { viewer->zoom = yratio; @@ -1125,11 +1157,11 @@ static void pdf_viewer_button_zoom_fit_cb(GtkButton *button, PdfViewer *viewer) static void pdf_viewer_button_zoom_width_cb(GtkButton *button, PdfViewer *viewer) { - GtkAllocation *allocation; + GtkAllocation allocation; double xratio; - allocation = &(viewer->scrollwin->allocation); - debug_print("width: %d\n", allocation->width); - xratio = allocation->width / viewer->width; + gtk_widget_get_allocation(viewer->scrollwin, &allocation); + debug_print("width: %d\n", allocation.width); + xratio = allocation.width / viewer->width; gtk_spin_button_set_value(GTK_SPIN_BUTTON(viewer->zoom_scroll), xratio); } @@ -1156,7 +1188,7 @@ static void pdf_viewer_button_rotate_left_cb(GtkButton *button, PdfViewer *viewe } /* Show/Hide the index pane */ -static void pdf_viewer_show_document_index_cb(GtkButton *button, PdfViewer *viewer) +static void pdf_viewer_show_document_index_cb(GtkToggleButton *button, PdfViewer *viewer) { if (!viewer->pdf_index) { viewer->pdf_index = poppler_index_iter_new(viewer->pdf_doc); @@ -1183,8 +1215,9 @@ static void pdf_viewer_button_print_cb(GtkButton *button, PdfViewer *viewer) static void pdf_viewer_button_document_info_cb(GtkButton *button, PdfViewer *viewer) { alertpanel_full(_("PDF properties"), NULL, GTK_STOCK_CLOSE, NULL, NULL, - FALSE, (GtkWidget *) pdf_viewer_fill_info_table(viewer), - ALERT_NOTICE, G_ALERTDEFAULT); + ALERTFOCUS_FIRST, FALSE, + GTK_WIDGET(pdf_viewer_fill_info_table(viewer)), + ALERT_NOTICE); } /* @@ -1510,10 +1543,10 @@ static void pdf_viewer_clear(MimeViewer *_viewer) } vadj = gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(viewer->scrollwin)); - vadj->value = 0.0; + gtk_adjustment_set_value(vadj, 0.0); g_signal_emit_by_name(G_OBJECT(vadj), "value-changed", 0); vadj = gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(viewer->scrollwin_index)); - vadj->value = 0.0; + gtk_adjustment_set_value(vadj, 0.0); g_signal_emit_by_name(G_OBJECT(vadj), "value-changed", 0); gtk_tree_store_clear(GTK_TREE_STORE(viewer->index_model)); gtk_image_set_from_pixbuf(GTK_IMAGE(viewer->pdf_view), NULL); @@ -1553,7 +1586,7 @@ static gboolean pdf_viewer_scroll_page(MimeViewer *_viewer, gboolean up) gtk_spin_button_spin(GTK_SPIN_BUTTON(viewer->cur_page), GTK_SPIN_STEP_FORWARD, 1); vadj = gtk_scrolled_window_get_vadjustment( GTK_SCROLLED_WINDOW(viewer->scrollwin)); - vadj->value = 0.0; + gtk_adjustment_set_value(vadj, 0.0); g_signal_emit_by_name(G_OBJECT(vadj), "value-changed", 0); return TRUE; } @@ -1561,7 +1594,8 @@ static gboolean pdf_viewer_scroll_page(MimeViewer *_viewer, gboolean up) gtk_spin_button_spin(GTK_SPIN_BUTTON(viewer->cur_page), GTK_SPIN_STEP_BACKWARD, 1); vadj = gtk_scrolled_window_get_vadjustment( GTK_SCROLLED_WINDOW(viewer->scrollwin)); - vadj->value = vadj->upper - vadj->page_size; + gtk_adjustment_set_value(vadj, + gtk_adjustment_get_upper(vadj) - gtk_adjustment_get_page_size(vadj)); g_signal_emit_by_name(G_OBJECT(vadj), "value-changed", 0); return TRUE; } @@ -1580,7 +1614,7 @@ static void pdf_viewer_scroll_one_line(MimeViewer *_viewer, gboolean up) if (viewer->pdf_view == NULL) return; debug_print("up: %d\n", up); - if (vadj->value <(vadj->upper - vadj->page_size)) { + if (gtk_adjustment_get_value(vadj) < (gtk_adjustment_get_upper(vadj) - gtk_adjustment_get_page_size(vadj))) { gtkutils_scroll_one_line(GTK_WIDGET(viewer->pdf_view), vadj, up); } else { @@ -1599,6 +1633,13 @@ static void pdf_viewer_scroll_one_line(MimeViewer *_viewer, gboolean up) gtk_table_attach(GTK_TABLE(viewer->widgets_table), GTK_WIDGET(widget), \ col, col+1, 0, 1, 0, 0, BUTTON_H_PADDING, 0); \ col++; +#define ADD_TOGGLE_BUTTON_TO_TABLE(widget, stock_image) \ + widget = gtk_toggle_button_new(); \ + img = stock_pixmap_widget(stock_image); \ + gtk_button_set_image(GTK_BUTTON(widget), img); \ + gtk_table_attach(GTK_TABLE(viewer->widgets_table), GTK_WIDGET(widget), \ + col, col+1, 0, 1, 0, 0, BUTTON_H_PADDING, 0); \ + col++; #define ADD_SEP_TO_TABLE \ sep = gtk_label_new(""); \ @@ -1775,7 +1816,7 @@ static MimeViewer *pdf_viewer_create(void) ADD_SEP_TO_TABLE ADD_BUTTON_TO_TABLE(viewer->print, STOCK_PIXMAP_PRINTER) ADD_BUTTON_TO_TABLE(viewer->doc_info, STOCK_PIXMAP_DOC_INFO) - ADD_BUTTON_TO_TABLE(viewer->doc_index, STOCK_PIXMAP_DOC_INDEX) + ADD_TOGGLE_BUTTON_TO_TABLE(viewer->doc_index, STOCK_PIXMAP_DOC_INDEX) gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW(viewer->scrollwin), @@ -1799,6 +1840,8 @@ static MimeViewer *pdf_viewer_create(void) G_TYPE_DOUBLE); viewer->index_list = gtk_tree_view_new_with_model(GTK_TREE_MODEL(tree_store)); + g_object_unref(tree_store); + renderer = gtk_cell_renderer_text_new(); column = gtk_tree_view_column_new_with_attributes(_("Name"), renderer, "text", 0, NULL); gtk_tree_view_append_column(GTK_TREE_VIEW(viewer->index_list), column); @@ -2046,6 +2089,7 @@ static MimeViewer *pdf_viewer_create(void) } #undef ADD_BUTTON_TO_TABLE +#undef ADD_TOGGLE_BUTTON_TO_TABLE #undef ADD_SEP_TO_TABLE #undef BUTTON_H_PADDING #undef SEP_H_PADDING