[project @ 2005-07-16 14:35:20 by jmb]

- Convert Messages files to UTF-8 encoding.
- Replace local_encoding_name() with platform specific
  utf8_[to,from]_local_encoding() functions - this allows mapping of 8bit
  characters 0x80->0x9f (inclusive).
- All text that is rendered by the RISC OS Wimp is now converted to the system
  local encoding prior to display.
- Lose the horrendous hack that was messages_get_key()
- Menu text is now translated to system local encoding on the fly (if necessary)
  rather than at menu creation time. This allows the system alphabet to change
  under us and our menus remain usable.
- The Languages menu now lists all languages that are present in the LangNames
  file. In the case of selecting the UI language, those languages which are not
  available are shaded.

svn path=/import/netsurf/; revision=1796

1 files changed, 5 insertions, 18 deletions

diff --git a/riscos/window.c b/riscos/window.c
index 8abc6c9ed..867382565 100644
--- a/riscos/window.c
+++ b/riscos/window.c
@@ -909,24 +909,11 @@ void gui_window_set_extent(struct gui_window *g, int width, int height)
 
 void gui_window_set_status(struct gui_window *g, const char *text)
 {
-	char *local_text;
-	utf8_convert_ret err;
-
 	if ((!g->toolbar) || (!g->toolbar->status_handle))
 		return;
 
-	/* convert text to local encoding */
-	err = utf8_to_enc(text, local_encoding_name(), 0, &local_text);
-	if (err != UTF8_CONVERT_OK) {
-		/* A bad encoding should never happen, so assert this */
-		assert(err != UTF8_CONVERT_BADENC);
-		LOG(("utf8_to_enc failed"));
-		return;
-	}
-
 	ro_gui_set_icon_string(g->toolbar->status_handle,
-				ICON_STATUS_TEXT, local_text);
-	free(local_text);
+				ICON_STATUS_TEXT, text);
 }
 
 
@@ -1904,14 +1891,14 @@ bool ro_gui_window_keypress(struct gui_window *g, int key, bool toolbar)
 			}
 			return true;
 
-		case wimp_KEY_CONTROL + wimp_KEY_SHIFT + wimp_KEY_F9:
-			talloc_report_full(0, stderr);
-			return true;
-
 		case wimp_KEY_CONTROL + wimp_KEY_F9:	/* Dump url_store. */
 			url_store_dump();
 			return true;
 
+		case wimp_KEY_CONTROL + wimp_KEY_SHIFT + wimp_KEY_F9:
+			talloc_report_full(0, stderr);
+			return true;
+
 		case wimp_KEY_F11:	/* Zoom */
 			return ro_gui_menu_handle_action(g->window,
 					BROWSER_SCALE_VIEW, false);