over_link_cb (WebKitWebView *view, const gchar *wtf, const gchar *link,
FancyViewer *viewer, void *wtfa);
-static void
-load_progress_cb (WebKitWebView *view, gint progress, FancyViewer *viewer);
-static WebKitNavigationResponse
-navigation_requested_cb (WebKitWebView *view, WebKitWebFrame *frame,
- WebKitNetworkRequest *netreq, FancyViewer *viewer);
+static void
+load_progress_cb(WebKitWebView *view, GParamSpec* pspec, FancyViewer *viewer);
static MimeViewerFactory fancy_viewer_factory;
size_t nmemb, void *data);
static void *download_file_curl (void *data);
static void download_file_cb(GtkWidget *widget, FancyViewer *viewer);
+static gboolean fancy_set_contents(FancyViewer *viewer, gboolean use_defaults);
#if !WEBKIT_CHECK_VERSION (1,5,1)
gchar* webkit_web_view_get_selected_text(WebKitWebView* web_view);
static void fancy_auto_load_images_activated(GtkCheckMenuItem *item, FancyViewer *viewer) {
viewer->override_prefs_images = gtk_check_menu_item_get_active(item);
fancy_apply_prefs(viewer);
- webkit_web_view_reload (viewer->view);
+ fancy_set_contents(viewer, FALSE);
}
static void fancy_enable_remote_content_activated(GtkCheckMenuItem *item, FancyViewer *viewer) {
viewer->override_prefs_remote_content = gtk_check_menu_item_get_active(item);
fancy_apply_prefs(viewer);
- webkit_web_view_reload (viewer->view);
+ fancy_set_contents(viewer, FALSE);
}
static void fancy_enable_scripts_activated(GtkCheckMenuItem *item, FancyViewer *viewer) {
viewer->override_prefs_scripts = gtk_check_menu_item_get_active(item);
fancy_apply_prefs(viewer);
- webkit_web_view_reload (viewer->view);
+ fancy_set_contents(viewer, FALSE);
}
static void fancy_enable_plugins_activated(GtkCheckMenuItem *item, FancyViewer *viewer) {
viewer->override_prefs_plugins = gtk_check_menu_item_get_active(item);
fancy_apply_prefs(viewer);
- webkit_web_view_reload (viewer->view);
+ fancy_set_contents(viewer, FALSE);
}
static void fancy_enable_java_activated(GtkCheckMenuItem *item, FancyViewer *viewer) {
viewer->override_prefs_java = gtk_check_menu_item_get_active(item);
fancy_apply_prefs(viewer);
- webkit_web_view_reload (viewer->view);
+ fancy_set_contents(viewer, FALSE);
}
static void fancy_open_external_activated(GtkCheckMenuItem *item, FancyViewer *viewer) {
fancy_apply_prefs(viewer);
}
-static void fancy_load_uri(FancyViewer *viewer, const gchar *uri)
+static gboolean fancy_set_contents(FancyViewer *viewer, gboolean use_defaults)
{
-#if WEBKIT_CHECK_VERSION(1,1,1)
- webkit_web_view_load_uri(viewer->view, uri);
-#else
- webkit_web_view_open(viewer->view, uri);
-#endif
-}
-
-static gboolean fancy_show_mimepart_real(MimeViewer *_viewer)
-{
- FancyViewer *viewer = (FancyViewer *) _viewer;
MessageView *messageview = ((MimeViewer *)viewer)->mimeview
? ((MimeViewer *)viewer)->mimeview->messageview
: NULL;
}
else {
const gchar *charset = NULL;
+ gchar *contents = NULL;
if (messageview && messageview->forced_charset)
- charset = _viewer->mimeview->messageview->forced_charset;
+ charset = ((MimeViewer *)viewer)->mimeview->messageview->forced_charset;
else
charset = procmime_mimeinfo_get_parameter(partinfo, "charset");
if (!charset)
charset = conv_get_locale_charset_str();
debug_print("using %s charset\n", charset);
g_object_set(viewer->settings, "default-encoding", charset, NULL);
- gchar *tmp = g_filename_to_uri(viewer->filename, NULL, NULL);
- debug_print("zoom_level: %i\n", fancy_prefs.zoom_level);
- webkit_web_view_set_zoom_level(viewer->view, (fancy_prefs.zoom_level / 100.0));
+
+ if (use_defaults) {
+ debug_print("zoom_level: %i\n", fancy_prefs.zoom_level);
+ webkit_web_view_set_zoom_level(viewer->view, (fancy_prefs.zoom_level / 100.0));
- fancy_set_defaults(viewer);
- fancy_load_uri(viewer, tmp);
+ fancy_set_defaults(viewer);
+ }
- g_free(tmp);
+ contents = file_read_to_str_no_recode(viewer->filename);
+ webkit_web_view_load_string(viewer->view,
+ contents,
+ "text/html",
+ charset,
+ NULL);
+ g_free(contents);
}
viewer->loading = FALSE;
return FALSE;
}
+
+static gboolean fancy_show_mimepart_real(MimeViewer *_viewer)
+{
+ return fancy_set_contents((FancyViewer *)_viewer, TRUE);
+}
+
static void fancy_show_notice(FancyViewer *viewer, const gchar *message)
{
gtk_label_set_text(GTK_LABEL(viewer->l_link), message);
}
+
static gint fancy_show_mimepart_prepare(MimeViewer *_viewer)
{
FancyViewer *viewer = (FancyViewer *) _viewer;
viewer->cur_link = NULL;
fancy_set_defaults(viewer);
- fancy_load_uri(viewer, "about:blank");
+ webkit_web_view_load_uri(viewer->view, "about:blank");
debug_print("fancy_clear_viewer\n");
fancy_prefs.zoom_level = webkit_web_view_get_zoom_level(viewer->view) * 100;
g_free(viewer);
}
-static WebKitNavigationResponse
-navigation_requested_cb(WebKitWebView *view, WebKitWebFrame *frame,
- WebKitNetworkRequest *netreq, FancyViewer *viewer)
+static gboolean
+navigation_policy_cb (WebKitWebView *web_view,
+ WebKitWebFrame *frame,
+ WebKitNetworkRequest *request,
+ WebKitWebNavigationAction *navigation_action,
+ WebKitWebPolicyDecision *policy_decision,
+ FancyViewer *viewer)
{
- const gchar *uri = webkit_network_request_get_uri(netreq);
+ const gchar *uri = webkit_network_request_get_uri(request);
debug_print("navigation requested to %s\n", uri);
if (!strncmp(uri, "mailto:", 7)) {
+ debug_print("Opening message window\n");
compose_new(NULL, uri + 7, NULL);
- return WEBKIT_NAVIGATION_RESPONSE_IGNORE;
- } else if (!strncmp(uri, "file://", 7)) {
- return WEBKIT_NAVIGATION_RESPONSE_ACCEPT;
- } else if (viewer->override_prefs_remote_content)
- return WEBKIT_NAVIGATION_RESPONSE_ACCEPT;
- else {
+ webkit_web_policy_decision_ignore(policy_decision);
+ } else if (!strncmp(uri, "file://", 7) || !strcmp(uri, "about:blank")) {
+ debug_print("local navigation request ACCEPTED\n");
+ webkit_web_policy_decision_use(policy_decision);
+ } else if (viewer->override_prefs_remote_content) {
+ debug_print("remote navigation request ACCEPTED\n");
+ webkit_web_policy_decision_use(policy_decision);
+ } else {
+ debug_print("remote navigation request IGNORED\n");
fancy_show_notice(viewer, _("Remote content loading is disabled."));
- return WEBKIT_NAVIGATION_RESPONSE_IGNORE;
+ webkit_web_policy_decision_ignore(policy_decision);
}
+
+ return true;
}
static void resource_request_starting_cb(WebKitWebView *view,
}
}
-static void load_progress_cb(WebKitWebView *view, gint progress,
+static void load_progress_cb(WebKitWebView *view, GParamSpec* pspec,
FancyViewer *viewer)
{
- gdouble pbar;
- gchar *label = g_strdup_printf("%d%% Loading...", progress);
- pbar = (gdouble) progress / 100;
+ WebKitLoadStatus status = webkit_web_view_get_load_status(viewer->view);
+ gdouble pbar = webkit_web_view_get_progress(viewer->view);
+ const gchar *uri = webkit_web_view_get_uri(viewer->view);
+
+ gchar *label = g_strdup_printf("%d%% Loading...", (gint)(pbar * 100));
gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(viewer->progress), pbar);
gtk_progress_bar_set_text(GTK_PROGRESS_BAR(viewer->progress),
(const gchar*)label);
g_free(label);
+
+ switch (status) {
+ case WEBKIT_LOAD_PROVISIONAL:
+ case WEBKIT_LOAD_COMMITTED:
+ case WEBKIT_LOAD_FIRST_VISUALLY_NON_EMPTY_LAYOUT:
+ break;
+ case WEBKIT_LOAD_FAILED:
+ debug_print("Load failed: %s\n", uri);
+ break;
+ case WEBKIT_LOAD_FINISHED:
+ debug_print("Load finished: %s\n", uri);
+ break;
+ }
}
+
static void stop_loading_cb(GtkWidget *widget, GdkEvent *ev,
FancyViewer *viewer)
{
gchar *tmp = webkit_web_view_get_selected_text(viewer->view);
#endif
search = g_strconcat(GOOGLE_SEARCH, tmp, NULL);
-#if WEBKIT_CHECK_VERSION(1,1,1)
+
webkit_web_view_load_uri(viewer->view, search);
-#else
- webkit_web_view_open(viewer->view, search);
-#endif
g_free(search);
g_free(tmp);
}
webkit_web_view_zoom_out(viewer->view);
}
+#if WEBKIT_CHECK_VERSION (1,7,5)
+static void resource_load_failed_cb(WebKitWebView *web_view,
+ WebKitWebFrame *web_frame,
+ WebKitWebResource *web_resource,
+ GError *error,
+ FancyViewer *viewer)
+{
+ debug_print("Loading error: %s\n", error->message);
+}
+#endif
+
static MimeViewer *fancy_viewer_create(void)
{
FancyViewer *viewer;
G_CALLBACK(load_finished_cb), viewer);
g_signal_connect(G_OBJECT(viewer->view), "hovering-over-link",
G_CALLBACK(over_link_cb), viewer);
- g_signal_connect(G_OBJECT(viewer->view), "load-progress-changed",
+
+ g_signal_connect(G_OBJECT(viewer->view), "notify::progress",
G_CALLBACK(load_progress_cb), viewer);
- g_signal_connect(G_OBJECT(viewer->view), "navigation-requested",
- G_CALLBACK(navigation_requested_cb), viewer);
+ g_signal_connect(G_OBJECT(viewer->view), "notify::load-status",
+ G_CALLBACK(load_progress_cb), viewer);
+
+ g_signal_connect(G_OBJECT(viewer->view), "navigation-policy-decision-requested",
+ G_CALLBACK(navigation_policy_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_signal_connect(G_OBJECT(viewer->view), "key_press_event",
G_CALLBACK(keypress_events_cb), viewer);
+#if WEBKIT_CHECK_VERSION (1,7,5)
+ g_signal_connect(G_OBJECT(viewer->view), "resource-load-failed",
+ G_CALLBACK(resource_load_failed_cb), viewer);
+#endif
+
viewer->filename = NULL;
return (MimeViewer *) viewer;
}
projects / claws.git / blobdiff