diff options
author | James Bursa <james@netsurf-browser.org> | 2005-02-22 23:36:14 +0000 |
---|---|---|
committer | James Bursa <james@netsurf-browser.org> | 2005-02-22 23:36:14 +0000 |
commit | 504e05c4b34c789261b28edeeaa9bb39711ba51d (patch) | |
tree | 818ee27d2d85e1c6fa40f45fdaab087b828f2be0 /riscos/gui.c | |
parent | e9598b10f830ca6b28b44ad418a9081b636dab6c (diff) | |
download | netsurf-504e05c4b34c789261b28edeeaa9bb39711ba51d.tar.gz netsurf-504e05c4b34c789261b28edeeaa9bb39711ba51d.tar.bz2 |
[project @ 2005-02-22 23:36:14 by bursa]
Reimplement font family support, part 1.
svn path=/import/netsurf/; revision=1524
Diffstat (limited to 'riscos/gui.c')
-rw-r--r-- | riscos/gui.c | 54 |
1 files changed, 2 insertions, 52 deletions
diff --git a/riscos/gui.c b/riscos/gui.c index 067921fa5..cee09ef8d 100644 --- a/riscos/gui.c +++ b/riscos/gui.c @@ -149,7 +149,6 @@ struct ro_gui_poll_block { struct ro_gui_poll_block *ro_gui_poll_queued_blocks = 0; static void ro_gui_choose_language(void); -static void ro_gui_check_fonts(void); static void ro_gui_sprites_init(void); static void ro_gui_icon_bar_create(void); static void ro_gui_signal(int sig); @@ -188,7 +187,6 @@ void gui_init(int argc, char** argv) os_error *error; int length; struct theme_descriptor *descriptor = NULL; - rufl_code code; xhourglass_start(1); @@ -253,22 +251,7 @@ void gui_init(int argc, char** argv) die(error->errmess); } -#ifndef ncos - /* We don't need to check the fonts on NCOS */ - ro_gui_check_fonts(); -#endif - - code = rufl_init(); - if (code != rufl_OK) { - if (code == rufl_FONT_MANAGER_ERROR) - LOG(("rufl_init: rufl_FONT_MANAGER_ERROR: 0x%x: %s", - rufl_fm_error->errnum, - rufl_fm_error->errmess)); - else - LOG(("rufl_init: 0x%x", code)); - die("The Unicode font library could not be initialized. " - "Please report this to the developers."); - } + nsfont_init(); /* Issue a *Desktop to poke AcornURI into life */ if (getenv("NetSurf$Start_URI_Handler")) @@ -307,13 +290,13 @@ void gui_init(int argc, char** argv) descriptor = ro_gui_theme_find("Aletheia"); ro_gui_theme_apply(descriptor); - /* We don't create an Iconbar icon on NCOS */ #ifndef ncos ro_gui_icon_bar_create(); #endif ro_gui_check_resolvers(); } + /** * Determine the language to use. * @@ -373,39 +356,6 @@ void ro_gui_choose_language(void) /** - * Check that at least Homerton.Medium is available. - */ - -void ro_gui_check_fonts(void) -{ - char s[252]; - font_f font; - os_error *error; - - error = xfont_find_font("Homerton.Medium\\ELatin1", - 160, 160, 0, 0, &font, 0, 0); - if (error) { - if (error->errnum == error_FILE_NOT_FOUND) { - xwimp_start_task("TaskWindow -wimpslot 200K -quit " - "<NetSurf$Dir>.FixFonts", 0); - die("FontBadInst"); - } else { - snprintf(s, sizeof s, messages_get("FontError"), - error->errmess); - die(s); - } - } - - error = xfont_lose_font(font); - if (error) { - snprintf(s, sizeof s, messages_get("FontError"), - error->errmess); - die(s); - } -} - - -/** * Load resource sprites (pointers and misc icons). */ |