diff options
Diffstat (limited to 'riscos')
-rw-r--r-- | riscos/download.c | 1 | ||||
-rw-r--r-- | riscos/gui.c | 3 | ||||
-rw-r--r-- | riscos/gui/url_bar.c | 1 | ||||
-rw-r--r-- | riscos/help.c | 1 | ||||
-rw-r--r-- | riscos/menus.c | 13 | ||||
-rw-r--r-- | riscos/query.c | 1 | ||||
-rw-r--r-- | riscos/save.c | 1 | ||||
-rw-r--r-- | riscos/textselection.c | 1 | ||||
-rw-r--r-- | riscos/ucstables.c | 8 | ||||
-rw-r--r-- | riscos/ucstables.h | 5 | ||||
-rw-r--r-- | riscos/wimp.c | 1 | ||||
-rw-r--r-- | riscos/window.c | 1 |
12 files changed, 31 insertions, 6 deletions
diff --git a/riscos/download.c b/riscos/download.c index b89334f2c..b10c6c1d4 100644 --- a/riscos/download.c +++ b/riscos/download.c @@ -58,6 +58,7 @@ #include "utils/url.h" #include "utils/utf8.h" #include "utils/utils.h" +#include "riscos/ucstables.h" #define ICON_DOWNLOAD_ICON 0 #define ICON_DOWNLOAD_URL 1 diff --git a/riscos/gui.c b/riscos/gui.c index a5a9c94c2..83add251f 100644 --- a/riscos/gui.c +++ b/riscos/gui.c @@ -99,7 +99,7 @@ #include "riscos/wimp_event.h" #include "riscos/wimputils.h" #include "riscos/window.h" - +#include "riscos/ucstables.h" #ifndef FILETYPE_ACORN_URI @@ -2389,6 +2389,7 @@ int main(int argc, char** argv) .clipboard = riscos_clipboard_table, .download = riscos_download_table, .fetch = &riscos_fetch_table, + .utf8 = riscos_utf8_table, }; /* Consult NetSurf$Logging environment variable to decide if logging diff --git a/riscos/gui/url_bar.c b/riscos/gui/url_bar.c index 681824d89..b898e6f6c 100644 --- a/riscos/gui/url_bar.c +++ b/riscos/gui/url_bar.c @@ -42,6 +42,7 @@ #include "utils/messages.h" #include "utils/utf8.h" #include "utils/utils.h" +#include "riscos/ucstables.h" #define URLBAR_HEIGHT 52 #define URLBAR_FAVICON_SIZE 16 diff --git a/riscos/help.c b/riscos/help.c index 9da52f3e6..3c74e5419 100644 --- a/riscos/help.c +++ b/riscos/help.c @@ -44,6 +44,7 @@ #include "utils/log.h" #include "utils/utf8.h" #include "utils/utils.h" +#include "riscos/ucstables.h" /* Recognised help keys diff --git a/riscos/menus.c b/riscos/menus.c index d8e2f2c16..a0baca087 100644 --- a/riscos/menus.c +++ b/riscos/menus.c @@ -31,6 +31,12 @@ #include "oslib/osgbpb.h" #include "oslib/territory.h" #include "oslib/wimp.h" + +#include "utils/log.h" +#include "utils/messages.h" +#include "utils/url.h" +#include "utils/utils.h" +#include "utils/utf8.h" #include "content/content.h" #include "content/hlcache.h" #include "content/urldb.h" @@ -40,6 +46,7 @@ #include "desktop/local_history.h" #include "desktop/netsurf.h" #include "desktop/textinput.h" + #include "riscos/dialog.h" #include "riscos/configure.h" #include "riscos/cookies.h" @@ -56,11 +63,7 @@ #include "riscos/url_suggest.h" #include "riscos/wimp.h" #include "riscos/wimp_event.h" -#include "utils/log.h" -#include "utils/messages.h" -#include "utils/url.h" -#include "utils/utils.h" -#include "utils/utf8.h" +#include "riscos/ucstables.h" struct menu_definition_entry { menu_action action; /**< menu action */ diff --git a/riscos/query.c b/riscos/query.c index 226849462..2be2e2a3d 100644 --- a/riscos/query.c +++ b/riscos/query.c @@ -29,6 +29,7 @@ #include "utils/messages.h" #include "utils/utf8.h" #include "utils/utils.h" +#include "riscos/ucstables.h" #define ICON_QUERY_MESSAGE 0 #define ICON_QUERY_YES 1 diff --git a/riscos/save.c b/riscos/save.c index d58da1a91..fa638d37d 100644 --- a/riscos/save.c +++ b/riscos/save.c @@ -69,6 +69,7 @@ #include "riscos/thumbnail.h" #include "riscos/wimp.h" #include "riscos/wimp_event.h" +#include "riscos/ucstables.h" //typedef enum //{ diff --git a/riscos/textselection.c b/riscos/textselection.c index 68e71a9f5..5215a62c9 100644 --- a/riscos/textselection.c +++ b/riscos/textselection.c @@ -39,6 +39,7 @@ #include "riscos/mouse.h" #include "riscos/save.h" #include "riscos/textselection.h" +#include "riscos/ucstables.h" #ifndef wimp_DRAG_CLAIM_SUPPRESS_DRAGBOX diff --git a/riscos/ucstables.c b/riscos/ucstables.c index b9f196df0..3b7f8a42b 100644 --- a/riscos/ucstables.c +++ b/riscos/ucstables.c @@ -31,6 +31,7 @@ #include "utils/log.h" #include "utils/utf8.h" #include "utils/utils.h" +#include "desktop/gui.h" /* Common values (ASCII) */ #define common \ @@ -684,3 +685,10 @@ nserror utf8_from_local_encoding(const char *string, size_t len, char **result) return NSERROR_OK; } + +static struct gui_utf8_table utf8_table = { + .utf8_to_local = utf8_to_local_encoding, + .local_to_utf8 = utf8_from_local_encoding, +}; + +struct gui_utf8_table *riscos_utf8_table = &utf8_table; diff --git a/riscos/ucstables.h b/riscos/ucstables.h index 0be065897..e5d838249 100644 --- a/riscos/ucstables.h +++ b/riscos/ucstables.h @@ -21,4 +21,9 @@ * This is only used if nothing claims Service_International,8 */ +struct gui_utf8_table *riscos_utf8_table; + +nserror utf8_to_local_encoding(const char *string, size_t len, char **result); +nserror utf8_from_local_encoding(const char *string, size_t len, char **result); + const int *ucstable_from_alphabet(int alphabet); diff --git a/riscos/wimp.c b/riscos/wimp.c index 2e488918d..f59fa675a 100644 --- a/riscos/wimp.c +++ b/riscos/wimp.c @@ -40,6 +40,7 @@ #include "utils/log.h" #include "utils/utf8.h" #include "utils/utils.h" +#include "riscos/ucstables.h" static void ro_gui_wimp_cache_furniture_sizes(wimp_w w); diff --git a/riscos/window.c b/riscos/window.c index 72230a7fd..0116a9721 100644 --- a/riscos/window.c +++ b/riscos/window.c @@ -90,6 +90,7 @@ #include "riscos/wimp_event.h" #include "riscos/wimputils.h" #include "riscos/window.h" +#include "riscos/ucstables.h" void gui_window_redraw_window(struct gui_window *g); |