nilix/surf
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve parameters handling

Browse source 
There's no need to reload all parameters each time a new url is loaded,
instead set only custom parameters and restore those to defaults when
needed.
This commit is contained in:
Quentin Rameau 2017-05-09 14:45:24 +02:00
parent b115434720
commit 745a319baf
1 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
surf.c
View file

@ -636,18 +636,32 @@ cookiepolicy_set(const WebKitCookieAcceptPolicy p)
void void
seturiparameters(Client *c, const char *uri) seturiparameters(Client *c, const char *uri)
{ {
Parameter *newconfig = NULL;
int i; int i;
for (i = 0; i < LENGTH(uriparams); ++i) { for (i = 0; i < LENGTH(uriparams); ++i) {
if (uriparams[i].uri && if (uriparams[i].uri &&
!regexec(&(uriparams[i].re), uri, 0, NULL, 0)) { !regexec(&(uriparams[i].re), uri, 0, NULL, 0)) {
curconfig = uriparams[i].config; newconfig = uriparams[i].config;
break; break;
} }
} }
for (i = 0; i < ParameterLast; ++i) if (!newconfig)
setparameter(c, 0, i, &curconfig[i].val); 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 void
@ -1350,7 +1364,6 @@ loadchanged(WebKitWebView *v, WebKitLoadEvent e, Client *c)
switch (e) { switch (e) {
case WEBKIT_LOAD_STARTED: case WEBKIT_LOAD_STARTED:
curconfig = defconfig;
setatom(c, AtomUri, title); setatom(c, AtomUri, title);
c->title = title; c->title = title;
c->https = c->insecure = 0; c->https = c->insecure = 0;