diff options
author | Vincent Sanders <vince@netsurf-browser.org> | 2011-10-06 23:31:55 +0000 |
---|---|---|
committer | Vincent Sanders <vince@netsurf-browser.org> | 2011-10-06 23:31:55 +0000 |
commit | 52ad2c1e2523b28aa5363656fbbef20e97665cce (patch) | |
tree | 17fa08828007484f14e432f70347064b76108b95 /desktop | |
parent | 3fde9589c1ba89d16ec4d294fb308631f0257e3a (diff) | |
download | netsurf-52ad2c1e2523b28aa5363656fbbef20e97665cce.tar.gz netsurf-52ad2c1e2523b28aa5363656fbbef20e97665cce.tar.bz2 |
initial favicon support
svn path=/trunk/netsurf/; revision=12975
Diffstat (limited to 'desktop')
-rw-r--r-- | desktop/browser.c | 123 | ||||
-rw-r--r-- | desktop/browser.h | 3 |
2 files changed, 101 insertions, 25 deletions
diff --git a/desktop/browser.c b/desktop/browser.c index fbcac5297..ed1cfc345 100644 --- a/desktop/browser.c +++ b/desktop/browser.c @@ -80,7 +80,6 @@ static void browser_window_convert_to_download(struct browser_window *bw, llcache_handle *stream); static void browser_window_start_throbber(struct browser_window *bw); static void browser_window_stop_throbber(struct browser_window *bw); -static void browser_window_set_icon(struct browser_window *bw); static void browser_window_destroy_children(struct browser_window *bw); static void browser_window_destroy_internal(struct browser_window *bw); static void browser_window_set_scale_internal(struct browser_window *bw, @@ -878,6 +877,34 @@ void browser_window_go_post(struct browser_window *bw, const char *url, nsurl_unref(nsref); } +/** + * Callback for fetchcache() for browser window favicon fetches. + */ + +static nserror browser_window_favicon_callback(hlcache_handle *c, + const hlcache_event *event, void *pw) +{ + struct browser_window *bw = pw; + + switch (event->type) { + case CONTENT_MSG_DONE: + LOG(("favicon contents for %p done!", bw)); + /* content_get_bitmap on the bw->favicon should give + us the favicon at this point + */ + if (bw->window != NULL) { + gui_window_set_icon(bw->window, bw->favicon); + } else { + LOG(("null browser window on favicon!")); + } + break; + + default: + LOG(("favicon unhandled event")); + break; + } + return NSERROR_OK; +} /** * Callback for fetchcache() for browser window fetches. @@ -935,6 +962,18 @@ nserror browser_window_callback(hlcache_handle *c, hlcache_handle_release(bw->current_content); } + if (bw->favicon != NULL) { + content_status status = + content_get_status(bw->favicon); + + if (status == CONTENT_STATUS_READY || + status == CONTENT_STATUS_DONE) + content_close(bw->favicon); + + hlcache_handle_release(bw->favicon); + bw->favicon = NULL; + } + bw->current_content = c; bw->loading_content = NULL; @@ -1001,7 +1040,32 @@ nserror browser_window_callback(hlcache_handle *c, browser_window_update(bw, false); browser_window_set_status(bw, content_get_status_message(c)); browser_window_stop_throbber(bw); - browser_window_set_icon(bw); + if (bw->favicon == NULL) { + /* no favicon via link - try for the default location - bletch */ + nsurl *nsref = NULL; + nsurl *nsurl; + nserror error; + + error = nsurl_join(content_get_url(c), "/favicon.ico", &nsurl); + if (error == NSERROR_OK) { + + + hlcache_handle_retrieve(nsurl, + HLCACHE_RETRIEVE_MAY_DOWNLOAD | + HLCACHE_RETRIEVE_SNIFF_TYPE, + nsref, + NULL, + browser_window_favicon_callback, + bw, + NULL, + CONTENT_IMAGE, + &bw->favicon); + + nsurl_unref(nsurl); + + } + + } history_update(bw->history, c); hotlist_visited(c); @@ -1078,12 +1142,27 @@ nserror browser_window_callback(hlcache_handle *c, bw->refresh_interval = event->data.delay * 100; break; - case CONTENT_MSG_FAVICON_REFRESH: - /* Cause the GUI to update */ - if (bw->browser_window_type == BROWSER_WINDOW_NORMAL) { - gui_window_set_icon(bw->window, - html_get_favicon(bw->current_content)); + case CONTENT_MSG_LINK: /* content has an rfc5988 link element */ + { + nsurl *nsref = NULL; + if ((bw->favicon == NULL) && + (strstr(event->data.rfc5988_link.rel, "icon") != NULL)) { + /* its a favicon start a fetch for it */ + LOG(("fetching favicon rel:%s '%s'", + event->data.rfc5988_link.rel, + nsurl_access(event->data.rfc5988_link.url))); + hlcache_handle_retrieve(event->data.rfc5988_link.url, + HLCACHE_RETRIEVE_MAY_DOWNLOAD | + HLCACHE_RETRIEVE_SNIFF_TYPE, + nsref, + NULL, + browser_window_favicon_callback, + bw, + NULL, + CONTENT_IMAGE, + &bw->favicon); } + } break; default: @@ -1274,24 +1353,6 @@ bool browser_window_check_throbber(struct browser_window *bw) } /** - * when ready, set icon at top level - * \param bw browser_window - * current implementation ignores lower-levels' link rels completely - */ -void browser_window_set_icon(struct browser_window *bw) -{ - while (bw->parent) - bw = bw->parent; - - if (bw->current_content != NULL && - content_get_type(bw->current_content) == CONTENT_HTML) - gui_window_set_icon(bw->window, - html_get_favicon(bw->current_content)); - else - gui_window_set_icon(bw->window, NULL); -} - -/** * Redraw browser window, set extent to content, and update title. * * \param bw browser_window @@ -1663,6 +1724,18 @@ void browser_window_destroy_internal(struct browser_window *bw) bw->current_content = NULL; } + if (bw->favicon != NULL) { + content_status status = + content_get_status(bw->favicon); + + if (status == CONTENT_STATUS_READY || + status == CONTENT_STATUS_DONE) + content_close(bw->favicon); + + hlcache_handle_release(bw->favicon); + bw->favicon = NULL; + } + if (bw->box != NULL) { bw->box->iframe = NULL; bw->box = NULL; diff --git a/desktop/browser.h b/desktop/browser.h index d7d996c5e..c96c4f177 100644 --- a/desktop/browser.h +++ b/desktop/browser.h @@ -75,6 +75,9 @@ struct browser_window { /** Page being loaded, or 0. */ struct hlcache_handle *loading_content; + /** Page Favicon */ + struct hlcache_handle *favicon; + /** Window history structure. */ struct history *history; |