diff options
| author | Quentin Rameau <quinq+hackers@fifth.space> | 2015-11-03 16:50:21 +0100 |
|---|---|---|
| committer | Christoph Lohmann <20h@r-36.net> | 2015-11-03 19:45:50 +0100 |
| commit | 5333171961fc192fbc4d493c940566b1b3d4b3e5 (patch) | |
| tree | fbf19886e75d23559ff8e10eeec7bcfe97403990 | |
| parent | Fix inspector handling when inspector is disabled. (diff) | |
| download | surf-5333171961fc192fbc4d493c940566b1b3d4b3e5.tar.gz surf-5333171961fc192fbc4d493c940566b1b3d4b3e5.tar.bz2 surf-5333171961fc192fbc4d493c940566b1b3d4b3e5.zip | |
Be more specific about what enablestyles parameter does.
The enablestyles configuration variable and parameter flag manages the global application of styles, not just the site-specific styles. Signed-off-by: Christoph Lohmann <20h@r-36.net>
| -rw-r--r-- | config.def.h | 2 | ||||
| -rw-r--r-- | surf.1 | 4 | ||||
| -rw-r--r-- | surf.c | 14 |
3 files changed, 10 insertions, 10 deletions
diff --git a/config.def.h b/config.def.h index 368291f..1c18827 100644 --- a/config.def.h +++ b/config.def.h @@ -30,7 +30,7 @@ static int diskcachebytes = 5 * 1024 * 1024; static Bool enableplugins = TRUE; static Bool enablescripts = TRUE; static Bool enableinspector = TRUE; -static Bool enablestyles = TRUE; +static Bool enablestyle = TRUE; static Bool loadimages = TRUE; static Bool hidebackground = FALSE; static Bool allowgeolocation = TRUE; diff --git a/surf.1 b/surf.1 index 3457a55..867783d 100644 --- a/surf.1 +++ b/surf.1 @@ -75,10 +75,10 @@ Disable kiosk mode (disable key strokes and right click) Enable kiosk mode (disable key strokes and right click) .TP .B \-m -Disable the site-specific styles. +Disable application of user style sheets. .TP .B \-M -Enable the site-specific styles. +Enable application of user style sheets. .TP .B \-n Disable the Web Inspector (Developer Tools). diff --git a/surf.c b/surf.c index dd9c306..586bde1 100644 --- a/surf.c +++ b/surf.c @@ -803,7 +803,7 @@ loadstatuschange(WebKitWebView *view, GParamSpec *pspec, Client *c) } setatom(c, AtomUri, uri); - if (enablestyles) + if (enablestyle) setstyle(c, getstyle(uri)); break; case WEBKIT_LOAD_FINISHED: @@ -1021,7 +1021,7 @@ newclient(void) "default-font-size", defaultfontsize, NULL); g_object_set(G_OBJECT(settings), "resizable-text-areas", 1, NULL); - if (enablestyles) + if (enablestyle) setstyle(c, getstyle("about:blank")); /* @@ -1534,8 +1534,8 @@ togglescrollbars(Client *c, const Arg *arg) void togglestyle(Client *c, const Arg *arg) { - enablestyles = !enablestyles; - setstyle(c, enablestyles ? getstyle(geturi(c)) : ""); + 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'; } @@ -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; |