Fix handling of uri-specific parameters

[surf.git] / surf.c

diff --git a/surf.c b/surf.c
index fb104e9..7e1bdcb 100644 (file)
--- 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,
@@ -83,6 +86,7 @@ typedef enum {
        ScrollBars,
        ShowIndicators,
        SiteQuirks,
+       SmoothScrolling,
        SpellChecking,
        SpellLanguages,
        StrictTLS,
@@ -529,10 +533,10 @@ geturi(Client *c)
 void
 setatom(Client *c, int a, const char *v)
 {
-       XSync(dpy, False);
        XChangeProperty(dpy, c->xid,
                        atoms[a], XA_STRING, 8, PropModeReplace,
                        (unsigned char *)v, strlen(v) + 1);
+       XSync(dpy, False);
 }
 
 const char *
@@ -544,6 +548,7 @@ getatom(Client *c, int a)
        unsigned long ldummy;
        unsigned char *p = NULL;
 
+       XSync(dpy, False);
        XGetWindowProperty(dpy, c->xid, atoms[a], 0L, BUFSIZ, False, XA_STRING,
                           &adummy, &idummy, &ldummy, &ldummy, &p);
        if (p)
@@ -638,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) {
@@ -651,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;
@@ -676,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;
@@ -703,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 */
@@ -750,6 +773,9 @@ setparameter(Client *c, int refresh, ParamName p, const Arg *a)
                return; /* do not update */
        case ShowIndicators:
                break;
+       case SmoothScrolling:
+               webkit_settings_set_enable_smooth_scrolling(s, a->b);
+               return; /* do not update */
        case SiteQuirks:
                webkit_settings_set_enable_site_specific_quirks(s, a->b);
                break;
@@ -766,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:
@@ -1015,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,
@@ -1029,6 +1056,7 @@ newview(Client *c, WebKitWebView *rv)
                   "enable-plugins", curconfig[Plugins].val.b,
                   "enable-accelerated-2d-canvas", curconfig[AcceleratedCanvas].val.b,
                   "enable-site-specific-quirks", curconfig[SiteQuirks].val.b,
+                  "enable-smooth-scrolling", curconfig[SmoothScrolling].val.b,
                   "media-playback-requires-user-gesture", curconfig[MediaManualPlay].val.b,
                   NULL);
 /* For more interesting settings, have a look at
@@ -1370,23 +1398,23 @@ loadfailedtls(WebKitWebView *v, gchar *uri, GTlsCertificate *cert,
 void
 loadchanged(WebKitWebView *v, WebKitLoadEvent e, Client *c)
 {
-       const char *title = geturi(c);
+       const char *uri = geturi(c);
 
        switch (e) {
        case WEBKIT_LOAD_STARTED:
-               setatom(c, AtomUri, title);
-               c->title = title;
+               setatom(c, AtomUri, uri);
+               c->title = uri;
                c->https = c->insecure = 0;
-               seturiparameters(c, geturi(c));
+               seturiparameters(c, uri);
                if (c->errorpage)
                        c->errorpage = 0;
                else
                        g_clear_object(&c->failedcert);
                break;
        case WEBKIT_LOAD_REDIRECTED:
-               setatom(c, AtomUri, title);
-               c->title = title;
-               seturiparameters(c, geturi(c));
+               setatom(c, AtomUri, uri);
+               c->title = uri;
+               seturiparameters(c, uri);
                break;
        case WEBKIT_LOAD_COMMITTED:
                c->https = webkit_web_view_get_tls_info(c->view, &c->cert,
@@ -1444,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