]> git.armaanb.net Git - chorizo.git/blobdiff - browser.c
draft 8
[chorizo.git] / browser.c
index e3bb431c29b67b9d166d65937eab7860c6dca08a..93df003240ee8855f62cad9dbc56c951ae324381 100644 (file)
--- a/browser.c
+++ b/browser.c
+#include <errno.h>
 #include <fcntl.h>
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <libgen.h>
 #include <sys/stat.h>
-#include <sys/types.h>
-
-#include <JavaScriptCore/JavaScript.h>
-#include <gdk/gdkkeysyms.h>
-#include <gio/gio.h>
-#include <gtk/gtk.h>
-#include <gtk/gtkx.h>
+#include <unistd.h>
 #include <webkit2/webkit2.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 *);
-GKeyFile *get_ini(void);
-GKeyFile *config;
-
-struct Client
-{
-       gchar *external_handler_uri;
-       gchar *feed_html;
-       gchar *hover_uri;
-       GtkWidget *location;
-       GtkWidget *tabicon;
-       GtkWidget *tablabel;
-       GtkWidget *vbox;
-       GtkWidget *web_view;
-       gboolean focus_new_tab;
-};
-
-struct MainWindow
+#include "config.h"
+#include "chorizo.h"
+
+struct MainWindow mw;
+struct Configuration cfg;
+gboolean switch_tab;
+
+gint clients = 0;
+
+int cooperative_pipe_fp = 0;
+gchar *fifopath;
+char **closed_tabs;
+size_t num_closed = 0;
+
+gboolean
+isearch_counted_matches(GtkWidget *widget, guint matches, gpointer data)
 {
-       GtkWidget *win;
-       GtkWidget *notebook;
-} mw;
+       struct Client *c = (struct Client *)data;
+       char *text = malloc(12);
+       sprintf(text, "%d matches", matches);
+       gtk_label_set_text(GTK_LABEL(c->isearch_matches), text);
+       free(text);
+       return TRUE;
+}
 
-struct DownloadManager
+gboolean
+quit_if_nothing_active(void)
 {
-       GtkWidget *scroll;
-       GtkWidget *toolbar;
-       GtkWidget *win;
-} dm;
+       if (clients == 0) {
+               if (downloads == 0) {
+                       gtk_main_quit();
+                       return TRUE;
+               } else {
+                       downloadmanager_show();
+               }
+       }
+       return FALSE;
+}
+gboolean
+remote_msg(GIOChannel *channel, GIOCondition condition, gpointer data)
+{
+       gchar *uri = NULL;
+       g_io_channel_read_line(channel, &uri, NULL, NULL, NULL);
+       if (uri) {
+               g_strstrip(uri);
+               client_new(uri, NULL);
+               g_free(uri);
+       }
+       return TRUE;
+}
 
-struct Configuration
+void
+allocfail(void)
 {
-       WebKitCookieAcceptPolicy cookie_policy;
-       const gchar *accepted_language[2];
-       gboolean cooperative_alone;
-       gboolean cooperative_instances;
-       gboolean enable_console_to_stdout;
-       gboolean javascript_disabled;
-       gboolean spellcheck_disabled;
-       gchar *download_dir;
-       gchar *fifo_suffix;
-       gchar *history_file;
-       gchar *home_uri;
-       gchar *search_engine;
-       gchar *spellcheck_language;
-       gchar *user_agent;
-       gdouble global_zoom;
-       gint tab_width_chars;
-} cfg;
-
-gint clients = 0, downloads = 0;
-int cooperative_pipe_fp = 0;
-gchar *search_text;
+       fprintf(stderr, "chorizo: fatal: alloc failed\n");
+       exit(EXIT_FAILURE);
+}
 
 void
 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);
+                                            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");
+               fprintf(stderr, "chorizo: warning: tab index was -1\n");
        else
                gtk_notebook_remove_page(GTK_NOTEBOOK(mw.notebook), idx);
 
-       free(c);
+       if (!cfg.private && WEBKIT_IS_WEB_VIEW(c->web_view)) {
+               const char *uri =
+                       webkit_web_view_get_uri(WEBKIT_WEB_VIEW(c->web_view));
+
+               // TODO: Shift everything left if over certain amount
+               if (uri != NULL) {
+                       num_closed++;
+                       if (num_closed > cfg_max_tabs_closed) {
+                               memmove(closed_tabs, closed_tabs,
+                                       cfg_max_tabs_closed - 1);
+                               num_closed = cfg_max_tabs_closed;
+                       } else {
+                               closed_tabs = realloc(
+                                       closed_tabs,
+                                       num_closed * sizeof(closed_tabs[0]));
+                               if (!closed_tabs) allocfail();
+                       }
+                       closed_tabs[num_closed - 1] = strdup(uri);
+               }
+       }
+
        clients--;
+       free(c);
 
        quit_if_nothing_active();
 }
 
+void
+set_uri(const char *uri, struct Client *c)
+{
+       if (!gtk_widget_is_focus(c->location))
+               gtk_entry_set_text(GTK_ENTRY(c->location),
+                                  (uri != NULL) ? uri : "");
+}
+
 WebKitWebView *
-client_new(const gchar *uri, WebKitWebView *related_wv, gboolean show,
-                                        gboolean focus_tab)
+client_new(const gchar *uri, WebKitWebView *related_wv)
 {
        struct Client *c;
        gchar *f;
        GtkWidget *evbox, *tabbox;
-
-       if (uri != NULL && cfg.cooperative_instances && !cfg.cooperative_alone) {
+       if (uri != NULL && !cfg.noncooperative_instances &&
+           !cfg.cooperative_alone) {
                f = ensure_uri_scheme(uri);
                write(cooperative_pipe_fp, f, strlen(f));
                write(cooperative_pipe_fp, "\n", 1);
                g_free(f);
                return NULL;
        }
-
        c = calloc(1, sizeof(struct Client));
-       if (!c) {
-               fprintf(stderr, __NAME__": fatal: calloc failed\n");
-               exit(EXIT_FAILURE);
-       }
+       if (!c) allocfail();
+
+       if (related_wv == NULL) {
+               WebKitUserContentManager *ucm =
+                       webkit_user_content_manager_new();
+               WebKitUserScript *wkscript;
+               WebKitUserStyleSheet *wkstyle;
+               gchar *path = NULL, *source, *base;
+               const gchar *entry = NULL;
+               GDir *dir = NULL;
+               base = g_build_filename(g_get_user_data_dir(), "chorizo",
+                                       "user-scripts", NULL);
+               dir = g_dir_open(base, 0, NULL);
+               if (dir != NULL) {
+                       while ((entry = g_dir_read_name(dir)) != NULL) {
+                               path = g_build_filename(base, entry, NULL);
+                               if (g_str_has_suffix(path, ".js")) {
+                                       g_file_get_contents(path, &source, NULL,
+                                                           NULL);
+                                       // clang-format off
+                                       wkscript = webkit_user_script_new(
+                                               source,
+                                         WEBKIT_USER_CONTENT_INJECT_ALL_FRAMES,
+                                   WEBKIT_USER_SCRIPT_INJECT_AT_DOCUMENT_START,
+                                               NULL, NULL);
+                                       // clang-format on
+                                       webkit_user_content_manager_add_script(
+                                               ucm, wkscript);
+                                       webkit_user_script_unref(wkscript);
+                               }
+                               g_free(path);
+                               if (source) g_free(source);
+                       }
+                       g_dir_close(dir);
+               }
+               base = g_build_filename(g_get_user_data_dir(), "chorizo",
+                                       "user-styles", NULL);
+               dir = g_dir_open(base, 0, NULL);
+               if (dir != NULL) {
+                       while ((entry = g_dir_read_name(dir)) != NULL) {
+                               path = g_build_filename(base, entry, NULL);
+                               if (g_str_has_suffix(path, ".css")) {
+                                       g_file_get_contents(path, &source, NULL,
+                                                           NULL);
+                                       // clang-format off
+                                       wkstyle = webkit_user_style_sheet_new(
+                                               source,
+                                         WEBKIT_USER_CONTENT_INJECT_ALL_FRAMES,
+                                                  WEBKIT_USER_STYLE_LEVEL_USER,
+                                               NULL, NULL);
+                                   webkit_user_content_manager_add_style_sheet(
+                                               ucm, wkstyle);
+                                       // clang-format on
+                                       webkit_user_style_sheet_unref(wkstyle);
+                               }
+                               g_free(path);
+                               g_free(source);
+                       }
+                       g_dir_close(dir);
+               }
+               g_free(base);
 
-       c->focus_new_tab = focus_tab;
+               c->web_view =
+                       webkit_web_view_new_with_user_content_manager(ucm);
 
-       if (related_wv == NULL)
-               c->web_view = webkit_web_view_new();
-       else
+               c->settings = webkit_web_view_get_settings(
+                       WEBKIT_WEB_VIEW(c->web_view));
+               if (cfg.verbose) {
+                       // clang-format off
+               webkit_settings_set_enable_write_console_messages_to_stdout(
+                               c->settings, true);
+                       // clang-format on
+               }
+               webkit_settings_set_enable_developer_extras(c->settings, TRUE);
+       } 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), cfg.global_zoom);
-       WebKitSettings *settings = webkit_web_view_get_settings(WEBKIT_WEB_VIEW(c->web_view));
-       webkit_settings_set_enable_javascript(settings, !cfg.javascript_disabled);
        g_signal_connect(G_OBJECT(c->web_view), "notify::favicon",
-                                                                        G_CALLBACK(changed_favicon), c);
+                        G_CALLBACK(changed_favicon), c);
        g_signal_connect(G_OBJECT(c->web_view), "notify::title",
-                                                                        G_CALLBACK(changed_title), c);
+                        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::estimated-load-progress",
-                                                                        G_CALLBACK(changed_load_progress), c);
+                        G_CALLBACK(changed_uri), c);
+       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",
-                                                                        G_CALLBACK(client_new_request), NULL);
+                        G_CALLBACK(client_new_request), c);
        g_signal_connect(G_OBJECT(c->web_view), "close",
-                                                                        G_CALLBACK(client_destroy), c);
+                        G_CALLBACK(client_destroy), c);
        g_signal_connect(G_OBJECT(c->web_view), "decide-policy",
-                                                                        G_CALLBACK(decide_policy), NULL);
+                        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-release-event",
-                                                                        G_CALLBACK(key_web_view), c);
+                        G_CALLBACK(key_web_view), c);
        g_signal_connect(G_OBJECT(c->web_view), "scroll-event",
-                                                                        G_CALLBACK(key_web_view), c);
+                        G_CALLBACK(key_web_view), c);
        g_signal_connect(G_OBJECT(c->web_view), "mouse-target-changed",
-                                                                        G_CALLBACK(hover_web_view), c);
+                        G_CALLBACK(hover_web_view), c);
        g_signal_connect(G_OBJECT(c->web_view), "web-process-crashed",
-                                                                        G_CALLBACK(crashed_web_view), c);
+                        G_CALLBACK(crashed_web_view), c);
+
+       GtkWidget *locbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
 
-       if (cfg.user_agent != NULL)
-               g_object_set(G_OBJECT(webkit_web_view_get_settings(WEBKIT_WEB_VIEW(c->web_view))),
-                                                                "user-agent", cfg.user_agent, NULL);
+       c->location = gtk_entry_new();
+       gtk_entry_set_placeholder_text(GTK_ENTRY(c->location), "URL");
+       char *location_symbol;
+       if (cfg.private) {
+               location_symbol = "security-high-symbolic";
+               gtk_entry_set_icon_tooltip_markup(
+                       GTK_ENTRY(c->location), GTK_ENTRY_ICON_PRIMARY,
+                       "You are in private mode. No history, caches, or "
+                       "cookies will be saved beyond this session.");
+       } else {
+               location_symbol = "text-x-generic-symbolic";
+       }
 
-       if (cfg.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);
+       gtk_entry_set_icon_from_icon_name(GTK_ENTRY(c->location),
+                                         GTK_ENTRY_ICON_PRIMARY,
+                                         location_symbol);
+       gtk_box_pack_start(GTK_BOX(locbox), c->location, TRUE, TRUE, 0);
 
-       webkit_settings_set_enable_developer_extras(webkit_web_view_get_settings(WEBKIT_WEB_VIEW(c->web_view)), TRUE);
+       c->wsearch = gtk_entry_new();
+       gtk_entry_set_placeholder_text(GTK_ENTRY(c->wsearch), "Search the web");
+       gtk_entry_set_icon_from_icon_name(GTK_ENTRY(c->wsearch),
+                                         GTK_ENTRY_ICON_PRIMARY,
+                                         "system-search-symbolic");
+       gtk_box_pack_start(GTK_BOX(locbox), c->wsearch, FALSE, TRUE, 0);
 
-       c->location = gtk_entry_new();
        g_signal_connect(G_OBJECT(c->location), "key-press-event",
-                                                                        G_CALLBACK(key_location), c);
+                        G_CALLBACK(key_location), c);
        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
+                        G_CALLBACK(icon_location), c);
+       g_signal_connect(G_OBJECT(c->wsearch), "key-press-event",
+                        G_CALLBACK(key_wsearch), 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. */
+        * avoids a graphical artifact.
+        */
+
        gtk_entry_set_icon_from_icon_name(GTK_ENTRY(c->location),
-                                                                                                                                               GTK_ENTRY_ICON_PRIMARY,
-                                                                                                                                               NULL);
+                                         GTK_ENTRY_ICON_SECONDARY, NULL);
+
+       c->isearch_box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
+       c->isearch = gtk_entry_new();
+       gtk_entry_set_placeholder_text(GTK_ENTRY(c->isearch), "Search page");
+       gtk_box_pack_start(GTK_BOX(c->isearch_box), c->isearch, FALSE, TRUE, 0);
+       gtk_entry_set_icon_from_icon_name(GTK_ENTRY(c->isearch),
+                                         GTK_ENTRY_ICON_PRIMARY,
+                                         "system-search-symbolic");
+       g_signal_connect(G_OBJECT(c->isearch), "key-press-event",
+                        G_CALLBACK(key_isearch), c);
+
+       c->isearch_matches = gtk_label_new("0 matches");
+       gtk_box_pack_start(GTK_BOX(c->isearch_box), c->isearch_matches, FALSE,
+                          TRUE, 5);
 
        c->vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 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_box_pack_start(GTK_BOX(c->vbox), c->isearch_box, FALSE, TRUE, 0);
+       gtk_box_pack_start(GTK_BOX(c->vbox), locbox, FALSE, FALSE, 0);
+
        gtk_container_set_focus_child(GTK_CONTAINER(c->vbox), c->web_view);
 
-       c->tabicon = gtk_image_new_from_icon_name("text-html", GTK_ICON_SIZE_SMALL_TOOLBAR);
+       c->tabicon = gtk_image_new_from_icon_name("text-html",
+                                                 GTK_ICON_SIZE_SMALL_TOOLBAR);
 
-       c->tablabel = gtk_label_new(__NAME__);
+       c->tablabel = gtk_label_new("chorizo");
        gtk_label_set_ellipsize(GTK_LABEL(c->tablabel), PANGO_ELLIPSIZE_END);
-       gtk_label_set_width_chars(GTK_LABEL(c->tablabel), cfg.tab_width_chars);
+       gtk_label_set_width_chars(GTK_LABEL(c->tablabel), cfg_tab_width);
        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. */
+       /*
+        * 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));
+                            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);
+                        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);
+                        G_CALLBACK(key_tablabel), c);
 
-       /* For easy access, store a reference to our label. */
-       g_object_set_data(G_OBJECT(evbox), "lariza-tab-label", c->tablabel);
+       // For easy access, store a reference to our label.
+       g_object_set_data(G_OBJECT(evbox), "chorizo-tab-label", c->tablabel);
 
-       /* This only shows the event box and the label inside, nothing else.
+       /*
+        * 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). */
+        * not part of the normal "widget tree" (IIUC).
+        */
        gtk_widget_show_all(evbox);
 
+       int page = gtk_notebook_get_current_page(GTK_NOTEBOOK(mw.notebook)) + 1;
        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);
+                                page);
+       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);
+       show_web_view(NULL, c);
 
        if (uri != NULL) {
                f = ensure_uri_scheme(uri);
                webkit_web_view_load_uri(WEBKIT_WEB_VIEW(c->web_view), f);
                g_free(f);
        }
+       set_uri(uri, c);
 
        clients++;
 
+       if (uri == NULL) gtk_widget_grab_focus(c->location);
+
        return WEBKIT_WEB_VIEW(c->web_view);
 }
 
 WebKitWebView *
 client_new_request(WebKitWebView *web_view,
-                                                                        WebKitNavigationAction *navigation_action, gpointer data)
+                  WebKitNavigationAction *navigation_action, gpointer data)
 {
-       return client_new(NULL, web_view, FALSE, FALSE);
+       switch_tab = FALSE;
+       WebKitWebView *new_web_view = client_new(NULL, web_view);
+       gtk_widget_grab_focus(GTK_WIDGET(new_web_view));
+       return new_web_view;
+}
+
+void
+mkdirp(const char *dir, mode_t mode)
+{
+       char tmp[256];
+       char *p = NULL;
+       size_t len;
+       snprintf(tmp, sizeof(tmp), "%s", dir);
+       len = strlen(tmp);
+       if (tmp[len - 1] == '/') tmp[len - 1] = 0;
+       for (p = tmp + 1; *p; p++)
+               if (*p == '/') {
+                       *p = 0;
+                       mkdir(tmp, mode);
+                       *p = '/';
+               }
+       mkdir(tmp, S_IRWXU);
 }
 
 void
 cooperation_setup(void)
 {
        GIOChannel *towatch;
-       gchar *fifofilename, *fifopath;
-
-       fifofilename = g_strdup_printf("%s-%s", __NAME__".fifo", cfg.fifo_suffix);
-       fifopath = g_build_filename(g_get_user_runtime_dir(), fifofilename, NULL);
+       gchar *fifofilename;
+
+       gchar *priv = (cfg.private) ? "-private" : "";
+       const gchar *fifo_suffix_env = g_getenv("CHORIZO_FIFO_SUFFIX");
+       const gchar *fifo_suffix = (fifo_suffix_env) ? fifo_suffix_env : "";
+       fifofilename = g_strdup_printf("%s%s%s%s", "chorizo", priv, ".fifo",
+                                      fifo_suffix);
+       fifopath = g_build_filename(g_get_user_runtime_dir(), "chorizo",
+                                   fifofilename, NULL);
+       mkdirp(dirname(fifopath), 0600);
        g_free(fifofilename);
 
-       if (!g_file_test(fifopath, G_FILE_TEST_EXISTS))
-               mkfifo(fifopath, 0600);
+       if (!g_file_test(fifopath, G_FILE_TEST_EXISTS)) mkfifo(fifopath, 0600);
 
        cooperative_pipe_fp = open(fifopath, O_WRONLY | O_NONBLOCK);
        if (!cooperative_pipe_fp) {
-               fprintf(stderr, __NAME__": Can't open FIFO at all.\n");
+               fprintf(stderr, "chorizo: error: can't open FIFO\n");
        } else {
                if (write(cooperative_pipe_fp, "", 0) == -1) {
-                       /* Could not do an empty write to the FIFO which means there's
-                        * no one listening. */
+                       /*
+                        * Could not do an empty write to the FIFO which
+                        * means there's no one listening.
+                        */
                        close(cooperative_pipe_fp);
                        towatch = g_io_channel_new_file(fifopath, "r+", NULL);
-                       g_io_add_watch(towatch, G_IO_IN, (GIOFunc)remote_msg, NULL);
+                       g_io_add_watch(towatch, G_IO_IN, (GIOFunc)remote_msg,
+                                      NULL);
                } else {
                        cfg.cooperative_alone = FALSE;
                }
        }
-
-       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);
-       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;
-
-       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
@@ -343,40 +424,40 @@ changed_load_progress(GObject *obj, GParamSpec *pspec, gpointer 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\"]"
+               "    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"
-               "{"
+               "else {"
                "    out = '';"
-               "    for (i = 0; i < a.length; i++)"
-               "    {"
+               "    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 += '<li><a href=\"' + url + '\">' + title + "
+               "'</a></li>';"
                "    }"
                "    out;"
                "}";
-
-
-       p = webkit_web_view_get_estimated_load_progress(WEBKIT_WEB_VIEW(c->web_view));
+       p = webkit_web_view_get_estimated_load_progress(
+               WEBKIT_WEB_VIEW(c->web_view));
        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. */
+               /*
+                * 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));
+                                              grab_feeds, NULL,
+                                              grab_feeds_finished, c);
        }
        gtk_entry_set_progress_fraction(GTK_ENTRY(c->location), p);
 }
@@ -388,11 +469,10 @@ changed_favicon(GObject *obj, GParamSpec *pspec, gpointer 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);
+                                            GTK_ICON_SIZE_SMALL_TOOLBAR);
        } else {
                w = cairo_image_surface_get_width(f);
                h = cairo_image_surface_get_height(f);
@@ -400,9 +480,10 @@ changed_favicon(GObject *obj, GParamSpec *pspec, gpointer data)
                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);
+                       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);
@@ -415,19 +496,23 @@ changed_title(GObject *obj, GParamSpec *pspec, gpointer data)
 {
        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));
 
-       u = u == NULL ? __NAME__ : u;
-       u = u[0] == 0 ? __NAME__ : u;
+       if (t == NULL) t = (u == NULL) ? "chorizo" : u;
 
-       t = t == NULL ? u : t;
-       t = t[0] == 0 ? u : t;
+       gchar *name = malloc(strlen(t) + 4);
+       if (!name) allocfail();
+       gboolean mute =
+               webkit_web_view_get_is_muted(WEBKIT_WEB_VIEW(c->web_view));
+       gchar *muted = (mute) ? "[M] " : "";
+       sprintf(name, "%s%s", muted, t);
+       gtk_label_set_text(GTK_LABEL(c->tablabel), name);
+       g_free(name);
 
-       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)));
+       mainwindow_title(
+               gtk_notebook_get_current_page(GTK_NOTEBOOK(mw.notebook)));
 }
 
 void
@@ -436,48 +521,59 @@ 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));
 
-       /* 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) {
-               gtk_entry_set_text(GTK_ENTRY(c->location), t);
-
-               if (cfg.history_file != NULL) {
-                       fp = fopen(cfg.history_file, "a");
+               set_uri(t, c);
+
+               // No g_get_user_state_dir unfortunately
+               gchar *state_env = getenv("XDG_STATE_DIR");
+               // clang-format off
+               gchar *state_dir = (state_env)
+                                       ? state_env
+                                       : g_build_filename(g_get_home_dir(),
+                                                           ".local", "state",
+                                                           "chorizo", NULL);
+               // clang-format on
+
+               gchar *history_file =
+                       g_build_filename(state_dir, "history", NULL);
+               if (!cfg.private) {
+                       mkdirp(state_dir, 0700);
+                       fp = fopen(history_file, "a");
                        if (fp != NULL) {
                                fprintf(fp, "%s\n", t);
                                fclose(fp);
                        } else {
-                               perror(__NAME__": Error opening history file");
+                               perror("chorizo: error: could not open history"
+                                      "file");
                        }
                }
+               g_free(history_file);
+               g_free(state_dir);
        }
 }
 
 gboolean
 crashed_web_view(WebKitWebView *web_view, gpointer 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);
+       GtkDialogFlags flags = GTK_DIALOG_DESTROY_WITH_PARENT;
+       GtkWidget *dialog = gtk_message_dialog_new(
+               GTK_WINDOW(mw.win), flags, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,
+               "ERROR: Web process %s crashed.\n%s",
+               webkit_web_view_get_uri(WEBKIT_WEB_VIEW(web_view)),
+               g_strerror(errno));
+       gtk_dialog_run(GTK_DIALOG(dialog));
+       gtk_widget_destroy(dialog);
 
        return TRUE;
 }
 
 gboolean
 decide_policy(WebKitWebView *web_view, WebKitPolicyDecision *decision,
-                                                       WebKitPolicyDecisionType type, gpointer data)
+             WebKitPolicyDecisionType type, gpointer data)
 {
        WebKitResponsePolicyDecision *r;
-
        switch (type) {
        case WEBKIT_POLICY_DECISION_TYPE_RESPONSE:
                r = WEBKIT_RESPONSE_POLICY_DECISION(decision);
@@ -487,140 +583,20 @@ decide_policy(WebKitWebView *web_view, WebKitPolicyDecision *decision,
                        webkit_policy_decision_use(decision);
                break;
        default:
-               /* Use whatever default there is. */
+               // Use whatever default there is.
                return FALSE;
        }
        return TRUE;
 }
 
-void
-download_handle_finished(WebKitDownload *download, gpointer data)
-{
-       downloads--;
-}
-
-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)
-{
-       gchar *sug_clean, *path, *path2 = NULL, *uri;
-       GtkToolItem *tb;
-       int suffix = 1;
-       size_t i;
-
-       sug_clean = g_strdup(suggested_filename);
-       for (i = 0; i < strlen(sug_clean); i++)
-               if (sug_clean[i] == G_DIR_SEPARATOR)
-                       sug_clean[i] = '_';
-
-       path = g_build_filename(cfg.download_dir, sug_clean, NULL);
-       path2 = g_strdup(path);
-       while (g_file_test(path2, G_FILE_TEST_EXISTS) && suffix < 1000) {
-               g_free(path2);
-
-               path2 = g_strdup_printf("%s.%d", path, suffix);
-               suffix++;
-       }
-
-       if (suffix == 1000) {
-               fprintf(stderr, __NAME__": Suffix reached limit for download.\n");
-               webkit_download_cancel(download);
-       } else {
-               uri = g_filename_to_uri(path2, NULL, NULL);
-               webkit_download_set_destination(download, uri);
-               g_free(uri);
-
-               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), sug_clean);
-               gtk_toolbar_insert(GTK_TOOLBAR(dm.toolbar), tb, 0);
-               gtk_widget_show_all(dm.win);
-
-               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);
-       }
-
-       g_free(sug_clean);
-       g_free(path);
-       g_free(path2);
-
-       /* Propagate -- to whom it may concern. */
-       return FALSE;
-}
-
-void
-downloadmanager_cancel(GtkToolButton *tb, gpointer data)
-{
-       WebKitDownload *download = WEBKIT_DOWNLOAD(data);
-
-       webkit_download_cancel(download);
-       g_object_unref(download);
-
-       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)
-{
-       dm.win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-       gtk_window_set_type_hint(GTK_WINDOW(dm.win), GDK_WINDOW_TYPE_HINT_DIALOG);
-       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(downloadmanager_delete), NULL);
-       g_signal_connect(G_OBJECT(dm.win), "key-press-event",
-                                                                        G_CALLBACK(key_downloadmanager), NULL);
-
-       dm.toolbar = gtk_toolbar_new();
-       gtk_orientable_set_orientation(GTK_ORIENTABLE(dm.toolbar),
-                                                                                                                                GTK_ORIENTATION_VERTICAL);
-       gtk_toolbar_set_style(GTK_TOOLBAR(dm.toolbar), GTK_TOOLBAR_BOTH_HORIZ);
-       gtk_toolbar_set_show_arrow(GTK_TOOLBAR(dm.toolbar), FALSE);
-
-       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_container_add(GTK_CONTAINER(dm.scroll), dm.toolbar);
-
-       gtk_container_add(GTK_CONTAINER(dm.win), dm.scroll);
-}
-
 gchar *
 ensure_uri_scheme(const gchar *t)
 {
        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, "data:") &&
-                       !g_str_has_prefix(f, "webkit:")) {
+       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, "data:") && !g_str_has_prefix(f, "webkit:")) {
                g_free(f);
                fabs = realpath(t, NULL);
                if (fabs != NULL) {
@@ -634,63 +610,6 @@ ensure_uri_scheme(const gchar *t)
                return g_strdup(t);
 }
 
-void
-get_config(void)
-{
-       cfg.accepted_language[0] = NULL;
-       cfg.accepted_language[1] = NULL;
-       cfg.cooperative_alone = TRUE;
-       cfg.cooperative_alone = TRUE;
-       cfg.fifo_suffix = "main";
-
-       const char *e = g_getenv(__NAME_UPPERCASE__"_FIFO_SUFFIX");
-       if (e != NULL)
-               cfg.fifo_suffix = g_strdup(e);
-
-       char *xdg_down = getenv("XDG_DOWNLOAD_DIR");
-       cfg.download_dir = (xdg_down) ? xdg_down : "/var/tmp";
-
-       config = get_ini();
-       cfg.accepted_language[0] = g_key_file_get_string(config, "browser",
-                                                                                                                                                                                                        "accepted_language", NULL);
-       cfg.history_file = g_key_file_get_string(config, "browser", "history_file",
-                                                                                                                                                                        NULL);
-       cfg.home_uri = g_key_file_get_string(config, "browser", "homepage", NULL);
-       cfg.home_uri = (cfg.home_uri) ? cfg.home_uri : "about:blank";
-       cfg.enable_console_to_stdout = g_key_file_get_boolean(config, "browser",
-                                                                                                                                                                                                                               "console_to_stdout",
-                                                                                                                                                                                                                               NULL);
-       cfg.user_agent = g_key_file_get_string(config, "browser", "user_agent", NULL);
-       cfg.javascript_disabled = g_key_file_get_boolean(config, "browser",
-                                                                                                                                                                                                        "javascript_disabled", NULL);
-       char *input_cookie_policy = g_key_file_get_string(config, "browser",
-                                                                                                                                                                                                               "cookie_policy", NULL);
-       cfg.cookie_policy = WEBKIT_COOKIE_POLICY_ACCEPT_NO_THIRD_PARTY;
-       if (input_cookie_policy) {
-               if (strcmp(input_cookie_policy, "all") == 0) {
-                       cfg.cookie_policy = WEBKIT_COOKIE_POLICY_ACCEPT_ALWAYS;
-               } else if (strcmp(input_cookie_policy, "none") == 0) {
-                       cfg.cookie_policy = WEBKIT_COOKIE_POLICY_ACCEPT_NEVER;
-               }
-       }
-
-       cfg.tab_width_chars = g_key_file_get_integer(config, "ui", "tab_width", NULL);
-       cfg.tab_width_chars = (cfg.tab_width_chars) ? cfg.tab_width_chars : 20;
-       cfg.global_zoom = g_key_file_get_double(config, "ui", "zoom_level", NULL);
-       cfg.global_zoom = (cfg.global_zoom) ? cfg.global_zoom : 1.0;
-       cfg.search_engine = g_key_file_get_string(config, "ui", "search_engine",
-                                                                                                                                                                               NULL);
-       cfg.search_engine = (cfg.search_engine) ? cfg.search_engine :
-               "https://duckduckgo.com?q=";
-       cfg.spellcheck_disabled = g_key_file_get_boolean(config, "ui",
-                                                                                                                                                                                                        "spellcheck_disabled", NULL);
-       cfg.spellcheck_language = g_key_file_get_string(config, "ui",
-                                                                                                                                                                                                                               "spellcheck_language",
-                                                                                                                                                                                                                               NULL);
-       cfg.spellcheck_language = (cfg.spellcheck_language) ? cfg.spellcheck_language
-               : "en_US";
-}
-
 void
 grab_feeds_finished(GObject *object, GAsyncResult *result, gpointer data)
 {
@@ -700,56 +619,58 @@ grab_feeds_finished(GObject *object, GAsyncResult *result, gpointer data)
        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
+       /*
+        * 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 */
+        * https://webkitgtk.org/reference/webkit2gtk/stable/WebKitWebView.html
+        */
 
-       js_result = webkit_web_view_run_javascript_finish(WEBKIT_WEB_VIEW(object),
-                                                                                                                                                                                                               result, &err);
+       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);
+               fprintf(stderr,
+                       "chorizo: error: 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));
+               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));
+                       fprintf(stderr,
+                               "chorizo: warning: 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_from_icon_name(
+                       GTK_ENTRY(c->location), GTK_ENTRY_ICON_SECONDARY,
+                       "application-rss+xml-symbolic");
                gtk_entry_set_icon_activatable(GTK_ENTRY(c->location),
-                                                                                                                                        GTK_ENTRY_ICON_PRIMARY,
-                                                                                                                                        TRUE);
+                                              GTK_ENTRY_ICON_SECONDARY, TRUE);
        } else {
-               gtk_entry_set_icon_from_icon_name(GTK_ENTRY(c->location),
-                                                                                                                                                       GTK_ENTRY_ICON_PRIMARY,
-                                                                                                                                                       NULL);
+               gtk_entry_set_icon_from_icon_name(
+                       GTK_ENTRY(c->location), GTK_ENTRY_ICON_SECONDARY, NULL);
        }
 
        webkit_javascript_result_unref(js_result);
 }
 
 void
-hover_web_view(WebKitWebView *web_view, WebKitHitTestResult *ht, guint modifiers,
-                                                        gpointer data)
+hover_web_view(WebKitWebView *web_view, WebKitHitTestResult *ht,
+              guint modifiers, gpointer data)
 {
        struct Client *c = (struct Client *)data;
        const char *to_show;
-
        g_free(c->hover_uri);
 
        if (webkit_hit_test_result_context_is_link(ht)) {
@@ -760,51 +681,50 @@ hover_web_view(WebKitWebView *web_view, WebKitHitTestResult *ht, guint modifiers
                c->hover_uri = NULL;
        }
 
-       if (!gtk_widget_is_focus(c->location))
-               gtk_entry_set_text(GTK_ENTRY(c->location), to_show);
+       if (!gtk_widget_is_focus(c->location)) set_uri(to_show, c);
 }
 
 void
 icon_location(GtkEntry *entry, GtkEntryIconPosition icon_pos, GdkEvent *event,
-                                                       gpointer data)
+             gpointer data)
 {
        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)
-               {
-                       /* 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);
-               }
+       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) {
+               /*
+                * 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);
+       }
 }
 
 void
@@ -813,64 +733,65 @@ init_default_web_context(void)
        gchar *p;
        WebKitWebContext *wc;
        WebKitCookieManager *cm;
+       wc = (cfg.private) ? webkit_web_context_new_ephemeral() :
+                                  webkit_web_context_get_default();
 
-       wc = webkit_web_context_get_default();
-
-       p = g_build_filename(g_get_user_config_dir(), __NAME__, "adblock", NULL);
+       p = g_build_filename(g_get_user_config_dir(), "chorizo", "adblock",
+                            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);
+       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);
+       p = g_build_filename(g_get_user_data_dir(), "chorizo", "web-extensions",
+                            NULL);
        webkit_web_context_set_web_extensions_directory(wc, p);
        g_free(p);
 
-       if (cfg.accepted_language[0] != NULL)
-               webkit_web_context_set_preferred_languages(wc, cfg.accepted_language);
-
+       char *xdg_down = getenv("XDG_DOWNLOAD_DIR");
        g_signal_connect(G_OBJECT(wc), "download-started",
-                                                                        G_CALLBACK(download_handle_start), NULL);
+                        G_CALLBACK(download_start),
+                        (xdg_down) ? xdg_down : "/var/tmp");
 
        trust_user_certs(wc);
 
        cm = webkit_web_context_get_cookie_manager(wc);
-       webkit_cookie_manager_set_accept_policy(cm, cfg.cookie_policy);
-
-       webkit_web_context_set_favicon_database_directory(wc, NULL);
-       webkit_cookie_manager_set_persistent_storage(cm,
-                                                                                                                                                                                        g_build_filename("/",
-                                                                                                                                                                                                                                                               g_get_user_cache_dir(),
-                                                                                                                                                                                                                                                               __NAME__,
-                                                                                                                                                                                                                                                               "cookies.db",
-                                                                                                                                                                                                                                                               NULL),
-                                                                                                                                                                                        WEBKIT_COOKIE_PERSISTENT_STORAGE_SQLITE);
-
-       const gchar * const languages[2] = {(const gchar *)cfg.spellcheck_language,
-               NULL};
-       webkit_web_context_set_spell_checking_languages(wc, languages);
-       webkit_web_context_set_spell_checking_enabled(wc, !cfg.spellcheck_disabled);
+       webkit_cookie_manager_set_accept_policy(cm, cfg_cookie_policy);
+
+       if (!cfg.private) {
+               webkit_web_context_set_favicon_database_directory(wc, NULL);
+
+               gchar *fname = g_build_filename("/", g_get_user_data_dir(),
+                                               "chorizo", "cookies.db", NULL);
+               mkdirp(dirname(fname), 0700);
+               WebKitCookiePersistentStorage type =
+                       WEBKIT_COOKIE_PERSISTENT_STORAGE_SQLITE;
+               webkit_cookie_manager_set_persistent_storage(cm, fname, type);
+               g_free(fname);
+       }
+       webkit_web_context_set_spell_checking_enabled(wc, TRUE);
 }
 
 void
-search(gpointer data, gint direction)
+isearch(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;
+       WebKitFindController *fc =
+               webkit_web_view_get_find_controller(web_view);
+       const gchar *isearch_text = gtk_entry_get_text(GTK_ENTRY(c->isearch));
+       if (isearch_text == NULL) return;
 
        switch (direction) {
        case 0:
-               webkit_find_controller_search(fc, search_text,
-                                                                                                                                       WEBKIT_FIND_OPTIONS_CASE_INSENSITIVE |
-                                                                                                                                       WEBKIT_FIND_OPTIONS_WRAP_AROUND,
-                                                                                                                                       G_MAXUINT);
+               g_signal_connect(G_OBJECT(fc), "counted-matches",
+                                G_CALLBACK(isearch_counted_matches), c);
+               webkit_find_controller_count_matches(
+                       fc, isearch_text, cfg_isearch_options, G_MAXUINT);
+               webkit_find_controller_search(fc, isearch_text,
+                                             cfg_isearch_options, G_MAXUINT);
                break;
        case 1:
                webkit_find_controller_search_next(fc);
@@ -885,283 +806,57 @@ search(gpointer data, gint direction)
 }
 
 void
-search_init(struct Client *c, int direction)
+isearch_init(struct Client *c, int direction)
 {
-       gtk_widget_grab_focus(c->location);
-       const gchar *contents = gtk_entry_get_text(GTK_ENTRY(c->location));
-       if (strcspn(contents, "s/")) {
-               gtk_entry_set_text(GTK_ENTRY(c->location), "s/");
+       if (webkit_web_view_get_uri(WEBKIT_WEB_VIEW(c->web_view))) {
+               gtk_widget_show(c->isearch_box);
+               gtk_widget_grab_focus(c->isearch);
        }
-       gtk_editable_set_position(GTK_EDITABLE(c->location), -1);
-       search(c, 0);
-       search(c, -1);
-       search(c, direction);
-}
-
-int
-def_key(char *key, unsigned int def)
-{
-       char *conf = g_key_file_get_string(config, "keybindings", key, NULL);
-       return (conf) ? gdk_keyval_from_name((conf) ? conf : NULL) : def;
 }
 
-gboolean
-key_common(GtkWidget *widget, GdkEvent *event, gpointer data)
-{
-       struct Client *c = (struct Client *)data;
-       gdouble now;
-       gchar *f;
-
-       if (event->type == GDK_KEY_PRESS) {
-               if (((GdkEventKey *)event)->state & GDK_CONTROL_MASK) {
-                       WebKitSettings *settings = webkit_web_view_get_settings(WEBKIT_WEB_VIEW(c->web_view));
-                       gboolean js = webkit_settings_get_enable_javascript(settings);
-                       int key = ((GdkEventKey *)event)->keyval;
-                       if (def_key("download_manager", GDK_KEY_y) == key) {
-                               gtk_widget_show_all(dm.win);
-                               return TRUE;
-                       } else if (def_key("history_back", GDK_KEY_h) == key) {
-                               webkit_web_view_go_back(WEBKIT_WEB_VIEW(c->web_view));
-                               return TRUE;
-                       } else if (def_key("history_forwards", GDK_KEY_l) == key) {
-                               webkit_web_view_go_forward(WEBKIT_WEB_VIEW(c->web_view));
-                               return TRUE;
-                       } else if (def_key("location", GDK_KEY_t) == key) {
-                               gtk_widget_grab_focus(c->location);
-                               const char *uri = webkit_web_view_get_uri(WEBKIT_WEB_VIEW(c->web_view));
-                               const char *goal = (uri) ? uri : "https://";
-                               gtk_entry_set_text(GTK_ENTRY(c->location), goal);
-                               gtk_editable_set_position(GTK_EDITABLE(c->location), -1);
-                               return TRUE;
-                       } else if (def_key("print", GDK_KEY_Print) == key) {
-                               webkit_print_operation_run_dialog(webkit_print_operation_new(WEBKIT_WEB_VIEW(c->web_view)),
-                                                                                                                                                                       GTK_WINDOW(gtk_widget_get_toplevel(mw.win)));
-                               return TRUE;
-                       } else if (def_key("quit", GDK_KEY_g) == key) {
-                               search(c, 2);
-                               gtk_widget_grab_focus(c->web_view);
-                               gtk_entry_set_text(GTK_ENTRY(c->location),
-                                                                                                        webkit_web_view_get_uri(WEBKIT_WEB_VIEW(c->web_view)));
-                               webkit_web_view_run_javascript(WEBKIT_WEB_VIEW(c->web_view),
-                                                                                                                                                        "window.getSelection().removeAllRanges();"
-                                                                                                                                                        "document.activeElement.blur();",
-                                                                                                                                                        NULL, NULL, c);
-                               return TRUE;
-                       } else if (def_key("reload", GDK_KEY_e) == key) {
-                               webkit_web_view_reload_bypass_cache(WEBKIT_WEB_VIEW(c->web_view));
-                               return TRUE;
-                       } else if (def_key("scroll_line_down", GDK_KEY_j) == key) {
-                               for (int i = 0; i < 2; i++) {
-                                       event->key.keyval = GDK_KEY_Down;
-                                       gdk_event_put(event);
-                               }
-                               return TRUE;
-                       } else if (def_key("scroll_line_up", GDK_KEY_k) == key) {
-                               event->key.keyval = GDK_KEY_Up;
-                               gdk_event_put(event);
-                               return TRUE;
-                       } else if (def_key("scroll_page_down", GDK_KEY_f) == key) {
-                               event->key.keyval = GDK_KEY_Page_Down;
-                               gdk_event_put(event);
-                               return TRUE;
-                       } else if (def_key("scroll_page_up", GDK_KEY_b) == key) {
-                               event->key.keyval = GDK_KEY_Page_Up;
-                               gdk_event_put(event);
-                               return TRUE;
-                       } else if (def_key("search_forwards", GDK_KEY_s) == key) {
-                               search_init(c, 1);
-                               return TRUE;
-                       } else if (def_key("search_backwards", GDK_KEY_r) == key) {
-                               search_init(c, -1);
-                               return TRUE;
-                       } else if (def_key("tab_close", GDK_KEY_q) == key) {
-                               client_destroy(NULL, c);
-                               return TRUE;
-                       } else if (def_key("tab_previous", GDK_KEY_u) == key) {
-                               gtk_notebook_prev_page(GTK_NOTEBOOK(mw.notebook));
-                               return TRUE;
-                       } else if (def_key("tab_new", GDK_KEY_w) == key) {
-                               f = ensure_uri_scheme(cfg.home_uri);
-                               client_new(f, NULL, TRUE, TRUE);
-                               g_free(f);
-                               return TRUE;
-                       } else if (def_key("tab_next", GDK_KEY_i) == key) {
-                               gtk_notebook_next_page(GTK_NOTEBOOK(mw.notebook));
-                               return TRUE;
-                       } else if (def_key("toggle_js", GDK_KEY_o) == key) {
-                               webkit_settings_set_enable_javascript(settings, (js) ? FALSE : TRUE);
-                               webkit_web_view_set_settings(WEBKIT_WEB_VIEW(c->web_view), settings);
-                               return TRUE;
-                       } else if (def_key("web_search", GDK_KEY_d) == key) {
-                               gtk_widget_grab_focus(c->location);
-                               gtk_entry_set_text(GTK_ENTRY(c->location), "w/");
-                               gtk_editable_set_position(GTK_EDITABLE(c->location), -1);
-                               return TRUE;
-                       } else if (def_key("zoom_in", GDK_KEY_equal) == key) {
-                               now = webkit_web_view_get_zoom_level(WEBKIT_WEB_VIEW(c->web_view));
-                               webkit_web_view_set_zoom_level(WEBKIT_WEB_VIEW(c->web_view), now + 0.1);
-                               return TRUE;
-                       } else if (def_key("zoom_out", GDK_KEY_minus) == key) {
-                               now = webkit_web_view_get_zoom_level(WEBKIT_WEB_VIEW(c->web_view));
-                               webkit_web_view_set_zoom_level(WEBKIT_WEB_VIEW(c->web_view), now - 0.1);
-                               return TRUE;
-                       } else if (def_key("zoom_reset", GDK_KEY_0) == key) {
-                               webkit_web_view_set_zoom_level(WEBKIT_WEB_VIEW(c->web_view),
-                                                                                                                                                        cfg.global_zoom);
-                               return TRUE;
-                       }
-               }
-       }
-       return FALSE;
-}
-
-gboolean
-key_downloadmanager(GtkWidget *widget, GdkEvent *event, gpointer data)
-{
-       if (event->type == GDK_KEY_PRESS) {
-               if (((GdkEventKey *)event)->state & GDK_CONTROL_MASK) {
-                       int key = ((GdkEventKey *)event)->keyval;
-                       if ((def_key("close_tab", GDK_KEY_q) == key) ||
-                                       (def_key("download_manager", GDK_KEY_y) == key)) {
-                               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) {
-               int key = ((GdkEventKey *)event)->keyval;
-               if ((GDK_KEY_KP_Enter == key) || (GDK_KEY_Return == key)) {
-                       gtk_widget_grab_focus(c->web_view);
-                       t = gtk_entry_get_text(GTK_ENTRY(c->location));
-                       if (t != NULL && t[0] == 's' && t[1] == '/') {
-                               if (search_text != NULL)
-                                       g_free(search_text);
-                               search_text = g_strdup(t + 2);
-                               search(c, 0);
-                       } else if (t != NULL && t[0] == 'w' && t[1] == '/') {
-                               const char *engine = cfg.search_engine;
-                               int len = strlen(engine) + strlen(t) - 2;
-                               char *f = (char *) malloc(len);
-                               snprintf(f, len + 1, "%s%s", engine, t + 2);
-                               webkit_web_view_load_uri(WEBKIT_WEB_VIEW(c->web_view), f);
-                               free(f);
-                       } else {
-                               f = ensure_uri_scheme(t);
-                               webkit_web_view_load_uri(WEBKIT_WEB_VIEW(c->web_view), f);
-                               g_free(f);
-                       }
-                       return TRUE;
-               } else if ((GDK_KEY_Escape == key) ||
-                                                        (def_key("quit", GDK_KEY_g) == key)) {
-                       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)
+void
+reopen_tab(void)
 {
-       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_entry_set_progress_fraction(GTK_ENTRY(c->location), 0);
-               }
-       } else if (event->type == GDK_BUTTON_RELEASE) {
-               switch (((GdkEventButton *)event)->button) {
-               case 2:
-                       if (c->hover_uri != NULL) {
-                               client_new(c->hover_uri, NULL, TRUE, FALSE);
-                               return TRUE;
-                       }
-                       break;
-               case 8:
-                       webkit_web_view_go_back(WEBKIT_WEB_VIEW(c->web_view));
-                       return TRUE;
-               case 9:
-                       webkit_web_view_go_forward(WEBKIT_WEB_VIEW(c->web_view));
-                       return TRUE;
-               }
-       } else if (event->type == GDK_SCROLL) {
-               if (((GdkEventScroll *)event)->state & GDK_CONTROL_MASK ||
-                               ((GdkEventScroll *)event)->state & GDK_CONTROL_MASK) {
-                       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 ? cfg.global_zoom : z;
-                       webkit_web_view_set_zoom_level(WEBKIT_WEB_VIEW(c->web_view), z);
-                       return TRUE;
-               }
-       }
-
-       return FALSE;
+       if (num_closed == 0) return;
+       client_new(closed_tabs[num_closed - 1], NULL);
+       num_closed--;
+       closed_tabs = realloc(closed_tabs, num_closed * sizeof(closed_tabs[0]));
+       if (!closed_tabs) allocfail();
 }
 
 void
 mainwindow_setup(void)
 {
        mw.win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-       gtk_window_set_default_size(GTK_WINDOW(mw.win), 800, 600);
+       gtk_window_set_default_size(GTK_WINDOW(mw.win), 1200, 900);
        g_signal_connect(G_OBJECT(mw.win), "destroy", gtk_main_quit, NULL);
-       gtk_window_set_title(GTK_WINDOW(mw.win), __NAME__);
+
+       gchar *priv = (cfg.private) ? "-private" : "";
+       gchar *title = malloc(strlen(priv) + 7);
+       if (!title) allocfail();
+       sprintf(title, "%s%s", "chorizo", priv);
+       gtk_window_set_title(GTK_WINDOW(mw.win), title);
+       g_free(title);
 
        mw.notebook = gtk_notebook_new();
        gtk_notebook_set_scrollable(GTK_NOTEBOOK(mw.notebook), TRUE);
+       gtk_notebook_set_tab_pos(GTK_NOTEBOOK(mw.notebook), GTK_POS_LEFT);
        gtk_container_add(GTK_CONTAINER(mw.win), mw.notebook);
        g_signal_connect(G_OBJECT(mw.notebook), "switch-page",
-                                                                        G_CALLBACK(notebook_switch_page), NULL);
+                        G_CALLBACK(notebook_switch_page), NULL);
+
+       GtkCssProvider *css = gtk_css_provider_new();
+       const char *css_data = "notebook header.left * { \
+                                       margin: 0; \
+                                       padding-top: 0; \
+                                       padding-bottom: 0; \
+                               }";
+       gtk_css_provider_load_from_data(css, css_data, strlen(css_data), NULL);
+       gtk_style_context_add_provider_for_screen(
+               gdk_screen_get_default(), GTK_STYLE_PROVIDER(css),
+               GTK_STYLE_PROVIDER_PRIORITY_USER);
+
+       gtk_widget_show_all(mw.win);
 }
 
 void
@@ -1169,13 +864,12 @@ mainwindow_title(gint idx)
 {
        GtkWidget *child, *widg, *tablabel;
        const gchar *text;
-
        child = gtk_notebook_get_nth_page(GTK_NOTEBOOK(mw.notebook), idx);
-       if (child == NULL)
-               return;
+       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");
+       tablabel = (GtkWidget *)g_object_get_data(G_OBJECT(widg),
+                                                 "chorizo-tab-label");
        text = gtk_label_get_text(GTK_LABEL(tablabel));
        gtk_window_set_title(GTK_WINDOW(mw.win), text);
 }
@@ -1186,130 +880,61 @@ notebook_switch_page(GtkNotebook *nb, GtkWidget *p, guint idx, gpointer data)
        mainwindow_title(idx);
 }
 
-gboolean
-quit_if_nothing_active(void)
-{
-       if (clients == 0) {
-               if (downloads == 0) {
-                       gtk_main_quit();
-                       return TRUE;
-               } else {
-                       gtk_widget_show_all(dm.win);
-               }
-       }
-
-       return FALSE;
-}
-
-gboolean
-remote_msg(GIOChannel *channel, GIOCondition condition, gpointer data)
-{
-       gchar *uri = NULL;
-
-       g_io_channel_read_line(channel, &uri, NULL, NULL, NULL);
-       if (uri) {
-               g_strstrip(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);
-                       char *jscmd = malloc(strlen(path) + 36);
-                       sprintf(jscmd, "console.log(\"Running userscript %s\");", path);
-                       if (g_str_has_suffix(path, ".js")) {
-                               if (g_file_get_contents(path, &contents, NULL, NULL)) {
-                                       webkit_web_view_run_javascript(web_view, jscmd, NULL, NULL, NULL);
-                                       webkit_web_view_run_javascript(web_view, contents, NULL, NULL, NULL);
-                                       g_free(contents);
-                                       g_free(jscmd);
-                               }
-                       }
-                       g_free(path);
-               }
-               g_dir_close(scriptdir);
-       }
-
-       g_free(base);
-}
-
 void
 show_web_view(WebKitWebView *web_view, gpointer data)
 {
        struct Client *c = (struct Client *)data;
-       gint idx;
-
        (void)web_view;
+       gint idx = gtk_notebook_page_num(GTK_NOTEBOOK(mw.notebook), c->vbox);
 
-       gtk_widget_show_all(mw.win);
-
-       if (c->focus_new_tab) {
-               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_show_all(GTK_WIDGET(
+               gtk_notebook_get_nth_page(GTK_NOTEBOOK(mw.notebook), idx)));
+       gtk_widget_hide(c->isearch_box);
 
-               gtk_widget_grab_focus(c->web_view);
-       }
+       if (idx != -1 && switch_tab)
+               gtk_notebook_set_current_page(GTK_NOTEBOOK(mw.notebook), idx);
+       gtk_widget_grab_focus(c->web_view);
 }
 
 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);
+       gchar *basedir, *absfile;
+       const gchar *file;
+       GDir *dir = NULL;
+       basedir = g_build_filename(g_get_user_data_dir(), "chorizo", "certs",
+                                  NULL);
        dir = g_dir_open(basedir, 0, NULL);
+       g_free(basedir);
        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);
+                       absfile = g_build_filename(g_get_user_data_dir(),
+                                                  "chorizo", "certs", file,
+                                                  NULL);
                        cert = g_tls_certificate_new_from_file(absfile, NULL);
+                       g_free(absfile);
                        if (cert == NULL)
-                               fprintf(stderr, __NAME__": Could not load trusted cert '%s'\n", file);
+                               fprintf(stderr,
+                                       "chorizo: warning: could not load"
+                                       "trusted cert: %s\n",
+                                       file);
                        else
-                               webkit_web_context_allow_tls_certificate_for_host(wc, cert, file);
+                               // clang-format off
+                             webkit_web_context_allow_tls_certificate_for_host(
+                                       wc, cert, file);
+                       // clang-format on
                        file = g_dir_read_name(dir);
                }
                g_dir_close(dir);
        }
 }
 
-GKeyFile *
-get_ini(void)
+void
+version(void)
 {
-       GKeyFileFlags flags = G_KEY_FILE_NONE;
-       g_autoptr(GError) error = NULL;
-       config = g_key_file_new();
-
-       // Load user config
-       if (!g_key_file_load_from_file(config,
-                                                                                                                                g_build_filename(g_get_user_config_dir(),
-                                                                                                                                                                                                       __NAME__, "lariza.ini",
-                                                                                                                                                                                                       NULL), flags, &error)) {
-               // Load global config
-               if (!g_key_file_load_from_file(config, "/etc/lariza.ini", flags,
-                                                                                                                                        &error)) {
-                       fprintf(stderr, "Could not load lariza.ini: %s", error->message);
-               }
-       }
-       return config;
+       printf("%s %s\n", "chorizo", VERSION);
 }
 
 int
@@ -1317,38 +942,59 @@ main(int argc, char **argv)
 {
        int opt, i;
 
-       gtk_init(&argc, &argv);
-       get_config();
+       // TODO:pretty this
+       cfg.noncooperative_instances = FALSE;
+       cfg.cooperative_alone = TRUE;
+       closed_tabs = malloc(0);
+       if (!closed_tabs) allocfail();
 
-       while ((opt = getopt(argc, argv, "C")) != -1) {
+       while ((opt = getopt(argc, argv, "cpvV")) != -1) {
                switch (opt) {
-               case 'C':
-                       cfg.cooperative_instances = FALSE;
+               case 'c':
+                       cfg.noncooperative_instances = TRUE;
+                       break;
+               case 'p':
+                       cfg.private = TRUE;
                        break;
+               case 'v':
+                       cfg.verbose = TRUE;
+                       break;
+               case 'V':
+                       version();
+                       exit(0);
                default:
-                       fprintf(stderr, "Usage: "__NAME__" [OPTION]... [URI]...\n");
+                       fprintf(stderr,
+                               "usage: chorizo [OPTION]... [URI]...\n");
                        exit(EXIT_FAILURE);
                }
        }
 
-       if (cfg.cooperative_instances)
-               cooperation_setup();
+       if (cfg.verbose) version();
 
-       if (!cfg.cooperative_instances || cfg.cooperative_alone)
+       gtk_init(&argc, &argv);
+
+       // Keep clipboard contents after program closes
+       gtk_clipboard_store(gtk_clipboard_get_for_display(
+               gdk_display_get_default(), GDK_SELECTION_CLIPBOARD));
+
+       if (!cfg.noncooperative_instances) cooperation_setup();
+
+       if (cfg.noncooperative_instances || cfg.cooperative_alone)
                init_default_web_context();
 
        downloadmanager_setup();
        mainwindow_setup();
 
        if (optind >= argc) {
-               client_new(cfg.home_uri, NULL, TRUE, TRUE);
+               client_new(cfg_home_uri, NULL);
        } else {
-               for (i = optind; i < argc; i++)
-                       client_new(argv[i], NULL, TRUE, TRUE);
+               for (i = optind; i < argc; i++) client_new(argv[i], NULL);
        }
 
-       if (!cfg.cooperative_instances || cfg.cooperative_alone)
+       if (cfg.noncooperative_instances || cfg.cooperative_alone) {
                gtk_main();
+               remove(fifopath);
+       }
 
        exit(EXIT_SUCCESS);
 }