Style cleanup.
[surf.git] / surf.c
diff --git a/surf.c b/surf.c
index c598404..0fae80b 100644 (file)
--- a/surf.c
+++ b/surf.c
 #include <sys/file.h>
 #include <libgen.h>
 #include <stdarg.h>
+#include <regex.h>
+#include <pwd.h>
+#include <string.h>
 
 #include "arg.h"
 
 char *argv0;
 
 #define LENGTH(x)               (sizeof x / sizeof x[0])
-#define CLEANMASK(mask)                (mask & (MODKEY|GDK_SHIFT_MASK))
+#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 };
+enum {
+       ClkDoc   = WEBKIT_HIT_TEST_RESULT_CONTEXT_DOCUMENT,
+       ClkLink  = WEBKIT_HIT_TEST_RESULT_CONTEXT_LINK,
+       ClkImg   = WEBKIT_HIT_TEST_RESULT_CONTEXT_IMAGE,
+       ClkMedia = WEBKIT_HIT_TEST_RESULT_CONTEXT_MEDIA,
+       ClkSel   = WEBKIT_HIT_TEST_RESULT_CONTEXT_SELECTION,
+       ClkEdit  = WEBKIT_HIT_TEST_RESULT_CONTEXT_EDITABLE,
+       ClkAny   = ClkDoc | ClkLink | ClkImg | ClkMedia | ClkSel | ClkEdit,
+};
 
 typedef union Arg Arg;
 union Arg {
@@ -60,6 +72,14 @@ typedef struct {
        const Arg arg;
 } Key;
 
+typedef struct {
+       unsigned int click;
+       unsigned int mask;
+       guint button;
+       void (*func)(Client *c, const Arg *arg);
+       const Arg arg;
+} Button;
+
 typedef struct {
        SoupCookieJarText parent_instance;
        int lock;
@@ -71,6 +91,12 @@ typedef struct {
 
 G_DEFINE_TYPE(CookieJar, cookiejar, SOUP_TYPE_COOKIE_JAR_TEXT)
 
+typedef struct {
+       char *regex;
+       char *style;
+       regex_t re;
+} SiteStyle;
+
 static Display *dpy;
 static Atom atoms[AtomLast];
 static Client *clients = NULL;
@@ -78,18 +104,20 @@ static GdkNativeWindow embed = 0;
 static gboolean showxid = FALSE;
 static char winid[64];
 static gboolean usingproxy = 0;
-static char togglestat[8];
+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);
+               WebKitNetworkResponse *resp, Client *c);
+static char *buildfile(const char *path);
 static char *buildpath(const char *path);
-static gboolean buttonrelease(WebKitWebView *web, GdkEventButton *e,
-               GList *gl);
+static gboolean buttonrelease(WebKitWebView *web, GdkEventButton *e, Client *c);
 static void cleanup(void);
 static void clipboard(Client *c, const Arg *arg);
 
@@ -127,6 +155,10 @@ 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 void handleplumb(Client *c, WebKitWebView *w, const gchar *uri);
+
 static gboolean initdownload(WebKitWebView *v, WebKitDownload *o, Client *c);
 
 static void inspector(Client *c, const Arg *arg);
@@ -148,12 +180,15 @@ 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 void populatepopup(WebKitWebView *web, GtkMenu *menu, Client *c);
-static void popupactivate(GtkMenuItem *menu, Client *);
+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 linkopen(Client *c, const Arg *arg);
+static void linkopenembed(Client *c, const Arg *arg);
 static void reload(Client *c, const Arg *arg);
 static void scroll_h(Client *c, const Arg *arg);
 static void scroll_v(Client *c, const Arg *arg);
@@ -164,8 +199,8 @@ 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 *v, WebKitWebFrame *frame,
-               const char *title, Client *c);
+static void titlechange(WebKitWebView *view, GParamSpec *pspec, Client *c);
+static void titlechangeleave(void *a, void *b, 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);
@@ -198,60 +233,105 @@ addaccelgroup(Client *c) {
 static void
 beforerequest(WebKitWebView *w, WebKitWebFrame *f, WebKitWebResource *r,
                WebKitNetworkRequest *req, WebKitNetworkResponse *resp,
-               gpointer d) {
+               Client *c) {
        const gchar *uri = webkit_network_request_get_uri(req);
+       int i, isascii = 1;
 
        if(g_str_has_suffix(uri, "/favicon.ico"))
                webkit_network_request_set_uri(req, "about:blank");
+
+       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, w, uri);
+       }
 }
 
 static char *
-buildpath(const char *path) {
-       char *apath, *p;
+buildfile(const char *path) {
+       char *dname, *bname, *bpath, *fpath;
        FILE *f;
 
-       /* 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);
+       dname = g_path_get_dirname(path);
+       bname = g_path_get_basename(path);
+
+       bpath = buildpath(dname);
+       g_free(dname);
+
+       fpath = g_build_filename(bpath, bname, NULL);
+       g_free(bname);
+
+       if(!(f = fopen(fpath, "a")))
+               die("Could not open file: %s\n", fpath);
+
+       g_chmod(fpath, 0600); /* always */
+       fclose(f);
+
+       return fpath;
+}
+
+static char *
+buildpath(const char *path) {
+       struct passwd *pw;
+       char *apath, *name, *p, *fpath;
+
+       if(path[0] == '~') {
+               if(path[1] == '/' || path[1] == '\0') {
+                       p = (char *)&path[1];
+                       pw = getpwuid(getuid());
                } else {
-                       apath = g_strconcat(g_get_home_dir(), "/",
-                                       &path[1], NULL);
+                       if((p = strchr(path, '/')))
+                               name = g_strndup(&path[1], --p - path);
+                       else
+                               name = g_strdup(&path[1]);
+
+                       if(!(pw = getpwnam(name))) {
+                               die("Can't get user %s home directory: %s.\n",
+                                               name, path);
+                       }
+                       g_free(name);
                }
+               apath = g_build_filename(pw->pw_dir, p, NULL);
        } else {
-               apath = g_strconcat(g_get_current_dir(), "/", path, NULL);
+               apath = g_strdup(path);
        }
 
-       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);
-       }
+       /* creating directory */
+       if(g_mkdir_with_parents(apath, 0700) < 0)
+               die("Could not access directory: %s\n", apath);
 
-       return apath;
+       fpath = realpath(apath, NULL);
+       g_free(apath);
+
+       return fpath;
 }
 
 static gboolean
-buttonrelease(WebKitWebView *web, GdkEventButton *e, GList *gl) {
+buttonrelease(WebKitWebView *web, GdkEventButton *e, Client *c) {
        WebKitHitTestResultContext context;
        WebKitHitTestResult *result = webkit_web_view_get_hit_test_result(web,
                        e);
        Arg arg;
+       unsigned int i;
 
        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);
+       g_object_get(result, "link-uri", &arg.v, NULL);
+       for(i = 0; i < LENGTH(buttons); i++) {
+               if(context & buttons[i].click && e->button == buttons[i].button &&
+               CLEANMASK(e->state) == CLEANMASK(buttons[i].mask) && buttons[i].func) {
+                       buttons[i].func(c, buttons[i].click == ClkLink && buttons[i].arg.i == 0 ? &arg : &buttons[i].arg);
                        return true;
                }
        }
@@ -260,6 +340,10 @@ buttonrelease(WebKitWebView *web, GdkEventButton *e, GList *gl) {
 
 static void
 cleanup(void) {
+       if(diskcache) {
+               soup_cache_flush(diskcache);
+               soup_cache_dump(diskcache);
+       }
        while(clients)
                destroyclient(clients);
        g_free(cookiefile);
@@ -533,6 +617,31 @@ geturi(Client *c) {
        return uri;
 }
 
+static gchar *
+getstyle(const char *uri) {
+       int i;
+
+       if(stylefile != NULL)
+               return g_strconcat("file://", stylefile, NULL);
+
+       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);
+               }
+       }
+       return g_strdup("");
+}
+
+static void
+handleplumb(Client *c, WebKitWebView *w, const gchar *uri) {
+       Arg arg;
+
+       webkit_web_view_stop_loading(w);
+       arg = (Arg)PLUMB((char *)uri);
+       spawn(c, &arg);
+}
+
 static gboolean
 initdownload(WebKitWebView *view, WebKitDownload *o, Client *c) {
        Arg arg;
@@ -629,6 +738,7 @@ 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;
 
@@ -644,10 +754,19 @@ loadstatuschange(WebKitWebView *view, GParamSpec *pspec, Client *c) {
                                        & SOUP_MESSAGE_CERTIFICATE_TRUSTED);
                }
                setatom(c, AtomUri, uri);
+
+               if(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;
@@ -656,7 +775,7 @@ loadstatuschange(WebKitWebView *view, GParamSpec *pspec, Client *c) {
 
 static void
 loaduri(Client *c, const Arg *arg) {
-       char *u, *rp;
+       char *u = NULL, *rp;
        const char *uri = (char *)arg->v;
        Arg a = { .b = FALSE };
        struct stat st;
@@ -683,9 +802,9 @@ loaduri(Client *c, const Arg *arg) {
                webkit_web_view_load_uri(c->view, u);
                c->progress = 0;
                c->title = copystr(&c->title, u);
-               g_free(u);
                updatetitle(c);
        }
+       g_free(u);
 }
 
 static void
@@ -702,7 +821,7 @@ newclient(void) {
        GdkGeometry hints = { 1, 1 };
        GdkScreen *screen;
        gdouble dpi;
-       char *uri, *ua;
+       char *ua;
 
        if(!(c = calloc(1, sizeof(Client))))
                die("Cannot malloc!\n");
@@ -734,6 +853,9 @@ newclient(void) {
        g_signal_connect(G_OBJECT(c->win),
                        "destroy",
                        G_CALLBACK(destroywin), c);
+       g_signal_connect(G_OBJECT(c->win),
+                       "leave_notify_event",
+                       G_CALLBACK(titlechangeleave), c);
 
        if(!kioskmode)
                addaccelgroup(c);
@@ -749,7 +871,7 @@ newclient(void) {
        c->view = WEBKIT_WEB_VIEW(webkit_web_view_new());
 
        g_signal_connect(G_OBJECT(c->view),
-                       "title-changed",
+                       "notify::title",
                        G_CALLBACK(titlechange), c);
        g_signal_connect(G_OBJECT(c->view),
                        "hovering-over-link",
@@ -782,8 +904,8 @@ newclient(void) {
                        "button-release-event",
                        G_CALLBACK(buttonrelease), c);
        g_signal_connect(G_OBJECT(c->view),
-                       "populate-popup",
-                       G_CALLBACK(populatepopup), c);
+                       "context-menu",
+                       G_CALLBACK(contextmenu), c);
        g_signal_connect(G_OBJECT(c->view),
                        "resource-request-starting",
                        G_CALLBACK(beforerequest), c);
@@ -832,8 +954,10 @@ newclient(void) {
        if(!(ua = getenv("SURF_USERAGENT")))
                ua = useragent;
        g_object_set(G_OBJECT(settings), "user-agent", ua, NULL);
-       uri = g_strconcat("file://", stylefile, NULL);
-       g_object_set(G_OBJECT(settings), "user-stylesheet-uri", uri, NULL);
+       if (enablestyles) {
+               g_object_set(G_OBJECT(settings), "user-stylesheet-uri",
+                                        getstyle("about:blank"), NULL);
+       }
        g_object_set(G_OBJECT(settings), "auto-load-images", loadimages,
                        NULL);
        g_object_set(G_OBJECT(settings), "enable-plugins", enableplugins,
@@ -848,6 +972,8 @@ newclient(void) {
                        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.
@@ -886,8 +1012,6 @@ newclient(void) {
                fullscreen(c, NULL);
        }
 
-       g_free(uri);
-
        setatom(c, AtomFind, "");
        setatom(c, AtomUri, "about:blank");
        if(hidebackground)
@@ -912,7 +1036,7 @@ newclient(void) {
 static void
 newwindow(Client *c, const Arg *arg, gboolean noembed) {
        guint i = 0;
-       const char *cmd[16], *uri;
+       const char *cmd[18], *uri;
        const Arg a = { .v = (void *)cmd };
        char tmp[64];
 
@@ -923,9 +1047,11 @@ newwindow(Client *c, const Arg *arg, gboolean noembed) {
                cmd[i++] = "-b";
        if(embed && !noembed) {
                cmd[i++] = "-e";
-               snprintf(tmp, LENGTH(tmp), "%u\n", (int)embed);
+               snprintf(tmp, LENGTH(tmp), "%u", (int)embed);
                cmd[i++] = tmp;
        }
+       if(!allowgeolocation)
+               cmd[i++] = "-g";
        if(!loadimages)
                cmd[i++] = "-i";
        if(kioskmode)
@@ -936,6 +1062,8 @@ newwindow(Client *c, const Arg *arg, gboolean noembed) {
                cmd[i++] = "-s";
        if(showxid)
                cmd[i++] = "-x";
+       if(enablediskcache)
+               cmd[i++] = "-D";
        cmd[i++] = "-c";
        cmd[i++] = cookiefile;
        cmd[i++] = "--";
@@ -946,24 +1074,27 @@ newwindow(Client *c, const Arg *arg, gboolean noembed) {
        spawn(NULL, &a);
 }
 
-static void
-populatepopup(WebKitWebView *web, GtkMenu *menu, Client *c) {
-       GList *items = gtk_container_get_children(GTK_CONTAINER(menu));
+static gboolean
+contextmenu(WebKitWebView *view, GtkWidget *menu, WebKitHitTestResult *target,
+               gboolean keyboard, Client *c) {
+       GList *items = gtk_container_get_children(GTK_CONTAINER(GTK_MENU(menu)));
 
        for(GList *l = items; l; l = l->next) {
-               g_signal_connect(l->data, "activate", G_CALLBACK(popupactivate), c);
+               g_signal_connect(l->data, "activate", G_CALLBACK(menuactivate), c);
        }
 
        g_list_free(items);
+       return FALSE;
 }
 
 static void
-popupactivate(GtkMenuItem *menu, Client *c) {
+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
@@ -971,10 +1102,10 @@ popupactivate(GtkMenuItem *menu, Client *c) {
         */
 
        GtkAction *a = NULL;
-       const char *name;
-       GtkClipboard *prisel;
+       const char *name, *uri;
+       GtkClipboard *prisel, *clpbrd;
 
-       a = gtk_activatable_get_related_action(GTK_ACTIVATABLE(menu));
+       a = gtk_activatable_get_related_action(GTK_ACTIVATABLE(item));
        if(a == NULL)
                return;
 
@@ -982,6 +1113,12 @@ popupactivate(GtkMenuItem *menu, Client *c) {
        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);
        }
 }
 
@@ -1028,6 +1165,16 @@ progresschange(WebKitWebView *view, GParamSpec *pspec, Client *c) {
        updatetitle(c);
 }
 
+static void
+linkopen(Client *c, const Arg *arg) {
+       newwindow(NULL, arg, 1);
+}
+
+static void
+linkopenembed(Client *c, const Arg *arg) {
+       newwindow(NULL, arg, 0);
+}
+
 static void
 reload(Client *c, const Arg *arg) {
        gboolean nocache = *(gboolean *)arg;
@@ -1083,6 +1230,7 @@ setatom(Client *c, int a, const char *v) {
 
 static void
 setup(void) {
+       int i;
        char *proxy;
        char *new_proxy;
        SoupURI *puri;
@@ -1101,9 +1249,26 @@ setup(void) {
        atoms[AtomUri] = XInternAtom(dpy, "_SURF_URI", False);
 
        /* dirs and files */
-       cookiefile = buildpath(cookiefile);
-       scriptfile = buildpath(scriptfile);
-       stylefile = buildpath(stylefile);
+       cookiefile = buildfile(cookiefile);
+       scriptfile = buildfile(scriptfile);
+       cachefolder = buildpath(cachefolder);
+       styledir = buildpath(styledir);
+       if(stylefile == NULL) {
+               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 = buildfile(
+                                       g_strconcat(styledir,
+                                               styles[i].style, NULL));
+               }
+       } else {
+               stylefile = buildfile(stylefile);
+       }
 
        /* request handler */
        s = webkit_get_default_session();
@@ -1113,6 +1278,14 @@ setup(void) {
                        SOUP_SESSION_FEATURE(cookiejar_new(cookiefile, FALSE,
                                        cookiepolicy_get())));
 
+       /* 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));
+       }
+
        /* ssl */
        tlsdb = g_tls_file_database_new(cafile, &error);
 
@@ -1125,8 +1298,12 @@ setup(void) {
 
        /* proxy */
        if((proxy = getenv("http_proxy")) && strcmp(proxy, "")) {
-               new_proxy = g_strrstr(proxy, "http://") ? g_strdup(proxy) :
-                       g_strdup_printf("http://%s", proxy);
+               new_proxy = g_strrstr(proxy, "http://")
+            || g_strrstr(proxy, "socks://")
+            || g_strrstr(proxy, "socks4://")
+            || g_strrstr(proxy, "socks5://")
+            ? 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);
@@ -1178,8 +1355,17 @@ stop(Client *c, const Arg *arg) {
 }
 
 static void
-titlechange(WebKitWebView *v, WebKitWebFrame *f, const char *t, Client *c) {
-       c->title = copystr(&c->title, t);
+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);
+       }
+}
+
+static void
+titlechangeleave(void *a, void *b, Client *c) {
+       c->linkhover = NULL;
        updatetitle(c);
 }
 
@@ -1268,12 +1454,11 @@ togglescrollbars(Client *c, const Arg *arg) {
 
 static void
 togglestyle(Client *c, const Arg *arg) {
-       WebKitWebSettings *settings;
+       WebKitWebSettings *settings = webkit_web_view_get_settings(c->view);
        char *uri;
 
-       settings = webkit_web_view_get_settings(c->view);
-       g_object_get(G_OBJECT(settings), "user-stylesheet-uri", &uri, NULL);
-       uri = uri[0] ? g_strdup("") : g_strconcat("file://", stylefile, NULL);
+       enablestyles = !enablestyles;
+       uri = enablestyles ? getstyle(geturi(c)) : g_strdup("");
        g_object_set(G_OBJECT(settings), "user-stylesheet-uri", uri, NULL);
 
        updatetitle(c);
@@ -1282,7 +1467,6 @@ togglestyle(Client *c, const Arg *arg) {
 static void
 gettogglestat(Client *c){
        gboolean value;
-       char *uri;
        int p = 0;
        WebKitWebSettings *settings = webkit_web_view_get_settings(c->view);
 
@@ -1294,6 +1478,8 @@ gettogglestat(Client *c){
 
        togglestat[p++] = allowgeolocation? 'G': 'g';
 
+       togglestat[p++] = enablediskcache? 'D': 'd';
+
        g_object_get(G_OBJECT(settings), "auto-load-images", &value, NULL);
        togglestat[p++] = value? 'I': 'i';
 
@@ -1303,8 +1489,7 @@ gettogglestat(Client *c){
        g_object_get(G_OBJECT(settings), "enable-plugins", &value, NULL);
        togglestat[p++] = value? 'V': 'v';
 
-       g_object_get(G_OBJECT(settings), "user-stylesheet-uri", &uri, NULL);
-       togglestat[p++] = uri[0] ? 'M': 'm';
+       togglestat[p++] = enablestyles ? 'M': 'm';
 
        togglestat[p] = '\0';
 }
@@ -1410,6 +1595,12 @@ main(int argc, char *argv[]) {
        case 'c':
                cookiefile = EARGF(usage());
                break;
+       case 'd':
+               enablediskcache = 0;
+               break;
+       case 'D':
+               enablediskcache = 1;
+               break;
        case 'e':
                embed = strtol(EARGF(usage()), NULL, 0);
                break;
@@ -1437,6 +1628,12 @@ main(int argc, char *argv[]) {
        case 'K':
                kioskmode = 1;
                break;
+       case 'm':
+               enablestyles = 0;
+               break;
+       case 'M':
+               enablestyles = 1;
+               break;
        case 'n':
                enableinspector = 0;
                break;