mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-12-22 12:12:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

Simplify content status text setting.

Browse Source
This commit is contained in:
Michael Drake 2012-08-15 11:50:08 +01:00
parent c3f9e3d3ce
commit fcb7143ecb
3 changed files with 26 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
content/content.c
View File

@ -59,7 +59,6 @@ const char * const content_status_name[] = {
static nserror content_llcache_callback(llcache_handle *llcache, static nserror content_llcache_callback(llcache_handle *llcache,
const llcache_event *event, void *pw); const llcache_event *event, void *pw);
static void content_convert(struct content *c); static void content_convert(struct content *c);
static void content_update_status(struct content *c);
/** /**
@ -169,7 +168,7 @@ nserror content_llcache_callback(llcache_handle *llcache,
(void) llcache_handle_get_source_data(llcache, &source_size); (void) llcache_handle_get_source_data(llcache, &source_size);
content_set_status(c, messages_get("Processing"), source_size); content_set_status(c, messages_get("Processing"));
content_broadcast(c, CONTENT_MSG_STATUS, msg_data); content_broadcast(c, CONTENT_MSG_STATUS, msg_data);
content_convert(c); content_convert(c);
@ -182,7 +181,7 @@ nserror content_llcache_callback(llcache_handle *llcache,
content_broadcast(c, CONTENT_MSG_ERROR, msg_data); content_broadcast(c, CONTENT_MSG_ERROR, msg_data);
break; break;
case LLCACHE_EVENT_PROGRESS: case LLCACHE_EVENT_PROGRESS:
content_set_status(c, "%s", event->data.msg); content_set_status(c, event->data.msg);
content_broadcast(c, CONTENT_MSG_STATUS, msg_data); content_broadcast(c, CONTENT_MSG_STATUS, msg_data);
break; break;
} }
@ -207,31 +206,7 @@ bool content_can_reformat(hlcache_handle *h)
} }
/** static void content_update_status(struct content *c)
* Updates content with new status.
*
* The textual status contained in the content is updated with given string.
*
* \param status_message new textual status
*/
void content_set_status(struct content *c, const char *status_message, ...)
{
va_list ap;
int len;
va_start(ap, status_message);
if ((len = vsnprintf(c->sub_status, sizeof (c->sub_status),
status_message, ap)) < 0 ||
(int)sizeof (c->sub_status) <= len)
c->sub_status[sizeof (c->sub_status) - 1] = '\0';
va_end(ap);
content_update_status(c);
}
void content_update_status(struct content *c)
{ {
if (c->status == CONTENT_STATUS_LOADING || if (c->status == CONTENT_STATUS_LOADING ||
c->status == CONTENT_STATUS_READY) { c->status == CONTENT_STATUS_READY) {
@ -245,8 +220,28 @@ void content_update_status(struct content *c)
"%s (%.1fs)", messages_get("Done"), "%s (%.1fs)", messages_get("Done"),
(float) time / 100); (float) time / 100);
} }
}
/* LOG(("%s", c->status_message)); */
/**
* Updates content with new status.
*
* The textual status contained in the content is updated with given string.
*
* \param status_message new textual status
*/
void content_set_status(struct content *c, const char *status_message)
{
size_t len = strlen(status_message);
if (len >= sizeof(c->sub_status)) {
len = sizeof(c->sub_status) - 1;
}
memcpy(c->sub_status, status_message, len);
c->sub_status[len] = '\0';
content_update_status(c);
} }

2
content/content_protected.h
View File

@ -160,7 +160,7 @@ void content_set_ready(struct content *c);
void content_set_done(struct content *c); void content_set_done(struct content *c);
void content_set_error(struct content *c); void content_set_error(struct content *c);
void content_set_status(struct content *c, const char *status_message, ...); void content_set_status(struct content *c, const char *status_message);
void content_broadcast(struct content *c, content_msg msg, void content_broadcast(struct content *c, content_msg msg,
union content_msg_data data); union content_msg_data data);
void content_add_error(struct content *c, const char *token, void content_add_error(struct content *c, const char *token,

3
render/html.c
View File

@ -32,7 +32,6 @@
#include "content/content_protected.h" #include "content/content_protected.h"
#include "content/fetch.h" #include "content/fetch.h"
#include "content/hlcache.h" #include "content/hlcache.h"
#include "desktop/browser.h"
#include "desktop/options.h" #include "desktop/options.h"
#include "desktop/selection.h" #include "desktop/selection.h"
#include "desktop/scrollbar.h" #include "desktop/scrollbar.h"
@ -2510,7 +2509,7 @@ static nserror html_clone(const struct content *old, struct content **newc)
void html_set_status(html_content *c, const char *extra) void html_set_status(html_content *c, const char *extra)
{ {
content_set_status(&c->base, "%s", extra); content_set_status(&c->base, extra);
} }