pinosaur
/
surf.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Unset previous user styles before applying another one
[surf.git]
/
surf.c
diff --git
a/surf.c
b/surf.c
index
2003b79
..
51c1813
100644
(file)
--- a/
surf.c
+++ b/
surf.c
@@
-61,12
+61,15
@@
enum {
typedef enum {
AcceleratedCanvas,
typedef enum {
AcceleratedCanvas,
+ AccessMicrophone,
+ AccessWebcam,
CaretBrowsing,
Certificate,
CookiePolicies,
DiskCache,
DefaultCharset,
DNSPrefetch,
CaretBrowsing,
Certificate,
CookiePolicies,
DiskCache,
DefaultCharset,
DNSPrefetch,
+ FileURLsCrossAccess,
FontSize,
FrameFlattening,
Geolocation,
FontSize,
FrameFlattening,
Geolocation,
@@
-530,10
+533,10
@@
geturi(Client *c)
void
setatom(Client *c, int a, const char *v)
{
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);
XChangeProperty(dpy, c->xid,
atoms[a], XA_STRING, 8, PropModeReplace,
(unsigned char *)v, strlen(v) + 1);
+ XSync(dpy, False);
}
const char *
}
const char *
@@
-545,6
+548,7
@@
getatom(Client *c, int a)
unsigned long ldummy;
unsigned char *p = NULL;
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)
XGetWindowProperty(dpy, c->xid, atoms[a], 0L, BUFSIZ, False, XA_STRING,
&adummy, &idummy, &ldummy, &ldummy, &p);
if (p)
@@
-677,6
+681,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 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;
case CaretBrowsing:
webkit_settings_set_enable_caret_browsing(s, a->b);
refresh = 0;
@@
-704,6
+712,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 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 */
case FontSize:
webkit_settings_set_default_font_size(s, a->i);
return; /* do not update */
@@
-770,11
+782,10
@@
setparameter(Client *c, int refresh, ParamName p, const Arg *a)
WEBKIT_TLS_ERRORS_POLICY_IGNORE);
break;
case Style:
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)));
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:
refresh = 0;
break;
case ZoomLevel:
@@
-1019,6
+1030,8
@@
newview(Client *c, WebKitWebView *rv)
webkit_web_view_new_with_related_view(rv));
} else {
settings = webkit_settings_new_with_settings(
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,
"auto-load-images", curconfig[LoadImages].val.b,
"default-charset", curconfig[DefaultCharset].val.v,
"default-font-size", curconfig[FontSize].val.i,
@@
-1375,23
+1388,23
@@
loadfailedtls(WebKitWebView *v, gchar *uri, GTlsCertificate *cert,
void
loadchanged(WebKitWebView *v, WebKitLoadEvent e, Client *c)
{
void
loadchanged(WebKitWebView *v, WebKitLoadEvent e, Client *c)
{
- const char *
title
= geturi(c);
+ const char *
uri
= geturi(c);
switch (e) {
case WEBKIT_LOAD_STARTED:
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;
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:
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,
break;
case WEBKIT_LOAD_COMMITTED:
c->https = webkit_web_view_get_tls_info(c->view, &c->cert,
@@
-1449,15
+1462,27
@@
mousetargetchanged(WebKitWebView *v, WebKitHitTestResult *h, guint modifiers,
gboolean
permissionrequested(WebKitWebView *v, WebKitPermissionRequest *r, Client *c)
{
gboolean
permissionrequested(WebKitWebView *v, WebKitPermissionRequest *r, Client *c)
{
+ ParamName param = ParameterLast;
+
if (WEBKIT_IS_GEOLOCATION_PERMISSION_REQUEST(r)) {
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
}
gboolean