Certificate,
CookiePolicies,
DiskCache,
+ DefaultCharset,
DNSPrefetch,
FontSize,
FrameFlattening,
Geolocation,
HideBackground,
Inspector,
+ Java,
JavaScript,
KioskMode,
LoadImages,
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
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 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;
} 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,
"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,
switch (e) {
case WEBKIT_LOAD_STARTED:
- curconfig = defconfig;
setatom(c, AtomUri, title);
c->title = title;
c->https = c->insecure = 0;