X-Git-Url: https://git.danieliu.xyz/?p=surf.git;a=blobdiff_plain;f=surf.c;h=7e1bdcb0e62a8197c3da01c8d47f827475b7f214;hp=8ecf0f52e113628862e00debb4cc7eeee961812b;hb=2223417c91569f8314205d8f34c3cdf4d96d6e1a;hpb=0df9f79d9536acc4627ebd726b62de7ba4c3070e
diff --git a/surf.c b/surf.c
index 8ecf0f5..7e1bdcb 100644
--- a/surf.c
+++ b/surf.c
@@ -61,16 +61,21 @@ enum {
typedef enum {
AcceleratedCanvas,
+ AccessMicrophone,
+ AccessWebcam,
CaretBrowsing,
Certificate,
CookiePolicies,
DiskCache,
+ DefaultCharset,
DNSPrefetch,
+ FileURLsCrossAccess,
FontSize,
FrameFlattening,
Geolocation,
HideBackground,
Inspector,
+ Java,
JavaScript,
KioskMode,
LoadImages,
@@ -81,6 +86,7 @@ typedef enum {
ScrollBars,
ShowIndicators,
SiteQuirks,
+ SmoothScrolling,
SpellChecking,
SpellLanguages,
StrictTLS,
@@ -256,9 +262,9 @@ char *argv0;
void
usage(void)
{
- die("usage: %s [-bBdDfFgGiIkKmMnNpPsStTvwxX] [-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
@@ -527,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 *
@@ -542,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)
@@ -636,18 +643,42 @@ cookiepolicy_set(const WebKitCookieAcceptPolicy p)
void
seturiparameters(Client *c, const char *uri)
{
+ Parameter *config, *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;
+
+ for (i = 0; i < ParameterLast; ++i) {
+ 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;
}
void
@@ -660,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;
@@ -681,9 +716,16 @@ 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 */
+ 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 */
@@ -700,6 +742,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 +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;
@@ -744,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:
@@ -993,7 +1040,10 @@ 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,
"enable-caret-browsing", curconfig[CaretBrowsing].val.b,
"enable-developer-extras", curconfig[Inspector].val.b,
@@ -1001,10 +1051,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
@@ -1332,7 +1384,7 @@ loadfailedtls(WebKitWebView *v, gchar *uri, GTlsCertificate *cert,
g_object_get(cert, "certificate-pem", &pem, NULL);
html = g_strdup_printf("Could not validate TLS for â%sâ
%s
"
"You can inspect the following certificate "
- "with Ctrl+Shift+x (default keybinding).
"
+ "with Ctrl-t (default keybinding)."
"%s
", uri, errmsg->str, pem);
g_free(pem);
g_string_free(errmsg, TRUE);
@@ -1346,24 +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:
- curconfig = defconfig;
- 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,
@@ -1421,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
@@ -1901,8 +1964,7 @@ 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;