From 226c002d574e9e366ee9782675063c835b0d1a5c Mon Sep 17 00:00:00 2001
From: John Tytgat <joty@netsurf-browser.org>
Date: Sun, 9 May 2004 16:49:53 +0000
Subject: [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
---
 render/html.c  | 26 ++++++++++++++++++--------
 render/html.h  |  2 +-
 riscos/menus.c |  4 ++--
 3 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/render/html.c b/render/html.c
index 376b42ddc..e4681f762 100644
--- a/render/html.c
+++ b/render/html.c
@@ -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)
diff --git a/render/html.h b/render/html.h
index 79b2ca3ec..ab49b266b 100644
--- a/render/html.h
+++ b/render/html.h
@@ -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). */
diff --git a/riscos/menus.c b/riscos/menus.c
index a7d49a140..41f08007b 100644
--- a/riscos/menus.c
+++ b/riscos/menus.c
@@ -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);
-- 
cgit v1.2.3