Fix synchronization issue with atoms

[surf.git] / surf.c

diff --git a/surf.c b/surf.c
index fb104e9..2d3a6f5 100644 (file)
--- a/surf.c
+++ b/surf.c
@@ -83,6 +83,7 @@ typedef enum {
        ScrollBars,
        ShowIndicators,
        SiteQuirks,
+       SmoothScrolling,
        SpellChecking,
        SpellLanguages,
        StrictTLS,
@@ -529,10 +530,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 +545,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)
@@ -750,6 +752,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;
@@ -1029,6 +1034,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 +1376,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,