Merge branch 'chris/display-idna'

This enables frontends to display international domain names in UTF-8, instead of the encoded versions.
It is disabled by default, as some frontends cannot display the full range of UTF-8 characters in their status or URL bar.

1 files changed, 20 insertions, 4 deletions

diff --git a/render/html_interaction.c b/render/html_interaction.c
index 6e2a2df4c..1b2e5b9c9 100644
--- a/render/html_interaction.c
+++ b/render/html_interaction.c
@@ -300,6 +300,8 @@ void html_mouse_action(struct content *c, struct browser_window *bw,
 	enum { ACTION_NONE, ACTION_SUBMIT, ACTION_GO } action = ACTION_NONE;
 	const char *title = 0;
 	nsurl *url = 0;
+	char *url_s = NULL;
+	size_t url_l = 0;
 	const char *target = 0;
 	char status_buffer[200];
 	const char *status = 0;
@@ -814,12 +816,26 @@ void html_mouse_action(struct content *c, struct browser_window *bw,
 					y - html_object_pos_y);
 		}
 	} else if (url) {
+		if (nsoption_bool(display_decoded_idn) == true) {
+			if (nsurl_access_utf8(url, &url_s, &url_l) != NSERROR_OK) {
+				/* Unable to obtain a decoded IDN.  This is not a fatal error.
+				 * Ensure the string pointer is NULL so we use the encoded version. */
+				url_s = NULL;
+			}
+		}
+
 		if (title) {
 			snprintf(status_buffer, sizeof status_buffer, "%s: %s",
-					nsurl_access(url), title);
-			status = status_buffer;
-		} else
-			status = nsurl_access(url);
+					url_s ? url_s : nsurl_access(url), title);
+		} else {
+			snprintf(status_buffer, sizeof status_buffer, "%s",
+					url_s ? url_s : nsurl_access(url));
+		}
+
+		status = status_buffer;
+
+		if (url_s != NULL)
+			free(url_s);
 
 		pointer = get_pointer_shape(url_box, imagemap);