X-Git-Url: https://git.danieliu.xyz/?p=surf.git;a=blobdiff_plain;f=surf.c;h=7e1bdcb0e62a8197c3da01c8d47f827475b7f214;hp=2d3a6f56861d77aa1cdd711e0323f1e064acd99b;hb=2223417c91569f8314205d8f34c3cdf4d96d6e1a;hpb=f5be376ccc1fef96722df610c4783e99ce1e944e

diff --git a/surf.c b/surf.c
index 2d3a6f5..7e1bdcb 100644
--- a/surf.c
+++ b/surf.c
@@ -61,12 +61,15 @@ enum {
 
 typedef enum {
 	AcceleratedCanvas,
+	AccessMicrophone,
+	AccessWebcam,
 	CaretBrowsing,
 	Certificate,
 	CookiePolicies,
 	DiskCache,
 	DefaultCharset,
 	DNSPrefetch,
+	FileURLsCrossAccess,
 	FontSize,
 	FrameFlattening,
 	Geolocation,
@@ -640,7 +643,7 @@ cookiepolicy_set(const WebKitCookieAcceptPolicy p)
 void
 seturiparameters(Client *c, const char *uri)
 {
-	Parameter *newconfig = NULL;
+	Parameter *config, *newconfig = NULL;
 	int i;
 
 	for (i = 0; i < LENGTH(uriparams); ++i) {
@@ -653,16 +656,26 @@ seturiparameters(Client *c, const char *uri)
 
 	if (!newconfig)
 		newconfig = defconfig;
-	if (newconfig == curconfig)
-		return;
 
 	for (i = 0; i < ParameterLast; ++i) {
-		if (defconfig[i].force)
-			continue;
-		if (newconfig[i].force)
-			setparameter(c, 0, i, &newconfig[i].val);
-		else if (curconfig[i].force)
-			setparameter(c, 0, i, &defconfig[i].val);
+		switch(i) {
+		case Certificate:
+		case CookiePolicies:
+		case Style:
+			config = defconfig[i].force ? defconfig :
+			         newconfig[i].force ? newconfig :
+			         defconfig;
+			break;
+		default:
+			if (newconfig == curconfig || defconfig[i].force)
+				continue;
+			config = newconfig[i].force ? newconfig :
+			         curconfig[i].force ? defconfig :
+			         NULL;
+		}
+
+		if (config)
+			setparameter(c, 0, i, &config[i].val);
 	}
 
 	curconfig = newconfig;
@@ -678,6 +691,10 @@ setparameter(Client *c, int refresh, ParamName p, const Arg *a)
 	case AcceleratedCanvas:
 		webkit_settings_set_enable_accelerated_2d_canvas(s, a->b);
 		break;
+	case AccessMicrophone:
+		return; /* do nothing */
+	case AccessWebcam:
+		return; /* do nothing */
 	case CaretBrowsing:
 		webkit_settings_set_enable_caret_browsing(s, a->b);
 		refresh = 0;
@@ -705,6 +722,10 @@ setparameter(Client *c, int refresh, ParamName p, const Arg *a)
 	case DNSPrefetch:
 		webkit_settings_set_enable_dns_prefetching(s, a->b);
 		return; /* do not update */
+	case FileURLsCrossAccess:
+		webkit_settings_set_allow_file_access_from_file_urls(s, a->b);
+		webkit_settings_set_allow_universal_access_from_file_urls(s, a->b);
+		return; /* do not update */
 	case FontSize:
 		webkit_settings_set_default_font_size(s, a->i);
 		return; /* do not update */
@@ -771,11 +792,10 @@ setparameter(Client *c, int refresh, ParamName p, const Arg *a)
 		    WEBKIT_TLS_ERRORS_POLICY_IGNORE);
 		break;
 	case Style:
+		webkit_user_content_manager_remove_all_style_sheets(
+		    webkit_web_view_get_user_content_manager(c->view));
 		if (a->b)
 			setstyle(c, getstyle(geturi(c)));
-		else
-			webkit_user_content_manager_remove_all_style_sheets(
-			    webkit_web_view_get_user_content_manager(c->view));
 		refresh = 0;
 		break;
 	case ZoomLevel:
@@ -1020,6 +1040,8 @@ newview(Client *c, WebKitWebView *rv)
 		    webkit_web_view_new_with_related_view(rv));
 	} else {
 		settings = webkit_settings_new_with_settings(
+		   "allow-file-access-from-file-urls", curconfig[FileURLsCrossAccess].val.b,
+		   "allow-universal-access-from-file-urls", curconfig[FileURLsCrossAccess].val.b,
 		   "auto-load-images", curconfig[LoadImages].val.b,
 		   "default-charset", curconfig[DefaultCharset].val.v,
 		   "default-font-size", curconfig[FontSize].val.i,
@@ -1450,15 +1472,27 @@ mousetargetchanged(WebKitWebView *v, WebKitHitTestResult *h, guint modifiers,
 gboolean
 permissionrequested(WebKitWebView *v, WebKitPermissionRequest *r, Client *c)
 {
+	ParamName param = ParameterLast;
+
 	if (WEBKIT_IS_GEOLOCATION_PERMISSION_REQUEST(r)) {
-		if (curconfig[Geolocation].val.b)
-			webkit_permission_request_allow(r);
-		else
-			webkit_permission_request_deny(r);
-		return TRUE;
+		param = Geolocation;
+	} else if (WEBKIT_IS_USER_MEDIA_PERMISSION_REQUEST(r)) {
+		if (webkit_user_media_permission_is_for_audio_device(
+		    WEBKIT_USER_MEDIA_PERMISSION_REQUEST(r)))
+			param = AccessMicrophone;
+		else if (webkit_user_media_permission_is_for_video_device(
+		         WEBKIT_USER_MEDIA_PERMISSION_REQUEST(r)))
+			param = AccessWebcam;
+	} else {
+		return FALSE;
 	}
 
-	return FALSE;
+	if (curconfig[param].val.b)
+		webkit_permission_request_allow(r);
+	else
+		webkit_permission_request_deny(r);
+
+	return TRUE;
 }
 
 gboolean