Merge branch 'surf-webkit2' into mysurf

3 files changed, 10 insertions, 1 deletions

diff --git a/config.h b/config.h
index 53a0d6b..76dc895 100644
--- a/config.h
+++ b/config.h
@@ -46,6 +46,7 @@ static Parameter defconfig[ParameterLast] = {
 	[SpellLanguages]      =       { { .v = ((char *[]){ "en_US", "cs_CZ", NULL }) }, },
 	[StrictTLS]           =       { { .i = 1 },     },
 	[Style]               =       { { .i = 1 },     },
+	[WebGL]               =       { { .i = 0 },     },
 	[ZoomLevel]           =       { { .f = 1.0 },   },
 };
 
diff --git a/surf.1 b/surf.1
index 711a9aa..45c31bb 100644
--- a/surf.1
+++ b/surf.1
@@ -306,6 +306,9 @@ string.
 .TP
 .B http_proxy
 If this variable is set and not empty upon startup, surf will use it as the http proxy.
+.SH SIGNALS
+Surf will reload the current page on
+.BR SIGHUP .
 .SH PLUGINS
 For using plugins in surf, first determine your running architecture. Then get
 the appropriate plugin for that architecture and copy it to
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