Add config option for Java activation

[surf.git] / surf.c

diff --git a/surf.c b/surf.c
index 84ab8e3..fb104e9 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,
@@ -236,7 +238,7 @@ static void clicknewwindow(Client *c, const Arg *a, WebKitHitTestResult *h);
 static void clickexternplayer(Client *c, const Arg *a, WebKitHitTestResult *h);
 
 static char winid[64];
-static char togglestats[11];
+static char togglestats[12];
 static char pagestats[2];
 static Atom atoms[AtomLast];
 static Window embed;
@@ -256,9 +258,9 @@ char *argv0;
 void
 usage(void)
 {
-       die("usage: %s [-bBdDfFgGiIkKmMnNpPsStTvx] [-a cookiepolicies ] "
-           "[-c cookiefile] [-C stylefile] [-e xid] [-r scriptfile] "
-           "[-u useragent] [-z zoomlevel] [uri]\n", basename(argv0));
+       die("usage: surf [-bBdDfFgGiIkKmMnNpPsStTvwxX]\n"
+           "[-a cookiepolicies ] [-c cookiefile] [-C stylefile] [-e xid]\n"
+           "[-r scriptfile] [-u useragent] [-z zoomlevel] [uri]\n");
 }
 
 void
@@ -590,8 +592,9 @@ gettogglestats(Client *c)
        togglestats[6] = curconfig[Plugins].val.b ?         'V' : 'v';
        togglestats[7] = curconfig[Style].val.b ?           'M' : 'm';
        togglestats[8] = curconfig[FrameFlattening].val.b ? 'F' : 'f';
-       togglestats[9] = curconfig[StrictTLS].val.b ?       'T' : 't';
-       togglestats[10] = '\0';
+       togglestats[9] = curconfig[Certificate].val.b ?     'X' : 'x';
+       togglestats[10] = curconfig[StrictTLS].val.b ?      'T' : 't';
+       togglestats[11] = '\0';
 }
 
 void
@@ -635,18 +638,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
@@ -680,6 +697,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 */
@@ -699,6 +719,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;
@@ -791,14 +814,16 @@ setcert(Client *c, const char *uri)
                return;
        }
 
-       uri = strstr(uri, "://") + sizeof("://") - 1;
-       host = strndup(uri, strstr(uri, "/") - uri);
+       if ((uri = strstr(uri, "https://"))) {
+               uri += sizeof("https://") - 1;
+               host = g_strndup(uri, strchr(uri, '/') - uri);
+               webkit_web_context_allow_tls_certificate_for_host(
+                   webkit_web_view_get_context(c->view), cert, host);
+               g_free(host);
+       }
 
-       webkit_web_context_allow_tls_certificate_for_host(
-           webkit_web_view_get_context(c->view), cert, host);
        g_object_unref(cert);
 
-       free(host);
 }
 
 const char *
@@ -881,7 +906,7 @@ newwindow(Client *c, const Arg *a, int noembed)
 {
        int i = 0;
        char tmp[64];
-       const char *cmd[28], *uri;
+       const char *cmd[29], *uri;
        const Arg arg = { .v = cmd };
 
        cmd[i++] = argv0;
@@ -921,6 +946,7 @@ newwindow(Client *c, const Arg *a, int noembed)
        }
        if (showxid)
                cmd[i++] = "-w";
+       cmd[i++] = curconfig[Certificate].val.b ? "-X" : "-x" ;
        /* do not keep zoom level */
        cmd[i++] = "--";
        if ((uri = a->v))
@@ -990,6 +1016,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,
@@ -997,13 +1024,14 @@ 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,
                   "media-playback-requires-user-gesture", curconfig[MediaManualPlay].val.b,
                   NULL);
-/* For mor interesting settings, have a look at
+/* For more interesting settings, have a look at
  * http://webkitgtk.org/reference/webkit2gtk/stable/WebKitSettings.html */
 
                if (strcmp(fulluseragent, "")) {
@@ -1328,7 +1356,7 @@ loadfailedtls(WebKitWebView *v, gchar *uri, GTlsCertificate *cert,
        g_object_get(cert, "certificate-pem", &pem, NULL);
        html = g_strdup_printf("<p>Could not validate TLS for “%s”<br>%s</p>"
                               "<p>You can inspect the following certificate "
-                              "with Ctrl+Shift+x (default keybinding).</p>"
+                              "with Ctrl-t (default keybinding).</p>"
                               "<p><pre>%s</pre></p>", uri, errmsg->str, pem);
        g_free(pem);
        g_string_free(errmsg, TRUE);
@@ -1346,7 +1374,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;
@@ -1897,11 +1924,16 @@ main(int argc, char *argv[])
                fulluseragent = EARGF(usage());
                break;
        case 'v':
-               die("surf-"VERSION", ©2009-2017 surf engineers, "
-                   "see LICENSE for details\n");
+               die("surf-"VERSION", see LICENSE for © details\n");
        case 'w':
                showxid = 1;
                break;
+       case 'x':
+               defconfig CSETB(Certificate, 0);
+               break;
+       case 'X':
+               defconfig CSETB(Certificate, 1);
+               break;
        case 'z':
                defconfig CSETF(ZoomLevel, strtof(EARGF(usage()), NULL));
                break;