viewer->override_prefs_scripts = fancy_prefs.enable_scripts;
viewer->override_prefs_plugins = fancy_prefs.enable_plugins;
viewer->override_prefs_java = fancy_prefs.enable_java;
- viewer->override_stylesheet = g_strconcat("file://", fancy_prefs.stylesheet, NULL);
+
+ gchar *tmp;
+#ifdef G_OS_WIN32
+ /* Replace backslashes with forward slashes, since we'll be
+ * using this string in an URI. */
+ gchar *tmp2 = g_strdup(fancy_prefs.stylesheet);
+ subst_char(tmp2, '\\', '/');
+
+ /* Escape string for use in an URI, keeping dir separators
+ * and colon for Windows drive name ("C:") intact. */
+ tmp = g_uri_escape_string(tmp2, "/:", TRUE);
+ g_free(tmp2);
+#else
+ /* Escape string for use in an URI, keeping dir separators
+ * intact. */
+ tmp = g_uri_escape_string(fancy_prefs.stylesheet, "/", TRUE);
+#endif
+ viewer->override_stylesheet = g_strconcat("file://", tmp, NULL);
+ g_free(tmp);
+ debug_print("Passing '%s' as stylesheet URI to Webkit\n",
+ viewer->override_stylesheet);
g_signal_handlers_block_by_func(G_OBJECT(viewer->enable_images),
fancy_auto_load_images_activated, viewer);
gtk_label_set_text(GTK_LABEL(viewer->l_link), message);
}
-static gint fancy_show_mimepart_prepare(MimeViewer *_viewer)
+static gboolean fancy_show_mimepart_prepare(MimeViewer *_viewer)
{
FancyViewer *viewer = (FancyViewer *) _viewer;
FancyViewer *viewer = (FancyViewer *) _viewer;
viewer->to_load = partinfo;
viewer->loading = TRUE;
- g_timeout_add(5, (GtkFunction)fancy_show_mimepart_prepare, viewer);
+ g_timeout_add(5, (GSourceFunc)fancy_show_mimepart_prepare, viewer);
}
static void fancy_print(MimeViewer *_viewer)
/* Config for printing */
gtk_print_operation_set_print_settings(op, printing_get_settings());
gtk_print_operation_set_default_page_setup(op, printing_get_page_setup());
-#if GTK_CHECK_VERSION(2,18,0)
/* enable Page Size and Orientation in the print dialog */
gtk_print_operation_set_embed_page_setup(op, TRUE);
-#endif
/* Start printing process */
res = webkit_web_frame_print_full(webkit_web_view_get_main_frame(viewer->view),
}
static void over_link_cb(WebKitWebView *view, const gchar *wtf,
- const gchar *link, FancyViewer *viewer, void *wtfa)
+ const gchar *link, FancyViewer *viewer, void *wtfa)
{
+ /* Display the link in the bottom statusbar. */
gtk_label_set_text(GTK_LABEL(viewer->l_link), link);
- g_free(viewer->cur_link);
- viewer->cur_link = NULL;
- if(link) {
- viewer->cur_link = g_strdup(link);
- }
}
static void load_progress_cb(WebKitWebView *view, GParamSpec* pspec,
}
}
-static gboolean populate_popup_cb (WebKitWebView *view, GtkWidget *menu,
- FancyViewer *viewer)
+static gboolean context_menu_cb (WebKitWebView *view, GtkWidget *menu,
+ WebKitHitTestResult *hit_test_result,
+ gboolean triggered_with_keyboard,
+ gpointer user_data)
{
+ FancyViewer *viewer = (FancyViewer *)user_data;
Plugin *plugin = plugin_get_loaded_by_name("RSSyl");
+ WebKitHitTestResultContext context;
+ gchar *link_uri = NULL;
+
+ g_object_get(G_OBJECT(hit_test_result),
+ "context", &context,
+ "link-uri", &link_uri,
+ NULL);
+
+ debug_print("context %d, link-uri '%s'\n", context,
+ (link_uri != NULL ? link_uri : "(null)"));
+ if (context & WEBKIT_HIT_TEST_RESULT_CONTEXT_LINK &&
+ link_uri != NULL) {
+ if (viewer->cur_link != NULL)
+ g_free(viewer->cur_link);
+ /* g_object_get() already made a copy, no need to strdup() here */
+ viewer->cur_link = link_uri;
+ }
+
gtk_container_foreach(GTK_CONTAINER(menu),
(GtkCallback)viewer_menu_handler,
viewer);
+
if (plugin) {
GtkWidget *rssyl = gtk_image_menu_item_new_with_label(_("Import feed"));
GtkWidget *img = gtk_image_new_from_stock(GTK_STOCK_ADD, GTK_ICON_SIZE_MENU);
G_CALLBACK(import_feed_cb),
(gpointer *) viewer);
}
- return TRUE;
+
+ return FALSE;
}
static gint keypress_events_cb (GtkWidget *widget, GdkEventKey *event,
{
if (event->state == CTRL_KEY) {
switch (event->keyval) {
- case GDK_plus:
+ case GDK_KEY_plus:
zoom_in_cb(viewer->ev_zoom_in, NULL, viewer);
break;
- case GDK_period:
+ case GDK_KEY_period:
zoom_100_cb(viewer->ev_zoom_100, NULL, viewer);
break;
- case GDK_minus:
+ case GDK_KEY_minus:
zoom_out_cb(viewer->ev_zoom_out, NULL, viewer);
break;
}
g_signal_connect(G_OBJECT(viewer->view), "load-finished",
G_CALLBACK(load_finished_cb), viewer);
g_signal_connect(G_OBJECT(viewer->view), "hovering-over-link",
- G_CALLBACK(over_link_cb), viewer);
+ G_CALLBACK(over_link_cb), viewer);
g_signal_connect(G_OBJECT(viewer->view), "notify::progress",
G_CALLBACK(load_progress_cb), viewer);
g_signal_connect(G_OBJECT(viewer->view), "resource-request-starting",
G_CALLBACK(resource_request_starting_cb), viewer);
- g_signal_connect(G_OBJECT(viewer->view), "populate-popup",
- G_CALLBACK(populate_popup_cb), viewer);
+ g_signal_connect(G_OBJECT(viewer->view), "context-menu",
+ G_CALLBACK(context_menu_cb), viewer);
g_signal_connect(G_OBJECT(viewer->view), "button-press-event",
G_CALLBACK(press_button_cb), viewer);
g_signal_connect(G_OBJECT(viewer->view), "button-release-event",
projects / claws.git / blobdiff