Be more specific about what enablestyles parameter does.

[surf.git] / surf.c

diff --git a/surf.c b/surf.c
index 55ffd84..586bde1 100644 (file)
--- a/surf.c
+++ b/surf.c
@@ -155,6 +155,7 @@ static void gettogglestat(Client *c);
 static void getpagestat(Client *c);
 static char *geturi(Client *c);
 static const gchar *getstyle(const char *uri);
+static void setstyle(Client *c, const char *style);
 
 static void handleplumb(Client *c, WebKitWebView *w, const gchar *uri);
 
@@ -662,6 +663,14 @@ getstyle(const char *uri)
        return "";
 }
 
+void
+setstyle(Client *c, const char *style)
+{
+       WebKitWebSettings *settings = webkit_web_view_get_settings(c->view);
+
+       g_object_set(G_OBJECT(settings), "user-stylesheet-uri", style, NULL);
+}
+
 void
 handleplumb(Client *c, WebKitWebView *w, const gchar *uri)
 {
@@ -686,10 +695,12 @@ initdownload(WebKitWebView *view, WebKitDownload *o, Client *c)
 void
 inspector(Client *c, const Arg *arg)
 {
-       if (c->isinspecting)
-               webkit_web_inspector_close(c->inspector);
-       else
-               webkit_web_inspector_show(c->inspector);
+       if (enableinspector) {
+               if (c->isinspecting)
+                       webkit_web_inspector_close(c->inspector);
+               else
+                       webkit_web_inspector_show(c->inspector);
+       }
 }
 
 WebKitWebView *
@@ -776,7 +787,6 @@ 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;
 
@@ -793,10 +803,8 @@ loadstatuschange(WebKitWebView *view, GParamSpec *pspec, Client *c)
                }
                setatom(c, AtomUri, uri);
 
-               if (enablestyles) {
-                       g_object_set(G_OBJECT(set), "user-stylesheet-uri",
-                                    getstyle(uri), NULL);
-               }
+               if (enablestyle)
+                       setstyle(c, getstyle(uri));
                break;
        case WEBKIT_LOAD_FINISHED:
                c->progress = 100;
@@ -997,11 +1005,6 @@ newclient(void)
        if (!(ua = getenv("SURF_USERAGENT")))
                ua = useragent;
        g_object_set(G_OBJECT(settings), "user-agent", ua, 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),
@@ -1018,6 +1021,8 @@ newclient(void)
                     "default-font-size", defaultfontsize, NULL);
        g_object_set(G_OBJECT(settings),
                     "resizable-text-areas", 1, NULL);
+       if (enablestyle)
+               setstyle(c, getstyle("about:blank"));
 
        /*
         * While stupid, CSS specifies that a pixel represents 1/96 of an inch.
@@ -1050,10 +1055,8 @@ newclient(void)
                c->isinspecting = false;
        }
 
-       if (runinfullscreen) {
-               c->fullscreen = 0;
+       if (runinfullscreen)
                fullscreen(c, NULL);
-       }
 
        setatom(c, AtomFind, "");
        setatom(c, AtomUri, "about:blank");
@@ -1531,11 +1534,8 @@ togglescrollbars(Client *c, const Arg *arg)
 void
 togglestyle(Client *c, const Arg *arg)
 {
-       WebKitWebSettings *settings = webkit_web_view_get_settings(c->view);
-
-       enablestyles = !enablestyles;
-       g_object_set(G_OBJECT(settings), "user-stylesheet-uri",
-                    enablestyles ? getstyle(geturi(c)) : "", NULL);
+       enablestyle = !enablestyle;
+       setstyle(c, enablestyle ? getstyle(geturi(c)) : "");
 
        updatetitle(c);
 }
@@ -1566,7 +1566,7 @@ gettogglestat(Client *c)
        g_object_get(G_OBJECT(settings), "enable-plugins", &value, NULL);
        togglestat[p++] = value? 'V': 'v';
 
-       togglestat[p++] = enablestyles ? 'M': 'm';
+       togglestat[p++] = enablestyle ? 'M': 'm';
 
        togglestat[p] = '\0';
 }
@@ -1624,7 +1624,7 @@ updatewinid(Client *c)
 void
 usage(void)
 {
-       die("usage: %s [-bBfFgGiIkKnNpPsSvx] [-a cookiepolicies ] "
+       die("usage: %s [-bBdDfFgGiIkKmMnNpPsSvx] [-a cookiepolicies ] "
            "[-c cookiefile] [-e xid] [-r scriptfile] [-t stylefile] "
            "[-u useragent] [-z zoomlevel] [uri]\n", basename(argv0));
 }
@@ -1685,10 +1685,10 @@ main(int argc, char *argv[])
                embed = strtol(EARGF(usage()), NULL, 0);
                break;
        case 'f':
-               runinfullscreen = 1;
+               runinfullscreen = 0;
                break;
        case 'F':
-               runinfullscreen = 0;
+               runinfullscreen = 1;
                break;
        case 'g':
                allowgeolocation = 0;
@@ -1709,10 +1709,10 @@ main(int argc, char *argv[])
                kioskmode = 1;
                break;
        case 'm':
-               enablestyles = 0;
+               enablestyle = 0;
                break;
        case 'M':
-               enablestyles = 1;
+               enablestyle = 1;
                break;
        case 'n':
                enableinspector = 0;