Do not build SiteSpecific file when regex is invalid
[surf.git] / surf.c
diff --git a/surf.c b/surf.c
index 726369a..fcaa506 100644 (file)
--- a/surf.c
+++ b/surf.c
@@ -2,37 +2,47 @@
  *
  * To understand surf, start reading main().
  */
-#include <signal.h>
-#include <X11/X.h>
-#include <X11/Xatom.h>
-#include <gtk/gtkx.h>
-#include <gtk/gtk.h>
-#include <gdk/gdkx.h>
-#include <gdk/gdk.h>
-#include <gdk/gdkkeysyms.h>
-#include <string.h>
+#include <sys/file.h>
 #include <sys/types.h>
 #include <sys/wait.h>
-#include <unistd.h>
+#include <libgen.h>
 #include <limits.h>
-#include <stdlib.h>
+#include <pwd.h>
+#include <regex.h>
+#include <signal.h>
+#include <stdarg.h>
 #include <stdio.h>
-#include <webkit2/webkit2.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <gdk/gdk.h>
+#include <gdk/gdkkeysyms.h>
+#include <gdk/gdkx.h>
 #include <glib/gstdio.h>
+#include <gtk/gtk.h>
+#include <gtk/gtkx.h>
 #include <JavaScriptCore/JavaScript.h>
-#include <sys/file.h>
-#include <libgen.h>
-#include <stdarg.h>
-#include <regex.h>
-#include <pwd.h>
-#include <string.h>
+#include <webkit2/webkit2.h>
+#include <X11/X.h>
+#include <X11/Xatom.h>
 
 #include "arg.h"
 
-char *argv0;
-
 #define LENGTH(x)               (sizeof(x) / sizeof(x[0]))
 #define CLEANMASK(mask)         (mask & (MODKEY|GDK_SHIFT_MASK))
+#define SETB(p, s)              [p] = { { .b = s }, }
+#define SETI(p, s)              [p] = { { .i = s }, }
+#define SETV(p, s)              [p] = { { .v = s }, }
+#define SETF(p, s)              [p] = { { .f = s }, }
+#define FSETB(p, s)             [p] = { { .b = s }, 1 }
+#define FSETI(p, s)             [p] = { { .i = s }, 1 }
+#define FSETV(p, s)             [p] = { { .v = s }, 1 }
+#define FSETF(p, s)             [p] = { { .f = s }, 1 }
+#define CSETB(p, s)             [p] = (Parameter){ { .b = s }, 1 }
+#define CSETI(p, s)             [p] = (Parameter){ { .i = s }, 1 }
+#define CSETV(p, s)             [p] = (Parameter){ { .v = s }, 1 }
+#define CSETF(p, s)             [p] = (Parameter){ { .f = s }, 1 }
 
 enum { AtomFind, AtomGo, AtomUri, AtomLast };
 
@@ -47,31 +57,66 @@ enum {
        OnAny   = OnDoc | OnLink | OnImg | OnMedia | OnEdit | OnBar | OnSel,
 };
 
-typedef union Arg Arg;
-union Arg {
-       gboolean b;
-       gint i;
+typedef enum {
+       AcceleratedCanvas,
+       CaretBrowsing,
+       Certificate,
+       CookiePolicies,
+       DiskCache,
+       DNSPrefetch,
+       FontSize,
+       FrameFlattening,
+       Geolocation,
+       HideBackground,
+       Inspector,
+       JavaScript,
+       KioskMode,
+       LoadImages,
+       MediaManualPlay,
+       Plugins,
+       PreferredLanguages,
+       RunInFullscreen,
+       ScrollBars,
+       ShowIndicators,
+       SiteQuirks,
+       SpellChecking,
+       SpellLanguages,
+       StrictTLS,
+       Style,
+       ZoomLevel,
+       ParameterLast,
+} ParamName;
+
+typedef union {
+       int b;
+       int i;
+       float f;
        const void *v;
-};
+} Arg;
+
+typedef struct {
+       Arg val;
+       int force;
+} Parameter;
 
 typedef struct Client {
        GtkWidget *win;
-       Window xid;
        WebKitWebView *view;
        WebKitWebInspector *inspector;
+       WebKitFindController *finder;
        WebKitHitTestResult *mousepos;
-       GTlsCertificateFlags tlsflags;
-       const char *title, *targeturi;
+       GTlsCertificateFlags tlserr;
+       Window xid;
+       int progress, fullscreen, https, insecure;
+       const char *title, *overtitle, *targeturi;
        const char *needle;
-       gint progress;
        struct Client *next;
-       gboolean zoomed, fullscreen;
 } Client;
 
 typedef struct {
        guint mod;
        guint keyval;
-       void (*func)(Client *c, const Arg *arg);
+       void (*func)(Client *c, const Arg *a);
        const Arg arg;
 } Key;
 
@@ -85,123 +130,238 @@ typedef struct {
 } Button;
 
 typedef struct {
-       char *regex;
-       char *style;
+       const char *uri;
+       Parameter config[ParameterLast];
        regex_t re;
-} SiteStyle;
+} UriParameters;
 
-static Display *dpy;
-static Atom atoms[AtomLast];
-static Client *clients = NULL;
-static Window embed = 0;
-static gboolean showxid = FALSE;
-static char winid[64];
-static char togglestat[9];
-static char pagestat[3];
-static GTlsDatabase *tlsdb;
-static int cookiepolicy;
-static char *stylefile = NULL;
+typedef struct {
+       char *regex;
+       char *file;
+       regex_t re;
+} SiteSpecific;
 
-static void addaccelgroup(Client *c);
+/* Surf */
+static void usage(void);
+static void die(const char *errstr, ...);
+static void setup(void);
+static void sigchld(int unused);
+static void sighup(int unused);
 static char *buildfile(const char *path);
 static char *buildpath(const char *path);
-static gboolean buttonreleased(GtkWidget *w, GdkEventKey *e, Client *c);
-static void cleanup(void);
-static void clipboard(Client *c, const Arg *a);
-
+static const char *getuserhomedir(const char *user);
+static const char *getcurrentuserhomedir(void);
+static Client *newclient(Client *c);
+static void loaduri(Client *c, const Arg *a);
+static const char *geturi(Client *c);
+static void setatom(Client *c, int a, const char *v);
+static const char *getatom(Client *c, int a);
+static void updatetitle(Client *c);
+static void gettogglestats(Client *c);
+static void getpagestats(Client *c);
 static WebKitCookieAcceptPolicy cookiepolicy_get(void);
 static char cookiepolicy_set(const WebKitCookieAcceptPolicy p);
+static void seturiparameters(Client *c, const char *uri);
+static void setparameter(Client *c, int refresh, ParamName p, const Arg *a);
+static const char *getcert(const char *uri);
+static void setcert(Client *c, const char *file);
+static const char *getstyle(const char *uri);
+static void setstyle(Client *c, const char *file);
+static void runscript(Client *c);
+static void evalscript(Client *c, const char *jsstr, ...);
+static void updatewinid(Client *c);
+static void handleplumb(Client *c, const char *uri);
+static void newwindow(Client *c, const Arg *a, int noembed);
+static void spawn(Client *c, const Arg *a);
+static void destroyclient(Client *c);
+static void cleanup(void);
 
-static char *copystr(char **str, const char *src);
+/* GTK/WebKit */
+static WebKitWebView *newview(Client *c, WebKitWebView *rv);
+static void initwebextensions(WebKitWebContext *wc, Client *c);
 static GtkWidget *createview(WebKitWebView *v, WebKitNavigationAction *a,
-               Client *c);
+                             Client *c);
+static gboolean buttonreleased(GtkWidget *w, GdkEvent *e, Client *c);
+static GdkFilterReturn processx(GdkXEvent *xevent, GdkEvent *event,
+                                gpointer d);
+static gboolean winevent(GtkWidget *w, GdkEvent *e, Client *c);
+static void showview(WebKitWebView *v, Client *c);
+static GtkWidget *createwindow(Client *c);
+static void loadchanged(WebKitWebView *v, WebKitLoadEvent e, Client *c);
+static void progresschanged(WebKitWebView *v, GParamSpec *ps, Client *c);
+static void titlechanged(WebKitWebView *view, GParamSpec *ps, Client *c);
+static void mousetargetchanged(WebKitWebView *v, WebKitHitTestResult *h,
+                               guint modifiers, Client *c);
+static gboolean permissionrequested(WebKitWebView *v,
+                                    WebKitPermissionRequest *r, Client *c);
 static gboolean decidepolicy(WebKitWebView *v, WebKitPolicyDecision *d,
-    WebKitPolicyDecisionType dt, Client *c);
+                             WebKitPolicyDecisionType dt, Client *c);
 static void decidenavigation(WebKitPolicyDecision *d, Client *c);
 static void decidenewwindow(WebKitPolicyDecision *d, Client *c);
 static void decideresource(WebKitPolicyDecision *d, Client *c);
-static void closeview(WebKitWebView *v, Client *c);
-static void destroyclient(Client *c);
-static void destroywin(GtkWidget* w, Client *c);
-static void die(const char *errstr, ...);
-static void evalscript(Client *c, const char *jsstr, ...);
-static void runscript(Client *c);
-static void find(Client *c, const Arg *arg);
-static void togglefullscreen(Client *c, const Arg *a);
-static gboolean permissionrequested(WebKitWebView *v,
-               WebKitPermissionRequest *r, Client *c);
-static const char *getatom(Client *c, int a);
-static void gettogglestat(Client *c);
-static void getpagestat(Client *c);
-static char *geturi(Client *c);
-static const gchar *getstyle(const char *uri);
-static void setstyle(Client *c, const char *stylefile);
-
-static void handleplumb(Client *c, const gchar *uri);
-
+static void insecurecontent(WebKitWebView *v, WebKitInsecureContentEvent e,
+                            Client *c);
 static void downloadstarted(WebKitWebContext *wc, WebKitDownload *d,
-               Client *c);
+                            Client *c);
 static void responsereceived(WebKitDownload *d, GParamSpec *ps, Client *c);
 static void download(Client *c, WebKitURIResponse *r);
+static void closeview(WebKitWebView *v, Client *c);
+static void destroywin(GtkWidget* w, Client *c);
 
-static void toggleinspector(Client *c, const Arg *a);
-
-static gboolean keypress(GtkAccelGroup *group, GObject *obj, guint key,
-                         GdkModifierType mods, Client *c);
-static void mousetargetchanged(WebKitWebView *v, WebKitHitTestResult *h,
-               guint modifiers, Client *c);
-static void loadchanged(WebKitWebView *v, WebKitLoadEvent e, Client *c);
-static void loaduri(Client *c, const Arg *arg);
-static void navigate(Client *c, const Arg *arg);
-static Client *newclient(Client *c);
-static WebKitWebView *newview(Client *c, WebKitWebView *rv);
-static void showview(WebKitWebView *v, Client *c);
-static void newwindow(Client *c, const Arg *arg, gboolean noembed);
-static GtkWidget *createwindow(Client *c);
+/* Hotkeys */
 static void pasteuri(GtkClipboard *clipboard, const char *text, gpointer d);
+static void reload(Client *c, const Arg *a);
 static void print(Client *c, const Arg *a);
-static GdkFilterReturn processx(GdkXEvent *xevent, GdkEvent *event,
-                                gpointer d);
-static gboolean winevent(GtkWidget *w, GdkEvent *e, Client *c);
-static void progresschanged(WebKitWebView *v, GParamSpec *ps, Client *c);
-static void linkopen(Client *c, const Arg *arg);
-static void linkopenembed(Client *c, const Arg *arg);
-static void reload(Client *c, const Arg *arg);
-static void scroll_h(Client *c, const Arg *arg);
-static void scroll_v(Client *c, const Arg *arg);
-static void scroll(GtkAdjustment *a, const Arg *arg);
-static void setatom(Client *c, int a, const char *v);
-static void setup(void);
-static void sigchld(int unused);
-static void spawn(Client *c, const Arg *arg);
-static void stop(Client *c, const Arg *arg);
-static void titlechanged(WebKitWebView *view, GParamSpec *ps, Client *c);
-static void toggle(Client *c, const Arg *arg);
-static void togglecookiepolicy(Client *c, const Arg *arg);
-static void togglegeolocation(Client *c, const Arg *arg);
-static void togglescrollbars(Client *c, const Arg *arg);
-static void togglestyle(Client *c, const Arg *arg);
-static void updatetitle(Client *c);
-static void updatewinid(Client *c);
-static void usage(void);
-static void zoom(Client *c, const Arg *arg);
+static void clipboard(Client *c, const Arg *a);
+static void zoom(Client *c, const Arg *a);
+static void scroll(Client *c, const Arg *a);
+static void navigate(Client *c, const Arg *a);
+static void stop(Client *c, const Arg *a);
+static void toggle(Client *c, const Arg *a);
+static void togglefullscreen(Client *c, const Arg *a);
+static void togglecookiepolicy(Client *c, const Arg *a);
+static void toggleinspector(Client *c, const Arg *a);
+static void find(Client *c, const Arg *a);
+
+/* Buttons */
+static void clicknavigate(Client *c, const Arg *a, WebKitHitTestResult *h);
+static void clicknewwindow(Client *c, const Arg *a, WebKitHitTestResult *h);
+static void clickexternplayer(Client *c, const Arg *a, WebKitHitTestResult *h);
+
+static char winid[64];
+static char togglestats[11];
+static char pagestats[2];
+static Atom atoms[AtomLast];
+static Window embed;
+static int showxid;
+static int cookiepolicy;
+static Display *dpy;
+static Client *clients;
+static GdkDevice *gdkkb;
+static char *stylefile;
+static const char *useragent;
+static Parameter *curconfig;
+char *argv0;
 
 /* configuration, allows nested code to access above variables */
 #include "config.h"
 
 void
-addaccelgroup(Client *c)
+usage(void)
 {
-       int i;
-       GtkAccelGroup *group = gtk_accel_group_new();
-       GClosure *closure;
+       die("usage: %s [-bBdDfFgGiIkKmMnNpPsStTvx] [-a cookiepolicies ] "
+           "[-c cookiefile] [-C stylefile] [-e xid] [-r scriptfile] "
+           "[-u useragent] [-z zoomlevel] [uri]\n", basename(argv0));
+}
+
+void
+die(const char *errstr, ...)
+{
+       va_list ap;
+
+       va_start(ap, errstr);
+       vfprintf(stderr, errstr, ap);
+       va_end(ap);
+       exit(1);
+}
+
+void
+setup(void)
+{
+       GdkDisplay *gdpy;
+       int i, j;
+
+       /* clean up any zombies immediately */
+       sigchld(0);
+       if (signal(SIGHUP, sighup) == SIG_ERR)
+               die("Can't install SIGHUP handler");
+
+       if (!(dpy = XOpenDisplay(NULL)))
+               die("Can't open default display");
+
+       /* atoms */
+       atoms[AtomFind] = XInternAtom(dpy, "_SURF_FIND", False);
+       atoms[AtomGo] = XInternAtom(dpy, "_SURF_GO", False);
+       atoms[AtomUri] = XInternAtom(dpy, "_SURF_URI", False);
+
+       gtk_init(NULL, NULL);
+
+       gdpy = gdk_display_get_default();
+
+       curconfig = defconfig;
+
+       /* dirs and files */
+       cookiefile = buildfile(cookiefile);
+       scriptfile = buildfile(scriptfile);
+       cachedir   = buildpath(cachedir);
+       certdir    = buildpath(certdir);
+
+       gdkkb = gdk_seat_get_keyboard(gdk_display_get_default_seat(gdpy));
+
+       for (i = 0; i < LENGTH(certs); ++i) {
+               if (!regcomp(&(certs[i].re), certs[i].regex, REG_EXTENDED)) {
+                       certs[i].file = g_strconcat(certdir, "/", certs[i].file,
+                                                   NULL);
+               } else {
+                       fprintf(stderr, "Could not compile regex: %s\n",
+                               certs[i].regex);
+                       certs[i].regex = NULL;
+               }
+       }
+
+       if (!stylefile) {
+               styledir = buildpath(styledir);
+               for (i = 0; i < LENGTH(styles); ++i) {
+                       if (!regcomp(&(styles[i].re), styles[i].regex,
+                           REG_EXTENDED)) {
+                               styles[i].file = g_strconcat(styledir, "/",
+                                                   styles[i].file, NULL);
+                       } else {
+                               fprintf(stderr, "Could not compile regex: %s\n",
+                                       styles[i].regex);
+                               styles[i].regex = NULL;
+                       }
+               }
+               g_free(styledir);
+       } else {
+               stylefile = buildfile(stylefile);
+       }
 
-       for (i = 0; i < LENGTH(keys); i++) {
-               closure = g_cclosure_new(G_CALLBACK(keypress), c, NULL);
-               gtk_accel_group_connect(group, keys[i].keyval, keys[i].mod, 0,
-                                       closure);
+       for (i = 0; i < LENGTH(uriparams); ++i) {
+               if (!regcomp(&(uriparams[i].re), uriparams[i].uri,
+                   REG_EXTENDED)) {
+                       /* copy default parameters if they are not already set
+                        * or if they are forced */
+                       for (j = 0; j < ParameterLast; ++j) {
+                               if (!uriparams[i].config[j].force ||
+                                   defconfig[j].force)
+                                       uriparams[i].config[j] = defconfig[j];
+                       }
+               } else {
+                       fprintf(stderr, "Could not compile regex: %s\n",
+                               uriparams[i].uri);
+                       uriparams[i].uri = NULL;
+               }
        }
-       gtk_window_add_accel_group(GTK_WINDOW(c->win), group);
+}
+
+void
+sigchld(int unused)
+{
+       if (signal(SIGCHLD, sigchld) == SIG_ERR)
+               die("Can't install SIGCHLD handler");
+       while (waitpid(-1, NULL, WNOHANG) > 0)
+               ;
+}
+
+void
+sighup(int unused)
+{
+       Arg a = { .b = 0 };
+       Client *c;
+
+       for (c = clients; c; c = c->next)
+               reload(c, &a);
 }
 
 char *
@@ -229,29 +389,59 @@ buildfile(const char *path)
        return fpath;
 }
 
+static const char*
+getuserhomedir(const char *user)
+{
+       struct passwd *pw = getpwnam(user);
+
+       if (!pw)
+               die("Can't get user %s login information.\n", user);
+
+       return pw->pw_dir;
+}
+
+static const char*
+getcurrentuserhomedir(void)
+{
+       const char *homedir;
+       const char *user;
+       struct passwd *pw;
+
+       homedir = getenv("HOME");
+       if (homedir)
+               return homedir;
+
+       user = getenv("USER");
+       if (user)
+               return getuserhomedir(user);
+
+       pw = getpwuid(getuid());
+       if (!pw)
+               die("Can't get current user home directory\n");
+
+       return pw->pw_dir;
+}
+
 char *
 buildpath(const char *path)
 {
-       struct passwd *pw;
        char *apath, *name, *p, *fpath;
+       const char *homedir;
 
        if (path[0] == '~') {
                if (path[1] == '/' || path[1] == '\0') {
                        p = (char *)&path[1];
-                       pw = getpwuid(getuid());
+                       homedir = getcurrentuserhomedir();
                } else {
                        if ((p = strchr(path, '/')))
                                name = g_strndup(&path[1], --p - path);
                        else
                                name = g_strdup(&path[1]);
 
-                       if (!(pw = getpwnam(name))) {
-                               die("Can't get user %s home directory: %s.\n",
-                                   name, path);
-                       }
+                       homedir = getuserhomedir(name);
                        g_free(name);
                }
-               apath = g_build_filename(pw->pw_dir, p, NULL);
+               apath = g_build_filename(homedir, p, NULL);
        } else {
                apath = g_strdup(path);
        }
@@ -266,411 +456,367 @@ buildpath(const char *path)
        return fpath;
 }
 
-gboolean
-buttonreleased(GtkWidget *w, GdkEventKey *e, Client *c)
+Client *
+newclient(Client *rc)
 {
-       WebKitHitTestResultContext element;
-       GdkEventButton *eb = (GdkEventButton*)e;
-       int i;
+       Client *c;
 
-       element = webkit_hit_test_result_get_context(c->mousepos);
+       if (!(c = calloc(1, sizeof(Client))))
+               die("Cannot malloc!\n");
 
-       for (i = 0; i < LENGTH(buttons); ++i) {
-               if (element & buttons[i].target &&
-                   eb->button == buttons[i].button &&
-                   CLEANMASK(eb->state) == CLEANMASK(buttons[i].mask) &&
-                   buttons[i].func) {
-                       buttons[i].func(c, &buttons[i].arg, c->mousepos);
-                       return buttons[i].stopevent;
-               }
-       }
+       c->next = clients;
+       clients = c;
 
-       return FALSE;
+       c->progress = 100;
+       c->view = newview(c, rc ? rc->view : NULL);
+
+       return c;
 }
 
 void
-cleanup(void)
+loaduri(Client *c, const Arg *a)
 {
-       while (clients)
-               destroyclient(clients);
-       g_free(cookiefile);
-       g_free(scriptfile);
-       g_free(stylefile);
-       g_free(cachedir);
-}
+       struct stat st;
+       char *url, *path;
+       const char *uri = a->v;
 
-WebKitCookieAcceptPolicy
-cookiepolicy_get(void)
-{
-       switch (cookiepolicies[cookiepolicy]) {
-       case 'a':
-               return WEBKIT_COOKIE_POLICY_ACCEPT_NEVER;
-       case '@':
-               return WEBKIT_COOKIE_POLICY_ACCEPT_NO_THIRD_PARTY;
-       case 'A':
-       default:
-               break;
+       if (g_strcmp0(uri, "") == 0)
+               return;
+
+       if (g_str_has_prefix(uri, "http://")  ||
+           g_str_has_prefix(uri, "https://") ||
+           g_str_has_prefix(uri, "file://")  ||
+           g_str_has_prefix(uri, "about:")) {
+               url = g_strdup(uri);
+       } else if (!stat(uri, &st) && (path = realpath(uri, NULL))) {
+               url = g_strdup_printf("file://%s", path);
+               free(path);
+       } else {
+               url = g_strdup_printf("http://%s", uri);
+       }
+
+       setatom(c, AtomUri, url);
+
+       if (strcmp(url, geturi(c)) == 0) {
+               reload(c, a);
+       } else {
+               webkit_web_view_load_uri(c->view, url);
+               updatetitle(c);
        }
 
-       return WEBKIT_COOKIE_POLICY_ACCEPT_ALWAYS;
+       g_free(url);
 }
 
-char
-cookiepolicy_set(const WebKitCookieAcceptPolicy ep)
+const char *
+geturi(Client *c)
 {
-       switch (ep) {
-       case WEBKIT_COOKIE_POLICY_ACCEPT_NEVER:
-               return 'a';
-       case WEBKIT_COOKIE_POLICY_ACCEPT_NO_THIRD_PARTY:
-               return '@';
-       case WEBKIT_COOKIE_POLICY_ACCEPT_ALWAYS:
-       default:
-               break;
-       }
+       const char *uri;
 
-       return 'A';
+       if (!(uri = webkit_web_view_get_uri(c->view)))
+               uri = "about:blank";
+       return uri;
 }
 
 void
-evalscript(Client *c, const char *jsstr, ...)
+setatom(Client *c, int a, const char *v)
 {
-       va_list ap;
-       gchar *script;
-
-       va_start(ap, jsstr);
-       script = g_strdup_vprintf(jsstr, ap);
-       va_end(ap);
-
-       webkit_web_view_run_javascript(c->view, script, NULL, NULL, NULL);
-       g_free(script);
+       XSync(dpy, False);
+       XChangeProperty(dpy, c->xid,
+                       atoms[a], XA_STRING, 8, PropModeReplace,
+                       (unsigned char *)v, strlen(v) + 1);
 }
 
-void
-runscript(Client *c)
+const char *
+getatom(Client *c, int a)
 {
-       gchar *script;
-       gsize l;
+       static char buf[BUFSIZ];
+       Atom adummy;
+       int idummy;
+       unsigned long ldummy;
+       unsigned char *p = NULL;
 
-       if (g_file_get_contents(scriptfile, &script, &l, NULL) && l)
-               evalscript(c, script);
-       g_free(script);
-}
+       XGetWindowProperty(dpy, c->xid, atoms[a], 0L, BUFSIZ, False, XA_STRING,
+                          &adummy, &idummy, &ldummy, &ldummy, &p);
+       if (p)
+               strncpy(buf, (char *)p, LENGTH(buf) - 1);
+       else
+               buf[0] = '\0';
+       XFree(p);
 
-void
-clipboard(Client *c, const Arg *a)
-{
-       if (a->b) { /* load clipboard uri */
-               gtk_clipboard_request_text(gtk_clipboard_get(
-                                          GDK_SELECTION_PRIMARY),
-                                          pasteuri, c);
-       } else { /* copy uri */
-               gtk_clipboard_set_text(gtk_clipboard_get(
-                                      GDK_SELECTION_PRIMARY), c->targeturi
-                                      ? c->targeturi : geturi(c), -1);
-       }
+       return buf;
 }
 
-char *
-copystr(char **str, const char *src)
+void
+updatetitle(Client *c)
 {
-       char *tmp;
-       tmp = g_strdup(src);
+       char *title;
+       const char *name = c->overtitle ? c->overtitle :
+                          c->title ? c->title : "";
 
-       if (str && *str) {
-               g_free(*str);
-               *str = tmp;
-       }
-       return tmp;
-}
+       if (curconfig[ShowIndicators].val.b) {
+               gettogglestats(c);
+               getpagestats(c);
 
-GtkWidget *
-createview(WebKitWebView *v, WebKitNavigationAction *a, Client *c)
-{
-       Client *n;
+               if (c->progress != 100)
+                       title = g_strdup_printf("[%i%%] %s:%s | %s",
+                               c->progress, togglestats, pagestats, name);
+               else
+                       title = g_strdup_printf("%s:%s | %s",
+                               togglestats, pagestats, name);
 
-       switch (webkit_navigation_action_get_navigation_type(a)) {
-       case WEBKIT_NAVIGATION_TYPE_OTHER: /* fallthrough */
-               /*
-                * popup windows of type “other” are almost always triggered
-                * by user gesture, so inverse the logic here
-                */
-/* instead of this, compare destination uri to mouse-over uri for validating window */
-               if (webkit_navigation_action_is_user_gesture(a)) {
-                       return NULL;
-                       break;
-               }
-       case WEBKIT_NAVIGATION_TYPE_LINK_CLICKED: /* fallthrough */
-       case WEBKIT_NAVIGATION_TYPE_FORM_SUBMITTED: /* fallthrough */
-       case WEBKIT_NAVIGATION_TYPE_BACK_FORWARD: /* fallthrough */
-       case WEBKIT_NAVIGATION_TYPE_RELOAD: /* fallthrough */
-       case WEBKIT_NAVIGATION_TYPE_FORM_RESUBMITTED:
-               n = newclient(c);
-               break;
-       default:
-               return NULL;
-               break;
+               gtk_window_set_title(GTK_WINDOW(c->win), title);
+               g_free(title);
+       } else {
+               gtk_window_set_title(GTK_WINDOW(c->win), name);
        }
-
-       return GTK_WIDGET(n->view);
 }
 
-gboolean
-decidepolicy(WebKitWebView *v, WebKitPolicyDecision *d,
-    WebKitPolicyDecisionType dt, Client *c)
+void
+gettogglestats(Client *c)
 {
-       switch (dt) {
-       case WEBKIT_POLICY_DECISION_TYPE_NAVIGATION_ACTION:
-               decidenavigation(d, c);
-               break;
-       case WEBKIT_POLICY_DECISION_TYPE_NEW_WINDOW_ACTION:
-               decidenewwindow(d, c);
-               break;
-       case WEBKIT_POLICY_DECISION_TYPE_RESPONSE:
-               decideresource(d, c);
-               break;
-       default:
-               webkit_policy_decision_ignore(d);
-               break;
-       }
-       return TRUE;
+       togglestats[0] = cookiepolicy_set(cookiepolicy_get());
+       togglestats[1] = curconfig[CaretBrowsing].val.b ?   'C' : 'c';
+       togglestats[2] = curconfig[Geolocation].val.b ?     'G' : 'g';
+       togglestats[3] = curconfig[DiskCache].val.b ?       'D' : 'd';
+       togglestats[4] = curconfig[LoadImages].val.b ?      'I' : 'i';
+       togglestats[5] = curconfig[JavaScript].val.b ?      'S' : 's';
+       togglestats[6] = curconfig[Plugins].val.b ?         'V' : 'v';
+       togglestats[7] = curconfig[Style].val.b ?           'M' : 'm';
+       togglestats[8] = curconfig[FrameFlattening].val.b ? 'F' : 'f';
+       togglestats[9] = curconfig[StrictTLS].val.b ?       'T' : 't';
+       togglestats[10] = '\0';
 }
 
 void
-decidenavigation(WebKitPolicyDecision *d, Client *c)
+getpagestats(Client *c)
 {
-       WebKitNavigationAction *a;
-
-       a = webkit_navigation_policy_decision_get_navigation_action(
-           WEBKIT_NAVIGATION_POLICY_DECISION(d));
+       if (c->https)
+               pagestats[0] = (c->tlserr || c->insecure) ?  'U' : 'T';
+       else
+               pagestats[0] = '-';
+       pagestats[1] = '\0';
+}
 
-       switch (webkit_navigation_action_get_navigation_type(a)) {
-       case WEBKIT_NAVIGATION_TYPE_LINK_CLICKED: /* fallthrough */
-       case WEBKIT_NAVIGATION_TYPE_FORM_SUBMITTED: /* fallthrough */
-       case WEBKIT_NAVIGATION_TYPE_BACK_FORWARD: /* fallthrough */
-       case WEBKIT_NAVIGATION_TYPE_RELOAD: /* fallthrough */
-       case WEBKIT_NAVIGATION_TYPE_FORM_RESUBMITTED:
-       case WEBKIT_NAVIGATION_TYPE_OTHER: /* fallthrough */
-       default:
-               /* Do not navigate to links with a "_blank" target (popup) */
-               if (webkit_navigation_policy_decision_get_frame_name(
-                   WEBKIT_NAVIGATION_POLICY_DECISION(d))) {
-                       webkit_policy_decision_ignore(d);
-               } else {
-                       /* Filter out navigation to different domain ? */
-                       /* get action→urirequest, copy and load in new window+view
-                        * on Ctrl+Click ? */
-                       webkit_policy_decision_use(d);
-               }
-               break;
+WebKitCookieAcceptPolicy
+cookiepolicy_get(void)
+{
+       switch (((char *)curconfig[CookiePolicies].val.v)[cookiepolicy]) {
+       case 'a':
+               return WEBKIT_COOKIE_POLICY_ACCEPT_NEVER;
+       case '@':
+               return WEBKIT_COOKIE_POLICY_ACCEPT_NO_THIRD_PARTY;
+       default: /* fallthrough */
+       case 'A':
+               return WEBKIT_COOKIE_POLICY_ACCEPT_ALWAYS;
        }
 }
 
-void
-decidenewwindow(WebKitPolicyDecision *d, Client *c)
+char
+cookiepolicy_set(const WebKitCookieAcceptPolicy p)
 {
-       WebKitNavigationAction *a;
-       Arg arg;
-
-       a = webkit_navigation_policy_decision_get_navigation_action(
-           WEBKIT_NAVIGATION_POLICY_DECISION(d));
-
-       switch (webkit_navigation_action_get_navigation_type(a)) {
-       case WEBKIT_NAVIGATION_TYPE_LINK_CLICKED: /* fallthrough */
-       case WEBKIT_NAVIGATION_TYPE_FORM_SUBMITTED: /* fallthrough */
-       case WEBKIT_NAVIGATION_TYPE_BACK_FORWARD: /* fallthrough */
-       case WEBKIT_NAVIGATION_TYPE_RELOAD: /* fallthrough */
-       case WEBKIT_NAVIGATION_TYPE_FORM_RESUBMITTED:
-               /* Filter domains here */
-/* If the value of “mouse-button” is not 0, then the navigation was triggered by a mouse event.
- * test for link clicked but no button ? */
-               arg.v = webkit_uri_request_get_uri(
-                   webkit_navigation_action_get_request(a));
-               newwindow(c, &arg, 0);
-               break;
-       case WEBKIT_NAVIGATION_TYPE_OTHER: /* fallthrough */
-       default:
-               break;
+       switch (p) {
+       case WEBKIT_COOKIE_POLICY_ACCEPT_NEVER:
+               return 'a';
+       case WEBKIT_COOKIE_POLICY_ACCEPT_NO_THIRD_PARTY:
+               return '@';
+       default: /* fallthrough */
+       case WEBKIT_COOKIE_POLICY_ACCEPT_ALWAYS:
+               return 'A';
        }
-
-       webkit_policy_decision_ignore(d);
 }
 
 void
-decideresource(WebKitPolicyDecision *d, Client *c)
+seturiparameters(Client *c, const char *uri)
 {
-       const gchar *uri;
-       int i, isascii = 1;
-       WebKitResponsePolicyDecision *r = WEBKIT_RESPONSE_POLICY_DECISION(d);
-       WebKitURIResponse *res;
-
-       res = webkit_response_policy_decision_get_response(r);
-       uri = webkit_uri_response_get_uri(res);
-
-       if (g_str_has_suffix(uri, "/favicon.ico"))
-               webkit_uri_request_set_uri(
-                   webkit_response_policy_decision_get_request(r),
-                   "about:blank");
+       int i;
 
-       if (!g_str_has_prefix(uri, "http://")
-           && !g_str_has_prefix(uri, "https://")
-           && !g_str_has_prefix(uri, "about:")
-           && !g_str_has_prefix(uri, "file://")
-           && !g_str_has_prefix(uri, "data:")
-           && !g_str_has_prefix(uri, "blob:")
-           && strlen(uri) > 0) {
-               for (i = 0; i < strlen(uri); i++) {
-                       if (!g_ascii_isprint(uri[i])) {
-                               isascii = 0;
-                               break;
-                       }
-               }
-               if (isascii) {
-                       handleplumb(c, uri);
-                       webkit_policy_decision_ignore(d);
+       for (i = 0; i < LENGTH(uriparams); ++i) {
+               if (uriparams[i].uri &&
+                   !regexec(&(uriparams[i].re), uri, 0, NULL, 0)) {
+                       curconfig = uriparams[i].config;
+                       break;
                }
        }
 
-       if (webkit_response_policy_decision_is_mime_type_supported(r)) {
-               webkit_policy_decision_use(d);
-       } else {
-               webkit_policy_decision_ignore(d);
-               download(c, res);
-       }
+       for (i = 0; i < ParameterLast; ++i)
+               setparameter(c, 0, i, &curconfig[i].val);
 }
 
 void
-destroyclient(Client *c)
+setparameter(Client *c, int refresh, ParamName p, const Arg *a)
 {
-       Client *p;
-
-       webkit_web_view_stop_loading(c->view);
-       /* Not needed, has already been called
-       gtk_widget_destroy(c->win);
-        */
+       GdkRGBA bgcolor = { 0 };
+       WebKitSettings *s = webkit_web_view_get_settings(c->view);
 
-       for (p = clients; p && p->next != c; p = p->next)
-               ;
-       if (p)
-               p->next = c->next;
-       else
-               clients = c->next;
-       free(c);
-}
+       switch (p) {
+       case AcceleratedCanvas:
+               webkit_settings_set_enable_accelerated_2d_canvas(s, a->b);
+               break;
+       case CaretBrowsing:
+               webkit_settings_set_enable_caret_browsing(s, a->b);
+               refresh = 0;
+               break;
+       case Certificate:
+               if (a->b)
+                       setcert(c, geturi(c));
+               return; /* do not update */
+       case CookiePolicies:
+               webkit_cookie_manager_set_accept_policy(
+                   webkit_web_context_get_cookie_manager(
+                   webkit_web_view_get_context(c->view)),
+                   cookiepolicy_get());
+               refresh = 0;
+               break;
+       case DiskCache:
+               webkit_web_context_set_cache_model(
+                   webkit_web_view_get_context(c->view), a->b ?
+                   WEBKIT_CACHE_MODEL_WEB_BROWSER :
+                   WEBKIT_CACHE_MODEL_DOCUMENT_VIEWER);
+               return; /* do not update */
+       case DNSPrefetch:
+               webkit_settings_set_enable_dns_prefetching(s, a->b);
+               return; /* do not update */
+       case FontSize:
+               webkit_settings_set_default_font_size(s, a->i);
+               return; /* do not update */
+       case FrameFlattening:
+               webkit_settings_set_enable_frame_flattening(s, a->b);
+               break;
+       case Geolocation:
+               refresh = 0;
+               break;
+       case HideBackground:
+               if (a->b)
+                       webkit_web_view_set_background_color(c->view, &bgcolor);
+               return; /* do not update */
+       case Inspector:
+               webkit_settings_set_enable_developer_extras(s, a->b);
+               return; /* do not update */
+       case JavaScript:
+               webkit_settings_set_enable_javascript(s, a->b);
+               break;
+       case KioskMode:
+               return; /* do nothing */
+       case LoadImages:
+               webkit_settings_set_auto_load_images(s, a->b);
+               break;
+       case MediaManualPlay:
+               webkit_settings_set_media_playback_requires_user_gesture(s, a->b);
+               break;
+       case Plugins:
+               webkit_settings_set_enable_plugins(s, a->b);
+               break;
+       case PreferredLanguages:
+               return; /* do nothing */
+       case RunInFullscreen:
+               return; /* do nothing */
+       case ScrollBars:
+               /* Disabled until we write some WebKitWebExtension for
+                * manipulating the DOM directly.
+               enablescrollbars = !enablescrollbars;
+               evalscript(c, "document.documentElement.style.overflow = '%s'",
+                   enablescrollbars ? "auto" : "hidden");
+               */
+               return; /* do not update */
+       case ShowIndicators:
+               break;
+       case SiteQuirks:
+               webkit_settings_set_enable_site_specific_quirks(s, a->b);
+               break;
+       case SpellChecking:
+               webkit_web_context_set_spell_checking_enabled(
+                   webkit_web_view_get_context(c->view), a->b);
+               return; /* do not update */
+       case SpellLanguages:
+               return; /* do nothing */
+       case StrictTLS:
+               webkit_web_context_set_tls_errors_policy(
+                   webkit_web_view_get_context(c->view), a->b ?
+                   WEBKIT_TLS_ERRORS_POLICY_FAIL :
+                   WEBKIT_TLS_ERRORS_POLICY_IGNORE);
+               break;
+       case Style:
+               if (a->b)
+                       setstyle(c, getstyle(geturi(c)));
+               else
+                       webkit_user_content_manager_remove_all_style_sheets(
+                           webkit_web_view_get_user_content_manager(c->view));
+               refresh = 0;
+               break;
+       case ZoomLevel:
+               webkit_web_view_set_zoom_level(c->view, a->f);
+               return; /* do not update */
+       default:
+               return; /* do nothing */
+       }
 
-void
-closeview(WebKitWebView *v, Client *c)
-{
-       gtk_widget_destroy(c->win);
+       updatetitle(c);
+       if (refresh)
+               reload(c, a);
 }
 
-void
-destroywin(GtkWidget* w, Client *c)
+const char *
+getcert(const char *uri)
 {
-       destroyclient(c);
-       if (clients == NULL)
-               gtk_main_quit();
-}
+       int i;
 
-void
-die(const char *errstr, ...)
-{
-       va_list ap;
+       for (i = 0; i < LENGTH(certs); ++i) {
+               if (certs[i].regex &&
+                   !regexec(&(certs[i].re), uri, 0, NULL, 0))
+                       return certs[i].file;
+       }
 
-       va_start(ap, errstr);
-       vfprintf(stderr, errstr, ap);
-       va_end(ap);
-       exit(EXIT_FAILURE);
+       return NULL;
 }
 
 void
-find(Client *c, const Arg *arg)
+setcert(Client *c, const char *uri)
 {
-       const char *s;
+       const char *file = getcert(uri);
+       char *host;
+       GTlsCertificate *cert;
 
-       s = getatom(c, AtomFind);
-       gboolean forward = *(gboolean *)arg;
-       webkit_web_view_search_text(c->view, s, FALSE, forward, TRUE);
-}
-
-void
-togglefullscreen(Client *c, const Arg *a)
-{
-       /* toggling value is handled in winevent() */
-       if (c->fullscreen)
-               gtk_window_unfullscreen(GTK_WINDOW(c->win));
-       else
-               gtk_window_fullscreen(GTK_WINDOW(c->win));
-}
+       if (!file)
+               return;
 
-gboolean
-permissionrequested(WebKitWebView *v, WebKitPermissionRequest *r, Client *c)
-{
-       if (WEBKIT_IS_GEOLOCATION_PERMISSION_REQUEST(r)) {
-               if (allowgeolocation)
-                       webkit_permission_request_allow(r);
-               else
-                       webkit_permission_request_deny(r);
-               return TRUE;
+       if (!(cert = g_tls_certificate_new_from_file(file, NULL))) {
+               fprintf(stderr, "Could not read certificate file: %s\n", file);
+               return;
        }
 
-       return FALSE;
-}
+       uri = strstr(uri, "://") + sizeof("://") - 1;
+       host = strndup(uri, strstr(uri, "/") - uri);
 
-const char *
-getatom(Client *c, int a)
-{
-       static char buf[BUFSIZ];
-       Atom adummy;
-       int idummy;
-       unsigned long ldummy;
-       unsigned char *p = NULL;
-
-       XGetWindowProperty(dpy, c->xid,
-                          atoms[a], 0L, BUFSIZ, False, XA_STRING,
-                          &adummy, &idummy, &ldummy, &ldummy, &p);
-       if (p)
-               strncpy(buf, (char *)p, LENGTH(buf)-1);
-       else
-               buf[0] = '\0';
-       XFree(p);
-
-       return buf;
-}
+       webkit_web_context_allow_tls_certificate_for_host(
+           webkit_web_view_get_context(c->view), cert, host);
 
-char *
-geturi(Client *c)
-{
-       char *uri;
-
-       if (!(uri = (char *)webkit_web_view_get_uri(c->view)))
-               uri = "about:blank";
-       return uri;
+       free(host);
 }
 
-const gchar *
+const char *
 getstyle(const char *uri)
 {
        int i;
 
-       if (stylefile != NULL)
+       if (stylefile)
                return stylefile;
 
-       for (i = 0; i < LENGTH(styles); i++) {
-               if (styles[i].regex && !regexec(&(styles[i].re), uri, 0,
-                   NULL, 0))
-                       return styles[i].style;
+       for (i = 0; i < LENGTH(styles); ++i) {
+               if (styles[i].regex &&
+                   !regexec(&(styles[i].re), uri, 0, NULL, 0))
+                       return styles[i].file;
        }
 
        return "";
 }
 
 void
-setstyle(Client *c, const char *stylefile)
+setstyle(Client *c, const char *file)
 {
        gchar *style;
 
-       if (!g_file_get_contents(stylefile, &style, NULL, NULL)) {
-               fprintf(stderr, "Could not read style file: %s\n", stylefile);
+       if (!g_file_get_contents(file, &style, NULL, NULL)) {
+               fprintf(stderr, "Could not read style file: %s\n", file);
                return;
        }
 
@@ -685,184 +831,140 @@ setstyle(Client *c, const char *stylefile)
 }
 
 void
-handleplumb(Client *c, const gchar *uri)
+runscript(Client *c)
 {
-       Arg arg;
+       gchar *script;
+       gsize l;
 
-       arg = (Arg)PLUMB(uri);
-       spawn(c, &arg);
+       if (g_file_get_contents(scriptfile, &script, &l, NULL) && l)
+               evalscript(c, script);
+       g_free(script);
 }
 
 void
-downloadstarted(WebKitWebContext *wc, WebKitDownload *d, Client *c)
+evalscript(Client *c, const char *jsstr, ...)
 {
-       g_signal_connect(G_OBJECT(d), "notify::response",
-           G_CALLBACK(responsereceived), c);
+       va_list ap;
+       gchar *script;
+
+       va_start(ap, jsstr);
+       script = g_strdup_vprintf(jsstr, ap);
+       va_end(ap);
+
+       webkit_web_view_run_javascript(c->view, script, NULL, NULL, NULL);
+       g_free(script);
 }
 
 void
-responsereceived(WebKitDownload *d, GParamSpec *ps, Client *c)
+updatewinid(Client *c)
 {
-       download(c, webkit_download_get_response(d));
-       webkit_download_cancel(d);
+       snprintf(winid, LENGTH(winid), "%lu", c->xid);
 }
 
 void
-download(Client *c, WebKitURIResponse *r)
+handleplumb(Client *c, const char *uri)
 {
-       Arg a;
-
-       a = (Arg)DOWNLOAD(webkit_uri_response_get_uri(r), geturi(c));
+       Arg a = (Arg)PLUMB(uri);
        spawn(c, &a);
 }
 
 void
-toggleinspector(Client *c, const Arg *a)
-{
-       if (enableinspector) {
-               if (webkit_web_inspector_is_attached(c->inspector))
-                       webkit_web_inspector_close(c->inspector);
-               else
-                       webkit_web_inspector_show(c->inspector);
-       }
-}
-
-gboolean
-keypress(GtkAccelGroup *group, GObject *obj, guint key, GdkModifierType mods,
-         Client *c)
+newwindow(Client *c, const Arg *a, int noembed)
 {
-       guint i;
-       gboolean processed = FALSE;
+       int i = 0;
+       char tmp[64];
+       const char *cmd[28], *uri;
+       const Arg arg = { .v = cmd };
 
-       mods = CLEANMASK(mods);
-       key = gdk_keyval_to_lower(key);
-       updatewinid(c);
-       for (i = 0; i < LENGTH(keys); i++) {
-               if (key == keys[i].keyval
-                   && mods == keys[i].mod
-                   && keys[i].func) {
-                       keys[i].func(c, &(keys[i].arg));
-                       processed = TRUE;
-               }
+       cmd[i++] = argv0;
+       cmd[i++] = "-a";
+       cmd[i++] = curconfig[CookiePolicies].val.v;
+       cmd[i++] = curconfig[ScrollBars].val.b ? "-B" : "-b";
+       if (cookiefile && g_strcmp0(cookiefile, "")) {
+               cmd[i++] = "-c";
+               cmd[i++] = cookiefile;
        }
+       if (stylefile && g_strcmp0(stylefile, "")) {
+               cmd[i++] = "-C";
+               cmd[i++] = stylefile;
+       }
+       cmd[i++] = curconfig[DiskCache].val.b ? "-D" : "-d";
+       if (embed && !noembed) {
+               cmd[i++] = "-e";
+               snprintf(tmp, LENGTH(tmp), "%lu", embed);
+               cmd[i++] = tmp;
+       }
+       cmd[i++] = curconfig[RunInFullscreen].val.b ? "-F" : "-f" ;
+       cmd[i++] = curconfig[Geolocation].val.b ?     "-G" : "-g" ;
+       cmd[i++] = curconfig[LoadImages].val.b ?      "-I" : "-i" ;
+       cmd[i++] = curconfig[KioskMode].val.b ?       "-K" : "-k" ;
+       cmd[i++] = curconfig[Style].val.b ?           "-M" : "-m" ;
+       cmd[i++] = curconfig[Inspector].val.b ?       "-N" : "-n" ;
+       cmd[i++] = curconfig[Plugins].val.b ?         "-P" : "-p" ;
+       if (scriptfile && g_strcmp0(scriptfile, "")) {
+               cmd[i++] = "-r";
+               cmd[i++] = scriptfile;
+       }
+       cmd[i++] = curconfig[JavaScript].val.b ? "-S" : "-s";
+       cmd[i++] = curconfig[StrictTLS].val.b ? "-T" : "-t";
+       if (fulluseragent && g_strcmp0(fulluseragent, "")) {
+               cmd[i++] = "-u";
+               cmd[i++] = fulluseragent;
+       }
+       if (showxid)
+               cmd[i++] = "-x";
+       /* do not keep zoom level */
+       cmd[i++] = "--";
+       if ((uri = a->v))
+               cmd[i++] = uri;
+       cmd[i] = NULL;
 
-       return processed;
-}
-
-void
-mousetargetchanged(WebKitWebView *v, WebKitHitTestResult *h, guint modifiers,
-    Client *c)
-{
-       WebKitHitTestResultContext hc;
-
-       /* Keep the hit test to know where is the pointer on the next click */
-       c->mousepos = h;
-
-       hc = webkit_hit_test_result_get_context(h);
-
-       if (hc & OnLink)
-               c->targeturi = webkit_hit_test_result_get_link_uri(h);
-       else if (hc & OnImg)
-               c->targeturi = webkit_hit_test_result_get_image_uri(h);
-       else if (hc & OnMedia)
-               c->targeturi = webkit_hit_test_result_get_media_uri(h);
-       else
-               c->targeturi = NULL;
-       updatetitle(c);
+       spawn(c, &arg);
 }
 
 void
-loadchanged(WebKitWebView *v, WebKitLoadEvent e, Client *c)
+spawn(Client *c, const Arg *a)
 {
-       switch (e) {
-       case WEBKIT_LOAD_STARTED:
-               c->tlsflags = G_TLS_CERTIFICATE_VALIDATE_ALL + 1;
-               break;
-       case WEBKIT_LOAD_REDIRECTED:
-               setatom(c, AtomUri, geturi(c));
-               break;
-       case WEBKIT_LOAD_COMMITTED:
-               if (!webkit_web_view_get_tls_info(c->view, NULL, &(c->tlsflags)))
-                       c->tlsflags = G_TLS_CERTIFICATE_VALIDATE_ALL + 1;
-
-               setatom(c, AtomUri, geturi(c));
-
-               if (enablestyle)
-                       setstyle(c, getstyle(geturi(c)));
-               break;
-       case WEBKIT_LOAD_FINISHED:
-               /* Disabled until we write some WebKitWebExtension for
-                * manipulating the DOM directly.
-               evalscript(c, "document.documentElement.style.overflow = '%s'",
-                   enablescrollbars ? "auto" : "hidden");
-               */
-               runscript(c);
-               break;
+       if (fork() == 0) {
+               if (dpy)
+                       close(ConnectionNumber(dpy));
+               setsid();
+               execvp(((char **)a->v)[0], (char **)a->v);
+               fprintf(stderr, "%s: execvp %s", argv0, ((char **)a->v)[0]);
+               perror(" failed");
+               exit(1);
        }
-       updatetitle(c);
 }
 
 void
-loaduri(Client *c, const Arg *arg)
+destroyclient(Client *c)
 {
-       char *u = NULL, *rp;
-       const char *uri = (char *)arg->v;
-       Arg a = { .b = FALSE };
-       struct stat st;
-
-       if (strcmp(uri, "") == 0)
-               return;
-
-       /* In case it's a file path. */
-       if (stat(uri, &st) == 0) {
-               rp = realpath(uri, NULL);
-               u = g_strdup_printf("file://%s", rp);
-               free(rp);
-       } else {
-               u = g_strrstr(uri, "://") ? g_strdup(uri)
-                   : g_strdup_printf("http://%s", uri);
-       }
+       Client *p;
 
-       setatom(c, AtomUri, uri);
+       webkit_web_view_stop_loading(c->view);
+       /* Not needed, has already been called
+       gtk_widget_destroy(c->win);
+        */
 
-       /* prevents endless loop */
-       if (strcmp(u, geturi(c)) == 0) {
-               reload(c, &a);
-       } else {
-               webkit_web_view_load_uri(c->view, u);
-               c->progress = 0;
-               c->title = copystr(&c->title, u);
-               updatetitle(c);
-       }
-       g_free(u);
+       for (p = clients; p && p->next != c; p = p->next)
+               ;
+       if (p)
+               p->next = c->next;
+       else
+               clients = c->next;
+       free(c);
 }
 
 void
-navigate(Client *c, const Arg *arg)
-{
-       int steps = *(int *)arg;
-       webkit_web_view_go_back_or_forward(c->view, steps);
-}
-
-Client *
-newclient(Client *rc)
+cleanup(void)
 {
-       Client *c;
-       gdouble dpi;
-
-       if (!(c = calloc(1, sizeof(Client))))
-               die("Cannot malloc!\n");
-
-       c->title = NULL;
-       c->progress = 100;
-
-       c->next = clients;
-       clients = c;
-
-       c->view = newview(c, rc ? rc->view : NULL);
-       c->tlsflags = G_TLS_CERTIFICATE_VALIDATE_ALL + 1;
-
-       return c;
+       while (clients)
+               destroyclient(clients);
+       g_free(cookiefile);
+       g_free(scriptfile);
+       g_free(stylefile);
+       g_free(cachedir);
+       XCloseDisplay(dpy);
 }
 
 WebKitWebView *
@@ -872,7 +974,6 @@ newview(Client *c, WebKitWebView *rv)
        WebKitSettings *settings;
        WebKitUserContentManager *contentmanager;
        WebKitWebContext *context;
-       char *ua;
 
        /* Webview */
        if (rv) {
@@ -880,41 +981,51 @@ newview(Client *c, WebKitWebView *rv)
                    webkit_web_view_new_with_related_view(rv));
        } else {
                settings = webkit_settings_new_with_settings(
-                   "auto-load-images", loadimages,
-                   "default-font-size", defaultfontsize,
-                   "enable-caret-browsing", enablecaretbrowsing,
-                   "enable-developer-extras", enableinspector,
-                   "enable-dns-prefetching", enablednsprefetching,
-                   "enable-frame-flattening", enableframeflattening,
-                   "enable-html5-database", enablecache,
-                   "enable-html5-local-storage", enablecache,
-                   "enable-javascript", enablescripts,
-                   "enable-plugins", enableplugins,
-                   NULL);
-               if (!(ua = getenv("SURF_USERAGENT")))
-                       ua = useragent;
-               webkit_settings_set_user_agent(settings, ua);
-               /* Have a look at http://webkitgtk.org/reference/webkit2gtk/stable/WebKitSettings.html
-                * for more interesting settings */
+                  "auto-load-images", curconfig[LoadImages].val.b,
+                  "default-font-size", curconfig[FontSize].val.i,
+                  "enable-caret-browsing", curconfig[CaretBrowsing].val.b,
+                  "enable-developer-extras", curconfig[Inspector].val.b,
+                  "enable-dns-prefetching", curconfig[DNSPrefetch].val.b,
+                  "enable-frame-flattening", curconfig[FrameFlattening].val.b,
+                  "enable-html5-database", curconfig[DiskCache].val.b,
+                  "enable-html5-local-storage", curconfig[DiskCache].val.b,
+                  "enable-javascript", curconfig[JavaScript].val.b,
+                  "enable-plugins", curconfig[Plugins].val.b,
+                  "enable-accelerated-2d-canvas", curconfig[AcceleratedCanvas].val.b,
+                  "enable-site-specific-quirks", curconfig[SiteQuirks].val.b,
+                  "media-playback-requires-user-gesture", curconfig[MediaManualPlay].val.b,
+                  NULL);
+/* For mor interesting settings, have a look at
+ * http://webkitgtk.org/reference/webkit2gtk/stable/WebKitSettings.html */
+
+               if (strcmp(fulluseragent, "")) {
+                       webkit_settings_set_user_agent(settings, fulluseragent);
+               } else if (surfuseragent) {
+                       webkit_settings_set_user_agent_with_application_details(
+                           settings, "Surf", VERSION);
+               }
+               useragent = webkit_settings_get_user_agent(settings);
 
                contentmanager = webkit_user_content_manager_new();
 
                context = webkit_web_context_new_with_website_data_manager(
-                   webkit_website_data_manager_new(
-                   "base-cache-directory", cachedir,
-                   "base-data-directory", cachedir,
-                   NULL));
+                         webkit_website_data_manager_new(
+                         "base-cache-directory", cachedir,
+                         "base-data-directory", cachedir,
+                         NULL));
 
-               /* rendering process model, can be a shared unique one or one for each
-                * view */
+               /* rendering process model, can be a shared unique one
+                * or one for each view */
                webkit_web_context_set_process_model(context,
                    WEBKIT_PROCESS_MODEL_MULTIPLE_SECONDARY_PROCESSES);
-               /* ssl */
-               webkit_web_context_set_tls_errors_policy(context, strictssl ?
-                   WEBKIT_TLS_ERRORS_POLICY_FAIL : WEBKIT_TLS_ERRORS_POLICY_IGNORE);
+               /* TLS */
+               webkit_web_context_set_tls_errors_policy(context,
+                   curconfig[StrictTLS].val.b ? WEBKIT_TLS_ERRORS_POLICY_FAIL :
+                   WEBKIT_TLS_ERRORS_POLICY_IGNORE);
                /* disk cache */
-               webkit_web_context_set_cache_model(context, enablecache ?
-                   WEBKIT_CACHE_MODEL_WEB_BROWSER : WEBKIT_CACHE_MODEL_DOCUMENT_VIEWER);
+               webkit_web_context_set_cache_model(context,
+                   curconfig[DiskCache].val.b ? WEBKIT_CACHE_MODEL_WEB_BROWSER :
+                   WEBKIT_CACHE_MODEL_DOCUMENT_VIEWER);
 
                /* Currently only works with text file to be compatible with curl */
                webkit_cookie_manager_set_persistent_storage(
@@ -924,9 +1035,18 @@ newview(Client *c, WebKitWebView *rv)
                webkit_cookie_manager_set_accept_policy(
                    webkit_web_context_get_cookie_manager(context),
                    cookiepolicy_get());
+               /* languages */
+               webkit_web_context_set_preferred_languages(context,
+                   curconfig[PreferredLanguages].val.v);
+               webkit_web_context_set_spell_checking_languages(context,
+                   curconfig[SpellLanguages].val.v);
+               webkit_web_context_set_spell_checking_enabled(context,
+                   curconfig[SpellChecking].val.b);
 
                g_signal_connect(G_OBJECT(context), "download-started",
-                   G_CALLBACK(downloadstarted), c);
+                                G_CALLBACK(downloadstarted), c);
+               g_signal_connect(G_OBJECT(context), "initialize-web-extensions",
+                                G_CALLBACK(initwebextensions), c);
 
                v = g_object_new(WEBKIT_TYPE_WEB_VIEW,
                    "settings", settings,
@@ -935,134 +1055,198 @@ newview(Client *c, WebKitWebView *rv)
                    NULL);
        }
 
-       g_signal_connect(G_OBJECT(v),
-                        "notify::title",
+       g_signal_connect(G_OBJECT(v), "notify::estimated-load-progress",
+                        G_CALLBACK(progresschanged), c);
+       g_signal_connect(G_OBJECT(v), "notify::title",
                         G_CALLBACK(titlechanged), c);
-       g_signal_connect(G_OBJECT(v),
-                        "mouse-target-changed",
+       g_signal_connect(G_OBJECT(v), "button-release-event",
+                        G_CALLBACK(buttonreleased), c);
+       g_signal_connect(G_OBJECT(v), "close",
+                       G_CALLBACK(closeview), c);
+       g_signal_connect(G_OBJECT(v), "create",
+                        G_CALLBACK(createview), c);
+       g_signal_connect(G_OBJECT(v), "decide-policy",
+                        G_CALLBACK(decidepolicy), c);
+       g_signal_connect(G_OBJECT(v), "insecure-content-detected",
+                        G_CALLBACK(insecurecontent), c);
+       g_signal_connect(G_OBJECT(v), "load-changed",
+                        G_CALLBACK(loadchanged), c);
+       g_signal_connect(G_OBJECT(v), "mouse-target-changed",
                         G_CALLBACK(mousetargetchanged), c);
-       g_signal_connect(G_OBJECT(v),
-                        "permission-request",
+       g_signal_connect(G_OBJECT(v), "permission-request",
                         G_CALLBACK(permissionrequested), c);
-       g_signal_connect(G_OBJECT(v),
-                        "create",
-                        G_CALLBACK(createview), c);
        g_signal_connect(G_OBJECT(v), "ready-to-show",
                         G_CALLBACK(showview), c);
-       g_signal_connect(G_OBJECT(v),
-                        "decide-policy",
-                        G_CALLBACK(decidepolicy), c);
-       g_signal_connect(G_OBJECT(v),
-                        "load-changed",
-                        G_CALLBACK(loadchanged), c);
-       g_signal_connect(G_OBJECT(v),
-                        "notify::estimated-load-progress",
-                        G_CALLBACK(progresschanged), c);
-       g_signal_connect(G_OBJECT(v),
-                        "button-release-event",
-                        G_CALLBACK(buttonreleased), c);
-       g_signal_connect(G_OBJECT(v), "close",
-                       G_CALLBACK(closeview), c);
 
        return v;
 }
 
 void
-showview(WebKitWebView *v, Client *c)
+initwebextensions(WebKitWebContext *wc, Client *c)
 {
-       GdkGeometry hints = { 1, 1 };
-       GdkRGBA bgcolor = { 0 };
-       GdkWindow *gwin;
+       webkit_web_context_set_web_extensions_directory(wc, WEBEXTDIR);
+}
 
-       c->win = createwindow(c);
+GtkWidget *
+createview(WebKitWebView *v, WebKitNavigationAction *a, Client *c)
+{
+       Client *n;
 
-       if (enableinspector)
-               c->inspector = webkit_web_view_get_inspector(c->view);
+       switch (webkit_navigation_action_get_navigation_type(a)) {
+       case WEBKIT_NAVIGATION_TYPE_OTHER: /* fallthrough */
+               /*
+                * popup windows of type “other” are almost always triggered
+                * by user gesture, so inverse the logic here
+                */
+/* instead of this, compare destination uri to mouse-over uri for validating window */
+               if (webkit_navigation_action_is_user_gesture(a))
+                       return NULL;
+       case WEBKIT_NAVIGATION_TYPE_LINK_CLICKED: /* fallthrough */
+       case WEBKIT_NAVIGATION_TYPE_FORM_SUBMITTED: /* fallthrough */
+       case WEBKIT_NAVIGATION_TYPE_BACK_FORWARD: /* fallthrough */
+       case WEBKIT_NAVIGATION_TYPE_RELOAD: /* fallthrough */
+       case WEBKIT_NAVIGATION_TYPE_FORM_RESUBMITTED:
+               n = newclient(c);
+               break;
+       default:
+               return NULL;
+       }
 
-       if (!kioskmode)
-               addaccelgroup(c);
+       return GTK_WIDGET(n->view);
+}
 
-       /* Arranging */
-       gtk_container_add(GTK_CONTAINER(c->win), GTK_WIDGET(c->view));
+gboolean
+buttonreleased(GtkWidget *w, GdkEvent *e, Client *c)
+{
+       WebKitHitTestResultContext element;
+       int i;
 
-       /* Setup */
-       gtk_widget_grab_focus(GTK_WIDGET(c->view));
-       gtk_widget_show(GTK_WIDGET(c->view));
-       gtk_widget_show(c->win);
-       gwin = gtk_widget_get_window(GTK_WIDGET(c->win));
-       c->xid = gdk_x11_window_get_xid(gwin);
-       gtk_window_set_geometry_hints(GTK_WINDOW(c->win), NULL, &hints,
-                                     GDK_HINT_MIN_SIZE);
-       gdk_window_set_events(gwin, GDK_ALL_EVENTS_MASK);
-       gdk_window_add_filter(gwin, processx, c);
+       element = webkit_hit_test_result_get_context(c->mousepos);
 
-       /* This might conflict with _zoomto96dpi_. */
-       if (zoomlevel != 1.0)
-               webkit_web_view_set_zoom_level(c->view, zoomlevel);
+       for (i = 0; i < LENGTH(buttons); ++i) {
+               if (element & buttons[i].target &&
+                   e->button.button == buttons[i].button &&
+                   CLEANMASK(e->button.state) == CLEANMASK(buttons[i].mask) &&
+                   buttons[i].func) {
+                       buttons[i].func(c, &buttons[i].arg, c->mousepos);
+                       return buttons[i].stopevent;
+               }
+       }
 
-       if (runinfullscreen)
-               togglefullscreen(c, NULL);
+       return FALSE;
+}
 
-       setatom(c, AtomFind, "");
-       setatom(c, AtomUri, "about:blank");
-       if (hidebackground)
-               webkit_web_view_set_background_color(c->view, &bgcolor);
+GdkFilterReturn
+processx(GdkXEvent *e, GdkEvent *event, gpointer d)
+{
+       Client *c = (Client *)d;
+       XPropertyEvent *ev;
+       Arg a;
 
-       if (showxid) {
-               gdk_display_sync(gtk_widget_get_display(c->win));
-               printf("%lu\n", c->xid);
-               fflush(NULL);
-                if (fclose(stdout) != 0) {
-                       die("Error closing stdout");
-                }
+       if (((XEvent *)e)->type == PropertyNotify) {
+               ev = &((XEvent *)e)->xproperty;
+               if (ev->state == PropertyNewValue) {
+                       if (ev->atom == atoms[AtomFind]) {
+                               find(c, NULL);
+
+                               return GDK_FILTER_REMOVE;
+                       } else if (ev->atom == atoms[AtomGo]) {
+                               a.v = getatom(c, AtomGo);
+                               loaduri(c, &a);
+
+                               return GDK_FILTER_REMOVE;
+                       }
+               }
+       }
+       return GDK_FILTER_CONTINUE;
+}
+
+gboolean
+winevent(GtkWidget *w, GdkEvent *e, Client *c)
+{
+       int i;
+
+       switch (e->type) {
+       case GDK_ENTER_NOTIFY:
+               c->overtitle = c->targeturi;
+               updatetitle(c);
+               break;
+       case GDK_KEY_PRESS:
+               if (!curconfig[KioskMode].val.b) {
+                       for (i = 0; i < LENGTH(keys); ++i) {
+                               if (gdk_keyval_to_lower(e->key.keyval) ==
+                                   keys[i].keyval &&
+                                   CLEANMASK(e->key.state) == keys[i].mod &&
+                                   keys[i].func) {
+                                       updatewinid(c);
+                                       keys[i].func(c, &(keys[i].arg));
+                                       return TRUE;
+                               }
+                       }
+               }
+       case GDK_LEAVE_NOTIFY:
+               c->overtitle = NULL;
+               updatetitle(c);
+               break;
+       case GDK_WINDOW_STATE:
+               if (e->window_state.changed_mask ==
+                   GDK_WINDOW_STATE_FULLSCREEN)
+                       c->fullscreen = e->window_state.new_window_state &
+                                       GDK_WINDOW_STATE_FULLSCREEN;
+               break;
+       default:
+               break;
        }
+
+       return FALSE;
 }
 
 void
-newwindow(Client *c, const Arg *arg, gboolean noembed)
+showview(WebKitWebView *v, Client *c)
 {
-       guint i = 0;
-       const char *cmd[18], *uri;
-       const Arg a = { .v = (void *)cmd };
-       char tmp[64];
+       GdkRGBA bgcolor = { 0 };
+       GdkWindow *gwin;
 
-       cmd[i++] = argv0;
-       cmd[i++] = "-a";
-       cmd[i++] = cookiepolicies;
-       if (!enablescrollbars)
-               cmd[i++] = "-b";
-       if (embed && !noembed) {
-               cmd[i++] = "-e";
-               snprintf(tmp, LENGTH(tmp), "%u", (int)embed);
-               cmd[i++] = tmp;
+       c->finder = webkit_web_view_get_find_controller(c->view);
+       c->inspector = webkit_web_view_get_inspector(c->view);
+
+       c->win = createwindow(c);
+
+       gtk_container_add(GTK_CONTAINER(c->win), GTK_WIDGET(c->view));
+       gtk_widget_show_all(c->win);
+       gtk_widget_grab_focus(GTK_WIDGET(c->view));
+
+       gwin = gtk_widget_get_window(GTK_WIDGET(c->win));
+       c->xid = gdk_x11_window_get_xid(gwin);
+       updatewinid(c);
+       if (showxid) {
+               gdk_display_sync(gtk_widget_get_display(c->win));
+               puts(winid);
        }
-       if (!allowgeolocation)
-               cmd[i++] = "-g";
-       if (!loadimages)
-               cmd[i++] = "-i";
-       if (kioskmode)
-               cmd[i++] = "-k";
-       if (!enableplugins)
-               cmd[i++] = "-p";
-       if (!enablescripts)
-               cmd[i++] = "-s";
-       if (showxid)
-               cmd[i++] = "-x";
-       if (enablediskcache)
-               cmd[i++] = "-D";
-       cmd[i++] = "-c";
-       cmd[i++] = cookiefile;
-       cmd[i++] = "--";
-       uri = arg->v ? (char *)arg->v : c->linkhover;
-       if (uri)
-               cmd[i++] = uri;
-       cmd[i++] = NULL;
-       spawn(NULL, &a);
+
+       if (curconfig[HideBackground].val.b)
+               webkit_web_view_set_background_color(c->view, &bgcolor);
+
+       if (!curconfig[KioskMode].val.b) {
+               gdk_window_set_events(gwin, GDK_ALL_EVENTS_MASK);
+               gdk_window_add_filter(gwin, processx, c);
+       }
+
+       if (curconfig[RunInFullscreen].val.b)
+               togglefullscreen(c, NULL);
+
+       if (curconfig[ZoomLevel].val.f != 1.0)
+               webkit_web_view_set_zoom_level(c->view,
+                                              curconfig[ZoomLevel].val.f);
+
+       setatom(c, AtomFind, "");
+       setatom(c, AtomUri, "about:blank");
 }
 
 GtkWidget *
 createwindow(Client *c)
 {
+       char *wmstr;
        GtkWidget *w;
 
        if (embed) {
@@ -1070,439 +1254,465 @@ createwindow(Client *c)
        } else {
                w = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 
-               /* TA:  20091214:  Despite what the GNOME docs say, the ICCCM
-                * is always correct, so we should still call this function.
-                * But when doing so, we *must* differentiate between a
-                * WM_CLASS and a resource on the window.  By convention, the
-                * window class (WM_CLASS) is capped, while the resource is in
-                * lowercase.   Both these values come as a pair.
-                */
-               gtk_window_set_wmclass(GTK_WINDOW(w), "surf", "Surf");
+               wmstr = g_path_get_basename(argv0);
+               gtk_window_set_wmclass(GTK_WINDOW(w), wmstr, "Surf");
+               g_free(wmstr);
 
-               /* TA:  20091214:  And set the role here as well -- so that
-                * sessions can pick this up.
-                */
-               gtk_window_set_role(GTK_WINDOW(w), "Surf");
+               wmstr = g_strdup_printf("%s[%lu]", "Surf",
+                       webkit_web_view_get_page_id(c->view));
+               gtk_window_set_role(GTK_WINDOW(w), wmstr);
+               g_free(wmstr);
 
-               gtk_window_set_default_size(GTK_WINDOW(w), 800, 600);
+               gtk_window_set_default_size(GTK_WINDOW(w), winsize[0], winsize[1]);
        }
 
        g_signal_connect(G_OBJECT(w), "destroy",
-           G_CALLBACK(destroywin), c);
+                        G_CALLBACK(destroywin), c);
+       g_signal_connect(G_OBJECT(w), "enter-notify-event",
+                        G_CALLBACK(winevent), c);
+       g_signal_connect(G_OBJECT(w), "key-press-event",
+                        G_CALLBACK(winevent), c);
        g_signal_connect(G_OBJECT(w), "leave-notify-event",
-           G_CALLBACK(winevent), c);
+                        G_CALLBACK(winevent), c);
        g_signal_connect(G_OBJECT(w), "window-state-event",
-           G_CALLBACK(winevent), c);
+                        G_CALLBACK(winevent), c);
 
        return w;
 }
 
 void
-pasteuri(GtkClipboard *clipboard, const char *text, gpointer d)
+loadchanged(WebKitWebView *v, WebKitLoadEvent e, Client *c)
+{
+       const char *title = geturi(c);
+
+       switch (e) {
+       case WEBKIT_LOAD_STARTED:
+               curconfig = defconfig;
+               setatom(c, AtomUri, title);
+               c->title = title;
+               c->https = c->insecure = 0;
+               seturiparameters(c, geturi(c));
+               break;
+       case WEBKIT_LOAD_REDIRECTED:
+               setatom(c, AtomUri, title);
+               c->title = title;
+               seturiparameters(c, geturi(c));
+               break;
+       case WEBKIT_LOAD_COMMITTED:
+               c->https = webkit_web_view_get_tls_info(c->view, NULL,
+                                                       &c->tlserr);
+               break;
+       case WEBKIT_LOAD_FINISHED:
+               /* Disabled until we write some WebKitWebExtension for
+                * manipulating the DOM directly.
+               evalscript(c, "document.documentElement.style.overflow = '%s'",
+                   enablescrollbars ? "auto" : "hidden");
+               */
+               runscript(c);
+               break;
+       }
+       updatetitle(c);
+}
+
+void
+progresschanged(WebKitWebView *v, GParamSpec *ps, Client *c)
+{
+       c->progress = webkit_web_view_get_estimated_load_progress(c->view) *
+                     100;
+       updatetitle(c);
+}
+
+void
+titlechanged(WebKitWebView *view, GParamSpec *ps, Client *c)
+{
+       c->title = webkit_web_view_get_title(c->view);
+       updatetitle(c);
+}
+
+void
+mousetargetchanged(WebKitWebView *v, WebKitHitTestResult *h, guint modifiers,
+    Client *c)
+{
+       WebKitHitTestResultContext hc = webkit_hit_test_result_get_context(h);
+
+       /* Keep the hit test to know where is the pointer on the next click */
+       c->mousepos = h;
+
+       if (hc & OnLink)
+               c->targeturi = webkit_hit_test_result_get_link_uri(h);
+       else if (hc & OnImg)
+               c->targeturi = webkit_hit_test_result_get_image_uri(h);
+       else if (hc & OnMedia)
+               c->targeturi = webkit_hit_test_result_get_media_uri(h);
+       else
+               c->targeturi = NULL;
+
+       c->overtitle = c->targeturi;
+       updatetitle(c);
+}
+
+gboolean
+permissionrequested(WebKitWebView *v, WebKitPermissionRequest *r, Client *c)
+{
+       if (WEBKIT_IS_GEOLOCATION_PERMISSION_REQUEST(r)) {
+               if (curconfig[Geolocation].val.b)
+                       webkit_permission_request_allow(r);
+               else
+                       webkit_permission_request_deny(r);
+               return TRUE;
+       }
+
+       return FALSE;
+}
+
+gboolean
+decidepolicy(WebKitWebView *v, WebKitPolicyDecision *d,
+    WebKitPolicyDecisionType dt, Client *c)
+{
+       switch (dt) {
+       case WEBKIT_POLICY_DECISION_TYPE_NAVIGATION_ACTION:
+               decidenavigation(d, c);
+               break;
+       case WEBKIT_POLICY_DECISION_TYPE_NEW_WINDOW_ACTION:
+               decidenewwindow(d, c);
+               break;
+       case WEBKIT_POLICY_DECISION_TYPE_RESPONSE:
+               decideresource(d, c);
+               break;
+       default:
+               webkit_policy_decision_ignore(d);
+               break;
+       }
+       return TRUE;
+}
+
+void
+decidenavigation(WebKitPolicyDecision *d, Client *c)
+{
+       WebKitNavigationAction *a =
+           webkit_navigation_policy_decision_get_navigation_action(
+           WEBKIT_NAVIGATION_POLICY_DECISION(d));
+
+       switch (webkit_navigation_action_get_navigation_type(a)) {
+       case WEBKIT_NAVIGATION_TYPE_LINK_CLICKED: /* fallthrough */
+       case WEBKIT_NAVIGATION_TYPE_FORM_SUBMITTED: /* fallthrough */
+       case WEBKIT_NAVIGATION_TYPE_BACK_FORWARD: /* fallthrough */
+       case WEBKIT_NAVIGATION_TYPE_RELOAD: /* fallthrough */
+       case WEBKIT_NAVIGATION_TYPE_FORM_RESUBMITTED: /* fallthrough */
+       case WEBKIT_NAVIGATION_TYPE_OTHER: /* fallthrough */
+       default:
+               /* Do not navigate to links with a "_blank" target (popup) */
+               if (webkit_navigation_policy_decision_get_frame_name(
+                   WEBKIT_NAVIGATION_POLICY_DECISION(d))) {
+                       webkit_policy_decision_ignore(d);
+               } else {
+                       /* Filter out navigation to different domain ? */
+                       /* get action→urirequest, copy and load in new window+view
+                        * on Ctrl+Click ? */
+                       webkit_policy_decision_use(d);
+               }
+               break;
+       }
+}
+
+void
+decidenewwindow(WebKitPolicyDecision *d, Client *c)
 {
-       Arg arg = {.v = text };
-       if (text != NULL)
-               loaduri((Client *) d, &arg);
-}
+       Arg arg;
+       WebKitNavigationAction *a =
+           webkit_navigation_policy_decision_get_navigation_action(
+           WEBKIT_NAVIGATION_POLICY_DECISION(d));
 
-void
-print(Client *c, const Arg *a)
-{
-       webkit_print_operation_run_dialog(webkit_print_operation_new(c->view),
-           GTK_WINDOW(c->win));
+
+       switch (webkit_navigation_action_get_navigation_type(a)) {
+       case WEBKIT_NAVIGATION_TYPE_LINK_CLICKED: /* fallthrough */
+       case WEBKIT_NAVIGATION_TYPE_FORM_SUBMITTED: /* fallthrough */
+       case WEBKIT_NAVIGATION_TYPE_BACK_FORWARD: /* fallthrough */
+       case WEBKIT_NAVIGATION_TYPE_RELOAD: /* fallthrough */
+       case WEBKIT_NAVIGATION_TYPE_FORM_RESUBMITTED:
+               /* Filter domains here */
+/* If the value of “mouse-button” is not 0, then the navigation was triggered by a mouse event.
+ * test for link clicked but no button ? */
+               arg.v = webkit_uri_request_get_uri(
+                       webkit_navigation_action_get_request(a));
+               newwindow(c, &arg, 0);
+               break;
+       case WEBKIT_NAVIGATION_TYPE_OTHER: /* fallthrough */
+       default:
+               break;
+       }
+
+       webkit_policy_decision_ignore(d);
 }
 
-GdkFilterReturn
-processx(GdkXEvent *e, GdkEvent *event, gpointer d)
+void
+decideresource(WebKitPolicyDecision *d, Client *c)
 {
-       Client *c = (Client *)d;
-       XPropertyEvent *ev;
-       Arg arg;
-
-       if (((XEvent *)e)->type == PropertyNotify) {
-               ev = &((XEvent *)e)->xproperty;
-               if (ev->state == PropertyNewValue) {
-                       if (ev->atom == atoms[AtomFind]) {
-                               arg.b = TRUE;
-                               find(c, &arg);
+       int i, isascii = 1;
+       WebKitResponsePolicyDecision *r = WEBKIT_RESPONSE_POLICY_DECISION(d);
+       WebKitURIResponse *res =
+           webkit_response_policy_decision_get_response(r);
+       const gchar *uri = webkit_uri_response_get_uri(res);
 
-                               return GDK_FILTER_REMOVE;
-                       } else if (ev->atom == atoms[AtomGo]) {
-                               arg.v = getatom(c, AtomGo);
-                               loaduri(c, &arg);
+       if (g_str_has_suffix(uri, "/favicon.ico")) {
+               webkit_policy_decision_ignore(d);
+               return;
+       }
 
-                               return GDK_FILTER_REMOVE;
+       if (!g_str_has_prefix(uri, "http://")
+           && !g_str_has_prefix(uri, "https://")
+           && !g_str_has_prefix(uri, "about:")
+           && !g_str_has_prefix(uri, "file://")
+           && !g_str_has_prefix(uri, "data:")
+           && !g_str_has_prefix(uri, "blob:")
+           && strlen(uri) > 0) {
+               for (i = 0; i < strlen(uri); i++) {
+                       if (!g_ascii_isprint(uri[i])) {
+                               isascii = 0;
+                               break;
                        }
                }
+               if (isascii) {
+                       handleplumb(c, uri);
+                       webkit_policy_decision_ignore(d);
+                       return;
+               }
        }
-       return GDK_FILTER_CONTINUE;
-}
 
-void
-progresschanged(WebKitWebView *v, GParamSpec *ps, Client *c)
-{
-       c->progress = webkit_web_view_get_estimated_load_progress(c->view) *
-           100;
-       updatetitle(c);
+       if (webkit_response_policy_decision_is_mime_type_supported(r)) {
+               webkit_policy_decision_use(d);
+       } else {
+               webkit_policy_decision_ignore(d);
+               download(c, res);
+       }
 }
 
 void
-linkopen(Client *c, const Arg *arg)
+insecurecontent(WebKitWebView *v, WebKitInsecureContentEvent e, Client *c)
 {
-       newwindow(NULL, arg, 1);
+       c->insecure = 1;
 }
 
 void
-linkopenembed(Client *c, const Arg *arg)
+downloadstarted(WebKitWebContext *wc, WebKitDownload *d, Client *c)
 {
-       newwindow(NULL, arg, 0);
+       g_signal_connect(G_OBJECT(d), "notify::response",
+                        G_CALLBACK(responsereceived), c);
 }
 
 void
-reload(Client *c, const Arg *arg)
+responsereceived(WebKitDownload *d, GParamSpec *ps, Client *c)
 {
-       gboolean nocache = *(gboolean *)arg;
-       if (nocache)
-               webkit_web_view_reload_bypass_cache(c->view);
-       else
-               webkit_web_view_reload(c->view);
+       download(c, webkit_download_get_response(d));
+       webkit_download_cancel(d);
 }
 
 void
-scroll_h(Client *c, const Arg *arg)
+download(Client *c, WebKitURIResponse *r)
 {
-       scroll(gtk_scrolled_window_get_hadjustment(
-              GTK_SCROLLED_WINDOW(c->scroll)), arg);
+       Arg a = (Arg)DOWNLOAD(webkit_uri_response_get_uri(r), geturi(c));
+       spawn(c, &a);
 }
 
 void
-scroll_v(Client *c, const Arg *arg)
+closeview(WebKitWebView *v, Client *c)
 {
-       scroll(gtk_scrolled_window_get_vadjustment(
-              GTK_SCROLLED_WINDOW(c->scroll)), arg);
+       gtk_widget_destroy(c->win);
 }
 
 void
-scroll(GtkAdjustment *a, const Arg *arg)
+destroywin(GtkWidget* w, Client *c)
 {
-       gdouble v;
-
-       v = gtk_adjustment_get_value(a);
-       switch (arg->i) {
-       case +10000:
-       case -10000:
-               v += gtk_adjustment_get_page_increment(a) * (arg->i / 10000);
-               break;
-       case +20000:
-       case -20000:
-       default:
-               v += gtk_adjustment_get_step_increment(a) * arg->i;
-       }
-
-       v = MAX(v, 0.0);
-       v = MIN(v, gtk_adjustment_get_upper(a) -
-               gtk_adjustment_get_page_size(a));
-       gtk_adjustment_set_value(a, v);
+       destroyclient(c);
+       if (!clients)
+               gtk_main_quit();
 }
 
 void
-setatom(Client *c, int a, const char *v)
+pasteuri(GtkClipboard *clipboard, const char *text, gpointer d)
 {
-       XSync(dpy, False);
-       XChangeProperty(dpy, c->xid,
-                       atoms[a], XA_STRING, 8, PropModeReplace,
-                       (unsigned char *)v, strlen(v) + 1);
+       Arg a = {.v = text };
+       if (text)
+               loaduri((Client *) d, &a);
 }
 
 void
-setup(void)
+reload(Client *c, const Arg *a)
 {
-       int i;
-       WebKitWebContext *context;
-       GError *error = NULL;
-
-       /* clean up any zombies immediately */
-       sigchld(0);
-       gtk_init(NULL, NULL);
-
-       dpy = GDK_DISPLAY_XDISPLAY(gdk_display_get_default());
-
-       /* atoms */
-       atoms[AtomFind] = XInternAtom(dpy, "_SURF_FIND", False);
-       atoms[AtomGo] = XInternAtom(dpy, "_SURF_GO", False);
-       atoms[AtomUri] = XInternAtom(dpy, "_SURF_URI", False);
-
-       /* dirs and files */
-       cookiefile = buildfile(cookiefile);
-       scriptfile = buildfile(scriptfile);
-       cachedir   = buildpath(cachedir);
-
-       if (stylefile == NULL) {
-               styledir = buildpath(styledir);
-               for (i = 0; i < LENGTH(styles); i++) {
-                       if (regcomp(&(styles[i].re), styles[i].regex,
-                           REG_EXTENDED)) {
-                               fprintf(stderr,
-                                       "Could not compile regex: %s\n",
-                                       styles[i].regex);
-                               styles[i].regex = NULL;
-                       }
-                       styles[i].style = g_strconcat(styledir, "/",
-                           styles[i].style, NULL);
-               }
-               g_free(styledir);
-       } else {
-               stylefile = buildfile(stylefile);
-       }
+       if (a->b)
+               webkit_web_view_reload_bypass_cache(c->view);
+       else
+               webkit_web_view_reload(c->view);
 }
 
 void
-sigchld(int unused)
+print(Client *c, const Arg *a)
 {
-       if (signal(SIGCHLD, sigchld) == SIG_ERR)
-               die("Can't install SIGCHLD handler");
-       while (0 < waitpid(-1, NULL, WNOHANG));
+       webkit_print_operation_run_dialog(webkit_print_operation_new(c->view),
+                                         GTK_WINDOW(c->win));
 }
 
 void
-spawn(Client *c, const Arg *arg)
+clipboard(Client *c, const Arg *a)
 {
-       if (fork() == 0) {
-               if (dpy)
-                       close(ConnectionNumber(dpy));
-               setsid();
-               execvp(((char **)arg->v)[0], (char **)arg->v);
-               fprintf(stderr, "surf: execvp %s", ((char **)arg->v)[0]);
-               perror(" failed");
-               exit(0);
+       if (a->b) { /* load clipboard uri */
+               gtk_clipboard_request_text(gtk_clipboard_get(
+                                          GDK_SELECTION_PRIMARY),
+                                          pasteuri, c);
+       } else { /* copy uri */
+               gtk_clipboard_set_text(gtk_clipboard_get(
+                                      GDK_SELECTION_PRIMARY), c->targeturi
+                                      ? c->targeturi : geturi(c), -1);
        }
 }
 
 void
-stop(Client *c, const Arg *arg)
-{
-       webkit_web_view_stop_loading(c->view);
+zoom(Client *c, const Arg *a)
+{
+       if (a->i > 0)
+               webkit_web_view_set_zoom_level(c->view,
+                                              curconfig[ZoomLevel].val.f + 0.1);
+       else if (a->i < 0)
+               webkit_web_view_set_zoom_level(c->view,
+                                              curconfig[ZoomLevel].val.f - 0.1);
+       else
+               webkit_web_view_set_zoom_level(c->view, 1.0);
+
+       curconfig[ZoomLevel].val.f = webkit_web_view_get_zoom_level(c->view);
 }
 
 void
-titlechanged(WebKitWebView *view, GParamSpec *ps, Client *c)
+scroll(Client *c, const Arg *a)
 {
-       c->title = webkit_web_view_get_title(c->view);
-       updatetitle(c);
-}
+       GdkEvent *ev = gdk_event_new(GDK_KEY_PRESS);
 
-gboolean
-winevent(GtkWidget *w, GdkEvent *e, Client *c)
-{
-       switch (e->type) {
-       case GDK_LEAVE_NOTIFY:
-               c->targeturi = NULL;
-               updatetitle(c);
+       gdk_event_set_device(ev, gdkkb);
+       ev->key.window = gtk_widget_get_window(GTK_WIDGET(c->win));
+       ev->key.state = GDK_CONTROL_MASK;
+       ev->key.time = GDK_CURRENT_TIME;
+
+       switch (a->i) {
+       case 'd':
+               ev->key.keyval = GDK_KEY_Down;
+               break;
+       case 'D':
+               ev->key.keyval = GDK_KEY_Page_Down;
+               break;
+       case 'l':
+               ev->key.keyval = GDK_KEY_Left;
+               break;
+       case 'r':
+               ev->key.keyval = GDK_KEY_Right;
+               break;
+       case 'U':
+               ev->key.keyval = GDK_KEY_Page_Up;
+               break;
+       case 'u':
+               ev->key.keyval = GDK_KEY_Up;
                break;
-       case GDK_WINDOW_STATE: /* fallthrough */
-               if (e->window_state.changed_mask ==
-                   GDK_WINDOW_STATE_FULLSCREEN) {
-                       c->fullscreen = e->window_state.new_window_state &
-                           GDK_WINDOW_STATE_FULLSCREEN;
-                       break;
-               }
-       default:
-               return FALSE;
        }
 
-       return TRUE;
+       gdk_event_put(ev);
 }
 
 void
-toggle(Client *c, const Arg *arg)
+navigate(Client *c, const Arg *a)
 {
-       WebKitWebSettings *settings;
-       char *name = (char *)arg->v;
-       gboolean value;
-       Arg a = { .b = FALSE };
-
-       settings = webkit_web_view_get_settings(c->view);
-       g_object_get(G_OBJECT(settings), name, &value, NULL);
-       g_object_set(G_OBJECT(settings), name, !value, NULL);
-
-       reload(c, &a);
+       if (a->i < 0)
+               webkit_web_view_go_back(c->view);
+       else if (a->i > 0)
+               webkit_web_view_go_forward(c->view);
 }
 
 void
-togglecookiepolicy(Client *c, const Arg *arg)
+stop(Client *c, const Arg *a)
 {
-       ++cookiepolicy;
-       cookiepolicy %= strlen(cookiepolicies);
-
-       webkit_cookie_manager_set_accept_policy(
-           webkit_web_context_get_cookie_manager(
-           webkit_web_view_get_context(c->view)),
-           cookiepolicy_get());
-
-       updatetitle(c);
-       /* Do not reload. */
+       webkit_web_view_stop_loading(c->view);
 }
 
 void
-togglegeolocation(Client *c, const Arg *arg)
+toggle(Client *c, const Arg *a)
 {
-       Arg a = { .b = FALSE };
-
-       allowgeolocation ^= 1;
-       reload(c, &a);
+       curconfig[a->i].val.b ^= 1;
+       setparameter(c, 1, (ParamName)a->i, &curconfig[a->i].val);
 }
 
 void
-twitch(Client *c, const Arg *arg)
+togglefullscreen(Client *c, const Arg *a)
 {
-       GtkAdjustment *a;
-       gdouble v;
-
-       a = gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(
-                                               c->scroll));
-
-       v = gtk_adjustment_get_value(a);
-
-       v += arg->i;
-
-       v = MAX(v, 0.0);
-       v = MIN(v, gtk_adjustment_get_upper(a) -
-               gtk_adjustment_get_page_size(a));
-       gtk_adjustment_set_value(a, v);
+       /* toggling value is handled in winevent() */
+       if (c->fullscreen)
+               gtk_window_unfullscreen(GTK_WINDOW(c->win));
+       else
+               gtk_window_fullscreen(GTK_WINDOW(c->win));
 }
 
 void
-togglescrollbars(Client *c, const Arg *arg)
+togglecookiepolicy(Client *c, const Arg *a)
 {
-       GtkPolicyType vspolicy;
-       Arg a;
-
-       gtk_scrolled_window_get_policy(GTK_SCROLLED_WINDOW(c->scroll), NULL,
-                                      &vspolicy);
+       ++cookiepolicy;
+       cookiepolicy %= strlen(curconfig[CookiePolicies].val.v);
 
-       if (vspolicy == GTK_POLICY_AUTOMATIC) {
-               gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(c->scroll),
-                                              GTK_POLICY_NEVER,
-                                              GTK_POLICY_NEVER);
-       } else {
-               gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(c->scroll),
-                                              GTK_POLICY_AUTOMATIC,
-                                              GTK_POLICY_AUTOMATIC);
-               a.i = +1;
-               twitch(c, &a);
-               a.i = -1;
-               twitch(c, &a);
-       }
+       setparameter(c, 0, CookiePolicies, NULL);
 }
 
 void
-togglestyle(Client *c, const Arg *arg)
+toggleinspector(Client *c, const Arg *a)
 {
-       enablestyle = !enablestyle;
-       setstyle(c, enablestyle ? getstyle(geturi(c)) : "");
-
-       updatetitle(c);
+       if (webkit_web_inspector_is_attached(c->inspector))
+               webkit_web_inspector_close(c->inspector);
+       else if (curconfig[Inspector].val.b)
+               webkit_web_inspector_show(c->inspector);
 }
 
 void
-gettogglestat(Client *c)
+find(Client *c, const Arg *a)
 {
-       gboolean value;
-       int p = 0;
-       WebKitWebSettings *settings = webkit_web_view_get_settings(c->view);
-
-       togglestat[p++] = cookiepolicy_set(cookiepolicy_get());
-
-       g_object_get(G_OBJECT(settings), "enable-caret-browsing", &value,
-                    NULL);
-       togglestat[p++] = value? 'C': 'c';
+       const char *s, *f;
 
-       togglestat[p++] = allowgeolocation? 'G': 'g';
-
-       togglestat[p++] = enablediskcache? 'D': 'd';
-
-       g_object_get(G_OBJECT(settings), "auto-load-images", &value, NULL);
-       togglestat[p++] = value? 'I': 'i';
-
-       g_object_get(G_OBJECT(settings), "enable-scripts", &value, NULL);
-       togglestat[p++] = value? 'S': 's';
+       if (a && a->i) {
+               if (a->i > 0)
+                       webkit_find_controller_search_next(c->finder);
+               else
+                       webkit_find_controller_search_previous(c->finder);
+       } else {
+               s = getatom(c, AtomFind);
+               f = webkit_find_controller_get_search_text(c->finder);
 
-       g_object_get(G_OBJECT(settings), "enable-plugins", &value, NULL);
-       togglestat[p++] = value? 'V': 'v';
+               if (g_strcmp0(f, s) == 0) /* reset search */
+                       webkit_find_controller_search(c->finder, "", findopts,
+                                                     G_MAXUINT);
 
-       togglestat[p++] = enablestyle ? 'M': 'm';
+               webkit_find_controller_search(c->finder, s, findopts,
+                                             G_MAXUINT);
 
-       togglestat[p] = '\0';
+               if (strcmp(s, "") == 0)
+                       webkit_find_controller_search_finish(c->finder);
+       }
 }
 
 void
-getpagestat(Client *c)
+clicknavigate(Client *c, const Arg *a, WebKitHitTestResult *h)
 {
-       const char *uri = geturi(c);
-
-       pagestats[0] = c->tlsflags > G_TLS_CERTIFICATE_VALIDATE_ALL ? '-' :
-           c->tlsflags > 0 ? 'U' : 'T';
-       pagestat[1] = '\0';
+       navigate(c, a);
 }
 
 void
-updatetitle(Client *c)
+clicknewwindow(Client *c, const Arg *a, WebKitHitTestResult *h)
 {
-       char *t;
-
-       if (showindicators) {
-               gettogglestat(c);
-               getpagestat(c);
-
-               if (c->linkhover) {
-                       t = g_strdup_printf("%s:%s | %s", togglestat, pagestat,
-                                           c->linkhover);
-               } else if (c->progress != 100) {
-                       t = g_strdup_printf("[%i%%] %s:%s | %s", c->progress,
-                                           togglestat, pagestat,
-                                           c->title == NULL ? "" : c->title);
-               } else {
-                       t = g_strdup_printf("%s:%s | %s", togglestat, pagestat,
-                                           c->title == NULL ? "" : c->title);
-               }
-
-               gtk_window_set_title(GTK_WINDOW(c->win), t);
-               g_free(t);
-       } else {
-               gtk_window_set_title(GTK_WINDOW(c->win), (c->title == NULL) ?
-                                    "" : c->title);
-       }
-}
+       Arg arg;
 
-void
-updatewinid(Client *c)
-{
-       snprintf(winid, LENGTH(winid), "%lu", c->xid);
+       arg.v = webkit_hit_test_result_get_link_uri(h);
+       newwindow(c, &arg, a->b);
 }
 
 void
-usage(void)
+clickexternplayer(Client *c, const Arg *a, WebKitHitTestResult *h)
 {
-       die("usage: %s [-bBdDfFgGiIkKmMnNpPsSvx] [-a cookiepolicies ] "
-           "[-c cookiefile] [-e xid] [-r scriptfile] [-t stylefile] "
-           "[-u useragent] [-z zoomlevel] [uri]\n", basename(argv0));
-}
+       Arg arg;
 
-void
-zoom(Client *c, const Arg *arg)
-{
-       c->zoomed = TRUE;
-       if (arg->i < 0) {
-               /* zoom out */
-               webkit_web_view_zoom_out(c->view);
-       } else if (arg->i > 0) {
-               /* zoom in */
-               webkit_web_view_zoom_in(c->view);
-       } else {
-               /* reset */
-               c->zoomed = FALSE;
-               webkit_web_view_set_zoom_level(c->view, 1.0);
-       }
+       arg = (Arg)VIDEOPLAY(webkit_hit_test_result_get_media_uri(h));
+       spawn(c, &arg);
 }
 
 int
@@ -1516,109 +1726,115 @@ main(int argc, char *argv[])
        /* command line args */
        ARGBEGIN {
        case 'a':
-               cookiepolicies = EARGF(usage());
+               defconfig CSETV(CookiePolicies, EARGF(usage()));
                break;
        case 'b':
-               enablescrollbars = 0;
+               defconfig CSETB(ScrollBars, 0);
                break;
        case 'B':
-               enablescrollbars = 1;
+               defconfig CSETB(ScrollBars, 1);
                break;
        case 'c':
                cookiefile = EARGF(usage());
                break;
+       case 'C':
+               stylefile = EARGF(usage());
+               break;
        case 'd':
-               enablediskcache = 0;
+               defconfig CSETB(DiskCache, 0);
                break;
        case 'D':
-               enablediskcache = 1;
+               defconfig CSETB(DiskCache, 1);
                break;
        case 'e':
                embed = strtol(EARGF(usage()), NULL, 0);
                break;
        case 'f':
-               runinfullscreen = 0;
+               defconfig CSETB(RunInFullscreen, 0);
                break;
        case 'F':
-               runinfullscreen = 1;
+               defconfig CSETB(RunInFullscreen, 1);
                break;
        case 'g':
-               allowgeolocation = 0;
+               defconfig CSETB(Geolocation, 0);
                break;
        case 'G':
-               allowgeolocation = 1;
+               defconfig CSETB(Geolocation, 1);
                break;
        case 'i':
-               loadimages = 0;
+               defconfig CSETB(LoadImages, 0);
                break;
        case 'I':
-               loadimages = 1;
+               defconfig CSETB(LoadImages, 1);
                break;
        case 'k':
-               kioskmode = 0;
+               defconfig CSETB(KioskMode, 0);
                break;
        case 'K':
-               kioskmode = 1;
+               defconfig CSETB(KioskMode, 1);
                break;
        case 'm':
-               enablestyle = 0;
+               defconfig CSETB(Style, 0);
                break;
        case 'M':
-               enablestyle = 1;
+               defconfig CSETB(Style, 1);
                break;
        case 'n':
-               enableinspector = 0;
+               defconfig CSETB(Inspector, 0);
                break;
        case 'N':
-               enableinspector = 1;
+               defconfig CSETB(Inspector, 1);
                break;
        case 'p':
-               enableplugins = 0;
+               defconfig CSETB(Plugins, 0);
                break;
        case 'P':
-               enableplugins = 1;
+               defconfig CSETB(Plugins, 1);
                break;
        case 'r':
                scriptfile = EARGF(usage());
                break;
        case 's':
-               enablescripts = 0;
+               defconfig CSETB(JavaScript, 0);
                break;
        case 'S':
-               enablescripts = 1;
+               defconfig CSETB(JavaScript, 1);
                break;
        case 't':
-               stylefile = EARGF(usage());
+               defconfig CSETB(StrictTLS, 0);
+               break;
+       case 'T':
+               defconfig CSETB(StrictTLS, 1);
                break;
        case 'u':
-               useragent = EARGF(usage());
+               fulluseragent = EARGF(usage());
                break;
        case 'v':
-               die("surf-"VERSION", ©2009-2015 surf engineers, "
+               die("surf-"VERSION", ©2009-2017 surf engineers, "
                    "see LICENSE for details\n");
        case 'x':
-               showxid = TRUE;
+               showxid = 1;
                break;
        case 'z':
-               zoomlevel = strtof(EARGF(usage()), NULL);
+               defconfig CSETF(ZoomLevel, strtof(EARGF(usage()), NULL));
                break;
        default:
                usage();
        } ARGEND;
        if (argc > 0)
                arg.v = argv[0];
+       else
+               arg.v = "about:blank";
 
        setup();
        c = newclient(NULL);
        showview(NULL, c);
-       if (arg.v)
-               loaduri(clients, &arg);
-       else
-               updatetitle(c);
+
+       loaduri(c, &arg);
+       updatetitle(c);
 
        gtk_main();
        cleanup();
 
-       return EXIT_SUCCESS;
+       return 0;
 }
-