#include <string.h>
#include <gtk/gtk.h>
-#include <gdk/gdkx.h>
+#include <gtk/gtkx.h>
#include <gdk/gdkkeysyms.h>
#include <gio/gio.h>
-#include <webkit/webkit.h>
+#include <webkit2/webkit2.h>
-static void adblock(WebKitWebView *, WebKitWebFrame *, WebKitWebResource *,
- WebKitNetworkRequest *, WebKitNetworkResponse *, gpointer);
-static void adblock_load(void);
-static void client_destroy(GtkWidget *obj, gpointer data);
+static void client_destroy(GtkWidget *, gpointer);
static gboolean client_destroy_request(WebKitWebView *, gpointer);
-static WebKitWebView *client_new(const gchar *uri);
-static WebKitWebView *client_new_request(WebKitWebView *, WebKitWebFrame *,
+static WebKitWebView *client_new(const gchar *);
+static WebKitWebView *client_new_request(WebKitWebView *, WebKitNavigationAction *,
gpointer);
static void cooperation_setup(void);
-static void changed_load_progress(GObject *obj, GParamSpec *pspec,
- gpointer data);
+static void changed_download_progress(GObject *, GParamSpec *, gpointer);
+static void changed_load_progress(GObject *, GParamSpec *, gpointer);
static void changed_title(GObject *, GParamSpec *, gpointer);
static void changed_uri(GObject *, GParamSpec *, gpointer);
-static gboolean download_handle(WebKitWebView *, WebKitDownload *, gpointer);
-static gboolean download_reset_indicator(gpointer);
-static gboolean download_request(WebKitWebView *, WebKitWebFrame *,
- WebKitNetworkRequest *, gchar *,
- WebKitWebPolicyDecision *, gpointer);
+static gboolean crashed_web_view(WebKitWebView *, gpointer);
+static gboolean crashed_web_view_reload(gpointer);
+static gboolean decide_policy(WebKitWebView *, WebKitPolicyDecision *,
+ WebKitPolicyDecisionType, gpointer);
+static gboolean download_handle(WebKitDownload *, gchar *, gpointer);
+static void download_handle_start(WebKitWebView *, WebKitDownload *, gpointer);
static void downloadmanager_cancel(GtkToolButton *, gpointer data);
-static void downloadmanager_progress(GObject *obj, GParamSpec *pspec,
- gpointer data);
static void downloadmanager_setup(void);
-static gchar *ensure_url_scheme(const gchar *);
+static gchar *ensure_uri_scheme(const gchar *);
static void grab_environment_configuration(void);
-static void hover_web_view(WebKitWebView *, gchar *, gchar *, gpointer);
+static void hover_web_view(WebKitWebView *, WebKitHitTestResult *, guint, gpointer);
static gboolean key_downloadmanager(GtkWidget *, GdkEvent *, gpointer);
static gboolean key_location(GtkWidget *, GdkEvent *, gpointer);
static gboolean key_web_view(GtkWidget *, GdkEvent *, gpointer);
static gboolean remote_msg(GIOChannel *, GIOCondition, gpointer);
static void search(gpointer, gint);
static Window tabbed_launch(void);
+static void trust_user_certs(WebKitWebContext *);
static void usage(void);
struct Client
{
+ gchar *hover_uri;
GtkWidget *location;
GtkWidget *progress;
GtkWidget *scroll;
- GtkWidget *status;
GtkWidget *top_box;
GtkWidget *vbox;
GtkWidget *web_view;
} dm;
-static gchar *accepted_language = "en-US";
-static GSList *adblock_patterns = NULL;
+static const gchar *accepted_language[2] = { NULL, NULL };
static gint clients = 0;
static gboolean cooperative_alone = TRUE;
static gboolean cooperative_instances = TRUE;
static int cooperative_pipe_fp = 0;
+static int crash_autoreload_delay = 2;
static gchar *download_dir = "/tmp";
-static gint downloads_indicated = 0;
static Window embed = 0;
static gchar *fifo_suffix = "main";
-static gchar *first_uri = NULL;
static gdouble global_zoom = 1.0;
+static gchar *home_uri = "about:blank";
+static gboolean initial_wc_setup_done = FALSE;
static GHashTable *keywords = NULL;
-static gboolean language_is_set = FALSE;
static gchar *search_text = NULL;
-static gboolean show_all_requests = FALSE;
static gboolean tabbed_automagic = TRUE;
+static gchar *user_agent = NULL;
+static gchar *web_extensions_dir = NULL;
-void
-adblock(WebKitWebView *web_view, WebKitWebFrame *frame,
- WebKitWebResource *resource, WebKitNetworkRequest *request,
- WebKitNetworkResponse *response, gpointer data)
-{
- GSList *it = adblock_patterns;
- const gchar *uri;
-
- uri = webkit_network_request_get_uri(request);
- if (show_all_requests)
- fprintf(stderr, " -> %s\n", uri);
-
- while (it)
- {
- if (g_regex_match((GRegex *)(it->data), uri, 0, NULL))
- {
- webkit_network_request_set_uri(request, "about:blank");
- if (show_all_requests)
- fprintf(stderr, " BLOCKED!\n");
- return;
- }
- it = g_slist_next(it);
- }
-}
-
-void
-adblock_load(void)
-{
- GRegex *re = NULL;
- GError *err = NULL;
- GIOChannel *channel = NULL;
- gchar *path = NULL, *buf = NULL;
-
- path = g_build_filename(g_get_user_config_dir(), __NAME__, "adblock.black",
- NULL);
- channel = g_io_channel_new_file(path, "r", &err);
- if (channel != NULL)
- {
- while (g_io_channel_read_line(channel, &buf, NULL, NULL, NULL)
- == G_IO_STATUS_NORMAL)
- {
- g_strstrip(buf);
- if (buf[0] != '#')
- {
- re = g_regex_new(buf,
- G_REGEX_CASELESS | G_REGEX_OPTIMIZE,
- G_REGEX_MATCH_PARTIAL, &err);
- if (err != NULL)
- {
- fprintf(stderr, __NAME__": Could not compile regex: %s\n", buf);
- g_error_free(err);
- err = NULL;
- }
- else
- adblock_patterns = g_slist_append(adblock_patterns, re);
- }
- g_free(buf);
- }
- }
- g_io_channel_shutdown(channel, FALSE, NULL);
- g_free(path);
-}
-
void
client_destroy(GtkWidget *obj, gpointer data)
{
struct Client *c = (struct Client *)data;
+ g_signal_handlers_disconnect_by_func(G_OBJECT(c->web_view),
+ changed_load_progress, c);
+
free(c);
clients--;
client_new(const gchar *uri)
{
struct Client *c;
+ WebKitWebContext *wc;
gchar *f;
if (uri != NULL && cooperative_instances && !cooperative_alone)
exit(EXIT_FAILURE);
}
+ c->hover_uri = NULL;
c->win = NULL;
if (embed != 0)
{
gtk_window_set_wmclass(GTK_WINDOW(c->win), __NAME__, __NAME_CAPITALIZED__);
}
- /* When using Gtk2, it only shows a white area when run in suckless'
- * tabbed. It appears we need to set a default window size for this
- * to work. This is not needed when using Gtk3. */
- gtk_window_set_default_size(GTK_WINDOW(c->win), 1024, 768);
-
g_signal_connect(G_OBJECT(c->win), "destroy", G_CALLBACK(client_destroy), c);
gtk_window_set_title(GTK_WINDOW(c->win), __NAME__);
c->web_view = webkit_web_view_new();
-
- /* XXX I really do want to enable this option. However, I get
- * reproducable crashes with it enabled. I've seen bug reports from
- * 2010 about this... WebKit crashes in libpixman, so maybe it's not
- * a WebKit issue.
- * Yeah, well. I'll turn it off for now. */
- /*webkit_web_view_set_full_content_zoom(WEBKIT_WEB_VIEW(c->web_view), TRUE);*/
+ wc = webkit_web_view_get_context(WEBKIT_WEB_VIEW(c->web_view));
webkit_web_view_set_zoom_level(WEBKIT_WEB_VIEW(c->web_view), global_zoom);
g_signal_connect(G_OBJECT(c->web_view), "notify::title",
G_CALLBACK(changed_title), c);
g_signal_connect(G_OBJECT(c->web_view), "notify::uri",
G_CALLBACK(changed_uri), c);
- g_signal_connect(G_OBJECT(c->web_view), "notify::progress",
+ g_signal_connect(G_OBJECT(c->web_view), "notify::estimated-load-progress",
G_CALLBACK(changed_load_progress), c);
- g_signal_connect(G_OBJECT(c->web_view), "create-web-view",
+ g_signal_connect(G_OBJECT(c->web_view), "create",
G_CALLBACK(client_new_request), NULL);
- g_signal_connect(G_OBJECT(c->web_view), "close-web-view",
+ g_signal_connect(G_OBJECT(c->web_view), "close",
G_CALLBACK(client_destroy_request), c);
- g_signal_connect(G_OBJECT(c->web_view),
- "mime-type-policy-decision-requested",
- G_CALLBACK(download_request), NULL);
- g_signal_connect(G_OBJECT(c->web_view), "download-requested",
- G_CALLBACK(download_handle), c);
+ g_signal_connect(G_OBJECT(c->web_view), "decide-policy",
+ G_CALLBACK(decide_policy), NULL);
g_signal_connect(G_OBJECT(c->web_view), "key-press-event",
G_CALLBACK(key_web_view), c);
g_signal_connect(G_OBJECT(c->web_view), "button-press-event",
G_CALLBACK(key_web_view), c);
g_signal_connect(G_OBJECT(c->web_view), "scroll-event",
G_CALLBACK(key_web_view), c);
- g_signal_connect(G_OBJECT(c->web_view), "hovering-over-link",
+ g_signal_connect(G_OBJECT(c->web_view), "mouse-target-changed",
G_CALLBACK(hover_web_view), c);
- g_signal_connect(G_OBJECT(c->web_view), "resource-request-starting",
- G_CALLBACK(adblock), NULL);
+ g_signal_connect(G_OBJECT(c->web_view), "web-process-crashed",
+ G_CALLBACK(crashed_web_view), c);
- if (!language_is_set)
+ if (!initial_wc_setup_done)
{
- g_object_set(webkit_get_default_session(), "accept-language",
- accepted_language, NULL);
- language_is_set = TRUE;
+ if (accepted_language[0] != NULL)
+ webkit_web_context_set_preferred_languages(wc, accepted_language);
+
+ g_signal_connect(G_OBJECT(wc), "download-started",
+ G_CALLBACK(download_handle_start), NULL);
+
+ trust_user_certs(wc);
+
+ initial_wc_setup_done = TRUE;
}
+ if (user_agent != NULL)
+ g_object_set(G_OBJECT(webkit_web_view_get_settings(WEBKIT_WEB_VIEW(c->web_view))),
+ "user-agent", user_agent, NULL);
+
c->scroll = gtk_scrolled_window_new(NULL, NULL);
gtk_container_add(GTK_CONTAINER(c->scroll), c->web_view);
g_signal_connect(G_OBJECT(c->location), "key-press-event",
G_CALLBACK(key_location), c);
- c->progress = gtk_progress_bar_new();
- gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(c->progress), 0);
+ /* XXX Progress bars don't work/look as intended anymore. Level bars
+ * are a dirty workaround (kind of). */
+ c->progress = gtk_level_bar_new();
+ gtk_level_bar_set_value(GTK_LEVEL_BAR(c->progress), 0);
+ gtk_widget_set_size_request(c->progress, 100, -1);
- c->status = gtk_progress_bar_new();
- gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(c->status), 0);
- gtk_widget_set_size_request(c->status, 20, -1);
+ c->top_box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
+ gtk_box_pack_start(GTK_BOX(c->top_box), c->location, TRUE, TRUE, 2);
+ gtk_box_pack_start(GTK_BOX(c->top_box), c->progress, FALSE, FALSE, 2);
- c->top_box = gtk_hbox_new(FALSE, 0);
- gtk_box_pack_start(GTK_BOX(c->top_box), c->status, FALSE, FALSE, 2);
- gtk_box_pack_start(GTK_BOX(c->top_box), c->location, TRUE, TRUE, 0);
- gtk_box_pack_end(GTK_BOX(c->top_box), c->progress, FALSE, TRUE, 2);
-
- c->vbox = gtk_vbox_new(FALSE, 0);
+ c->vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_box_pack_start(GTK_BOX(c->vbox), c->top_box, FALSE, FALSE, 2);
- gtk_container_add(GTK_CONTAINER(c->vbox), c->scroll);
+ gtk_box_pack_start(GTK_BOX(c->vbox), c->scroll, TRUE, TRUE, 2);
gtk_container_add(GTK_CONTAINER(c->win), c->vbox);
if (uri != NULL)
{
- f = ensure_url_scheme(uri);
- if (show_all_requests)
- fprintf(stderr, "====> %s\n", uri);
+ f = ensure_uri_scheme(uri);
webkit_web_view_load_uri(WEBKIT_WEB_VIEW(c->web_view), f);
g_free(f);
}
}
WebKitWebView *
-client_new_request(WebKitWebView *web_view, WebKitWebFrame *frame, gpointer data)
+client_new_request(WebKitWebView *web_view,
+ WebKitNavigationAction *navigation_action, gpointer data)
{
return client_new(NULL);
}
g_free(fifopath);
}
+void
+changed_download_progress(GObject *obj, GParamSpec *pspec, gpointer data)
+{
+ WebKitDownload *download = WEBKIT_DOWNLOAD(obj);
+ WebKitURIResponse *resp;
+ GtkToolItem *tb = GTK_TOOL_ITEM(data);
+ gdouble p, size_mb;
+ const gchar *uri;
+ gchar *t, *filename, *base;
+
+ p = webkit_download_get_estimated_progress(download) * 100;
+ resp = webkit_download_get_response(download);
+ size_mb = webkit_uri_response_get_content_length(resp) / 1e6;
+
+ uri = webkit_download_get_destination(download);
+ filename = g_filename_from_uri(uri, NULL, NULL);
+ if (filename == NULL)
+ {
+ /* This really should not happen because WebKit uses that URI to
+ * write to a file... */
+ fprintf(stderr, __NAME__": Could not construct file name from URI!\n");
+ t = g_strdup_printf("%s (%.0f%% of %.1f MB)",
+ webkit_uri_response_get_uri(resp), p, size_mb);
+ }
+ else
+ {
+ base = g_path_get_basename(filename);
+ t = g_strdup_printf("%s (%.0f%% of %.1f MB)", base, p, size_mb);
+ g_free(filename);
+ g_free(base);
+ }
+ gtk_tool_button_set_label(GTK_TOOL_BUTTON(tb), t);
+ g_free(t);
+}
+
void
changed_load_progress(GObject *obj, GParamSpec *pspec, gpointer data)
{
struct Client *c = (struct Client *)data;
gdouble p;
- p = webkit_web_view_get_progress(WEBKIT_WEB_VIEW(c->web_view));
- gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(c->progress), p);
+ p = webkit_web_view_get_estimated_load_progress(WEBKIT_WEB_VIEW(c->web_view));
+ gtk_level_bar_set_value(GTK_LEVEL_BAR(c->progress), p);
}
void
}
gboolean
-download_handle(WebKitWebView *web_view, WebKitDownload *download, gpointer data)
+crashed_web_view(WebKitWebView *web_view, gpointer data)
+{
+ fprintf(stderr, __NAME__": WebView crashed!\n");
+ if (crash_autoreload_delay >= 1)
+ {
+ fprintf(stderr, __NAME__": Reloading WebView in %d seconds.\n",
+ crash_autoreload_delay);
+ g_timeout_add_seconds(crash_autoreload_delay, crashed_web_view_reload,
+ web_view);
+ }
+
+ return TRUE;
+}
+
+gboolean
+crashed_web_view_reload(gpointer data)
+{
+ webkit_web_view_reload_bypass_cache(WEBKIT_WEB_VIEW(data));
+
+ return G_SOURCE_REMOVE;
+}
+
+gboolean
+decide_policy(WebKitWebView *web_view, WebKitPolicyDecision *decision,
+ WebKitPolicyDecisionType type, gpointer data)
+{
+ WebKitResponsePolicyDecision *r;
+
+ switch (type)
+ {
+ case WEBKIT_POLICY_DECISION_TYPE_RESPONSE:
+ r = WEBKIT_RESPONSE_POLICY_DECISION(decision);
+ if (!webkit_response_policy_decision_is_mime_type_supported(r))
+ webkit_policy_decision_download(decision);
+ else
+ webkit_policy_decision_use(decision);
+ break;
+ default:
+ /* Use whatever default there is. */
+ return FALSE;
+ }
+ return TRUE;
+}
+
+void
+download_handle_start(WebKitWebView *web_view, WebKitDownload *download,
+ gpointer data)
+{
+ g_signal_connect(G_OBJECT(download), "decide-destination",
+ G_CALLBACK(download_handle), data);
+}
+
+gboolean
+download_handle(WebKitDownload *download, gchar *suggested_filename, gpointer data)
{
- struct Client *c = (struct Client *)data;
gchar *path, *path2 = NULL, *uri;
GtkToolItem *tb;
- gboolean ret;
int suffix = 1;
- path = g_build_filename(download_dir,
- webkit_download_get_suggested_filename(download),
- NULL);
+ path = g_build_filename(download_dir, suggested_filename, NULL);
path2 = g_strdup(path);
while (g_file_test(path2, G_FILE_TEST_EXISTS) && suffix < 1000)
{
if (suffix == 1000)
{
fprintf(stderr, __NAME__": Suffix reached limit for download.\n");
- ret = FALSE;
+ webkit_download_cancel(download);
}
else
{
uri = g_filename_to_uri(path2, NULL, NULL);
- webkit_download_set_destination_uri(download, uri);
- ret = TRUE;
+ webkit_download_set_destination(download, uri);
g_free(uri);
- gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(c->status), 1);
- downloads_indicated++;
- g_timeout_add(500, download_reset_indicator, c);
-
- tb = gtk_tool_button_new_from_stock(GTK_STOCK_DELETE);
- gtk_tool_button_set_label(GTK_TOOL_BUTTON(tb),
- webkit_download_get_suggested_filename(download));
+ tb = gtk_tool_button_new(NULL, NULL);
+ gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(tb), "gtk-delete");
+ gtk_tool_button_set_label(GTK_TOOL_BUTTON(tb), suggested_filename);
gtk_toolbar_insert(GTK_TOOLBAR(dm.toolbar), tb, 0);
- gtk_widget_show_all(dm.toolbar);
+ gtk_widget_show_all(dm.win);
- g_signal_connect(G_OBJECT(download), "notify::progress",
- G_CALLBACK(downloadmanager_progress), tb);
+ g_signal_connect(G_OBJECT(download), "notify::estimated-progress",
+ G_CALLBACK(changed_download_progress), tb);
g_object_ref(download);
g_signal_connect(G_OBJECT(tb), "clicked",
g_free(path);
g_free(path2);
- return ret;
-}
-
-gboolean
-download_reset_indicator(gpointer data)
-{
- struct Client *c = (struct Client *)data;
-
- downloads_indicated--;
- if (downloads_indicated == 0)
- gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(c->status), 0);
-
- return FALSE;
-}
-
-gboolean
-download_request(WebKitWebView *web_view, WebKitWebFrame *frame,
- WebKitNetworkRequest *request, gchar *mime_type,
- WebKitWebPolicyDecision *policy_decision, gpointer data)
-{
- if (!webkit_web_view_can_show_mime_type(web_view, mime_type))
- {
- webkit_web_policy_decision_download(policy_decision);
- return TRUE;
- }
+ /* Propagate -- to whom it may concern. */
return FALSE;
}
gtk_widget_destroy(GTK_WIDGET(tb));
}
-void
-downloadmanager_progress(GObject *obj, GParamSpec *pspec, gpointer data)
-{
- WebKitDownload *download = WEBKIT_DOWNLOAD(obj);
- GtkToolItem *tb = GTK_TOOL_ITEM(data);
- gdouble p;
- const gchar *uri;
- gchar *t, *filename, *base;
-
- p = webkit_download_get_progress(download) * 100;
-
- uri = webkit_download_get_destination_uri(download);
- filename = g_filename_from_uri(uri, NULL, NULL);
- if (filename == NULL)
- {
- /* This really should not happen because WebKit uses that URI to
- * write to a file... */
- fprintf(stderr, __NAME__": Could not construct file name from URI!\n");
- t = g_strdup_printf("%s (%.0f%%)",
- webkit_download_get_suggested_filename(download), p);
- }
- else
- {
- base = g_path_get_basename(filename);
- t = g_strdup_printf("%s (%.0f%%)", base, p);
- g_free(filename);
- g_free(base);
- }
- gtk_tool_button_set_label(GTK_TOOL_BUTTON(tb), t);
- g_free(t);
-}
-
void
downloadmanager_setup(void)
{
dm.scroll = gtk_scrolled_window_new(NULL, NULL);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(dm.scroll),
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
- gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(dm.scroll),
- dm.toolbar);
+ gtk_container_add(GTK_CONTAINER(dm.scroll), dm.toolbar);
gtk_container_add(GTK_CONTAINER(dm.win), dm.scroll);
}
gchar *
-ensure_url_scheme(const gchar *t)
+ensure_uri_scheme(const gchar *t)
{
gchar *f;
e = g_getenv(__NAME_UPPERCASE__"_ACCEPTED_LANGUAGE");
if (e != NULL)
- accepted_language = g_strdup(e);
+ accepted_language[0] = g_strdup(e);
+
+ e = g_getenv(__NAME_UPPERCASE__"_CRASH_AUTORELOAD_DELAY");
+ if (e != NULL)
+ crash_autoreload_delay = atoi(e);
e = g_getenv(__NAME_UPPERCASE__"_DOWNLOAD_DIR");
if (e != NULL)
if (e != NULL)
fifo_suffix = g_strdup(e);
+ e = g_getenv(__NAME_UPPERCASE__"_HOME_URI");
+ if (e != NULL)
+ home_uri = g_strdup(e);
+
+ e = g_getenv(__NAME_UPPERCASE__"_USER_AGENT");
+ if (e != NULL)
+ user_agent = g_strdup(e);
+
+ e = g_getenv(__NAME_UPPERCASE__"_WEB_EXTENSIONS_DIR");
+ if (e != NULL)
+ web_extensions_dir = g_strdup(e);
+ else
+ web_extensions_dir = g_build_filename(g_get_user_data_dir(), __NAME__,
+ "web_extensions", NULL);
+
e = g_getenv(__NAME_UPPERCASE__"_ZOOM");
if (e != NULL)
global_zoom = atof(e);
}
void
-hover_web_view(WebKitWebView *web_view, gchar *title, gchar *uri, gpointer data)
+hover_web_view(WebKitWebView *web_view, WebKitHitTestResult *ht, guint modifiers,
+ gpointer data)
{
struct Client *c = (struct Client *)data;
if (!gtk_widget_is_focus(c->location))
{
- if (uri == NULL)
+ if (webkit_hit_test_result_context_is_link(ht))
+ {
gtk_entry_set_text(GTK_ENTRY(c->location),
- webkit_web_view_get_uri(WEBKIT_WEB_VIEW(c->web_view)));
+ webkit_hit_test_result_get_link_uri(ht));
+
+ if (c->hover_uri != NULL)
+ g_free(c->hover_uri);
+ c->hover_uri = g_strdup(webkit_hit_test_result_get_link_uri(ht));
+ }
else
- gtk_entry_set_text(GTK_ENTRY(c->location), uri);
+ {
+ gtk_entry_set_text(GTK_ENTRY(c->location),
+ webkit_web_view_get_uri(WEBKIT_WEB_VIEW(c->web_view)));
+
+ if (c->hover_uri != NULL)
+ g_free(c->hover_uri);
+ c->hover_uri = NULL;
+ }
}
}
{
switch (((GdkEventKey *)event)->keyval)
{
- case GDK_KEY_q: /* close window (left hand) */
+ case GDK_KEY_d: /* close window (left hand) */
gtk_widget_hide(dm.win);
return TRUE;
}
struct Client *c = (struct Client *)data;
const gchar *t;
gchar *f;
+ WebKitWebContext *wc = webkit_web_view_get_context(WEBKIT_WEB_VIEW(c->web_view));
if (event->type == GDK_KEY_PRESS)
{
gtk_entry_set_text(GTK_ENTRY(c->location), "/");
gtk_editable_set_position(GTK_EDITABLE(c->location), -1);
return TRUE;
+ case GDK_KEY_c: /* reload trusted certs (left hand) */
+ trust_user_certs(wc);
+ return TRUE;
}
}
else
if (search_text != NULL)
g_free(search_text);
search_text = g_strdup(t + 1); /* XXX whacky */
- search(c, 1);
+ search(c, 0);
}
else if (!keywords_try_search(WEBKIT_WEB_VIEW(c->web_view), t))
{
- f = ensure_url_scheme(t);
- if (show_all_requests)
- fprintf(stderr, "====> %s\n", f);
+ f = ensure_uri_scheme(t);
webkit_web_view_load_uri(WEBKIT_WEB_VIEW(c->web_view), f);
g_free(f);
}
key_web_view(GtkWidget *widget, GdkEvent *event, gpointer data)
{
struct Client *c = (struct Client *)data;
- WebKitHitTestResultContext ht_context;
- WebKitHitTestResult *ht_result = NULL;
- gchar *ht_uri = NULL, *f;
+ gdouble dx, dy;
+ gchar *f;
gfloat z;
- gboolean b;
+ WebKitWebContext *wc = webkit_web_view_get_context(WEBKIT_WEB_VIEW(c->web_view));
if (event->type == GDK_KEY_PRESS)
{
gtk_widget_destroy(c->win);
return TRUE;
case GDK_KEY_w: /* home (left hand) */
- f = ensure_url_scheme(first_uri);
- if (show_all_requests)
- fprintf(stderr, "====> %s\n", f);
+ f = ensure_uri_scheme(home_uri);
webkit_web_view_load_uri(WEBKIT_WEB_VIEW(c->web_view), f);
g_free(f);
return TRUE;
case GDK_KEY_e: /* new tab (left hand) */
- f = ensure_url_scheme(first_uri);
- if (show_all_requests)
- fprintf(stderr, "====> %s\n", f);
+ f = ensure_uri_scheme(home_uri);
client_new(f);
g_free(f);
return TRUE;
webkit_web_view_reload_bypass_cache(WEBKIT_WEB_VIEW(
c->web_view));
return TRUE;
- case GDK_KEY_s: /* toggle source view (left hand) */
- b = webkit_web_view_get_view_source_mode(WEBKIT_WEB_VIEW(
- c->web_view));
- b = !b;
- webkit_web_view_set_view_source_mode(WEBKIT_WEB_VIEW(
- c->web_view), b);
- webkit_web_view_reload(WEBKIT_WEB_VIEW(c->web_view));
- return TRUE;
case GDK_KEY_d: /* download manager (left hand) */
gtk_widget_show_all(dm.win);
return TRUE;
gtk_entry_set_text(GTK_ENTRY(c->location), "/");
gtk_editable_set_position(GTK_EDITABLE(c->location), -1);
return TRUE;
+ case GDK_KEY_c: /* reload trusted certs (left hand) */
+ trust_user_certs(wc);
+ return TRUE;
}
}
else if (((GdkEventKey *)event)->keyval == GDK_KEY_Escape)
{
webkit_web_view_stop_loading(WEBKIT_WEB_VIEW(c->web_view));
- gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(c->progress), 0);
+ gtk_level_bar_set_value(GTK_LEVEL_BAR(c->progress), 0);
}
}
else if (event->type == GDK_BUTTON_PRESS)
switch (((GdkEventButton *)event)->button)
{
case 2:
- ht_result = webkit_web_view_get_hit_test_result(
- WEBKIT_WEB_VIEW(c->web_view),
- (GdkEventButton *)event);
- g_object_get(ht_result, "context", &ht_context, NULL);
- if (ht_context & WEBKIT_HIT_TEST_RESULT_CONTEXT_LINK)
+ if (c->hover_uri != NULL)
{
- g_object_get(ht_result, "link-uri", &ht_uri, NULL);
- client_new(ht_uri);
- g_object_unref(ht_result);
+ client_new(c->hover_uri);
return TRUE;
}
- g_object_unref(ht_result);
break;
case 8:
webkit_web_view_go_back(WEBKIT_WEB_VIEW(c->web_view));
if (((GdkEventScroll *)event)->state & GDK_MOD1_MASK ||
((GdkEventScroll *)event)->state & GDK_CONTROL_MASK)
{
- switch (((GdkEventScroll *)event)->direction)
- {
- case GDK_SCROLL_UP:
- z = webkit_web_view_get_zoom_level(WEBKIT_WEB_VIEW(
- c->web_view));
- z += 0.1;
- webkit_web_view_set_zoom_level(WEBKIT_WEB_VIEW(c->web_view),
- z);
- return TRUE;
- case GDK_SCROLL_DOWN:
- z = webkit_web_view_get_zoom_level(WEBKIT_WEB_VIEW(
- c->web_view));
- z -= 0.1;
- webkit_web_view_set_zoom_level(WEBKIT_WEB_VIEW(c->web_view),
- z);
- return TRUE;
- default:
- break;
- }
+ gdk_event_get_scroll_deltas(event, &dx, &dy);
+ z = webkit_web_view_get_zoom_level(WEBKIT_WEB_VIEW(c->web_view));
+ z += -dy * 0.1;
+ z = dx != 0 ? global_zoom : z;
+ webkit_web_view_set_zoom_level(WEBKIT_WEB_VIEW(c->web_view), z);
+ return TRUE;
}
}
{
tokens = g_strsplit(buf, " ", 2);
if (tokens[0] != NULL && tokens[1] != NULL)
- g_hash_table_insert(keywords, tokens[0], tokens[1]);
- else
- g_strfreev(tokens);
+ g_hash_table_insert(keywords, g_strdup(tokens[0]),
+ g_strdup(tokens[1]));
+ g_strfreev(tokens);
}
g_free(buf);
}
+ g_io_channel_shutdown(channel, FALSE, NULL);
}
- g_io_channel_shutdown(channel, FALSE, NULL);
g_free(path);
}
if (val != NULL)
{
uri = g_strdup_printf((gchar *)val, tokens[1]);
- if (show_all_requests)
- fprintf(stderr, "====> %s\n", uri);
webkit_web_view_load_uri(web_view, uri);
g_free(uri);
ret = TRUE;
search(gpointer data, gint direction)
{
struct Client *c = (struct Client *)data;
+ WebKitWebView *web_view = WEBKIT_WEB_VIEW(c->web_view);
+ WebKitFindController *fc = webkit_web_view_get_find_controller(web_view);
if (search_text == NULL)
return;
- webkit_web_view_search_text(WEBKIT_WEB_VIEW(c->web_view), search_text,
- FALSE, direction == 1, TRUE);
+ switch (direction)
+ {
+ case 0:
+ webkit_find_controller_search(fc, search_text,
+ WEBKIT_FIND_OPTIONS_CASE_INSENSITIVE |
+ WEBKIT_FIND_OPTIONS_WRAP_AROUND,
+ G_MAXUINT);
+ break;
+ case 1:
+ webkit_find_controller_search_next(fc);
+ break;
+ case -1:
+ webkit_find_controller_search_previous(fc);
+ break;
+ }
}
Window
}
tabbed_stdout_channel = g_io_channel_unix_new(tabbed_stdout);
+ if (tabbed_stdout_channel == NULL)
+ {
+ fprintf(stderr, __NAME__": Could open tabbed's stdout\n");
+ return 0;
+ }
g_io_channel_read_line(tabbed_stdout_channel, &output, NULL, NULL, NULL);
+ g_io_channel_shutdown(tabbed_stdout_channel, FALSE, NULL);
if (output == NULL)
{
fprintf(stderr, __NAME__": Could not read XID from tabbed\n");
return 0;
}
-
- g_io_channel_shutdown(tabbed_stdout_channel, FALSE, NULL);
-
g_strstrip(output);
plug_into = strtol(output, NULL, 16);
g_free(output);
+ if (plug_into == 0)
+ fprintf(stderr, __NAME__": The XID from tabbed is 0\n");
return plug_into;
}
+void
+trust_user_certs(WebKitWebContext *wc)
+{
+ GTlsCertificate *cert;
+ const gchar *basedir, *file, *absfile;
+ GDir *dir;
+
+ basedir = g_build_filename(g_get_user_config_dir(), __NAME__, "certs", NULL);
+ dir = g_dir_open(basedir, 0, NULL);
+ if (dir != NULL)
+ {
+ file = g_dir_read_name(dir);
+ while (file != NULL)
+ {
+ absfile = g_build_filename(g_get_user_config_dir(), __NAME__, "certs",
+ file, NULL);
+ cert = g_tls_certificate_new_from_file(absfile, NULL);
+ if (cert == NULL)
+ fprintf(stderr, __NAME__": Could not load trusted cert '%s'\n", file);
+ else
+ webkit_web_context_allow_tls_certificate_for_host(wc, cert, file);
+ file = g_dir_read_name(dir);
+ }
+ g_dir_close(dir);
+ }
+}
+
void
usage(void)
{
- fprintf(stderr, "Usage: "__NAME__" [OPTION]... <URI>...\n");
+ fprintf(stderr, "Usage: "__NAME__" [OPTION]... [URI]...\n");
exit(EXIT_FAILURE);
}
grab_environment_configuration();
- while ((opt = getopt(argc, argv, "e:rCT")) != -1)
+ while ((opt = getopt(argc, argv, "e:CT")) != -1)
{
switch (opt)
{
embed = atol(optarg);
tabbed_automagic = FALSE;
break;
- case 'r':
- show_all_requests = TRUE;
- break;
case 'C':
cooperative_instances = FALSE;
break;
}
}
- if (optind >= argc)
- usage();
-
- adblock_load();
keywords_load();
cooperation_setup();
downloadmanager_setup();
if (tabbed_automagic && !(cooperative_instances && !cooperative_alone))
embed = tabbed_launch();
- first_uri = g_strdup(argv[optind]);
- for (i = optind; i < argc; i++)
- client_new(argv[i]);
+ if (!cooperative_instances || cooperative_alone)
+ webkit_web_context_set_web_extensions_directory(webkit_web_context_get_default(),
+ web_extensions_dir);
+
+ if (optind >= argc)
+ client_new(home_uri);
+ else
+ {
+ for (i = optind; i < argc; i++)
+ client_new(argv[i]);
+ }
+
if (!cooperative_instances || cooperative_alone)
gtk_main();
exit(EXIT_SUCCESS);
projects / chorizo.git / blobdiff