summaryrefslogtreecommitdiff
path: root/surf.c
diff options
context:
space:
mode:
authorKarel Kočí <cynerd@email.cz>2018-05-19 12:21:54 +0200
committerKarel Kočí <cynerd@email.cz>2018-05-19 12:21:54 +0200
commit33692359ec516ce194f34bab361f04b1c2a54efc (patch)
tree32699140408e22d9a4b40fdefb79396f30f49fed /surf.c
parent545133a542d1904632768db1922be6e3a38ae10f (diff)
parent81f0452bc6c2a110239fa303ad1e72f11c33dc94 (diff)
downloadsurf-33692359ec516ce194f34bab361f04b1c2a54efc.tar.gz
surf-33692359ec516ce194f34bab361f04b1c2a54efc.tar.bz2
surf-33692359ec516ce194f34bab361f04b1c2a54efc.zip
Merge branch 'surf-webkit2' into mysurf
Diffstat (limited to 'surf.c')
-rw-r--r--surf.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/surf.c b/surf.c
index 807e8dd..9f3b880 100644
--- a/surf.c
+++ b/surf.c
@@ -79,6 +79,7 @@ typedef enum {
SpellLanguages,
StrictTLS,
Style,
+ WebGL,
ZoomLevel,
ParameterLast
} ParamName;
@@ -820,6 +821,9 @@ setparameter(Client *c, int refresh, ParamName p, const Arg *a)
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 */
@@ -917,7 +921,7 @@ runscript(Client *c)
gsize l;
if (g_file_get_contents(scriptfile, &script, &l, NULL) && l)
- evalscript(c, script);
+ evalscript(c, "%s", script);
g_free(script);
}
@@ -1079,6 +1083,7 @@ newview(Client *c, WebKitWebView *rv)
"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