]> git.armaanb.net Git - chorizo.git/blobdiff - browser.c
Allow webkit:// in URLs
[chorizo.git] / browser.c
index a88e78bd023eb851f9c0a5c5e668aaf3cc200f6d..8df0e330777700e743a953d9cd7123db95e30109 100644 (file)
--- a/browser.c
+++ b/browser.c
@@ -1,3 +1,4 @@
+#include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/types.h>
 #include <gdk/gdkkeysyms.h>
 #include <gio/gio.h>
 #include <webkit2/webkit2.h>
-
-
-static void client_destroy(GtkWidget *, gpointer);
-static gboolean client_destroy_request(WebKitWebView *, gpointer);
-static WebKitWebView *client_new(const gchar *);
-static WebKitWebView *client_new_request(WebKitWebView *, WebKitNavigationAction *,
-                                         gpointer);
-static void cooperation_setup(void);
-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 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_setup(void);
-static gchar *ensure_uri_scheme(const gchar *);
-static void grab_environment_configuration(void);
-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 void keywords_load(void);
-static gboolean keywords_try_search(WebKitWebView *, const gchar *);
-static gboolean remote_msg(GIOChannel *, GIOCondition, gpointer);
-static void search(gpointer, gint);
-static Window tabbed_launch(void);
-static void trust_user_certs(WebKitWebContext *);
+#include <JavaScriptCore/JavaScript.h>
+
+
+void client_destroy(GtkWidget *, gpointer);
+WebKitWebView *client_new(const gchar *, WebKitWebView *, gboolean,
+                          gboolean);
+WebKitWebView *client_new_request(WebKitWebView *, WebKitNavigationAction *,
+                                  gpointer);
+void cooperation_setup(void);
+void changed_download_progress(GObject *, GParamSpec *, gpointer);
+void changed_load_progress(GObject *, GParamSpec *, gpointer);
+void changed_favicon(GObject *, GParamSpec *, gpointer);
+void changed_title(GObject *, GParamSpec *, gpointer);
+void changed_uri(GObject *, GParamSpec *, gpointer);
+gboolean crashed_web_view(WebKitWebView *, gpointer);
+gboolean decide_policy(WebKitWebView *, WebKitPolicyDecision *,
+                       WebKitPolicyDecisionType, gpointer);
+gboolean download_handle(WebKitDownload *, gchar *, gpointer);
+void download_handle_start(WebKitWebView *, WebKitDownload *, gpointer);
+void downloadmanager_cancel(GtkToolButton *, gpointer);
+gboolean downloadmanager_delete(GtkWidget *, gpointer);
+void downloadmanager_setup(void);
+gchar *ensure_uri_scheme(const gchar *);
+void grab_environment_configuration(void);
+void grab_feeds_finished(GObject *, GAsyncResult *, gpointer);
+void hover_web_view(WebKitWebView *, WebKitHitTestResult *, guint, gpointer);
+void icon_location(GtkEntry *, GtkEntryIconPosition, GdkEvent *, gpointer);
+void init_default_web_context(void);
+gboolean key_common(GtkWidget *, GdkEvent *, gpointer);
+gboolean key_downloadmanager(GtkWidget *, GdkEvent *, gpointer);
+gboolean key_location(GtkWidget *, GdkEvent *, gpointer);
+gboolean key_tablabel(GtkWidget *, GdkEvent *, gpointer);
+gboolean key_web_view(GtkWidget *, GdkEvent *, gpointer);
+void mainwindow_setup(void);
+void mainwindow_title(gint);
+void notebook_switch_page(GtkNotebook *, GtkWidget *, guint, gpointer);
+gboolean quit_if_nothing_active(void);
+gboolean remote_msg(GIOChannel *, GIOCondition, gpointer);
+void run_user_scripts(WebKitWebView *);
+void search(gpointer, gint);
+void show_web_view(WebKitWebView *, gpointer);
+void trust_user_certs(WebKitWebContext *);
 
 
 struct Client
 {
+    gchar *external_handler_uri;
     gchar *hover_uri;
+    gchar *feed_html;
     GtkWidget *location;
-    GtkWidget *progress;
-    GtkWidget *top_box;
+    GtkWidget *tabicon;
+    GtkWidget *tablabel;
     GtkWidget *vbox;
     GtkWidget *web_view;
-    GtkWidget *win;
+    gboolean focus_new_tab;
 };
 
+struct MainWindow
+{
+    GtkWidget *win;
+    GtkWidget *notebook;
+} mw;
+
 struct DownloadManager
 {
     GtkWidget *scroll;
@@ -63,99 +82,78 @@ struct DownloadManager
 } dm;
 
 
-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 = "/var/tmp";
-static Window embed = 0;
-static gchar *fifo_suffix = "main";
-static gdouble global_zoom = 1.0;
-static gchar *home_uri = "about:blank";
-static gboolean initial_wc_setup_done = FALSE;
-static GHashTable *keywords = NULL;
-static gchar *search_text = NULL;
-static gboolean tabbed_automagic = TRUE;
-static gchar *user_agent = NULL;
+const gchar *accepted_language[2] = { NULL, NULL };
+gint clients = 0, downloads = 0;
+gboolean cooperative_alone = TRUE;
+gboolean cooperative_instances = TRUE;
+int cooperative_pipe_fp = 0;
+gchar *download_dir = "/var/tmp";
+gboolean enable_console_to_stdout = FALSE;
+gchar *fifo_suffix = "main";
+gdouble global_zoom = 1.0;
+gchar *history_file = NULL;
+gchar *home_uri = "about:blank";
+gchar *search_text = NULL;
+GtkPositionType tab_pos = GTK_POS_TOP;
+gint tab_width_chars = 20;
+gchar *user_agent = NULL;
 
 
 void
-client_destroy(GtkWidget *obj, gpointer data)
+client_destroy(GtkWidget *widget, gpointer data)
 {
     struct Client *c = (struct Client *)data;
+    gint idx;
 
     g_signal_handlers_disconnect_by_func(G_OBJECT(c->web_view),
                                          changed_load_progress, c);
 
+    idx = gtk_notebook_page_num(GTK_NOTEBOOK(mw.notebook), c->vbox);
+    if (idx == -1)
+        fprintf(stderr, __NAME__": Tab index was -1, bamboozled\n");
+    else
+        gtk_notebook_remove_page(GTK_NOTEBOOK(mw.notebook), idx);
+
     free(c);
     clients--;
 
-    if (clients == 0)
-        gtk_main_quit();
-}
-
-gboolean
-client_destroy_request(WebKitWebView *web_view, gpointer data)
-{
-    struct Client *c = (struct Client *)data;
-
-    gtk_widget_destroy(c->win);
-
-    return TRUE;
+    quit_if_nothing_active();
 }
 
 WebKitWebView *
-client_new(const gchar *uri)
+client_new(const gchar *uri, WebKitWebView *related_wv, gboolean show,
+           gboolean focus_tab)
 {
     struct Client *c;
-    WebKitWebContext *wc;
     gchar *f;
+    GtkWidget *evbox, *tabbox;
 
     if (uri != NULL && cooperative_instances && !cooperative_alone)
     {
-        write(cooperative_pipe_fp, uri, strlen(uri));
+        f = ensure_uri_scheme(uri);
+        write(cooperative_pipe_fp, f, strlen(f));
         write(cooperative_pipe_fp, "\n", 1);
+        g_free(f);
         return NULL;
     }
 
-    c = malloc(sizeof(struct Client));
+    c = calloc(1, sizeof(struct Client));
     if (!c)
     {
-        fprintf(stderr, __NAME__": fatal: malloc failed\n");
+        fprintf(stderr, __NAME__": fatal: calloc failed\n");
         exit(EXIT_FAILURE);
     }
 
-    c->hover_uri = NULL;
-    c->win = NULL;
-    if (embed != 0)
-    {
-        c->win = gtk_plug_new(embed);
-        if (!gtk_plug_get_embedded(GTK_PLUG(c->win)))
-        {
-            fprintf(stderr, __NAME__": Can't plug-in to XID %ld.\n", embed);
-            gtk_widget_destroy(c->win);
-            c->win = NULL;
-            embed = 0;
-        }
-    }
-
-    if (c->win == NULL)
-    {
-        c->win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-        gtk_window_set_wmclass(GTK_WINDOW(c->win), __NAME__, __NAME_CAPITALIZED__);
-    }
-
-    gtk_window_set_default_size(GTK_WINDOW(c->win), 800, 600);
+    c->focus_new_tab = focus_tab;
 
-    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();
-    wc = webkit_web_view_get_context(WEBKIT_WEB_VIEW(c->web_view));
+    if (related_wv == NULL)
+        c->web_view = webkit_web_view_new();
+    else
+        c->web_view = webkit_web_view_new_with_related_view(related_wv);
 
     webkit_web_view_set_zoom_level(WEBKIT_WEB_VIEW(c->web_view), global_zoom);
+    g_signal_connect(G_OBJECT(c->web_view), "notify::favicon",
+                     G_CALLBACK(changed_favicon), c);
     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",
@@ -165,12 +163,12 @@ client_new(const gchar *uri)
     g_signal_connect(G_OBJECT(c->web_view), "create",
                      G_CALLBACK(client_new_request), NULL);
     g_signal_connect(G_OBJECT(c->web_view), "close",
-                     G_CALLBACK(client_destroy_request), c);
+                     G_CALLBACK(client_destroy), 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_signal_connect(G_OBJECT(c->web_view), "button-release-event",
                      G_CALLBACK(key_web_view), c);
     g_signal_connect(G_OBJECT(c->web_view), "scroll-event",
                      G_CALLBACK(key_web_view), c);
@@ -179,45 +177,73 @@ client_new(const gchar *uri)
     g_signal_connect(G_OBJECT(c->web_view), "web-process-crashed",
                      G_CALLBACK(crashed_web_view), c);
 
-    if (!initial_wc_setup_done)
-    {
-        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);
 
+    if (enable_console_to_stdout)
+        webkit_settings_set_enable_write_console_messages_to_stdout(webkit_web_view_get_settings(WEBKIT_WEB_VIEW(c->web_view)), TRUE);
+
+    webkit_settings_set_enable_developer_extras(webkit_web_view_get_settings(WEBKIT_WEB_VIEW(c->web_view)), TRUE);
+
     c->location = gtk_entry_new();
     g_signal_connect(G_OBJECT(c->location), "key-press-event",
                      G_CALLBACK(key_location), c);
-
-    /* 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->top_box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
-    gtk_box_pack_start(GTK_BOX(c->top_box), c->location, TRUE, TRUE, 0);
-    gtk_box_pack_start(GTK_BOX(c->top_box), c->progress, FALSE, FALSE, 0);
+    g_signal_connect(G_OBJECT(c->location), "icon-release",
+                     G_CALLBACK(icon_location), c);
+    /* XXX This is a workaround. Setting this to NULL (which is done in
+     * grab_feeds_finished() if no feed has been detected) adds a little
+     * padding left of the text. Not sure why. The point of this call
+     * right here is to have that padding right from the start. This
+     * avoids a graphical artifact. */
+    gtk_entry_set_icon_from_icon_name(GTK_ENTRY(c->location),
+                                      GTK_ENTRY_ICON_PRIMARY,
+                                      NULL);
 
     c->vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
-    gtk_box_pack_start(GTK_BOX(c->vbox), c->top_box, FALSE, FALSE, 0);
+    gtk_box_pack_start(GTK_BOX(c->vbox), c->location, FALSE, FALSE, 0);
     gtk_box_pack_start(GTK_BOX(c->vbox), c->web_view, TRUE, TRUE, 0);
 
-    gtk_container_add(GTK_CONTAINER(c->win), c->vbox);
+    c->tabicon = gtk_image_new_from_icon_name("text-html", GTK_ICON_SIZE_SMALL_TOOLBAR);
+
+    c->tablabel = gtk_label_new(__NAME__);
+    gtk_label_set_ellipsize(GTK_LABEL(c->tablabel), PANGO_ELLIPSIZE_END);
+    gtk_label_set_width_chars(GTK_LABEL(c->tablabel), tab_width_chars);
+    gtk_widget_set_has_tooltip(c->tablabel, TRUE);
+
+    /* XXX I don't own a HiDPI screen, so I don't know if scale_factor
+     * does the right thing. */
+    tabbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL,
+                         5 * gtk_widget_get_scale_factor(mw.win));
+    gtk_box_pack_start(GTK_BOX(tabbox), c->tabicon, FALSE, FALSE, 0);
+    gtk_box_pack_start(GTK_BOX(tabbox), c->tablabel, TRUE, TRUE, 0);
+
+    evbox = gtk_event_box_new();
+    gtk_container_add(GTK_CONTAINER(evbox), tabbox);
+    g_signal_connect(G_OBJECT(evbox), "button-release-event",
+                     G_CALLBACK(key_tablabel), c);
+
+    gtk_widget_add_events(evbox, GDK_SCROLL_MASK);
+    g_signal_connect(G_OBJECT(evbox), "scroll-event",
+                     G_CALLBACK(key_tablabel), c);
 
-    gtk_widget_grab_focus(c->web_view);
-    gtk_widget_show_all(c->win);
+    /* For easy access, store a reference to our label. */
+    g_object_set_data(G_OBJECT(evbox), "lariza-tab-label", c->tablabel);
+
+    /* This only shows the event box and the label inside, nothing else.
+     * Needed because the evbox/label is "internal" to the notebook and
+     * not part of the normal "widget tree" (IIUC). */
+    gtk_widget_show_all(evbox);
+
+    gtk_notebook_insert_page(GTK_NOTEBOOK(mw.notebook), c->vbox, evbox,
+                             gtk_notebook_get_current_page(GTK_NOTEBOOK(mw.notebook)) + 1);
+    gtk_notebook_set_tab_reorderable(GTK_NOTEBOOK(mw.notebook), c->vbox, TRUE);
+
+    if (show)
+        show_web_view(NULL, c);
+    else
+        g_signal_connect(G_OBJECT(c->web_view), "ready-to-show",
+                         G_CALLBACK(show_web_view), c);
 
     if (uri != NULL)
     {
@@ -235,7 +261,7 @@ WebKitWebView *
 client_new_request(WebKitWebView *web_view,
                    WebKitNavigationAction *navigation_action, gpointer data)
 {
-    return client_new(NULL);
+    return client_new(NULL, web_view, FALSE, FALSE);
 }
 
 void
@@ -283,7 +309,10 @@ changed_download_progress(GObject *obj, GParamSpec *pspec, gpointer data)
     const gchar *uri;
     gchar *t, *filename, *base;
 
-    p = webkit_download_get_estimated_progress(download) * 100;
+    p = webkit_download_get_estimated_progress(download);
+    p = p > 1 ? 1 : p;
+    p = p < 0 ? 0 : p;
+    p *= 100;
     resp = webkit_download_get_response(download);
     size_mb = webkit_uri_response_get_content_length(resp) / 1e6;
 
@@ -313,19 +342,97 @@ changed_load_progress(GObject *obj, GParamSpec *pspec, gpointer data)
 {
     struct Client *c = (struct Client *)data;
     gdouble p;
+    gchar *grab_feeds =
+        "a = document.querySelectorAll('"
+        "    html > head > link[rel=\"alternate\"][href][type=\"application/atom+xml\"],"
+        "    html > head > link[rel=\"alternate\"][href][type=\"application/rss+xml\"]"
+        "');"
+        "if (a.length == 0)"
+        "    null;"
+        "else"
+        "{"
+        "    out = '';"
+        "    for (i = 0; i < a.length; i++)"
+        "    {"
+        "        url = encodeURIComponent(a[i].href);"
+        "        if ('title' in a[i] && a[i].title != '')"
+        "            title = encodeURIComponent(a[i].title);"
+        "        else"
+        "            title = url;"
+        "        out += '<li><a href=\"' + url + '\">' + title + '</a></li>';"
+        "    }"
+        "    out;"
+        "}";
 
     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);
+    if (p == 1)
+    {
+        p = 0;
+
+        /* The page has loaded fully. We now run the short JavaScript
+         * snippet above that operates on the DOM. It tries to grab all
+         * occurences of <link rel="alternate" ...>, i.e. RSS/Atom feed
+         * references. */
+        webkit_web_view_run_javascript(WEBKIT_WEB_VIEW(c->web_view),
+                                       grab_feeds, NULL,
+                                       grab_feeds_finished, c);
+
+        run_user_scripts(WEBKIT_WEB_VIEW(c->web_view));
+    }
+    gtk_entry_set_progress_fraction(GTK_ENTRY(c->location), p);
+}
+
+void
+changed_favicon(GObject *obj, GParamSpec *pspec, gpointer data)
+{
+    struct Client *c = (struct Client *)data;
+    cairo_surface_t *f;
+    int w, h, w_should, h_should;
+    GdkPixbuf *pb, *pb_scaled;
+
+    f = webkit_web_view_get_favicon(WEBKIT_WEB_VIEW(c->web_view));
+    if (f == NULL)
+    {
+        gtk_image_set_from_icon_name(GTK_IMAGE(c->tabicon), "text-html",
+                                     GTK_ICON_SIZE_SMALL_TOOLBAR);
+    }
+    else
+    {
+        w = cairo_image_surface_get_width(f);
+        h = cairo_image_surface_get_height(f);
+        pb = gdk_pixbuf_get_from_surface(f, 0, 0, w, h);
+        if (pb != NULL)
+        {
+            w_should = 16 * gtk_widget_get_scale_factor(c->tabicon);
+            h_should = 16 * gtk_widget_get_scale_factor(c->tabicon);
+            pb_scaled = gdk_pixbuf_scale_simple(pb, w_should, h_should,
+                                                GDK_INTERP_BILINEAR);
+            gtk_image_set_from_pixbuf(GTK_IMAGE(c->tabicon), pb_scaled);
+
+            g_object_unref(pb_scaled);
+            g_object_unref(pb);
+        }
+    }
 }
 
 void
 changed_title(GObject *obj, GParamSpec *pspec, gpointer data)
 {
-    const gchar *t;
+    const gchar *t, *u;
     struct Client *c = (struct Client *)data;
 
+    u = webkit_web_view_get_uri(WEBKIT_WEB_VIEW(c->web_view));
     t = webkit_web_view_get_title(WEBKIT_WEB_VIEW(c->web_view));
-    gtk_window_set_title(GTK_WINDOW(c->win), (t == NULL ? __NAME__ : t));
+
+    u = u == NULL ? __NAME__ : u;
+    u = u[0] == 0 ? __NAME__ : u;
+
+    t = t == NULL ? u : t;
+    t = t[0] == 0 ? u : t;
+
+    gtk_label_set_text(GTK_LABEL(c->tablabel), t);
+    gtk_widget_set_tooltip_text(c->tablabel, t);
+    mainwindow_title(gtk_notebook_get_current_page(GTK_NOTEBOOK(mw.notebook)));
 }
 
 void
@@ -333,32 +440,44 @@ changed_uri(GObject *obj, GParamSpec *pspec, gpointer data)
 {
     const gchar *t;
     struct Client *c = (struct Client *)data;
+    FILE *fp;
 
     t = webkit_web_view_get_uri(WEBKIT_WEB_VIEW(c->web_view));
-    gtk_entry_set_text(GTK_ENTRY(c->location), (t == NULL ? __NAME__ : t));
-}
 
-gboolean
-crashed_web_view(WebKitWebView *web_view, gpointer data)
-{
-    fprintf(stderr, __NAME__": WebView crashed!\n");
-    if (crash_autoreload_delay >= 1)
+    /* When a web process crashes, we get a "notify::uri" signal, but we
+     * can no longer read a meaningful URI. It's just an empty string
+     * now. Not updating the location bar in this scenario is important,
+     * because we would override the "WEB PROCESS CRASHED" message. */
+    if (t != NULL && strlen(t) > 0)
     {
-        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);
-    }
+        gtk_entry_set_text(GTK_ENTRY(c->location), t);
 
-    return TRUE;
+        if (history_file != NULL)
+        {
+            fp = fopen(history_file, "a");
+            if (fp != NULL)
+            {
+                fprintf(fp, "%s\n", t);
+                fclose(fp);
+            }
+            else
+                perror(__NAME__": Error opening history file");
+        }
+    }
 }
 
 gboolean
-crashed_web_view_reload(gpointer data)
+crashed_web_view(WebKitWebView *web_view, gpointer data)
 {
-    webkit_web_view_reload_bypass_cache(WEBKIT_WEB_VIEW(data));
+    gchar *t;
+    struct Client *c = (struct Client *)data;
+
+    t = g_strdup_printf("WEB PROCESS CRASHED: %s",
+                        webkit_web_view_get_uri(WEBKIT_WEB_VIEW(web_view)));
+    gtk_entry_set_text(GTK_ENTRY(c->location), t);
+    g_free(t);
 
-    return G_SOURCE_REMOVE;
+    return TRUE;
 }
 
 gboolean
@@ -383,6 +502,12 @@ decide_policy(WebKitWebView *web_view, WebKitPolicyDecision *decision,
     return TRUE;
 }
 
+void
+download_handle_finished(WebKitDownload *download, gpointer data)
+{
+    downloads--;
+}
+
 void
 download_handle_start(WebKitWebView *web_view, WebKitDownload *download,
                       gpointer data)
@@ -434,6 +559,10 @@ download_handle(WebKitDownload *download, gchar *suggested_filename, gpointer da
         g_signal_connect(G_OBJECT(download), "notify::estimated-progress",
                          G_CALLBACK(changed_download_progress), tb);
 
+        downloads++;
+        g_signal_connect(G_OBJECT(download), "finished",
+                         G_CALLBACK(download_handle_finished), NULL);
+
         g_object_ref(download);
         g_signal_connect(G_OBJECT(tb), "clicked",
                          G_CALLBACK(downloadmanager_cancel), download);
@@ -458,6 +587,15 @@ downloadmanager_cancel(GtkToolButton *tb, gpointer data)
     gtk_widget_destroy(GTK_WIDGET(tb));
 }
 
+gboolean
+downloadmanager_delete(GtkWidget *obj, gpointer data)
+{
+    if (!quit_if_nothing_active())
+        gtk_widget_hide(dm.win);
+
+    return TRUE;
+}
+
 void
 downloadmanager_setup(void)
 {
@@ -466,7 +604,7 @@ downloadmanager_setup(void)
     gtk_window_set_default_size(GTK_WINDOW(dm.win), 500, 250);
     gtk_window_set_title(GTK_WINDOW(dm.win), __NAME__" - Download Manager");
     g_signal_connect(G_OBJECT(dm.win), "delete-event",
-                     G_CALLBACK(gtk_widget_hide_on_delete), NULL);
+                     G_CALLBACK(downloadmanager_delete), NULL);
     g_signal_connect(G_OBJECT(dm.win), "key-press-event",
                      G_CALLBACK(key_downloadmanager), NULL);
 
@@ -487,16 +625,25 @@ downloadmanager_setup(void)
 gchar *
 ensure_uri_scheme(const gchar *t)
 {
-    gchar *f;
+    gchar *f, *fabs;
 
     f = g_ascii_strdown(t, -1);
     if (!g_str_has_prefix(f, "http:") &&
         !g_str_has_prefix(f, "https:") &&
         !g_str_has_prefix(f, "file:") &&
-        !g_str_has_prefix(f, "about:"))
+        !g_str_has_prefix(f, "about:") &&
+        !g_str_has_prefix(f, "data:") &&
+        !g_str_has_prefix(f, "webkit:"))
     {
         g_free(f);
-        f = g_strdup_printf("http://%s", t);
+        fabs = realpath(t, NULL);
+        if (fabs != NULL)
+        {
+            f = g_strdup_printf("file://%s", fabs);
+            free(fabs);
+        }
+        else
+            f = g_strdup_printf("http://%s", t);
         return f;
     }
     else
@@ -512,22 +659,43 @@ grab_environment_configuration(void)
     if (e != NULL)
         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)
         download_dir = g_strdup(e);
 
+    e = g_getenv(__NAME_UPPERCASE__"_ENABLE_CONSOLE_TO_STDOUT");
+    if (e != NULL)
+        enable_console_to_stdout = TRUE;
+
     e = g_getenv(__NAME_UPPERCASE__"_FIFO_SUFFIX");
     if (e != NULL)
         fifo_suffix = g_strdup(e);
 
+    e = g_getenv(__NAME_UPPERCASE__"_HISTORY_FILE");
+    if (e != NULL)
+        history_file = g_strdup(e);
+
     e = g_getenv(__NAME_UPPERCASE__"_HOME_URI");
     if (e != NULL)
         home_uri = g_strdup(e);
 
+    e = g_getenv(__NAME_UPPERCASE__"_TAB_POS");
+    if (e != NULL)
+    {
+        if (strcmp(e, "top") == 0)
+            tab_pos = GTK_POS_TOP;
+        if (strcmp(e, "right") == 0)
+            tab_pos = GTK_POS_RIGHT;
+        if (strcmp(e, "bottom") == 0)
+            tab_pos = GTK_POS_BOTTOM;
+        if (strcmp(e, "left") == 0)
+            tab_pos = GTK_POS_LEFT;
+    }
+
+    e = g_getenv(__NAME_UPPERCASE__"_TAB_WIDTH_CHARS");
+    if (e != NULL)
+        tab_width_chars = atoi(e);
+
     e = g_getenv(__NAME_UPPERCASE__"_USER_AGENT");
     if (e != NULL)
         user_agent = g_strdup(e);
@@ -537,6 +705,63 @@ grab_environment_configuration(void)
         global_zoom = atof(e);
 }
 
+void
+grab_feeds_finished(GObject *object, GAsyncResult *result, gpointer data)
+{
+    struct Client *c = (struct Client *)data;
+    WebKitJavascriptResult *js_result;
+    JSCValue *value;
+    JSCException *exception;
+    GError *err = NULL;
+    gchar *str_value;
+
+    g_free(c->feed_html);
+    c->feed_html = NULL;
+
+    /* This was taken almost verbatim from the example in WebKit's
+     * documentation:
+     *
+     * https://webkitgtk.org/reference/webkit2gtk/stable/WebKitWebView.html#webkit-web-view-run-javascript-finish */
+
+    js_result = webkit_web_view_run_javascript_finish(WEBKIT_WEB_VIEW(object),
+                                                      result, &err);
+    if (!js_result)
+    {
+        fprintf(stderr, __NAME__": Error running javascript: %s\n", err->message);
+        g_error_free(err);
+        return;
+    }
+
+    value = webkit_javascript_result_get_js_value(js_result);
+    if (jsc_value_is_string(value))
+    {
+        str_value = jsc_value_to_string(value);
+        exception = jsc_context_get_exception(jsc_value_get_context(value));
+        if (exception != NULL)
+        {
+            fprintf(stderr, __NAME__": Error running javascript: %s\n",
+                    jsc_exception_get_message(exception));
+        }
+        else
+            c->feed_html = str_value;
+
+        gtk_entry_set_icon_from_icon_name(GTK_ENTRY(c->location),
+                                          GTK_ENTRY_ICON_PRIMARY,
+                                          "application-rss+xml-symbolic");
+        gtk_entry_set_icon_activatable(GTK_ENTRY(c->location),
+                                       GTK_ENTRY_ICON_PRIMARY,
+                                       TRUE);
+    }
+    else
+    {
+        gtk_entry_set_icon_from_icon_name(GTK_ENTRY(c->location),
+                                          GTK_ENTRY_ICON_PRIMARY,
+                                          NULL);
+    }
+
+    webkit_javascript_result_unref(js_result);
+}
+
 void
 hover_web_view(WebKitWebView *web_view, WebKitHitTestResult *ht, guint modifiers,
                gpointer data)
@@ -566,99 +791,87 @@ hover_web_view(WebKitWebView *web_view, WebKitHitTestResult *ht, guint modifiers
     }
 }
 
-gboolean
-key_downloadmanager(GtkWidget *widget, GdkEvent *event, gpointer data)
+void
+icon_location(GtkEntry *entry, GtkEntryIconPosition icon_pos, GdkEvent *event,
+              gpointer data)
 {
-    if (event->type == GDK_KEY_PRESS)
+    struct Client *c = (struct Client *)data;
+    gchar *d;
+    gchar *data_template =
+        "data:text/html,"
+        "<!DOCTYPE html>"
+        "<html>"
+        "    <head>"
+        "        <meta charset=\"UTF-8\">"
+        "        <title>Feeds</title>"
+        "    </head>"
+        "    <body>"
+        "        <p>Feeds found on this page:</p>"
+        "        <ul>"
+        "        %s"
+        "        </ul>"
+        "    </body>"
+        "</html>";
+
+    if (c->feed_html != NULL)
     {
-        if (((GdkEventKey *)event)->state & GDK_MOD1_MASK)
-        {
-            switch (((GdkEventKey *)event)->keyval)
-            {
-                case GDK_KEY_d:  /* close window (left hand) */
-                    gtk_widget_hide(dm.win);
-                    return TRUE;
-            }
-        }
+        /* What we're actually trying to do is show a simple HTML page
+         * that lists all the feeds on the current page. The function
+         * webkit_web_view_load_html() looks like the proper way to do
+         * that. Sad thing is, it doesn't create a history entry, but
+         * instead simply replaces the content of the current page. This
+         * is not what we want.
+         *
+         * RFC 2397 [0] defines the data URI scheme [1]. We abuse this
+         * mechanism to show my custom HTML snippet *and* create a
+         * history entry.
+         *
+         * [0]: https://tools.ietf.org/html/rfc2397
+         * [1]: https://en.wikipedia.org/wiki/Data_URI_scheme */
+        d = g_strdup_printf(data_template, c->feed_html);
+        webkit_web_view_load_uri(WEBKIT_WEB_VIEW(c->web_view), d);
+        g_free(d);
     }
-
-    return FALSE;
 }
 
-gboolean
-key_location(GtkWidget *widget, GdkEvent *event, gpointer data)
+void
+init_default_web_context(void)
 {
-    struct Client *c = (struct Client *)data;
-    const gchar *t;
-    gchar *f;
-    WebKitWebContext *wc = webkit_web_view_get_context(WEBKIT_WEB_VIEW(c->web_view));
+    gchar *p;
+    WebKitWebContext *wc;
 
-    if (event->type == GDK_KEY_PRESS)
-    {
-        if (((GdkEventKey *)event)->state & GDK_MOD1_MASK)
-        {
-            switch (((GdkEventKey *)event)->keyval)
-            {
-                case GDK_KEY_q:  /* close window (left hand) */
-                    gtk_widget_destroy(c->win);
-                    return TRUE;
-                case GDK_KEY_d:  /* download manager (left hand) */
-                    gtk_widget_show_all(dm.win);
-                    return TRUE;
-                case GDK_KEY_r:  /* reload (left hand) */
-                    webkit_web_view_reload_bypass_cache(WEBKIT_WEB_VIEW(
-                                                        c->web_view));
-                    return TRUE;
-                case GDK_KEY_k:  /* initiate search (BOTH hands) */
-                    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
-        {
-            switch (((GdkEventKey *)event)->keyval)
-            {
-                case GDK_KEY_Return:
-                    gtk_widget_grab_focus(c->web_view);
-                    t = gtk_entry_get_text(GTK_ENTRY(c->location));
-                    if (t != NULL && t[0] == '/')
-                    {
-                        if (search_text != NULL)
-                            g_free(search_text);
-                        search_text = g_strdup(t + 1);  /* XXX whacky */
-                        search(c, 0);
-                    }
-                    else if (!keywords_try_search(WEBKIT_WEB_VIEW(c->web_view), t))
-                    {
-                        f = ensure_uri_scheme(t);
-                        webkit_web_view_load_uri(WEBKIT_WEB_VIEW(c->web_view), f);
-                        g_free(f);
-                    }
-                    return TRUE;
-                case GDK_KEY_Escape:
-                    t = webkit_web_view_get_uri(WEBKIT_WEB_VIEW(c->web_view));
-                    gtk_entry_set_text(GTK_ENTRY(c->location),
-                                       (t == NULL ? __NAME__ : t));
-                    return TRUE;
-            }
-        }
-    }
+    wc = webkit_web_context_get_default();
 
-    return FALSE;
+    p = g_build_filename(g_get_user_config_dir(), __NAME__, "adblock.black", NULL);
+    webkit_web_context_set_sandbox_enabled(wc, TRUE);
+    webkit_web_context_add_path_to_sandbox(wc, p, TRUE);
+    g_free(p);
+
+    webkit_web_context_set_process_model(wc,
+        WEBKIT_PROCESS_MODEL_MULTIPLE_SECONDARY_PROCESSES);
+
+    p = g_build_filename(g_get_user_config_dir(), __NAME__, "web_extensions",
+                         NULL);
+    webkit_web_context_set_web_extensions_directory(wc, p);
+    g_free(p);
+
+    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);
+
+    webkit_web_context_set_favicon_database_directory(wc, NULL);
 }
 
 gboolean
-key_web_view(GtkWidget *widget, GdkEvent *event, gpointer data)
+key_common(GtkWidget *widget, GdkEvent *event, gpointer data)
 {
     struct Client *c = (struct Client *)data;
-    gdouble dx, dy;
-    gchar *f;
-    gfloat z;
     WebKitWebContext *wc = webkit_web_view_get_context(WEBKIT_WEB_VIEW(c->web_view));
+    gchar *f;
 
     if (event->type == GDK_KEY_PRESS)
     {
@@ -667,7 +880,7 @@ key_web_view(GtkWidget *widget, GdkEvent *event, gpointer data)
             switch (((GdkEventKey *)event)->keyval)
             {
                 case GDK_KEY_q:  /* close window (left hand) */
-                    gtk_widget_destroy(c->win);
+                    client_destroy(NULL, c);
                     return TRUE;
                 case GDK_KEY_w:  /* home (left hand) */
                     f = ensure_uri_scheme(home_uri);
@@ -676,7 +889,7 @@ key_web_view(GtkWidget *widget, GdkEvent *event, gpointer data)
                     return TRUE;
                 case GDK_KEY_e:  /* new tab (left hand) */
                     f = ensure_uri_scheme(home_uri);
-                    client_new(f);
+                    client_new(f, NULL, TRUE, TRUE);
                     g_free(f);
                     return TRUE;
                 case GDK_KEY_r:  /* reload (left hand) */
@@ -698,28 +911,159 @@ key_web_view(GtkWidget *widget, GdkEvent *event, gpointer data)
                     return TRUE;
                 case GDK_KEY_k:  /* initiate search (BOTH hands) */
                     gtk_widget_grab_focus(c->location);
-                    gtk_entry_set_text(GTK_ENTRY(c->location), "/");
+                    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;
+                case GDK_KEY_a:  /* go one tab to the left (left hand) */
+                    gtk_notebook_prev_page(GTK_NOTEBOOK(mw.notebook));
+                    return TRUE;
+                case GDK_KEY_s:  /* go one tab to the right (left hand) */
+                    gtk_notebook_next_page(GTK_NOTEBOOK(mw.notebook));
+                    return TRUE;
             }
         }
-        else if (((GdkEventKey *)event)->keyval == GDK_KEY_Escape)
+        /* navigate backward (left hand) */
+        else if (((GdkEventKey *)event)->keyval == GDK_KEY_F2)
+        {
+            webkit_web_view_go_back(WEBKIT_WEB_VIEW(c->web_view));
+            return TRUE;
+        }
+        /* navigate forward (left hand) */
+        else if (((GdkEventKey *)event)->keyval == GDK_KEY_F3)
+        {
+            webkit_web_view_go_forward(WEBKIT_WEB_VIEW(c->web_view));
+            return TRUE;
+        }
+    }
+
+    return FALSE;
+}
+
+gboolean
+key_downloadmanager(GtkWidget *widget, GdkEvent *event, gpointer data)
+{
+    if (event->type == GDK_KEY_PRESS)
+    {
+        if (((GdkEventKey *)event)->state & GDK_MOD1_MASK)
+        {
+            switch (((GdkEventKey *)event)->keyval)
+            {
+                case GDK_KEY_d:  /* close window (left hand) */
+                case GDK_KEY_q:
+                    downloadmanager_delete(dm.win, NULL);
+                    return TRUE;
+            }
+        }
+    }
+
+    return FALSE;
+}
+
+gboolean
+key_location(GtkWidget *widget, GdkEvent *event, gpointer data)
+{
+    struct Client *c = (struct Client *)data;
+    const gchar *t;
+    gchar *f;
+
+    if (key_common(widget, event, data))
+        return TRUE;
+
+    if (event->type == GDK_KEY_PRESS)
+    {
+        switch (((GdkEventKey *)event)->keyval)
+        {
+            case GDK_KEY_KP_Enter:
+            case GDK_KEY_Return:
+                gtk_widget_grab_focus(c->web_view);
+                t = gtk_entry_get_text(GTK_ENTRY(c->location));
+                if (t != NULL && t[0] == ':' && t[1] == '/')
+                {
+                    if (search_text != NULL)
+                        g_free(search_text);
+                    search_text = g_strdup(t + 2);
+                    search(c, 0);
+                }
+                else
+                {
+                    f = ensure_uri_scheme(t);
+                    webkit_web_view_load_uri(WEBKIT_WEB_VIEW(c->web_view), f);
+                    g_free(f);
+                }
+                return TRUE;
+            case GDK_KEY_Escape:
+                t = webkit_web_view_get_uri(WEBKIT_WEB_VIEW(c->web_view));
+                gtk_entry_set_text(GTK_ENTRY(c->location),
+                                   (t == NULL ? __NAME__ : t));
+                return TRUE;
+        }
+    }
+
+    return FALSE;
+}
+
+gboolean
+key_tablabel(GtkWidget *widget, GdkEvent *event, gpointer data)
+{
+    GdkScrollDirection direction;
+
+    if (event->type == GDK_BUTTON_RELEASE)
+    {
+        switch (((GdkEventButton *)event)->button)
+        {
+            case 2:
+                client_destroy(NULL, data);
+                return TRUE;
+        }
+    }
+    else if (event->type == GDK_SCROLL)
+    {
+        gdk_event_get_scroll_direction(event, &direction);
+        switch (direction)
+        {
+            case GDK_SCROLL_UP:
+                gtk_notebook_prev_page(GTK_NOTEBOOK(mw.notebook));
+                break;
+            case GDK_SCROLL_DOWN:
+                gtk_notebook_next_page(GTK_NOTEBOOK(mw.notebook));
+                break;
+            default:
+                break;
+        }
+        return TRUE;
+    }
+    return FALSE;
+}
+
+gboolean
+key_web_view(GtkWidget *widget, GdkEvent *event, gpointer data)
+{
+    struct Client *c = (struct Client *)data;
+    gdouble dx, dy;
+    gfloat z;
+
+    if (key_common(widget, event, data))
+        return TRUE;
+
+    if (event->type == GDK_KEY_PRESS)
+    {
+        if (((GdkEventKey *)event)->keyval == GDK_KEY_Escape)
         {
             webkit_web_view_stop_loading(WEBKIT_WEB_VIEW(c->web_view));
-            gtk_level_bar_set_value(GTK_LEVEL_BAR(c->progress), 0);
+            gtk_entry_set_progress_fraction(GTK_ENTRY(c->location), 0);
         }
     }
-    else if (event->type == GDK_BUTTON_PRESS)
+    else if (event->type == GDK_BUTTON_RELEASE)
     {
         switch (((GdkEventButton *)event)->button)
         {
             case 2:
                 if (c->hover_uri != NULL)
                 {
-                    client_new(c->hover_uri);
+                    client_new(c->hover_uri, NULL, TRUE, FALSE);
                     return TRUE;
                 }
                 break;
@@ -749,61 +1093,58 @@ key_web_view(GtkWidget *widget, GdkEvent *event, gpointer data)
 }
 
 void
-keywords_load(void)
+mainwindow_setup(void)
 {
-    GError *err = NULL;
-    GIOChannel *channel = NULL;
-    gchar *path = NULL, *buf = NULL;
-    gchar **tokens = NULL;
+    mw.win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+    gtk_window_set_default_size(GTK_WINDOW(mw.win), 800, 600);
+    g_signal_connect(G_OBJECT(mw.win), "destroy", gtk_main_quit, NULL);
+    gtk_window_set_title(GTK_WINDOW(mw.win), __NAME__);
+
+    mw.notebook = gtk_notebook_new();
+    gtk_notebook_set_scrollable(GTK_NOTEBOOK(mw.notebook), TRUE);
+    gtk_notebook_set_tab_pos(GTK_NOTEBOOK(mw.notebook), tab_pos);
+    gtk_container_add(GTK_CONTAINER(mw.win), mw.notebook);
+    g_signal_connect(G_OBJECT(mw.notebook), "switch-page",
+                     G_CALLBACK(notebook_switch_page), NULL);
+}
 
-    keywords = g_hash_table_new(g_str_hash, g_str_equal);
+void
+mainwindow_title(gint idx)
+{
+    GtkWidget *child, *widg, *tablabel;
+    const gchar *text;
 
-    path = g_build_filename(g_get_user_config_dir(), __NAME__, "keywordsearch",
-                            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] != '#')
-            {
-                tokens = g_strsplit(buf, " ", 2);
-                if (tokens[0] != NULL && tokens[1] != NULL)
-                    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_free(path);
+    child = gtk_notebook_get_nth_page(GTK_NOTEBOOK(mw.notebook), idx);
+    if (child == NULL)
+        return;
+
+    widg = gtk_notebook_get_tab_label(GTK_NOTEBOOK(mw.notebook), child);
+    tablabel = (GtkWidget *)g_object_get_data(G_OBJECT(widg), "lariza-tab-label");
+    text = gtk_label_get_text(GTK_LABEL(tablabel));
+    gtk_window_set_title(GTK_WINDOW(mw.win), text);
 }
 
-gboolean
-keywords_try_search(WebKitWebView *web_view, const gchar *t)
+void
+notebook_switch_page(GtkNotebook *nb, GtkWidget *p, guint idx, gpointer data)
 {
-    gboolean ret = FALSE;
-    gchar **tokens = NULL;
-    gchar *val = NULL, *uri = NULL;
+    mainwindow_title(idx);
+}
 
-    tokens = g_strsplit(t, " ", 2);
-    if (tokens[0] != NULL && tokens[1] != NULL)
+gboolean
+quit_if_nothing_active(void)
+{
+    if (clients == 0)
     {
-        val = g_hash_table_lookup(keywords, tokens[0]);
-        if (val != NULL)
+        if (downloads == 0)
         {
-            uri = g_strdup_printf((gchar *)val, tokens[1]);
-            webkit_web_view_load_uri(web_view, uri);
-            g_free(uri);
-            ret = TRUE;
+            gtk_main_quit();
+            return TRUE;
         }
+        else
+            gtk_widget_show_all(dm.win);
     }
-    g_strfreev(tokens);
 
-    return ret;
+    return FALSE;
 }
 
 gboolean
@@ -815,12 +1156,42 @@ remote_msg(GIOChannel *channel, GIOCondition condition, gpointer data)
     if (uri)
     {
         g_strstrip(uri);
-        client_new(uri);
+        client_new(uri, NULL, TRUE, TRUE);
         g_free(uri);
     }
     return TRUE;
 }
 
+void
+run_user_scripts(WebKitWebView *web_view)
+{
+    gchar *base = NULL, *path = NULL, *contents = NULL;
+    const gchar *entry = NULL;
+    GDir *scriptdir = NULL;
+
+    base = g_build_filename(g_get_user_config_dir(), __NAME__, "user-scripts", NULL);
+    scriptdir = g_dir_open(base, 0, NULL);
+    if (scriptdir != NULL)
+    {
+        while ((entry = g_dir_read_name(scriptdir)) != NULL)
+        {
+            path = g_build_filename(base, entry, NULL);
+            if (g_str_has_suffix(path, ".js"))
+            {
+                if (g_file_get_contents(path, &contents, NULL, NULL))
+                {
+                    webkit_web_view_run_javascript(web_view, contents, NULL, NULL, NULL);
+                    g_free(contents);
+                }
+            }
+            g_free(path);
+        }
+        g_dir_close(scriptdir);
+    }
+
+    g_free(base);
+}
+
 void
 search(gpointer data, gint direction)
 {
@@ -848,44 +1219,24 @@ search(gpointer data, gint direction)
     }
 }
 
-Window
-tabbed_launch(void)
+void
+show_web_view(WebKitWebView *web_view, gpointer data)
 {
-    gint tabbed_stdout;
-    GIOChannel *tabbed_stdout_channel;
-    GError *err = NULL;
-    gchar *output = NULL;
-    char *argv[] = { "tabbed", "-c", "-d", "-p", "s1", "-n", __NAME__, NULL };
-    Window plug_into;
+    struct Client *c = (struct Client *)data;
+    gint idx;
 
-    if (!g_spawn_async_with_pipes(NULL, argv, NULL, G_SPAWN_SEARCH_PATH, NULL,
-                                  NULL, NULL, NULL, &tabbed_stdout, NULL,
-                                  &err))
-    {
-        fprintf(stderr, __NAME__": Could not launch tabbed: %s\n", err->message);
-        g_error_free(err);
-        return 0;
-    }
+    (void)web_view;
 
-    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)
+    gtk_widget_show_all(mw.win);
+
+    if (c->focus_new_tab)
     {
-        fprintf(stderr, __NAME__": Could not read XID from tabbed\n");
-        return 0;
+        idx = gtk_notebook_page_num(GTK_NOTEBOOK(mw.notebook), c->vbox);
+        if (idx != -1)
+            gtk_notebook_set_current_page(GTK_NOTEBOOK(mw.notebook), idx);
+
+        gtk_widget_grab_focus(c->web_view);
     }
-    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
@@ -919,59 +1270,43 @@ trust_user_certs(WebKitWebContext *wc)
 int
 main(int argc, char **argv)
 {
-    gchar *c;
     int opt, i;
 
     gtk_init(&argc, &argv);
-
     grab_environment_configuration();
 
-    while ((opt = getopt(argc, argv, "e:CT")) != -1)
+    while ((opt = getopt(argc, argv, "C")) != -1)
     {
         switch (opt)
         {
-            case 'e':
-                embed = atol(optarg);
-                tabbed_automagic = FALSE;
-                break;
             case 'C':
                 cooperative_instances = FALSE;
                 break;
-            case 'T':
-                tabbed_automagic = FALSE;
-                break;
             default:
                 fprintf(stderr, "Usage: "__NAME__" [OPTION]... [URI]...\n");
                 exit(EXIT_FAILURE);
         }
     }
 
-    keywords_load();
     if (cooperative_instances)
         cooperation_setup();
-    downloadmanager_setup();
-
-    if (tabbed_automagic && !(cooperative_instances && !cooperative_alone))
-        embed = tabbed_launch();
 
     if (!cooperative_instances || cooperative_alone)
-    {
-        c = g_build_filename(g_get_user_data_dir(), __NAME__, "web_extensions",
-                             NULL);
-        webkit_web_context_set_web_extensions_directory(
-            webkit_web_context_get_default(), c
-        );
-    }
+        init_default_web_context();
+
+    downloadmanager_setup();
+    mainwindow_setup();
 
     if (optind >= argc)
-        client_new(home_uri);
+        client_new(home_uri, NULL, TRUE, TRUE);
     else
     {
         for (i = optind; i < argc; i++)
-            client_new(argv[i]);
+            client_new(argv[i], NULL, TRUE, TRUE);
     }
 
     if (!cooperative_instances || cooperative_alone)
         gtk_main();
+
     exit(EXIT_SUCCESS);
 }