Add config option for smooth scrolling activation

[surf.git] / surf.c

diff --git a/surf.c b/surf.c
index 0fcf22e..2003b79 100644 (file)
--- a/surf.c
+++ b/surf.c
@@ -65,12 +65,14 @@ typedef enum {
        Certificate,
        CookiePolicies,
        DiskCache,
+       DefaultCharset,
        DNSPrefetch,
        FontSize,
        FrameFlattening,
        Geolocation,
        HideBackground,
        Inspector,
+       Java,
        JavaScript,
        KioskMode,
        LoadImages,
@@ -81,6 +83,7 @@ typedef enum {
        ScrollBars,
        ShowIndicators,
        SiteQuirks,
+       SmoothScrolling,
        SpellChecking,
        SpellLanguages,
        StrictTLS,
@@ -636,18 +639,32 @@ cookiepolicy_set(const WebKitCookieAcceptPolicy p)
 void
 seturiparameters(Client *c, const char *uri)
 {
+       Parameter *newconfig = NULL;
        int i;
 
        for (i = 0; i < LENGTH(uriparams); ++i) {
                if (uriparams[i].uri &&
                    !regexec(&(uriparams[i].re), uri, 0, NULL, 0)) {
-                       curconfig = uriparams[i].config;
+                       newconfig = uriparams[i].config;
                        break;
                }
        }
 
-       for (i = 0; i < ParameterLast; ++i)
-               setparameter(c, 0, i, &curconfig[i].val);
+       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);
+       }
+
+       curconfig = newconfig;
 }
 
 void
@@ -681,6 +698,9 @@ setparameter(Client *c, int refresh, ParamName p, const Arg *a)
                    WEBKIT_CACHE_MODEL_WEB_BROWSER :
                    WEBKIT_CACHE_MODEL_DOCUMENT_VIEWER);
                return; /* do not update */
+       case DefaultCharset:
+               webkit_settings_set_default_charset(s, a->v);
+               return; /* do not update */
        case DNSPrefetch:
                webkit_settings_set_enable_dns_prefetching(s, a->b);
                return; /* do not update */
@@ -700,6 +720,9 @@ setparameter(Client *c, int refresh, ParamName p, const Arg *a)
        case Inspector:
                webkit_settings_set_enable_developer_extras(s, a->b);
                return; /* do not update */
+       case Java:
+               webkit_settings_set_enable_java(s, a->b);
+               return; /* do not update */
        case JavaScript:
                webkit_settings_set_enable_javascript(s, a->b);
                break;
@@ -728,6 +751,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;
@@ -994,6 +1020,7 @@ newview(Client *c, WebKitWebView *rv)
        } else {
                settings = webkit_settings_new_with_settings(
                   "auto-load-images", curconfig[LoadImages].val.b,
+                  "default-charset", curconfig[DefaultCharset].val.v,
                   "default-font-size", curconfig[FontSize].val.i,
                   "enable-caret-browsing", curconfig[CaretBrowsing].val.b,
                   "enable-developer-extras", curconfig[Inspector].val.b,
@@ -1001,10 +1028,12 @@ newview(Client *c, WebKitWebView *rv)
                   "enable-frame-flattening", curconfig[FrameFlattening].val.b,
                   "enable-html5-database", curconfig[DiskCache].val.b,
                   "enable-html5-local-storage", curconfig[DiskCache].val.b,
+                  "enable-java", curconfig[Java].val.b,
                   "enable-javascript", curconfig[JavaScript].val.b,
                   "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
@@ -1350,7 +1379,6 @@ loadchanged(WebKitWebView *v, WebKitLoadEvent e, Client *c)
 
        switch (e) {
        case WEBKIT_LOAD_STARTED:
-               curconfig = defconfig;
                setatom(c, AtomUri, title);
                c->title = title;
                c->https = c->insecure = 0;