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

[project @ 2004-05-09 16:49:53 by joty] 

Type change of struct content_html.encoding from xmlCharEncoding to xmlChar; Pickup Content-Type charset in the HTML file and use this if the server didn't send it or there was no server involved (e.g. HTML loading from disk).

svn path=/import/netsurf/; revision=846
This commit is contained in:
John Tytgat 2004-05-09 16:49:53 +00:00
parent f29ad7e266
commit 226c002d57
3 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
render/html.c
View File

@ -53,23 +53,25 @@ void html_create(struct content *c, const char *params[])
{
unsigned int i;
struct content_html_data *html = &c->data.html;
xmlCharEncoding encoding = XML_CHAR_ENCODING_NONE;
html->encoding = XML_CHAR_ENCODING_NONE;
html->encoding = NULL;
html->getenc = true;
for (i = 0; params[i]; i += 2) {
if (strcasecmp(params[i], "charset") == 0) {
html->encoding = xmlParseCharEncoding(params[i + 1]);
html->getenc = false; /* encoding specified - trust the server... */
if (html->encoding == XML_CHAR_ENCODING_ERROR) {
html->encoding = XML_CHAR_ENCODING_NONE;
html->getenc = true;
encoding = xmlParseCharEncoding(params[i + 1]);
if (encoding != XML_CHAR_ENCODING_ERROR
&& encoding != XML_CHAR_ENCODING_NONE) {
/* encoding specified - trust the server... */
html->encoding = xstrdup(xmlGetCharEncodingName(encoding));
html->getenc = false;
}
break;
}
}
html->parser = htmlCreatePushParserCtxt(0, 0, "", 0, 0, html->encoding);
html->parser = htmlCreatePushParserCtxt(0, 0, "", 0, 0, encoding);
html->base_url = xstrdup(c->url);
html->layout = 0;
html->background_colour = TRANSPARENT;
@ -98,13 +100,14 @@ void html_process_data(struct content *c, char *data, unsigned long size)
/* First time through, check if we need to detect the encoding
* if so, detect it and reset the parser instance with it.
* Do this detection only once.
*/
if (c->data.html.getenc) {
xmlCharEncoding encoding = xmlDetectCharEncoding(data, size);
if (encoding != XML_CHAR_ENCODING_ERROR &&
encoding != XML_CHAR_ENCODING_NONE) {
xmlSwitchEncoding(c->data.html.parser, encoding);
c->data.html.encoding = encoding;
c->data.html.encoding = xstrdup(xmlGetCharEncodingName(encoding));
}
c->data.html.getenc = false;
}
@ -148,6 +151,11 @@ int html_convert(struct content *c, unsigned int width, unsigned int height)
LOG(("Parsing failed"));
return 1;
}
/* Last change to pick the Content-Type charset information if the
* server didn't send it (or we're reading the HTML from disk)
*/
if (c->data.html.encoding == NULL && document->encoding != NULL)
c->data.html.encoding = xstrdup(document->encoding);
/* locate html and head elements */
for (html = document->children;
@ -805,6 +813,8 @@ void html_destroy(struct content *c)
if (c->data.html.parser)
htmlFreeParserCtxt(c->data.html.parser);
free(c->data.html.encoding);
free(c->data.html.base_url);
if (c->data.html.layout)

2
render/html.h
View File

@ -38,7 +38,7 @@ struct box_position {
struct content_html_data {
htmlParserCtxt *parser; /**< HTML parser context. */
xmlCharEncoding encoding; /**< Encoding of source. */
xmlChar *encoding; /**< Encoding of source. */
bool getenc; /**< Need to get the encoding from the document, as server is broken. */
char *base_url; /**< Base URL (may be a copy of content->url). */

4
riscos/menus.c
View File

@ -832,8 +832,8 @@ void ro_gui_menu_pageinfo(wimp_message_menu_warning *warning)
sprintf(icon_buf, "file_%x", ro_content_filetype(c));
if (c->type == CONTENT_HTML && c->data.html.encoding != 0) {
enc = xmlGetCharEncodingName(c->data.html.encoding);
if (c->type == CONTENT_HTML && c->data.html.encoding != NULL) {
enc = c->data.html.encoding;
}
ro_gui_set_icon_string(dialog_pageinfo, ICON_PAGEINFO_ICON, icon);