diff options
author | James Bursa <james@netsurf-browser.org> | 2003-04-06 18:09:34 +0000 |
---|---|---|
committer | James Bursa <james@netsurf-browser.org> | 2003-04-06 18:09:34 +0000 |
commit | 46edb645e1a08fb76835e4b3b8960ec3cce5e298 (patch) | |
tree | b1824939242a04900cf0737f620b425543d34754 /render/html.c | |
parent | 2253e38be8cbcf4243e43fc0d317cfda08bffeb2 (diff) | |
download | netsurf-46edb645e1a08fb76835e4b3b8960ec3cce5e298.tar.gz netsurf-46edb645e1a08fb76835e4b3b8960ec3cce5e298.tar.bz2 |
[project @ 2003-04-06 18:09:34 by bursa]
@import, more status messages.
svn path=/import/netsurf/; revision=116
Diffstat (limited to 'render/html.c')
-rw-r--r-- | render/html.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/render/html.c b/render/html.c index 63bab48c0..829e437fa 100644 --- a/render/html.c +++ b/render/html.c @@ -1,5 +1,5 @@ /** - * $Id: html.c,v 1.8 2003/04/05 21:38:06 bursa Exp $ + * $Id: html.c,v 1.9 2003/04/06 18:09:34 bursa Exp $ */ #include <assert.h> @@ -33,7 +33,6 @@ void html_create(struct content *c) c->data.html.document = NULL; c->data.html.markup = NULL; c->data.html.layout = NULL; - c->data.html.stylesheet = NULL; c->data.html.style = NULL; c->data.html.fonts = NULL; } @@ -57,6 +56,7 @@ int html_convert(struct content *c, unsigned int width, unsigned int height) struct css_selector* selector = xcalloc(1, sizeof(struct css_selector)); struct fetch_data *fetch_data; unsigned int i; + char status[80]; htmlParseChunk(c->data.html.parser, "", 0, 1); c->data.html.document = c->data.html.parser->myDoc; @@ -101,6 +101,10 @@ int html_convert(struct content *c, unsigned int width, unsigned int height) } while (c->active != 0) { + if (c->status_callback != 0) { + sprintf(status, "Loading %u stylesheets", c->active); + c->status_callback(c->status_p, status); + } fetch_poll(); gui_multitask(); } @@ -110,8 +114,6 @@ int html_convert(struct content *c, unsigned int width, unsigned int height) return 1; } - c->data.html.stylesheet = c->data.html.stylesheet_content[0]->data.css; - LOG(("Copying base style")); c->data.html.style = xcalloc(1, sizeof(struct css_style)); memcpy(c->data.html.style, &css_base_style, sizeof(struct css_style)); @@ -123,6 +125,7 @@ int html_convert(struct content *c, unsigned int width, unsigned int height) c->data.html.fonts = font_new_set(); + c->status_callback(c->status_p, "Formatting document"); LOG(("XML to box")); xml_to_box(c->data.html.markup, c->data.html.style, c->data.html.stylesheet_content, c->data.html.stylesheet_count, |