Send message size inside messages through pipes
[surf.git] / surf.c
diff --git a/surf.c b/surf.c
index a229994..2b54e3c 100644 (file)
--- a/surf.c
+++ b/surf.c
  *
  * To understand surf, start reading main().
  */
-
-#include <signal.h>
-#include <X11/X.h>
-#include <X11/Xatom.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 <glib.h>
+#include <libgen.h>
 #include <limits.h>
-#include <stdlib.h>
+#include <pwd.h>
+#include <regex.h>
+#include <signal.h>
 #include <stdio.h>
-#include <webkit/webkit.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 <gcr/gcr.h>
 #include <JavaScriptCore/JavaScript.h>
-#include <sys/file.h>
-#include <libgen.h>
-#include <stdarg.h>
-#include <regex.h>
+#include <webkit2/webkit2.h>
+#include <X11/X.h>
+#include <X11/Xatom.h>
+#include <glib.h>
 
 #include "arg.h"
+#include "common.h"
 
-char *argv0;
-
-#define LENGTH(x)               (sizeof x / sizeof x[0])
+#define LENGTH(x)               (sizeof(x) / sizeof(x[0]))
 #define CLEANMASK(mask)         (mask & (MODKEY|GDK_SHIFT_MASK))
-#define COOKIEJAR_TYPE          (cookiejar_get_type ())
-#define COOKIEJAR(obj)          (G_TYPE_CHECK_INSTANCE_CAST ((obj), COOKIEJAR_TYPE, CookieJar))
 
 enum { AtomFind, AtomGo, AtomUri, AtomLast };
 
-typedef union Arg Arg;
-union Arg {
-       gboolean b;
-       gint i;
-       const void *v;
+enum {
+       OnDoc   = WEBKIT_HIT_TEST_RESULT_CONTEXT_DOCUMENT,
+       OnLink  = WEBKIT_HIT_TEST_RESULT_CONTEXT_LINK,
+       OnImg   = WEBKIT_HIT_TEST_RESULT_CONTEXT_IMAGE,
+       OnMedia = WEBKIT_HIT_TEST_RESULT_CONTEXT_MEDIA,
+       OnEdit  = WEBKIT_HIT_TEST_RESULT_CONTEXT_EDITABLE,
+       OnBar   = WEBKIT_HIT_TEST_RESULT_CONTEXT_SCROLLBAR,
+       OnSel   = WEBKIT_HIT_TEST_RESULT_CONTEXT_SELECTION,
+       OnAny   = OnDoc | OnLink | OnImg | OnMedia | OnEdit | OnBar | OnSel,
 };
 
+typedef enum {
+       AcceleratedCanvas,
+       AccessMicrophone,
+       AccessWebcam,
+       CaretBrowsing,
+       Certificate,
+       CookiePolicies,
+       DiskCache,
+       DefaultCharset,
+       DNSPrefetch,
+       FileURLsCrossAccess,
+       FontSize,
+       FrameFlattening,
+       Geolocation,
+       HideBackground,
+       Inspector,
+       Java,
+       JavaScript,
+       KioskMode,
+       LoadImages,
+       MediaManualPlay,
+       Plugins,
+       PreferredLanguages,
+       RunInFullscreen,
+       ScrollBars,
+       ShowIndicators,
+       SiteQuirks,
+       SmoothScrolling,
+       SpellChecking,
+       SpellLanguages,
+       StrictTLS,
+       Style,
+       WebGL,
+       ZoomLevel,
+       ParameterLast
+} ParamName;
+
+typedef union {
+       int i;
+       float f;
+       const void *v;
+} Arg;
+
+typedef struct {
+       Arg val;
+       int prio;
+} Parameter;
+
 typedef struct Client {
-       GtkWidget *win, *scroll, *vbox, *pane;
+       GtkWidget *win;
        WebKitWebView *view;
        WebKitWebInspector *inspector;
-       char *title, *linkhover;
+       WebKitFindController *finder;
+       WebKitHitTestResult *mousepos;
+       GTlsCertificate *cert, *failedcert;
+       GTlsCertificateFlags tlserr;
+       Window xid;
+       unsigned long pageid;
+       int progress, fullscreen, https, insecure, errorpage;
+       const char *title, *overtitle, *targeturi;
        const char *needle;
-       gint progress;
        struct Client *next;
-       gboolean zoomed, fullscreen, isinspecting, sslfailed;
 } 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;
 
 typedef struct {
-       SoupCookieJarText parent_instance;
-       int lock;
-} CookieJar;
+       unsigned int target;
+       unsigned int mask;
+       guint button;
+       void (*func)(Client *c, const Arg *a, WebKitHitTestResult *h);
+       const Arg arg;
+       unsigned int stopevent;
+} Button;
 
 typedef struct {
-       SoupCookieJarTextClass parent_class;
-} CookieJarClass;
-
-G_DEFINE_TYPE(CookieJar, cookiejar, SOUP_TYPE_COOKIE_JAR_TEXT)
+       const char *uri;
+       Parameter config[ParameterLast];
+       regex_t re;
+} UriParameters;
 
 typedef struct {
        char *regex;
-       char *style;
+       char *file;
        regex_t re;
-} SiteStyle;
+} SiteSpecific;
 
-static Display *dpy;
-static Atom atoms[AtomLast];
-static Client *clients = NULL;
-static GdkNativeWindow embed = 0;
-static gboolean showxid = FALSE;
-static char winid[64];
-static gboolean usingproxy = 0;
-static char togglestat[9];
-static char pagestat[3];
-static GTlsDatabase *tlsdb;
-static int policysel = 0;
-static char *stylefile = NULL;
-static SoupCache *diskcache = NULL;
-
-static void addaccelgroup(Client *c);
-static void beforerequest(WebKitWebView *w, WebKitWebFrame *f,
-               WebKitWebResource *r, WebKitNetworkRequest *req,
-               WebKitNetworkResponse *resp, gpointer d);
-static char *buildpath(const char *path);
-static gboolean buttonrelease(WebKitWebView *web, GdkEventButton *e,
-               GList *gl);
-static void cleanup(void);
-static void clipboard(Client *c, const Arg *arg);
-
-/* Cookiejar implementation */
-static void cookiejar_changed(SoupCookieJar *self, SoupCookie *old_cookie,
-               SoupCookie *new_cookie);
-static void cookiejar_finalize(GObject *self);
-static SoupCookieJarAcceptPolicy cookiepolicy_get(void);
-static SoupCookieJar *cookiejar_new(const char *filename, gboolean read_only,
-               SoupCookieJarAcceptPolicy policy);
-static void cookiejar_set_property(GObject *self, guint prop_id,
-               const GValue *value, GParamSpec *pspec);
-static char cookiepolicy_set(const SoupCookieJarAcceptPolicy p);
-
-static char *copystr(char **str, const char *src);
-static WebKitWebView *createwindow(WebKitWebView *v, WebKitWebFrame *f,
-               Client *c);
-static gboolean decidedownload(WebKitWebView *v, WebKitWebFrame *f,
-               WebKitNetworkRequest *r, gchar *m,  WebKitWebPolicyDecision *p,
-               Client *c);
-static gboolean decidewindow(WebKitWebView *v, WebKitWebFrame *f,
-               WebKitNetworkRequest *r, WebKitWebNavigationAction *n,
-               WebKitWebPolicyDecision *p, Client *c);
-static gboolean deletion_interface(WebKitWebView *view,
-               WebKitDOMHTMLElement *arg1, Client *c);
-static void destroyclient(Client *c);
-static void destroywin(GtkWidget* w, Client *c);
-static void die(const char *errstr, ...);
-static void eval(Client *c, const Arg *arg);
-static void find(Client *c, const Arg *arg);
-static void fullscreen(Client *c, const Arg *arg);
-static void geopolicyrequested(WebKitWebView *v, WebKitWebFrame *f,
-               WebKitGeolocationPolicyDecision *d, 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 gchar *getstyle(const char *uri);
-
-static gboolean initdownload(WebKitWebView *v, WebKitDownload *o, Client *c);
-
-static void inspector(Client *c, const Arg *arg);
-static WebKitWebView *inspector_new(WebKitWebInspector *i, WebKitWebView *v,
-               Client *c);
-static gboolean inspector_show(WebKitWebInspector *i, Client *c);
-static gboolean inspector_close(WebKitWebInspector *i, Client *c);
-static void inspector_finished(WebKitWebInspector *i, Client *c);
-
-static gboolean keypress(GtkAccelGroup *group,
-               GObject *obj, guint key, GdkModifierType mods,
-               Client *c);
-static void linkhover(WebKitWebView *v, const char* t, const char* l,
-               Client *c);
-static void loadstatuschange(WebKitWebView *view, GParamSpec *pspec,
-               Client *c);
-static void loaduri(Client *c, const Arg *arg);
-static void navigate(Client *c, const Arg *arg);
-static Client *newclient(void);
-static void newwindow(Client *c, const Arg *arg, gboolean noembed);
-static void pasteuri(GtkClipboard *clipboard, const char *text, gpointer d);
-static gboolean contextmenu(WebKitWebView *view, GtkWidget *menu,
-               WebKitHitTestResult *target, gboolean keyboard, Client *c);
-static void menuactivate(GtkMenuItem *item, Client *c);
-static void print(Client *c, const Arg *arg);
-static GdkFilterReturn processx(GdkXEvent *xevent, GdkEvent *event,
-               gpointer d);
-static void progresschange(WebKitWebView *view, GParamSpec *pspec, Client *c);
-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);
+/* Surf */
+static void usage(void);
 static void setup(void);
 static void sigchld(int unused);
-static void source(Client *c, const Arg *arg);
-static void spawn(Client *c, const Arg *arg);
-static void stop(Client *c, const Arg *arg);
-static void titlechange(WebKitWebView *view, GParamSpec *pspec, 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 sighup(int unused);
+static char *buildfile(const char *path);
+static char *buildpath(const char *path);
+static char *untildepath(const char *path);
+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, ParamName *params);
+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 usage(void);
-static void windowobjectcleared(GtkWidget *w, WebKitWebFrame *frame,
-               JSContextRef js, JSObjectRef win, Client *c);
-static void zoom(Client *c, const Arg *arg);
+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 msgext(Client *c, char type, const Arg *a);
+static void destroyclient(Client *c);
+static void cleanup(void);
+
+/* 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);
+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 gboolean readpipe(GIOChannel *s, GIOCondition ioc, gpointer unused);
+static void showview(WebKitWebView *v, Client *c);
+static GtkWidget *createwindow(Client *c);
+static gboolean loadfailedtls(WebKitWebView *v, gchar *uri,
+                              GTlsCertificate *cert,
+                              GTlsCertificateFlags err, 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);
+static void decidenavigation(WebKitPolicyDecision *d, Client *c);
+static void decidenewwindow(WebKitPolicyDecision *d, Client *c);
+static void decideresource(WebKitPolicyDecision *d, Client *c);
+static void insecurecontent(WebKitWebView *v, WebKitInsecureContentEvent e,
+                            Client *c);
+static void downloadstarted(WebKitWebContext *wc, WebKitDownload *d,
+                            Client *c);
+static void responsereceived(WebKitDownload *d, GParamSpec *ps, Client *c);
+static void download(Client *c, WebKitURIResponse *r);
+static void webprocessterminated(WebKitWebView *v,
+                                 WebKitWebProcessTerminationReason r,
+                                 Client *c);
+static void closeview(WebKitWebView *v, Client *c);
+static void destroywin(GtkWidget* w, 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 void showcert(Client *c, const Arg *a);
+static void clipboard(Client *c, const Arg *a);
+static void zoom(Client *c, const Arg *a);
+static void scrollv(Client *c, const Arg *a);
+static void scrollh(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[12];
+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;
+static int modparams[ParameterLast];
+static int pipein[2], pipeout[2];
+char *argv0;
+
+static ParamName loadtransient[] = {
+       Certificate,
+       CookiePolicies,
+       DiskCache,
+       DNSPrefetch,
+       FileURLsCrossAccess,
+       JavaScript,
+       LoadImages,
+       PreferredLanguages,
+       ShowIndicators,
+       StrictTLS,
+       ParameterLast
+};
+
+static ParamName loadcommitted[] = {
+       AcceleratedCanvas,
+//     AccessMicrophone,
+//     AccessWebcam,
+       CaretBrowsing,
+       DefaultCharset,
+       FontSize,
+       FrameFlattening,
+       Geolocation,
+       HideBackground,
+       Inspector,
+       Java,
+//     KioskMode,
+       MediaManualPlay,
+       Plugins,
+       RunInFullscreen,
+       ScrollBars,
+       SiteQuirks,
+       SmoothScrolling,
+       SpellChecking,
+       SpellLanguages,
+       Style,
+       ZoomLevel,
+       ParameterLast
+};
+
+static ParamName loadfinished[] = {
+       ParameterLast
+};
 
 /* configuration, allows nested code to access above variables */
 #include "config.h"
 
-static void
-addaccelgroup(Client *c) {
-       int i;
-       GtkAccelGroup *group = gtk_accel_group_new();
-       GClosure *closure;
-
-       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);
-       }
-       gtk_window_add_accel_group(GTK_WINDOW(c->win), group);
+void
+usage(void)
+{
+       die("usage: surf [-bBdDfFgGiIkKmMnNpPsStTvwxX]\n"
+           "[-a cookiepolicies ] [-c cookiefile] [-C stylefile] [-e xid]\n"
+           "[-r scriptfile] [-u useragent] [-z zoomlevel] [uri]\n");
 }
 
-static void
-beforerequest(WebKitWebView *w, WebKitWebFrame *f, WebKitWebResource *r,
-               WebKitNetworkRequest *req, WebKitNetworkResponse *resp,
-               gpointer d) {
-       const gchar *uri = webkit_network_request_get_uri(req);
+void
+setup(void)
+{
+       GIOChannel *gchanin;
+       GdkDisplay *gdpy;
+       int i, j;
 
-       if(g_str_has_suffix(uri, "/favicon.ico"))
-               webkit_network_request_set_uri(req, "about:blank");
-}
+       /* clean up any zombies immediately */
+       sigchld(0);
+       if (signal(SIGHUP, sighup) == SIG_ERR)
+               die("Can't install SIGHUP handler");
 
-static char *
-buildpath(const char *path) {
-       char *apath, *p;
-       FILE *f;
+       if (!(dpy = XOpenDisplay(NULL)))
+               die("Can't open default display");
 
-       /* creating directory */
-       if(path[0] == '/') {
-               apath = g_strdup(path);
-       } else if(path[0] == '~') {
-               if(path[1] == '/') {
-                       apath = g_strconcat(g_get_home_dir(), &path[1], NULL);
-               } else {
-                       apath = g_strconcat(g_get_home_dir(), "/",
-                                       &path[1], NULL);
-               }
+       /* 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));
+
+       if (pipe(pipeout) < 0 || pipe(pipein) < 0) {
+               fputs("Unable to create pipes\n", stderr);
        } else {
-               apath = g_strconcat(g_get_current_dir(), "/", path, NULL);
+               gchanin = g_io_channel_unix_new(pipein[0]);
+               g_io_channel_set_encoding(gchanin, NULL, NULL);
+               g_io_channel_set_close_on_unref(gchanin, TRUE);
+               g_io_add_watch(gchanin, G_IO_IN, readpipe, NULL);
        }
 
-       if((p = strrchr(apath, '/'))) {
-               *p = '\0';
-               g_mkdir_with_parents(apath, 0700);
-               g_chmod(apath, 0700); /* in case it existed */
-               *p = '/';
-       }
-       /* creating file (gives error when apath ends with "/") */
-       if((f = fopen(apath, "a"))) {
-               g_chmod(apath, 0600); /* always */
-               fclose(f);
+
+       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;
+               }
        }
 
-       return apath;
-}
+       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);
+       }
 
-static gboolean
-buttonrelease(WebKitWebView *web, GdkEventButton *e, GList *gl) {
-       WebKitHitTestResultContext context;
-       WebKitHitTestResult *result = webkit_web_view_get_hit_test_result(web,
-                       e);
-       Arg arg;
+       for (i = 0; i < LENGTH(uriparams); ++i) {
+               if (regcomp(&(uriparams[i].re), uriparams[i].uri,
+                   REG_EXTENDED)) {
+                       fprintf(stderr, "Could not compile regex: %s\n",
+                               uriparams[i].uri);
+                       uriparams[i].uri = NULL;
+                       continue;
+               }
 
-       g_object_get(result, "context", &context, NULL);
-       if(context & WEBKIT_HIT_TEST_RESULT_CONTEXT_LINK) {
-               if(e->button == 2 ||
-                               (e->button == 1 && CLEANMASK(e->state) == CLEANMASK(MODKEY))) {
-                       g_object_get(result, "link-uri", &arg.v, NULL);
-                       newwindow(NULL, &arg, e->state & GDK_CONTROL_MASK);
-                       return true;
+               /* copy default parameters with higher priority */
+               for (j = 0; j < ParameterLast; ++j) {
+                       if (defconfig[j].prio >= uriparams[i].config[j].prio)
+                               uriparams[i].config[j] = defconfig[j];
                }
        }
-       return false;
 }
 
-static void
-cleanup(void) {
-       if (diskcache) {
-               soup_cache_flush(diskcache);
-               soup_cache_dump(diskcache);
-       }
-       while(clients)
-               destroyclient(clients);
-       g_free(cookiefile);
-       g_free(scriptfile);
-       g_free(stylefile);
+void
+sigchld(int unused)
+{
+       if (signal(SIGCHLD, sigchld) == SIG_ERR)
+               die("Can't install SIGCHLD handler");
+       while (waitpid(-1, NULL, WNOHANG) > 0)
+               ;
 }
 
-static void
-cookiejar_changed(SoupCookieJar *self, SoupCookie *old_cookie,
-               SoupCookie *new_cookie) {
-       flock(COOKIEJAR(self)->lock, LOCK_EX);
-       if(new_cookie && !new_cookie->expires && sessiontime) {
-               soup_cookie_set_expires(new_cookie,
-                               soup_date_new_from_now(sessiontime));
-       }
-       SOUP_COOKIE_JAR_CLASS(cookiejar_parent_class)->changed(self,
-                       old_cookie, new_cookie);
-       flock(COOKIEJAR(self)->lock, LOCK_UN);
-}
+void
+sighup(int unused)
+{
+       Arg a = { .i = 0 };
+       Client *c;
 
-static void
-cookiejar_class_init(CookieJarClass *klass) {
-       SOUP_COOKIE_JAR_CLASS(klass)->changed = cookiejar_changed;
-       G_OBJECT_CLASS(klass)->get_property =
-               G_OBJECT_CLASS(cookiejar_parent_class)->get_property;
-       G_OBJECT_CLASS(klass)->set_property = cookiejar_set_property;
-       G_OBJECT_CLASS(klass)->finalize = cookiejar_finalize;
-       g_object_class_override_property(G_OBJECT_CLASS(klass), 1, "filename");
+       for (c = clients; c; c = c->next)
+               reload(c, &a);
 }
 
-static void
-cookiejar_finalize(GObject *self) {
-       close(COOKIEJAR(self)->lock);
-       G_OBJECT_CLASS(cookiejar_parent_class)->finalize(self);
-}
+char *
+buildfile(const char *path)
+{
+       char *dname, *bname, *bpath, *fpath;
+       FILE *f;
 
-static void
-cookiejar_init(CookieJar *self) {
-       self->lock = open(cookiefile, 0);
-}
+       dname = g_path_get_dirname(path);
+       bname = g_path_get_basename(path);
 
-static SoupCookieJar *
-cookiejar_new(const char *filename, gboolean read_only,
-               SoupCookieJarAcceptPolicy policy) {
-       return g_object_new(COOKIEJAR_TYPE,
-                           SOUP_COOKIE_JAR_TEXT_FILENAME, filename,
-                           SOUP_COOKIE_JAR_READ_ONLY, read_only,
-                           SOUP_COOKIE_JAR_ACCEPT_POLICY, policy, NULL);
-}
+       bpath = buildpath(dname);
+       g_free(dname);
 
-static void
-cookiejar_set_property(GObject *self, guint prop_id, const GValue *value,
-               GParamSpec *pspec) {
-       flock(COOKIEJAR(self)->lock, LOCK_SH);
-       G_OBJECT_CLASS(cookiejar_parent_class)->set_property(self, prop_id,
-                       value, pspec);
-       flock(COOKIEJAR(self)->lock, LOCK_UN);
-}
+       fpath = g_build_filename(bpath, bname, NULL);
+       g_free(bpath);
+       g_free(bname);
 
-static SoupCookieJarAcceptPolicy
-cookiepolicy_get(void) {
-       switch(cookiepolicies[policysel]) {
-       case 'a':
-               return SOUP_COOKIE_JAR_ACCEPT_NEVER;
-       case '@':
-               return SOUP_COOKIE_JAR_ACCEPT_NO_THIRD_PARTY;
-       case 'A':
-       default:
-               break;
-       }
+       if (!(f = fopen(fpath, "a")))
+               die("Could not open file: %s\n", fpath);
 
-       return SOUP_COOKIE_JAR_ACCEPT_ALWAYS;
+       g_chmod(fpath, 0600); /* always */
+       fclose(f);
+
+       return fpath;
 }
 
-static char
-cookiepolicy_set(const SoupCookieJarAcceptPolicy ep) {
-       switch(ep) {
-       case SOUP_COOKIE_JAR_ACCEPT_NEVER:
-               return 'a';
-       case SOUP_COOKIE_JAR_ACCEPT_NO_THIRD_PARTY:
-               return '@';
-       case SOUP_COOKIE_JAR_ACCEPT_ALWAYS:
-       default:
-               break;
-       }
+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 'A';
+       return pw->pw_dir;
 }
 
-static void
-evalscript(JSContextRef js, char *script, char* scriptname) {
-       JSStringRef jsscript, jsscriptname;
-       JSValueRef exception = NULL;
+static const char*
+getcurrentuserhomedir(void)
+{
+       const char *homedir;
+       const char *user;
+       struct passwd *pw;
 
-       jsscript = JSStringCreateWithUTF8CString(script);
-       jsscriptname = JSStringCreateWithUTF8CString(scriptname);
-       JSEvaluateScript(js, jsscript, JSContextGetGlobalObject(js),
-                       jsscriptname, 0, &exception);
-       JSStringRelease(jsscript);
-       JSStringRelease(jsscriptname);
-}
+       homedir = getenv("HOME");
+       if (homedir)
+               return homedir;
 
-static void
-runscript(WebKitWebFrame *frame) {
-       char *script;
-       GError *error;
+       user = getenv("USER");
+       if (user)
+               return getuserhomedir(user);
 
-       if(g_file_get_contents(scriptfile, &script, NULL, &error)) {
-               evalscript(webkit_web_frame_get_global_context(frame),
-                               script, scriptfile);
-       }
+       pw = getpwuid(getuid());
+       if (!pw)
+               die("Can't get current user home directory\n");
+
+       return pw->pw_dir;
 }
 
-static void
-clipboard(Client *c, const Arg *arg) {
-       gboolean paste = *(gboolean *)arg;
+char *
+buildpath(const char *path)
+{
+       char *apath, *fpath;
 
-       if(paste) {
-               gtk_clipboard_request_text(
-                               gtk_clipboard_get(GDK_SELECTION_PRIMARY),
-                               pasteuri, c);
-       } else {
-               gtk_clipboard_set_text(
-                               gtk_clipboard_get(GDK_SELECTION_PRIMARY),
-                               c->linkhover ? c->linkhover : geturi(c), -1);
-       }
-}
+       if (path[0] == '~')
+               apath = untildepath(path);
+       else
+               apath = g_strdup(path);
 
-static char *
-copystr(char **str, const char *src) {
-       char *tmp;
-       tmp = g_strdup(src);
+       /* creating directory */
+       if (g_mkdir_with_parents(apath, 0700) < 0)
+               die("Could not access directory: %s\n", apath);
 
-       if(str && *str) {
-               g_free(*str);
-               *str = tmp;
-       }
-       return tmp;
-}
+       fpath = realpath(apath, NULL);
+       g_free(apath);
 
-static WebKitWebView *
-createwindow(WebKitWebView  *v, WebKitWebFrame *f, Client *c) {
-       Client *n = newclient();
-       return n->view;
+       return fpath;
 }
 
-static gboolean
-decidedownload(WebKitWebView *v, WebKitWebFrame *f, WebKitNetworkRequest *r,
-               gchar *m,  WebKitWebPolicyDecision *p, Client *c) {
-       if(!webkit_web_view_can_show_mime_type(v, m)) {
-               webkit_web_policy_decision_download(p);
-               return TRUE;
-       }
-       return FALSE;
-}
+char *
+untildepath(const char *path)
+{
+       char *apath, *name, *p;
+       const char *homedir;
 
-static gboolean
-decidewindow(WebKitWebView *view, WebKitWebFrame *f, WebKitNetworkRequest *r,
-               WebKitWebNavigationAction *n, WebKitWebPolicyDecision *p,
-               Client *c) {
-       Arg arg;
+       if (path[1] == '/' || path[1] == '\0') {
+               p = (char *)&path[1];
+               homedir = getcurrentuserhomedir();
+       } else {
+               if ((p = strchr(path, '/')))
+                       name = g_strndup(&path[1], p - (path + 1));
+               else
+                       name = g_strdup(&path[1]);
 
-       if(webkit_web_navigation_action_get_reason(n) ==
-                       WEBKIT_WEB_NAVIGATION_REASON_LINK_CLICKED) {
-               webkit_web_policy_decision_ignore(p);
-               arg.v = (void *)webkit_network_request_get_uri(r);
-               newwindow(NULL, &arg, 0);
-               return TRUE;
-       }
-       return FALSE;
+               homedir = getuserhomedir(name);
+               g_free(name);
+       }
+       apath = g_build_filename(homedir, p, NULL);
+       return apath;
 }
 
-static gboolean
-deletion_interface(WebKitWebView *view,
-               WebKitDOMHTMLElement *arg1, Client *c) {
-       return FALSE;
-}
+Client *
+newclient(Client *rc)
+{
+       Client *c;
 
-static void
-destroyclient(Client *c) {
-       Client *p;
+       if (!(c = calloc(1, sizeof(Client))))
+               die("Cannot malloc!\n");
 
-       webkit_web_view_stop_loading(c->view);
-       gtk_widget_destroy(GTK_WIDGET(c->view));
-       gtk_widget_destroy(c->scroll);
-       gtk_widget_destroy(c->vbox);
-       gtk_widget_destroy(c->win);
+       c->next = clients;
+       clients = c;
 
-       for(p = clients; p && p->next != c; p = p->next);
-       if(p) {
-               p->next = c->next;
-       } else {
-               clients = c->next;
-       }
-       free(c);
-       if(clients == NULL)
-               gtk_main_quit();
-}
+       c->progress = 100;
+       c->view = newview(c, rc ? rc->view : NULL);
 
-static void
-destroywin(GtkWidget* w, Client *c) {
-       destroyclient(c);
+       return c;
 }
 
-static void
-die(const char *errstr, ...) {
-       va_list ap;
+void
+loaduri(Client *c, const Arg *a)
+{
+       struct stat st;
+       char *url, *path, *apath;
+       const char *uri = a->v;
 
-       va_start(ap, errstr);
-       vfprintf(stderr, errstr, ap);
-       va_end(ap);
-       exit(EXIT_FAILURE);
-}
+       if (g_strcmp0(uri, "") == 0)
+               return;
 
-static void
-find(Client *c, const Arg *arg) {
-       const char *s;
+       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 (uri[0] == '~')
+                       apath = untildepath(uri);
+               else
+                       apath = (char *)uri;
+               if (!stat(apath, &st) && (path = realpath(apath, NULL))) {
+                       url = g_strdup_printf("file://%s", path);
+                       free(path);
+               } else {
+                       url = g_strdup_printf("http://%s", uri);
+               }
+               if (apath != uri)
+                       free(apath);
+       }
 
-       s = getatom(c, AtomFind);
-       gboolean forward = *(gboolean *)arg;
-       webkit_web_view_search_text(c->view, s, FALSE, forward, TRUE);
-}
+       setatom(c, AtomUri, url);
 
-static void
-fullscreen(Client *c, const Arg *arg) {
-       if(c->fullscreen) {
-               gtk_window_unfullscreen(GTK_WINDOW(c->win));
+       if (strcmp(url, geturi(c)) == 0) {
+               reload(c, a);
        } else {
-               gtk_window_fullscreen(GTK_WINDOW(c->win));
+               webkit_web_view_load_uri(c->view, url);
+               updatetitle(c);
        }
-       c->fullscreen = !c->fullscreen;
+
+       g_free(url);
 }
 
-static void
-geopolicyrequested(WebKitWebView *v, WebKitWebFrame *f,
-               WebKitGeolocationPolicyDecision *d, Client *c) {
-       if(allowgeolocation) {
-               webkit_geolocation_policy_allow(d);
-       } else {
-               webkit_geolocation_policy_deny(d);
-       }
+const char *
+geturi(Client *c)
+{
+       const char *uri;
+
+       if (!(uri = webkit_web_view_get_uri(c->view)))
+               uri = "about:blank";
+       return uri;
+}
+
+void
+setatom(Client *c, int a, const char *v)
+{
+       XChangeProperty(dpy, c->xid,
+                       atoms[a], XA_STRING, 8, PropModeReplace,
+                       (unsigned char *)v, strlen(v) + 1);
+       XSync(dpy, False);
 }
 
-static const char *
-getatom(Client *c, int a) {
+const char *
+getatom(Client *c, int a)
+{
        static char buf[BUFSIZ];
        Atom adummy;
        int idummy;
        unsigned long ldummy;
        unsigned char *p = NULL;
 
-       XGetWindowProperty(dpy, GDK_WINDOW_XID(GTK_WIDGET(c->win)->window),
-                       atoms[a], 0L, BUFSIZ, False, XA_STRING,
-                       &adummy, &idummy, &ldummy, &ldummy, &p);
-       if(p) {
-               strncpy(buf, (char *)p, LENGTH(buf)-1);
-       } else {
+       XSync(dpy, False);
+       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;
 }
 
-static char *
-geturi(Client *c) {
-       char *uri;
+void
+updatetitle(Client *c)
+{
+       char *title;
+       const char *name = c->overtitle ? c->overtitle :
+                          c->title ? c->title : "";
 
-       if(!(uri = (char *)webkit_web_view_get_uri(c->view)))
-               uri = "about:blank";
-       return uri;
-}
+       if (curconfig[ShowIndicators].val.i) {
+               gettogglestats(c);
+               getpagestats(c);
 
-static gchar *
-getstyle(const char *uri) {
-       int i;
+               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);
 
-       for(i = 0; i < LENGTH(styles); i++) {
-               if(styles[i].regex && !regexec(&(styles[i].re), uri, 0,
-                                       NULL, 0)) {
-                       return g_strconcat("file://", styles[i].style, NULL);
-               }
+               gtk_window_set_title(GTK_WINDOW(c->win), title);
+               g_free(title);
+       } else {
+               gtk_window_set_title(GTK_WINDOW(c->win), name);
        }
-       return g_strdup("");
 }
 
-static gboolean
-initdownload(WebKitWebView *view, WebKitDownload *o, Client *c) {
-       Arg arg;
-
-       updatewinid(c);
-       arg = (Arg)DOWNLOAD((char *)webkit_download_get_uri(o), geturi(c));
-       spawn(c, &arg);
-       return FALSE;
+void
+gettogglestats(Client *c)
+{
+       togglestats[0] = cookiepolicy_set(cookiepolicy_get());
+       togglestats[1] = curconfig[CaretBrowsing].val.i ?   'C' : 'c';
+       togglestats[2] = curconfig[Geolocation].val.i ?     'G' : 'g';
+       togglestats[3] = curconfig[DiskCache].val.i ?       'D' : 'd';
+       togglestats[4] = curconfig[LoadImages].val.i ?      'I' : 'i';
+       togglestats[5] = curconfig[JavaScript].val.i ?      'S' : 's';
+       togglestats[6] = curconfig[Plugins].val.i ?         'V' : 'v';
+       togglestats[7] = curconfig[Style].val.i ?           'M' : 'm';
+       togglestats[8] = curconfig[FrameFlattening].val.i ? 'F' : 'f';
+       togglestats[9] = curconfig[Certificate].val.i ?     'X' : 'x';
+       togglestats[10] = curconfig[StrictTLS].val.i ?      'T' : 't';
+       togglestats[11] = '\0';
+}
+
+void
+getpagestats(Client *c)
+{
+       if (c->https)
+               pagestats[0] = (c->tlserr || c->insecure) ?  'U' : 'T';
+       else
+               pagestats[0] = '-';
+       pagestats[1] = '\0';
+}
+
+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;
+       }
 }
 
-static void
-inspector(Client *c, const Arg *arg) {
-       if(c->isinspecting) {
-               webkit_web_inspector_close(c->inspector);
-       } else {
-               webkit_web_inspector_show(c->inspector);
+char
+cookiepolicy_set(const WebKitCookieAcceptPolicy p)
+{
+       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';
        }
 }
 
-static WebKitWebView *
-inspector_new(WebKitWebInspector *i, WebKitWebView *v, Client *c) {
-       return WEBKIT_WEB_VIEW(webkit_web_view_new());
+void
+seturiparameters(Client *c, const char *uri, ParamName *params)
+{
+       Parameter *config, *uriconfig = NULL;
+       int i, p;
+
+       for (i = 0; i < LENGTH(uriparams); ++i) {
+               if (uriparams[i].uri &&
+                   !regexec(&(uriparams[i].re), uri, 0, NULL, 0)) {
+                       uriconfig = uriparams[i].config;
+                       break;
+               }
+       }
+
+       curconfig = uriconfig ? uriconfig : defconfig;
+
+       for (i = 0; (p = params[i]) != ParameterLast; ++i) {
+               switch(p) {
+               default: /* FALLTHROUGH */
+                       if (!(defconfig[p].prio < curconfig[p].prio ||
+                           defconfig[p].prio < modparams[p]))
+                               continue;
+               case Certificate:
+               case CookiePolicies:
+               case Style:
+                       setparameter(c, 0, p, &curconfig[p].val);
+               }
+       }
 }
 
-static gboolean
-inspector_show(WebKitWebInspector *i, Client *c) {
-       WebKitWebView *w;
+void
+setparameter(Client *c, int refresh, ParamName p, const Arg *a)
+{
+       GdkRGBA bgcolor = { 0 };
+       WebKitSettings *s = webkit_web_view_get_settings(c->view);
 
-       if(c->isinspecting)
-               return false;
+       modparams[p] = curconfig[p].prio;
 
-       w = webkit_web_inspector_get_web_view(i);
-       gtk_paned_pack2(GTK_PANED(c->pane), GTK_WIDGET(w), TRUE, TRUE);
-       gtk_widget_show(GTK_WIDGET(w));
-       c->isinspecting = true;
+       switch (p) {
+       case AcceleratedCanvas:
+               webkit_settings_set_enable_accelerated_2d_canvas(s, a->i);
+               break;
+       case AccessMicrophone:
+               return; /* do nothing */
+       case AccessWebcam:
+               return; /* do nothing */
+       case CaretBrowsing:
+               webkit_settings_set_enable_caret_browsing(s, a->i);
+               refresh = 0;
+               break;
+       case Certificate:
+               if (a->i)
+                       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->i ?
+                   WEBKIT_CACHE_MODEL_WEB_BROWSER :
+                   WEBKIT_CACHE_MODEL_DOCUMENT_VIEWER);
+               return; /* do not update */
+       case DefaultCharset:
+               webkit_settings_set_default_charset(s, a->v);
+               return; /* do not update */
+       case DNSPrefetch:
+               webkit_settings_set_enable_dns_prefetching(s, a->i);
+               return; /* do not update */
+       case FileURLsCrossAccess:
+               webkit_settings_set_allow_file_access_from_file_urls(s, a->i);
+               webkit_settings_set_allow_universal_access_from_file_urls(s, a->i);
+               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->i);
+               break;
+       case Geolocation:
+               refresh = 0;
+               break;
+       case HideBackground:
+               if (a->i)
+                       webkit_web_view_set_background_color(c->view, &bgcolor);
+               return; /* do not update */
+       case Inspector:
+               webkit_settings_set_enable_developer_extras(s, a->i);
+               return; /* do not update */
+       case Java:
+               webkit_settings_set_enable_java(s, a->i);
+               return; /* do not update */
+       case JavaScript:
+               webkit_settings_set_enable_javascript(s, a->i);
+               break;
+       case KioskMode:
+               return; /* do nothing */
+       case LoadImages:
+               webkit_settings_set_auto_load_images(s, a->i);
+               break;
+       case MediaManualPlay:
+               webkit_settings_set_media_playback_requires_user_gesture(s, a->i);
+               break;
+       case Plugins:
+               webkit_settings_set_enable_plugins(s, a->i);
+               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 SmoothScrolling:
+               webkit_settings_set_enable_smooth_scrolling(s, a->i);
+               return; /* do not update */
+       case SiteQuirks:
+               webkit_settings_set_enable_site_specific_quirks(s, a->i);
+               break;
+       case SpellChecking:
+               webkit_web_context_set_spell_checking_enabled(
+                   webkit_web_view_get_context(c->view), a->i);
+               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->i ?
+                   WEBKIT_TLS_ERRORS_POLICY_FAIL :
+                   WEBKIT_TLS_ERRORS_POLICY_IGNORE);
+               break;
+       case Style:
+               webkit_user_content_manager_remove_all_style_sheets(
+                   webkit_web_view_get_user_content_manager(c->view));
+               if (a->i)
+                       setstyle(c, getstyle(geturi(c)));
+               refresh = 0;
+               break;
+       case WebGL:
+               webkit_settings_set_enable_webgl(s, a->i);
+               break;
+       case ZoomLevel:
+               webkit_web_view_set_zoom_level(c->view, a->f);
+               return; /* do not update */
+       default:
+               return; /* do nothing */
+       }
 
-       return true;
+       updatetitle(c);
+       if (refresh)
+               reload(c, a);
 }
 
-static gboolean
-inspector_close(WebKitWebInspector *i, Client *c) {
-       GtkWidget *w;
-
-       if(!c->isinspecting)
-               return false;
+const char *
+getcert(const char *uri)
+{
+       int i;
 
-       w = GTK_WIDGET(webkit_web_inspector_get_web_view(i));
-       gtk_widget_hide(w);
-       gtk_widget_destroy(w);
-       c->isinspecting = false;
+       for (i = 0; i < LENGTH(certs); ++i) {
+               if (certs[i].regex &&
+                   !regexec(&(certs[i].re), uri, 0, NULL, 0))
+                       return certs[i].file;
+       }
 
-       return true;
+       return NULL;
 }
 
-static void
-inspector_finished(WebKitWebInspector *i, Client *c) {
-       g_free(c->inspector);
-}
+void
+setcert(Client *c, const char *uri)
+{
+       const char *file = getcert(uri);
+       char *host;
+       GTlsCertificate *cert;
 
-static gboolean
-keypress(GtkAccelGroup *group, GObject *obj,
-               guint key, GdkModifierType mods, Client *c) {
-       guint i;
-       gboolean processed = FALSE;
+       if (!file)
+               return;
 
-       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;
-               }
+       if (!(cert = g_tls_certificate_new_from_file(file, NULL))) {
+               fprintf(stderr, "Could not read certificate file: %s\n", file);
+               return;
+       }
+
+       if ((uri = strstr(uri, "https://"))) {
+               uri += sizeof("https://") - 1;
+               host = g_strndup(uri, strchr(uri, '/') - uri);
+               webkit_web_context_allow_tls_certificate_for_host(
+                   webkit_web_view_get_context(c->view), cert, host);
+               g_free(host);
        }
 
-       return processed;
+       g_object_unref(cert);
+
 }
 
-static void
-linkhover(WebKitWebView *v, const char* t, const char* l, Client *c) {
-       if(l) {
-               c->linkhover = copystr(&c->linkhover, l);
-       } else if(c->linkhover) {
-               free(c->linkhover);
-               c->linkhover = NULL;
+const char *
+getstyle(const char *uri)
+{
+       int i;
+
+       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].file;
        }
-       updatetitle(c);
+
+       return "";
 }
 
-static void
-loadstatuschange(WebKitWebView *view, GParamSpec *pspec, Client *c) {
-       WebKitWebFrame *frame;
-       WebKitWebDataSource *src;
-       WebKitNetworkRequest *request;
-       WebKitWebSettings *set = webkit_web_view_get_settings(c->view);
-       SoupMessage *msg;
-       char *uri;
-
-       switch(webkit_web_view_get_load_status (c->view)) {
-       case WEBKIT_LOAD_COMMITTED:
-               uri = geturi(c);
-               if(strstr(uri, "https://") == uri) {
-                       frame = webkit_web_view_get_main_frame(c->view);
-                       src = webkit_web_frame_get_data_source(frame);
-                       request = webkit_web_data_source_get_request(src);
-                       msg = webkit_network_request_get_message(request);
-                       c->sslfailed = !(soup_message_get_flags(msg)
-                                       & SOUP_MESSAGE_CERTIFICATE_TRUSTED);
-               }
-               setatom(c, AtomUri, uri);
+void
+setstyle(Client *c, const char *file)
+{
+       gchar *style;
 
-               if(stylefile == NULL && enablestyles) {
-                       g_object_set(G_OBJECT(set), "user-stylesheet-uri",
-                                       getstyle(uri), NULL);
-               }
-               break;
-       case WEBKIT_LOAD_FINISHED:
-               c->progress = 100;
-               updatetitle(c);
-               if (diskcache) {
-                       soup_cache_flush(diskcache);
-                       soup_cache_dump(diskcache);
-               }
-               break;
-       default:
-               break;
+       if (!g_file_get_contents(file, &style, NULL, NULL)) {
+               fprintf(stderr, "Could not read style file: %s\n", file);
+               return;
        }
+
+       webkit_user_content_manager_add_style_sheet(
+           webkit_web_view_get_user_content_manager(c->view),
+           webkit_user_style_sheet_new(style,
+           WEBKIT_USER_CONTENT_INJECT_ALL_FRAMES,
+           WEBKIT_USER_STYLE_LEVEL_USER,
+           NULL, NULL));
+
+       g_free(style);
 }
 
-static void
-loaduri(Client *c, const Arg *arg) {
-       char *u = NULL, *rp;
-       const char *uri = (char *)arg->v;
-       Arg a = { .b = FALSE };
-       struct stat st;
+void
+runscript(Client *c)
+{
+       gchar *script;
+       gsize l;
 
-       if(strcmp(uri, "") == 0)
-               return;
+       if (g_file_get_contents(scriptfile, &script, &l, NULL) && l)
+               evalscript(c, "%s", script);
+       g_free(script);
+}
 
-       /* 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);
-       }
+void
+evalscript(Client *c, const char *jsstr, ...)
+{
+       va_list ap;
+       gchar *script;
 
-       setatom(c, AtomUri, uri);
+       va_start(ap, jsstr);
+       script = g_strdup_vprintf(jsstr, ap);
+       va_end(ap);
 
-       /* 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);
+       webkit_web_view_run_javascript(c->view, script, NULL, NULL, NULL);
+       g_free(script);
 }
 
-static void
-navigate(Client *c, const Arg *arg) {
-       int steps = *(int *)arg;
-       webkit_web_view_go_back_or_forward(c->view, steps);
+void
+updatewinid(Client *c)
+{
+       snprintf(winid, LENGTH(winid), "%lu", c->xid);
 }
 
-static Client *
-newclient(void) {
-       Client *c;
-       WebKitWebSettings *settings;
-       WebKitWebFrame *frame;
-       GdkGeometry hints = { 1, 1 };
-       GdkScreen *screen;
-       gdouble dpi;
-       char *uri = NULL, *ua;
-
-       if(!(c = calloc(1, sizeof(Client))))
-               die("Cannot malloc!\n");
+void
+handleplumb(Client *c, const char *uri)
+{
+       Arg a = (Arg)PLUMB(uri);
+       spawn(c, &a);
+}
+
+void
+newwindow(Client *c, const Arg *a, int noembed)
+{
+       int i = 0;
+       char tmp[64];
+       const char *cmd[29], *uri;
+       const Arg arg = { .v = cmd };
+
+       cmd[i++] = argv0;
+       cmd[i++] = "-a";
+       cmd[i++] = curconfig[CookiePolicies].val.v;
+       cmd[i++] = curconfig[ScrollBars].val.i ? "-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.i ? "-D" : "-d";
+       if (embed && !noembed) {
+               cmd[i++] = "-e";
+               snprintf(tmp, LENGTH(tmp), "%lu", embed);
+               cmd[i++] = tmp;
+       }
+       cmd[i++] = curconfig[RunInFullscreen].val.i ? "-F" : "-f" ;
+       cmd[i++] = curconfig[Geolocation].val.i ?     "-G" : "-g" ;
+       cmd[i++] = curconfig[LoadImages].val.i ?      "-I" : "-i" ;
+       cmd[i++] = curconfig[KioskMode].val.i ?       "-K" : "-k" ;
+       cmd[i++] = curconfig[Style].val.i ?           "-M" : "-m" ;
+       cmd[i++] = curconfig[Inspector].val.i ?       "-N" : "-n" ;
+       cmd[i++] = curconfig[Plugins].val.i ?         "-P" : "-p" ;
+       if (scriptfile && g_strcmp0(scriptfile, "")) {
+               cmd[i++] = "-r";
+               cmd[i++] = scriptfile;
+       }
+       cmd[i++] = curconfig[JavaScript].val.i ? "-S" : "-s";
+       cmd[i++] = curconfig[StrictTLS].val.i ? "-T" : "-t";
+       if (fulluseragent && g_strcmp0(fulluseragent, "")) {
+               cmd[i++] = "-u";
+               cmd[i++] = fulluseragent;
+       }
+       if (showxid)
+               cmd[i++] = "-w";
+       cmd[i++] = curconfig[Certificate].val.i ? "-X" : "-x" ;
+       /* do not keep zoom level */
+       cmd[i++] = "--";
+       if ((uri = a->v))
+               cmd[i++] = uri;
+       cmd[i] = NULL;
+
+       spawn(c, &arg);
+}
+
+void
+spawn(Client *c, const Arg *a)
+{
+       if (fork() == 0) {
+               if (dpy)
+                       close(ConnectionNumber(dpy));
+               close(pipein[0]);
+               close(pipeout[1]);
+               setsid();
+               execvp(((char **)a->v)[0], (char **)a->v);
+               fprintf(stderr, "%s: execvp %s", argv0, ((char **)a->v)[0]);
+               perror(" failed");
+               exit(1);
+       }
+}
 
-       c->title = NULL;
-       c->progress = 100;
+void
+destroyclient(Client *c)
+{
+       Client *p;
 
-       /* Window */
-       if(embed) {
-               c->win = gtk_plug_new(embed);
-       } else {
-               c->win = 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(c->win), "surf", "Surf");
+       webkit_web_view_stop_loading(c->view);
+       /* Not needed, has already been called
+       gtk_widget_destroy(c->win);
+        */
 
-               /* TA:  20091214:  And set the role here as well -- so that
-                * sessions can pick this up.
-                */
-               gtk_window_set_role(GTK_WINDOW(c->win), "Surf");
-       }
-       gtk_window_set_default_size(GTK_WINDOW(c->win), 800, 600);
-       g_signal_connect(G_OBJECT(c->win),
-                       "destroy",
-                       G_CALLBACK(destroywin), c);
+       for (p = clients; p && p->next != c; p = p->next)
+               ;
+       if (p)
+               p->next = c->next;
+       else
+               clients = c->next;
+       free(c);
+}
 
-       if(!kioskmode)
-               addaccelgroup(c);
+void
+cleanup(void)
+{
+       while (clients)
+               destroyclient(clients);
 
-       /* Pane */
-       c->pane = gtk_vpaned_new();
+       close(pipein[0]);
+       close(pipeout[1]);
+       g_free(cookiefile);
+       g_free(scriptfile);
+       g_free(stylefile);
+       g_free(cachedir);
+       XCloseDisplay(dpy);
+}
 
-       /* VBox */
-       c->vbox = gtk_vbox_new(FALSE, 0);
-       gtk_paned_pack1(GTK_PANED(c->pane), c->vbox, TRUE, TRUE);
+WebKitWebView *
+newview(Client *c, WebKitWebView *rv)
+{
+       WebKitWebView *v;
+       WebKitSettings *settings;
+       WebKitWebContext *context;
+       WebKitCookieManager *cookiemanager;
+       WebKitUserContentManager *contentmanager;
 
        /* Webview */
-       c->view = WEBKIT_WEB_VIEW(webkit_web_view_new());
-
-       g_signal_connect(G_OBJECT(c->view),
-                       "notify::title",
-                       G_CALLBACK(titlechange), c);
-       g_signal_connect(G_OBJECT(c->view),
-                       "hovering-over-link",
-                       G_CALLBACK(linkhover), c);
-       g_signal_connect(G_OBJECT(c->view),
-                       "geolocation-policy-decision-requested",
-                       G_CALLBACK(geopolicyrequested), c);
-       g_signal_connect(G_OBJECT(c->view),
-                       "create-web-view",
-                       G_CALLBACK(createwindow), c);
-       g_signal_connect(G_OBJECT(c->view),
-                       "new-window-policy-decision-requested",
-                       G_CALLBACK(decidewindow), c);
-       g_signal_connect(G_OBJECT(c->view),
-                       "mime-type-policy-decision-requested",
-                       G_CALLBACK(decidedownload), c);
-       g_signal_connect(G_OBJECT(c->view),
-                       "window-object-cleared",
-                       G_CALLBACK(windowobjectcleared), c);
-       g_signal_connect(G_OBJECT(c->view),
-                       "notify::load-status",
-                       G_CALLBACK(loadstatuschange), c);
-       g_signal_connect(G_OBJECT(c->view),
-                       "notify::progress",
-                       G_CALLBACK(progresschange), c);
-       g_signal_connect(G_OBJECT(c->view),
-                       "download-requested",
-                       G_CALLBACK(initdownload), c);
-       g_signal_connect(G_OBJECT(c->view),
-                       "button-release-event",
-                       G_CALLBACK(buttonrelease), c);
-       g_signal_connect(G_OBJECT(c->view),
-                       "context-menu",
-                       G_CALLBACK(contextmenu), c);
-       g_signal_connect(G_OBJECT(c->view),
-                       "resource-request-starting",
-                       G_CALLBACK(beforerequest), c);
-       g_signal_connect(G_OBJECT(c->view),
-                       "should-show-delete-interface-for-element",
-                       G_CALLBACK(deletion_interface), c);
-
-       /* Scrolled Window */
-       c->scroll = gtk_scrolled_window_new(NULL, NULL);
-
-       frame = webkit_web_view_get_main_frame(WEBKIT_WEB_VIEW(c->view));
-       g_signal_connect(G_OBJECT(frame), "scrollbars-policy-changed",
-                       G_CALLBACK(gtk_true), NULL);
-
-       if(!enablescrollbars) {
-               gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(c->scroll),
-                               GTK_POLICY_NEVER, GTK_POLICY_NEVER);
+       if (rv) {
+               v = WEBKIT_WEB_VIEW(webkit_web_view_new_with_related_view(rv));
        } else {
-               gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(c->scroll),
-                               GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+               settings = webkit_settings_new_with_settings(
+                  "allow-file-access-from-file-urls", curconfig[FileURLsCrossAccess].val.i,
+                  "allow-universal-access-from-file-urls", curconfig[FileURLsCrossAccess].val.i,
+                  "auto-load-images", curconfig[LoadImages].val.i,
+                  "default-charset", curconfig[DefaultCharset].val.v,
+                  "default-font-size", curconfig[FontSize].val.i,
+                  "enable-caret-browsing", curconfig[CaretBrowsing].val.i,
+                  "enable-developer-extras", curconfig[Inspector].val.i,
+                  "enable-dns-prefetching", curconfig[DNSPrefetch].val.i,
+                  "enable-frame-flattening", curconfig[FrameFlattening].val.i,
+                  "enable-html5-database", curconfig[DiskCache].val.i,
+                  "enable-html5-local-storage", curconfig[DiskCache].val.i,
+                  "enable-java", curconfig[Java].val.i,
+                  "enable-javascript", curconfig[JavaScript].val.i,
+                  "enable-plugins", curconfig[Plugins].val.i,
+                  "enable-accelerated-2d-canvas", curconfig[AcceleratedCanvas].val.i,
+                  "enable-site-specific-quirks", curconfig[SiteQuirks].val.i,
+                  "enable-smooth-scrolling", curconfig[SmoothScrolling].val.i,
+                  "enable-webgl", curconfig[WebGL].val.i,
+                  "media-playback-requires-user-gesture", curconfig[MediaManualPlay].val.i,
+                  NULL);
+/* For more 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));
+
+               cookiemanager = webkit_web_context_get_cookie_manager(context);
+
+               /* 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);
+               /* TLS */
+               webkit_web_context_set_tls_errors_policy(context,
+                   curconfig[StrictTLS].val.i ? WEBKIT_TLS_ERRORS_POLICY_FAIL :
+                   WEBKIT_TLS_ERRORS_POLICY_IGNORE);
+               /* disk cache */
+               webkit_web_context_set_cache_model(context,
+                   curconfig[DiskCache].val.i ? 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(cookiemanager,
+                   cookiefile, WEBKIT_COOKIE_PERSISTENT_STORAGE_TEXT);
+               /* cookie policy */
+               webkit_cookie_manager_set_accept_policy(cookiemanager,
+                   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.i);
+
+               g_signal_connect(G_OBJECT(context), "download-started",
+                                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,
+                   "user-content-manager", contentmanager,
+                   "web-context", context,
+                   NULL);
        }
 
-       /* Arranging */
-       gtk_container_add(GTK_CONTAINER(c->scroll), GTK_WIDGET(c->view));
-       gtk_container_add(GTK_CONTAINER(c->win), c->pane);
-       gtk_container_add(GTK_CONTAINER(c->vbox), c->scroll);
+       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), "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-failed-with-tls-errors",
+                        G_CALLBACK(loadfailedtls), 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_CALLBACK(permissionrequested), c);
+       g_signal_connect(G_OBJECT(v), "ready-to-show",
+                        G_CALLBACK(showview), c);
+       g_signal_connect(G_OBJECT(v), "web-process-terminated",
+                        G_CALLBACK(webprocessterminated), c);
+
+       return v;
+}
 
-       /* Setup */
-       gtk_box_set_child_packing(GTK_BOX(c->vbox), c->scroll, TRUE,
-                       TRUE, 0, GTK_PACK_START);
-       gtk_widget_grab_focus(GTK_WIDGET(c->view));
-       gtk_widget_show(c->pane);
-       gtk_widget_show(c->vbox);
-       gtk_widget_show(c->scroll);
-       gtk_widget_show(GTK_WIDGET(c->view));
-       gtk_widget_show(c->win);
-       gtk_window_set_geometry_hints(GTK_WINDOW(c->win), NULL, &hints,
-                       GDK_HINT_MIN_SIZE);
-       gdk_window_set_events(GTK_WIDGET(c->win)->window, GDK_ALL_EVENTS_MASK);
-       gdk_window_add_filter(GTK_WIDGET(c->win)->window, processx, c);
-       webkit_web_view_set_full_content_zoom(c->view, TRUE);
-
-       runscript(frame);
-
-       settings = webkit_web_view_get_settings(c->view);
-       if(!(ua = getenv("SURF_USERAGENT")))
-               ua = useragent;
-       g_object_set(G_OBJECT(settings), "user-agent", ua, NULL);
-       if (stylefile != NULL) {
-               uri = g_strconcat("file://", stylefile, NULL);
-               g_object_set(G_OBJECT(settings), "user-stylesheet-uri", uri, NULL);
-       }
-       g_object_set(G_OBJECT(settings), "auto-load-images", loadimages,
-                       NULL);
-       g_object_set(G_OBJECT(settings), "enable-plugins", enableplugins,
-                       NULL);
-       g_object_set(G_OBJECT(settings), "enable-scripts", enablescripts,
-                       NULL);
-       g_object_set(G_OBJECT(settings), "enable-spatial-navigation",
-                       enablespatialbrowsing, NULL);
-       g_object_set(G_OBJECT(settings), "enable-developer-extras",
-                       enableinspector, NULL);
-       g_object_set(G_OBJECT(settings), "enable-default-context-menu",
-                       kioskmode ^ 1, NULL);
-       g_object_set(G_OBJECT(settings), "default-font-size",
-                       defaultfontsize, NULL);
-       g_object_set(G_OBJECT(settings), "resizable-text-areas",
-                       1, NULL);
-
-       /*
-        * While stupid, CSS specifies that a pixel represents 1/96 of an inch.
-        * This ensures websites are not unusably small with a high DPI screen.
-        * It is equivalent to firefox's "layout.css.devPixelsPerPx" setting.
-        */
-       if(zoomto96dpi) {
-               screen = gdk_window_get_screen(GTK_WIDGET(c->win)->window);
-               dpi = gdk_screen_get_resolution(screen);
-               if(dpi != -1) {
-                       g_object_set(G_OBJECT(settings), "enforce-96-dpi", true,
-                                       NULL);
-                       webkit_web_view_set_zoom_level(c->view, dpi/96);
-               }
+static gboolean
+readpipe(GIOChannel *s, GIOCondition ioc, gpointer unused)
+{
+       static char msg[MSGBUFSZ], msgsz;
+       GError *gerr = NULL;
+
+       if (g_io_channel_read_chars(s, msg, sizeof(msg), NULL, &gerr) !=
+           G_IO_STATUS_NORMAL) {
+               fprintf(stderr, "surf: error reading pipe: %s\n",
+                       gerr->message);
+               g_error_free(gerr);
+               return TRUE;
        }
-       /* This might conflict with _zoomto96dpi_. */
-       if(zoomlevel != 1.0)
-               webkit_web_view_set_zoom_level(c->view, zoomlevel);
-
-       if(enableinspector) {
-               c->inspector = WEBKIT_WEB_INSPECTOR(
-                               webkit_web_view_get_inspector(c->view));
-               g_signal_connect(G_OBJECT(c->inspector), "inspect-web-view",
-                               G_CALLBACK(inspector_new), c);
-               g_signal_connect(G_OBJECT(c->inspector), "show-window",
-                               G_CALLBACK(inspector_show), c);
-               g_signal_connect(G_OBJECT(c->inspector), "close-window",
-                               G_CALLBACK(inspector_close), c);
-               g_signal_connect(G_OBJECT(c->inspector), "finished",
-                               G_CALLBACK(inspector_finished), c);
-               c->isinspecting = false;
+       if ((msgsz = msg[0]) < 3) {
+               fprintf(stderr, "surf: message too short: %d\n", msgsz);
+               return TRUE;
        }
 
-       if(runinfullscreen) {
-               c->fullscreen = 0;
-               fullscreen(c, NULL);
+       switch (msg[2]) {
+       case 'i':
+               close(pipein[1]);
+               close(pipeout[0]);
+               break;
        }
 
-       if(stylefile != NULL)
-               g_free(uri);
-
-       setatom(c, AtomFind, "");
-       setatom(c, AtomUri, "about:blank");
-       if(hidebackground)
-               webkit_web_view_set_transparent(c->view, TRUE);
-
-       c->next = clients;
-       clients = c;
+       return TRUE;
+}
 
-       if(showxid) {
-               gdk_display_sync(gtk_widget_get_display(c->win));
-               printf("%u\n",
-                       (guint)GDK_WINDOW_XID(GTK_WIDGET(c->win)->window));
-               fflush(NULL);
-                if (fclose(stdout) != 0) {
-                       die("Error closing stdout");
-                }
-       }
+void
+initwebextensions(WebKitWebContext *wc, Client *c)
+{
+       GVariant *gv;
 
-       return c;
-}
+       if (!pipeout[0] || !pipein[1])
+               return;
 
-static void
-newwindow(Client *c, const Arg *arg, gboolean noembed) {
-       guint i = 0;
-       const char *cmd[16], *uri;
-       const Arg a = { .v = (void *)cmd };
-       char tmp[64];
+       gv = g_variant_new("(ii)", pipeout[0], pipein[1]);
 
-       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;
-       }
-       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);
+       webkit_web_context_set_web_extensions_initialization_user_data(wc, gv);
+       webkit_web_context_set_web_extensions_directory(wc, WEBEXTDIR);
 }
 
-static gboolean
-contextmenu(WebKitWebView *view, GtkWidget *menu, WebKitHitTestResult *target,
-               gboolean keyboard, Client *c) {
-       GList *items = gtk_container_get_children(GTK_CONTAINER(GTK_MENU(menu)));
+GtkWidget *
+createview(WebKitWebView *v, WebKitNavigationAction *a, Client *c)
+{
+       Client *n;
 
-       for(GList *l = items; l; l = l->next) {
-               g_signal_connect(l->data, "activate", G_CALLBACK(menuactivate), c);
+       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;
        }
 
-       g_list_free(items);
-       return FALSE;
+       return GTK_WIDGET(n->view);
 }
 
-static void
-menuactivate(GtkMenuItem *item, Client *c) {
-       /*
-        * context-menu-action-2000     open link
-        * context-menu-action-1        open link in window
-        * context-menu-action-2        download linked file
-        * context-menu-action-3        copy link location
-        * context-menu-action-7        copy image address
-        * context-menu-action-13       reload
-        * context-menu-action-10       back
-        * context-menu-action-11       forward
-        * context-menu-action-12       stop
-        */
-
-       GtkAction *a = NULL;
-       const char *name, *uri;
-       GtkClipboard *prisel, *clpbrd;
+gboolean
+buttonreleased(GtkWidget *w, GdkEvent *e, Client *c)
+{
+       WebKitHitTestResultContext element;
+       int i;
 
-       a = gtk_activatable_get_related_action(GTK_ACTIVATABLE(item));
-       if(a == NULL)
-               return;
+       element = webkit_hit_test_result_get_context(c->mousepos);
 
-       name = gtk_action_get_name(a);
-       if(!g_strcmp0(name, "context-menu-action-3")) {
-               prisel = gtk_clipboard_get(GDK_SELECTION_PRIMARY);
-               gtk_clipboard_set_text(prisel, c->linkhover, -1);
-       } else if(!g_strcmp0(name, "context-menu-action-7")) {
-               prisel = gtk_clipboard_get(GDK_SELECTION_PRIMARY);
-               clpbrd = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
-               uri = gtk_clipboard_wait_for_text(clpbrd);
-               if(uri)
-                       gtk_clipboard_set_text(prisel, uri, -1);
+       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;
+               }
        }
-}
 
-static void
-pasteuri(GtkClipboard *clipboard, const char *text, gpointer d) {
-       Arg arg = {.v = text };
-       if(text != NULL)
-               loaduri((Client *) d, &arg);
-}
-
-static void
-print(Client *c, const Arg *arg) {
-       webkit_web_frame_print(webkit_web_view_get_main_frame(c->view));
+       return FALSE;
 }
 
-static GdkFilterReturn
-processx(GdkXEvent *e, GdkEvent *event, gpointer d) {
+GdkFilterReturn
+processx(GdkXEvent *e, GdkEvent *event, gpointer d)
+{
        Client *c = (Client *)d;
        XPropertyEvent *ev;
-       Arg arg;
+       Arg a;
 
-       if(((XEvent *)e)->type == PropertyNotify) {
+       if (((XEvent *)e)->type == PropertyNotify) {
                ev = &((XEvent *)e)->xproperty;
-               if(ev->state == PropertyNewValue) {
-                       if(ev->atom == atoms[AtomFind]) {
-                               arg.b = TRUE;
-                               find(c, &arg);
+               if (ev->state == PropertyNewValue) {
+                       if (ev->atom == atoms[AtomFind]) {
+                               find(c, NULL);
 
                                return GDK_FILTER_REMOVE;
-                       } else if(ev->atom == atoms[AtomGo]) {
-                               arg.v = getatom(c, AtomGo);
-                               loaduri(c, &arg);
+                       } else if (ev->atom == atoms[AtomGo]) {
+                               a.v = getatom(c, AtomGo);
+                               loaduri(c, &a);
 
                                return GDK_FILTER_REMOVE;
                        }
@@ -1078,410 +1322,658 @@ processx(GdkXEvent *e, GdkEvent *event, gpointer d) {
        return GDK_FILTER_CONTINUE;
 }
 
-static void
-progresschange(WebKitWebView *view, GParamSpec *pspec, Client *c) {
-       c->progress = webkit_web_view_get_progress(c->view) * 100;
-       updatetitle(c);
-}
+gboolean
+winevent(GtkWidget *w, GdkEvent *e, Client *c)
+{
+       int i;
 
-static void
-reload(Client *c, const Arg *arg) {
-       gboolean nocache = *(gboolean *)arg;
-       if(nocache) {
-                webkit_web_view_reload_bypass_cache(c->view);
-       } else {
-                webkit_web_view_reload(c->view);
+       switch (e->type) {
+       case GDK_ENTER_NOTIFY:
+               c->overtitle = c->targeturi;
+               updatetitle(c);
+               break;
+       case GDK_KEY_PRESS:
+               if (!curconfig[KioskMode].val.i) {
+                       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;
        }
-}
 
-static void
-scroll_h(Client *c, const Arg *arg) {
-       scroll(gtk_scrolled_window_get_hadjustment(
-                               GTK_SCROLLED_WINDOW(c->scroll)), arg);
+       return FALSE;
 }
 
-static void
-scroll_v(Client *c, const Arg *arg) {
-       scroll(gtk_scrolled_window_get_vadjustment(
-                               GTK_SCROLLED_WINDOW(c->scroll)), arg);
-}
+void
+showview(WebKitWebView *v, Client *c)
+{
+       GdkRGBA bgcolor = { 0 };
+       GdkWindow *gwin;
 
-static void
-scroll(GtkAdjustment *a, const Arg *arg) {
-       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;
+       c->finder = webkit_web_view_get_find_controller(c->view);
+       c->inspector = webkit_web_view_get_inspector(c->view);
+
+       c->pageid = webkit_web_view_get_page_id(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);
+               fflush(stdout);
        }
 
-       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);
-}
+       if (curconfig[HideBackground].val.i)
+               webkit_web_view_set_background_color(c->view, &bgcolor);
 
-static void
-setatom(Client *c, int a, const char *v) {
-       XSync(dpy, False);
-       XChangeProperty(dpy, GDK_WINDOW_XID(GTK_WIDGET(c->win)->window),
-                       atoms[a], XA_STRING, 8, PropModeReplace,
-                       (unsigned char *)v, strlen(v) + 1);
-}
+       if (!curconfig[KioskMode].val.i) {
+               gdk_window_set_events(gwin, GDK_ALL_EVENTS_MASK);
+               gdk_window_add_filter(gwin, processx, c);
+       }
 
-static void
-setup(void) {
-       int i;
-       char *proxy;
-       char *new_proxy;
-       SoupURI *puri;
-       SoupSession *s;
-       GError *error = NULL;
+       if (curconfig[RunInFullscreen].val.i)
+               togglefullscreen(c, NULL);
 
-       /* clean up any zombies immediately */
-       sigchld(0);
-       gtk_init(NULL, NULL);
+       if (curconfig[ZoomLevel].val.f != 1.0)
+               webkit_web_view_set_zoom_level(c->view,
+                                              curconfig[ZoomLevel].val.f);
 
-       dpy = GDK_DISPLAY();
+       setatom(c, AtomFind, "");
+       setatom(c, AtomUri, "about:blank");
+}
 
-       /* atoms */
-       atoms[AtomFind] = XInternAtom(dpy, "_SURF_FIND", False);
-       atoms[AtomGo] = XInternAtom(dpy, "_SURF_GO", False);
-       atoms[AtomUri] = XInternAtom(dpy, "_SURF_URI", False);
+GtkWidget *
+createwindow(Client *c)
+{
+       char *wmstr;
+       GtkWidget *w;
 
-       /* dirs and files */
-       cookiefile = buildpath(cookiefile);
-       scriptfile = buildpath(scriptfile);
-       cachefolder = buildpath(cachefolder);
-       styledir = buildpath(styledir);
-       if(stylefile == NULL && enablestyles) {
-               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 = buildpath(
-                                       g_strconcat(styledir,
-                                               styles[i].style, NULL));
-               }
+       if (embed) {
+               w = gtk_plug_new(embed);
        } else {
-               stylefile = buildpath(stylefile);
-       }
+               w = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 
-       /* request handler */
-       s = webkit_get_default_session();
+               wmstr = g_path_get_basename(argv0);
+               gtk_window_set_wmclass(GTK_WINDOW(w), wmstr, "Surf");
+               g_free(wmstr);
 
-       /* cookie jar */
-       soup_session_add_feature(s,
-                       SOUP_SESSION_FEATURE(cookiejar_new(cookiefile, FALSE,
-                                       cookiepolicy_get())));
+               wmstr = g_strdup_printf("%s[%lu]", "Surf", c->pageid);
+               gtk_window_set_role(GTK_WINDOW(w), wmstr);
+               g_free(wmstr);
 
-       /* disk cache */
-       if(enablediskcache) {
-               diskcache = soup_cache_new(cachefolder, SOUP_CACHE_SINGLE_USER);
-               soup_cache_set_max_size(diskcache, diskcachebytes);
-               soup_cache_load(diskcache);
-               soup_session_add_feature(s, SOUP_SESSION_FEATURE(diskcache));
+               gtk_window_set_default_size(GTK_WINDOW(w), winsize[0], winsize[1]);
        }
 
-       /* ssl */
-       tlsdb = g_tls_file_database_new(cafile, &error);
+       g_signal_connect(G_OBJECT(w), "destroy",
+                        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_signal_connect(G_OBJECT(w), "window-state-event",
+                        G_CALLBACK(winevent), c);
+
+       return w;
+}
+
+gboolean
+loadfailedtls(WebKitWebView *v, gchar *uri, GTlsCertificate *cert,
+              GTlsCertificateFlags err, Client *c)
+{
+       GString *errmsg = g_string_new(NULL);
+       gchar *html, *pem;
+
+       c->failedcert = g_object_ref(cert);
+       c->tlserr = err;
+       c->errorpage = 1;
+
+       if (err & G_TLS_CERTIFICATE_UNKNOWN_CA)
+               g_string_append(errmsg,
+                   "The signing certificate authority is not known.<br>");
+       if (err & G_TLS_CERTIFICATE_BAD_IDENTITY)
+               g_string_append(errmsg,
+                   "The certificate does not match the expected identity "
+                   "of the site that it was retrieved from.<br>");
+       if (err & G_TLS_CERTIFICATE_NOT_ACTIVATED)
+               g_string_append(errmsg,
+                   "The certificate's activation time "
+                   "is still in the future.<br>");
+       if (err & G_TLS_CERTIFICATE_EXPIRED)
+               g_string_append(errmsg, "The certificate has expired.<br>");
+       if (err & G_TLS_CERTIFICATE_REVOKED)
+               g_string_append(errmsg,
+                   "The certificate has been revoked according to "
+                   "the GTlsConnection's certificate revocation list.<br>");
+       if (err & G_TLS_CERTIFICATE_INSECURE)
+               g_string_append(errmsg,
+                   "The certificate's algorithm is considered insecure.<br>");
+       if (err & G_TLS_CERTIFICATE_GENERIC_ERROR)
+               g_string_append(errmsg,
+                   "Some error occurred validating the certificate.<br>");
+
+       g_object_get(cert, "certificate-pem", &pem, NULL);
+       html = g_strdup_printf("<p>Could not validate TLS for “%s”<br>%s</p>"
+                              "<p>You can inspect the following certificate "
+                              "with Ctrl-t (default keybinding).</p>"
+                              "<p><pre>%s</pre></p>", uri, errmsg->str, pem);
+       g_free(pem);
+       g_string_free(errmsg, TRUE);
+
+       webkit_web_view_load_alternate_html(c->view, html, uri, NULL);
+       g_free(html);
+
+       return TRUE;
+}
+
+void
+loadchanged(WebKitWebView *v, WebKitLoadEvent e, Client *c)
+{
+       const char *uri = geturi(c);
 
-       if(error) {
-               g_warning("Error loading SSL database %s: %s", cafile, error->message);
-               g_error_free(error);
-       }
-       g_object_set(G_OBJECT(s), "tls-database", tlsdb, NULL);
-       g_object_set(G_OBJECT(s), "ssl-strict", strictssl, NULL);
-
-       /* proxy */
-       if((proxy = getenv("http_proxy")) && strcmp(proxy, "")) {
-               new_proxy = g_strrstr(proxy, "http://") ? g_strdup(proxy) :
-                       g_strdup_printf("http://%s", proxy);
-               puri = soup_uri_new(new_proxy);
-               g_object_set(G_OBJECT(s), "proxy-uri", puri, NULL);
-               soup_uri_free(puri);
-               g_free(new_proxy);
-               usingproxy = 1;
+       switch (e) {
+       case WEBKIT_LOAD_STARTED:
+               setatom(c, AtomUri, uri);
+               c->title = uri;
+               c->https = c->insecure = 0;
+               seturiparameters(c, uri, loadtransient);
+               if (c->errorpage)
+                       c->errorpage = 0;
+               else
+                       g_clear_object(&c->failedcert);
+               break;
+       case WEBKIT_LOAD_REDIRECTED:
+               setatom(c, AtomUri, uri);
+               c->title = uri;
+               seturiparameters(c, uri, loadtransient);
+               break;
+       case WEBKIT_LOAD_COMMITTED:
+               seturiparameters(c, uri, loadcommitted);
+               c->https = webkit_web_view_get_tls_info(c->view, &c->cert,
+                                                       &c->tlserr);
+               break;
+       case WEBKIT_LOAD_FINISHED:
+               seturiparameters(c, uri, loadfinished);
+               /* 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);
 }
 
-static void
-sigchld(int unused) {
-       if(signal(SIGCHLD, sigchld) == SIG_ERR)
-               die("Can't install SIGCHLD handler");
-       while(0 < waitpid(-1, NULL, WNOHANG));
+void
+progresschanged(WebKitWebView *v, GParamSpec *ps, Client *c)
+{
+       c->progress = webkit_web_view_get_estimated_load_progress(c->view) *
+                     100;
+       updatetitle(c);
 }
 
-static void
-source(Client *c, const Arg *arg) {
-       Arg a = { .b = FALSE };
-       gboolean s;
+void
+titlechanged(WebKitWebView *view, GParamSpec *ps, Client *c)
+{
+       c->title = webkit_web_view_get_title(c->view);
+       updatetitle(c);
+}
 
-       s = webkit_web_view_get_view_source_mode(c->view);
-       webkit_web_view_set_view_source_mode(c->view, !s);
-       reload(c, &a);
+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);
 }
 
-static void
-spawn(Client *c, const Arg *arg) {
-       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);
+gboolean
+permissionrequested(WebKitWebView *v, WebKitPermissionRequest *r, Client *c)
+{
+       ParamName param = ParameterLast;
+
+       if (WEBKIT_IS_GEOLOCATION_PERMISSION_REQUEST(r)) {
+               param = Geolocation;
+       } else if (WEBKIT_IS_USER_MEDIA_PERMISSION_REQUEST(r)) {
+               if (webkit_user_media_permission_is_for_audio_device(
+                   WEBKIT_USER_MEDIA_PERMISSION_REQUEST(r)))
+                       param = AccessMicrophone;
+               else if (webkit_user_media_permission_is_for_video_device(
+                        WEBKIT_USER_MEDIA_PERMISSION_REQUEST(r)))
+                       param = AccessWebcam;
+       } else {
+               return FALSE;
        }
-}
 
-static void
-eval(Client *c, const Arg *arg) {
-       WebKitWebFrame *frame = webkit_web_view_get_main_frame(c->view);
-       evalscript(webkit_web_frame_get_global_context(frame),
-                       ((char **)arg->v)[0], "");
-}
+       if (curconfig[param].val.i)
+               webkit_permission_request_allow(r);
+       else
+               webkit_permission_request_deny(r);
 
-static void
-stop(Client *c, const Arg *arg) {
-       webkit_web_view_stop_loading(c->view);
+       return TRUE;
 }
 
-static void
-titlechange(WebKitWebView *view, GParamSpec *pspec, Client *c) {
-       const gchar *t = webkit_web_view_get_title(view);
-       if (t) {
-               c->title = copystr(&c->title, t);
-               updatetitle(c);
+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;
        }
 }
 
-static void
-toggle(Client *c, const Arg *arg) {
-       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);
+void
+decidenewwindow(WebKitPolicyDecision *d, Client *c)
+{
+       Arg arg;
+       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:
+               /* 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;
+       }
 
-       reload(c, &a);
+       webkit_policy_decision_ignore(d);
 }
 
-static void
-togglecookiepolicy(Client *c, const Arg *arg) {
-       SoupCookieJar *jar;
-       SoupCookieJarAcceptPolicy policy;
+void
+decideresource(WebKitPolicyDecision *d, Client *c)
+{
+       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);
+
+       if (g_str_has_suffix(uri, "/favicon.ico")) {
+               webkit_policy_decision_ignore(d);
+               return;
+       }
 
-       jar = SOUP_COOKIE_JAR(
-                       soup_session_get_feature(
-                               webkit_get_default_session(),
-                               SOUP_TYPE_COOKIE_JAR));
-       g_object_get(G_OBJECT(jar), "accept-policy", &policy, NULL);
+       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;
+               }
+       }
 
-       policysel++;
-       if(policysel >= strlen(cookiepolicies))
-               policysel = 0;
+       if (webkit_response_policy_decision_is_mime_type_supported(r)) {
+               webkit_policy_decision_use(d);
+       } else {
+               webkit_policy_decision_ignore(d);
+               download(c, res);
+       }
+}
 
-       g_object_set(G_OBJECT(jar), "accept-policy",
-                       cookiepolicy_get(), NULL);
+void
+insecurecontent(WebKitWebView *v, WebKitInsecureContentEvent e, Client *c)
+{
+       c->insecure = 1;
+}
 
-       updatetitle(c);
-       /* Do not reload. */
+void
+downloadstarted(WebKitWebContext *wc, WebKitDownload *d, Client *c)
+{
+       g_signal_connect(G_OBJECT(d), "notify::response",
+                        G_CALLBACK(responsereceived), c);
 }
 
-static void
-togglegeolocation(Client *c, const Arg *arg) {
-       Arg a = { .b = FALSE };
+void
+responsereceived(WebKitDownload *d, GParamSpec *ps, Client *c)
+{
+       download(c, webkit_download_get_response(d));
+       webkit_download_cancel(d);
+}
 
-       allowgeolocation ^= 1;
+void
+download(Client *c, WebKitURIResponse *r)
+{
+       Arg a = (Arg)DOWNLOAD(webkit_uri_response_get_uri(r), geturi(c));
+       spawn(c, &a);
+}
 
-       reload(c, &a);
+void
+webprocessterminated(WebKitWebView *v, WebKitWebProcessTerminationReason r,
+                     Client *c)
+{
+       fprintf(stderr, "web process terminated: %s\n",
+               r == WEBKIT_WEB_PROCESS_CRASHED ? "crashed" : "no memory");
+       closeview(v, c);
 }
 
-static void
-twitch(Client *c, const Arg *arg) {
-       GtkAdjustment *a;
-       gdouble v;
+void
+closeview(WebKitWebView *v, Client *c)
+{
+       gtk_widget_destroy(c->win);
+}
 
-       a = gtk_scrolled_window_get_vadjustment(
-                       GTK_SCROLLED_WINDOW(c->scroll));
+void
+destroywin(GtkWidget* w, Client *c)
+{
+       destroyclient(c);
+       if (!clients)
+               gtk_main_quit();
+}
 
-       v = gtk_adjustment_get_value(a);
+void
+pasteuri(GtkClipboard *clipboard, const char *text, gpointer d)
+{
+       Arg a = {.v = text };
+       if (text)
+               loaduri((Client *) d, &a);
+}
 
-       v += arg->i;
+void
+reload(Client *c, const Arg *a)
+{
+       if (a->i)
+               webkit_web_view_reload_bypass_cache(c->view);
+       else
+               webkit_web_view_reload(c->view);
+}
 
-       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);
+void
+print(Client *c, const Arg *a)
+{
+       webkit_print_operation_run_dialog(webkit_print_operation_new(c->view),
+                                         GTK_WINDOW(c->win));
 }
 
-static void
-togglescrollbars(Client *c, const Arg *arg) {
-       GtkPolicyType vspolicy;
-       Arg a;
+void
+showcert(Client *c, const Arg *a)
+{
+       GTlsCertificate *cert = c->failedcert ? c->failedcert : c->cert;
+       GcrCertificate *gcrt;
+       GByteArray *crt;
+       GtkWidget *win;
+       GcrCertificateWidget *wcert;
 
-       gtk_scrolled_window_get_policy(GTK_SCROLLED_WINDOW(c->scroll), NULL, &vspolicy);
+       if (!cert)
+               return;
 
-       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);
+       g_object_get(cert, "certificate", &crt, NULL);
+       gcrt = gcr_simple_certificate_new(crt->data, crt->len);
+       g_byte_array_unref(crt);
+
+       win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+       wcert = gcr_certificate_widget_new(gcrt);
+       g_object_unref(gcrt);
+
+       gtk_container_add(GTK_CONTAINER(win), GTK_WIDGET(wcert));
+       gtk_widget_show_all(win);
+}
+
+void
+clipboard(Client *c, const Arg *a)
+{
+       if (a->i) { /* 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);
        }
 }
 
-static void
-togglestyle(Client *c, const Arg *arg) {
-       WebKitWebSettings *settings = webkit_web_view_get_settings(c->view);
-       char *uri;
-
-       g_object_get(G_OBJECT(settings), "user-stylesheet-uri", &uri, NULL);
-       if(stylefile == NULL && enablestyles) {
-               uri = (uri && uri[0])? g_strdup("") : getstyle(geturi(c));
-       } else {
-               uri = uri[0]? g_strdup("") : g_strconcat("file://",
-                               stylefile, NULL);
-       }
-       g_object_set(G_OBJECT(settings), "user-stylesheet-uri", uri, NULL);
+void
+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);
 
-       updatetitle(c);
+       curconfig[ZoomLevel].val.f = webkit_web_view_get_zoom_level(c->view);
 }
 
 static void
-gettogglestat(Client *c){
-       gboolean value;
-       char *uri;
-       int p = 0;
-       WebKitWebSettings *settings = webkit_web_view_get_settings(c->view);
+msgext(Client *c, char type, const Arg *a)
+{
+       static char msg[MSGBUFSZ];
+       int ret;
+
+       if ((ret = snprintf(msg, sizeof(msg), "%c%c%c%c",
+                           4, c->pageid, type, a->i))
+           >= sizeof(msg)) {
+               fprintf(stderr, "surf: message too long: %d\n", ret);
+               return;
+       }
 
-       togglestat[p++] = cookiepolicy_set(cookiepolicy_get());
+       if (pipeout[1] && write(pipeout[1], msg, sizeof(msg)) < 0)
+               fprintf(stderr, "surf: error sending: %.*s\n", ret-2, msg+2);
+}
 
-       g_object_get(G_OBJECT(settings), "enable-caret-browsing",
-                       &value, NULL);
-       togglestat[p++] = value? 'C': 'c';
+void
+scrollv(Client *c, const Arg *a)
+{
+       msgext(c, 'v', a);
+}
 
-       togglestat[p++] = allowgeolocation? 'G': 'g';
+void
+scrollh(Client *c, const Arg *a)
+{
+       msgext(c, 'h', a);
+}
 
-       togglestat[p++] = enablediskcache? 'D': 'd';
+void
+navigate(Client *c, const Arg *a)
+{
+       if (a->i < 0)
+               webkit_web_view_go_back(c->view);
+       else if (a->i > 0)
+               webkit_web_view_go_forward(c->view);
+}
 
-       g_object_get(G_OBJECT(settings), "auto-load-images", &value, NULL);
-       togglestat[p++] = value? 'I': 'i';
+void
+stop(Client *c, const Arg *a)
+{
+       webkit_web_view_stop_loading(c->view);
+}
 
-       g_object_get(G_OBJECT(settings), "enable-scripts", &value, NULL);
-       togglestat[p++] = value? 'S': 's';
+void
+toggle(Client *c, const Arg *a)
+{
+       curconfig[a->i].val.i ^= 1;
+       setparameter(c, 1, (ParamName)a->i, &curconfig[a->i].val);
+}
 
-       g_object_get(G_OBJECT(settings), "enable-plugins", &value, NULL);
-       togglestat[p++] = value? 'V': 'v';
+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));
+}
 
-       g_object_get(G_OBJECT(settings), "user-stylesheet-uri", &uri, NULL);
-       togglestat[p++] = (uri && uri[0]) ? 'M': 'm';
+void
+togglecookiepolicy(Client *c, const Arg *a)
+{
+       ++cookiepolicy;
+       cookiepolicy %= strlen(curconfig[CookiePolicies].val.v);
 
-       togglestat[p] = '\0';
+       setparameter(c, 0, CookiePolicies, NULL);
 }
 
-static void
-getpagestat(Client *c) {
-       const char *uri = geturi(c);
+void
+toggleinspector(Client *c, const Arg *a)
+{
+       if (webkit_web_inspector_is_attached(c->inspector))
+               webkit_web_inspector_close(c->inspector);
+       else if (curconfig[Inspector].val.i)
+               webkit_web_inspector_show(c->inspector);
+}
 
-       if(strstr(uri, "https://") == uri) {
-               pagestat[0] = c->sslfailed ? 'U' : 'T';
-       } else {
-               pagestat[0] = '-';
-       }
+void
+find(Client *c, const Arg *a)
+{
+       const char *s, *f;
 
-       pagestat[1] = usingproxy ? 'P' : '-';
-       pagestat[2] = '\0';
+       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);
 
-}
+               if (g_strcmp0(f, s) == 0) /* reset search */
+                       webkit_find_controller_search(c->finder, "", findopts,
+                                                     G_MAXUINT);
 
-static void
-updatetitle(Client *c) {
-       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);
-               }
+               webkit_find_controller_search(c->finder, s, findopts,
+                                             G_MAXUINT);
 
-               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);
+               if (strcmp(s, "") == 0)
+                       webkit_find_controller_search_finish(c->finder);
        }
 }
 
-static void
-updatewinid(Client *c) {
-       snprintf(winid, LENGTH(winid), "%u",
-                       (int)GDK_WINDOW_XID(GTK_WIDGET(c->win)->window));
+void
+clicknavigate(Client *c, const Arg *a, WebKitHitTestResult *h)
+{
+       navigate(c, a);
 }
 
-static void
-usage(void) {
-       die("usage: %s [-bBfFgGiIkKnNpPsSvx]"
-               " [-a cookiepolicies ] "
-               " [-c cookiefile] [-e xid] [-r scriptfile]"
-               " [-t stylefile] [-u useragent] [-z zoomlevel]"
-               " [uri]\n", basename(argv0));
-}
+void
+clicknewwindow(Client *c, const Arg *a, WebKitHitTestResult *h)
+{
+       Arg arg;
 
-static void
-windowobjectcleared(GtkWidget *w, WebKitWebFrame *frame, JSContextRef js,
-               JSObjectRef win, Client *c) {
-       runscript(frame);
+       arg.v = webkit_hit_test_result_get_link_uri(h);
+       newwindow(c, &arg, a->i);
 }
 
-static 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);
-       }
+void
+clickexternplayer(Client *c, const Arg *a, WebKitHitTestResult *h)
+{
+       Arg arg;
+
+       arg = (Arg)VIDEOPLAY(webkit_hit_test_result_get_media_uri(h));
+       spawn(c, &arg);
 }
 
 int
-main(int argc, char *argv[]) {
+main(int argc, char *argv[])
+{
        Arg arg;
        Client *c;
 
@@ -1490,109 +1982,146 @@ main(int argc, char *argv[]) {
        /* command line args */
        ARGBEGIN {
        case 'a':
-               cookiepolicies = EARGF(usage());
+               defconfig[CookiePolicies].val.v = EARGF(usage());
+               defconfig[CookiePolicies].prio = 2;
                break;
        case 'b':
-               enablescrollbars = 0;
+               defconfig[ScrollBars].val.i = 0;
+               defconfig[ScrollBars].prio = 2;
                break;
        case 'B':
-               enablescrollbars = 1;
+               defconfig[ScrollBars].val.i = 1;
+               defconfig[ScrollBars].prio = 2;
                break;
        case 'c':
                cookiefile = EARGF(usage());
                break;
+       case 'C':
+               stylefile = EARGF(usage());
+               break;
        case 'd':
-               enablediskcache = 0;
+               defconfig[DiskCache].val.i = 0;
+               defconfig[DiskCache].prio = 2;
                break;
        case 'D':
-               enablediskcache = 1;
+               defconfig[DiskCache].val.i = 1;
+               defconfig[DiskCache].prio = 2;
                break;
        case 'e':
                embed = strtol(EARGF(usage()), NULL, 0);
                break;
        case 'f':
-               runinfullscreen = 1;
+               defconfig[RunInFullscreen].val.i = 0;
+               defconfig[RunInFullscreen].prio = 2;
                break;
        case 'F':
-               runinfullscreen = 0;
+               defconfig[RunInFullscreen].val.i = 1;
+               defconfig[RunInFullscreen].prio = 2;
                break;
        case 'g':
-               allowgeolocation = 0;
+               defconfig[Geolocation].val.i = 0;
+               defconfig[Geolocation].prio = 2;
                break;
        case 'G':
-               allowgeolocation = 1;
+               defconfig[Geolocation].val.i = 1;
+               defconfig[Geolocation].prio = 2;
                break;
        case 'i':
-               loadimages = 0;
+               defconfig[LoadImages].val.i = 0;
+               defconfig[LoadImages].prio = 2;
                break;
        case 'I':
-               loadimages = 1;
+               defconfig[LoadImages].val.i = 1;
+               defconfig[LoadImages].prio = 2;
                break;
        case 'k':
-               kioskmode = 0;
+               defconfig[KioskMode].val.i = 0;
+               defconfig[KioskMode].prio = 2;
                break;
        case 'K':
-               kioskmode = 1;
+               defconfig[KioskMode].val.i = 1;
+               defconfig[KioskMode].prio = 2;
                break;
        case 'm':
-               enablestyles = 0;
+               defconfig[Style].val.i = 0;
+               defconfig[Style].prio = 2;
                break;
        case 'M':
-               enablestyles = 1;
+               defconfig[Style].val.i = 1;
+               defconfig[Style].prio = 2;
                break;
        case 'n':
-               enableinspector = 0;
+               defconfig[Inspector].val.i = 0;
+               defconfig[Inspector].prio = 2;
                break;
        case 'N':
-               enableinspector = 1;
+               defconfig[Inspector].val.i = 1;
+               defconfig[Inspector].prio = 2;
                break;
        case 'p':
-               enableplugins = 0;
+               defconfig[Plugins].val.i = 0;
+               defconfig[Plugins].prio = 2;
                break;
        case 'P':
-               enableplugins = 1;
+               defconfig[Plugins].val.i = 1;
+               defconfig[Plugins].prio = 2;
                break;
        case 'r':
                scriptfile = EARGF(usage());
                break;
        case 's':
-               enablescripts = 0;
+               defconfig[JavaScript].val.i = 0;
+               defconfig[JavaScript].prio = 2;
                break;
        case 'S':
-               enablescripts = 1;
+               defconfig[JavaScript].val.i = 1;
+               defconfig[JavaScript].prio = 2;
                break;
        case 't':
-               stylefile = EARGF(usage());
+               defconfig[StrictTLS].val.i = 0;
+               defconfig[StrictTLS].prio = 2;
+               break;
+       case 'T':
+               defconfig[StrictTLS].val.i = 1;
+               defconfig[StrictTLS].prio = 2;
                break;
        case 'u':
-               useragent = EARGF(usage());
+               fulluseragent = EARGF(usage());
                break;
        case 'v':
-               die("surf-"VERSION", ©2009-2014 surf engineers, "
-                               "see LICENSE for details\n");
+               die("surf-"VERSION", see LICENSE for © details\n");
+       case 'w':
+               showxid = 1;
+               break;
        case 'x':
-               showxid = TRUE;
+               defconfig[Certificate].val.i = 0;
+               defconfig[Certificate].prio = 2;
+               break;
+       case 'X':
+               defconfig[Certificate].val.i = 1;
+               defconfig[Certificate].prio = 2;
                break;
        case 'z':
-               zoomlevel = strtof(EARGF(usage()), NULL);
+               defconfig[ZoomLevel].val.f = strtof(EARGF(usage()), NULL);
+               defconfig[ZoomLevel].prio = 2;
                break;
        default:
                usage();
        } ARGEND;
-       if(argc > 0)
+       if (argc > 0)
                arg.v = argv[0];
+       else
+               arg.v = "about:blank";
 
        setup();
-       c = newclient();
-       if(arg.v) {
-               loaduri(clients, &arg);
-       } else {
-               updatetitle(c);
-       }
+       c = newclient(NULL);
+       showview(NULL, c);
+
+       loaduri(c, &arg);
+       updatetitle(c);
 
        gtk_main();
        cleanup();
 
-       return EXIT_SUCCESS;
+       return 0;
 }
-