mirrors
/
netsurf
mirror of https://github.com/netsurf-browser/netsurf
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add CONTENT_MSG_FAVICON_REFRESH and emit and handle it appropriately. Animated favicons now work 

svn path=/trunk/netsurf/; revision=11242
This commit is contained in:
Daniel Silverstone 2011-01-07 13:10:20 +00:00
parent e6f33ef6ef
commit d00c5b0cd5
3 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
content/content.h
View File

@ -63,7 +63,8 @@ typedef enum {
CONTENT_MSG_REFORMAT, /**< content_reformat done */
CONTENT_MSG_REDRAW, /**< needs redraw (eg. new animation frame) */
CONTENT_MSG_REFRESH, /**< wants refresh */
CONTENT_MSG_DOWNLOAD /**< download, not for display */
CONTENT_MSG_DOWNLOAD, /**< download, not for display */
CONTENT_MSG_FAVICON_REFRESH, /**< favicon has been refreshed (eg. new animation frame) */
} content_msg;
/** Extra data for some content_msg messages. */

5
desktop/browser.c
View File

@ -581,6 +581,11 @@ nserror browser_window_callback(hlcache_handle *c,
case CONTENT_MSG_REFRESH:
bw->refresh_interval = event->data.delay * 100;
break;
case CONTENT_MSG_FAVICON_REFRESH:
/* Cause the GUI to update */
gui_window_set_icon(bw->window, html_get_favicon(bw->current_content));
break;
default:
assert(0);

21
render/favicon.c
View File

@ -166,9 +166,9 @@ bool favicon_get_icon(struct content *c, xmlNode *html)
url = favicon_get_icon_ref(c, html);
if (url == NULL)
return false;
LOG(("WOOP WOOP, SUMMON DA POLICE. FAVICON URL IS %s", url));
LOG(("WOOP WOOP, SUMMON DA POLICE. FAVICON URL IS %s", url));
error = hlcache_handle_retrieve(url, LLCACHE_RETRIEVE_NO_ERROR_PAGES,
content__get_url(c), NULL, favicon_callback, c, NULL,
permitted_types, &c->data.html.favicon);
@ -190,7 +190,7 @@ nserror favicon_callback(hlcache_handle *icon,
const hlcache_event *event, void *pw)
{
struct content *c = pw;
bool consider_done = false;
bool consider_done = false, consider_redraw = false;
switch (event->type) {
case CONTENT_MSG_LOADING:
@ -241,20 +241,27 @@ nserror favicon_callback(hlcache_handle *icon,
case CONTENT_MSG_REFRESH:
/* Fall through */
case CONTENT_MSG_REFORMAT:
consider_redraw = true;
break;
default:
assert(0);
}
if (consider_redraw && (c->data.html.favicon != NULL) && (content_get_type(c->data.html.favicon) == CONTENT_GIF)) {
union content_msg_data msg_data;
/* This is needed in order to cause animated GIFs to update their bitmap */
content_redraw(c->data.html.favicon, 0, 0, -1, -1, 0, 0, 0, 0, 1.0, 0);
content_broadcast(c, CONTENT_MSG_FAVICON_REFRESH, msg_data);
}
if (consider_done && (c->active == 0)) {
/* all objects have arrived */
content__reformat(c, c->available_width, c->height);
html_set_status(c, "");
content_set_done(c);
} else if (c->active == 0) {
content__reformat(c, c->available_width, c->height);
}
}
return NSERROR_OK;
}