diff options
author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2016-01-16 00:00:57 +0000 |
---|---|---|
committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2016-01-16 00:00:57 +0000 |
commit | 46f181b3488ddc1b8d11f2bf89327bb49ad4955c (patch) | |
tree | 85ea9f7ced7c954b2d085f2ae6e352d35d05692f /amiga/font.c | |
parent | 673f3e6887586c31e3f2507c6fd021c1e2c07209 (diff) | |
download | netsurf-46f181b3488ddc1b8d11f2bf89327bb49ad4955c.tar.gz netsurf-46f181b3488ddc1b8d11f2bf89327bb49ad4955c.tar.bz2 |
More font-related tidy-up
Diffstat (limited to 'amiga/font.c')
-rw-r--r-- | amiga/font.c | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/amiga/font.c b/amiga/font.c index 57017582f..ac5fd129f 100644 --- a/amiga/font.c +++ b/amiga/font.c @@ -18,31 +18,19 @@ #include "amiga/os3support.h" -#include <assert.h> - -#ifndef __amigaos4__ -#include <proto/bullet.h> -#endif #include <proto/diskfont.h> #include <proto/exec.h> - -#include <graphics/rpattr.h> - -#ifdef __amigaos4__ -#include <graphics/blitattr.h> -#endif +#include <proto/graphics.h> #include "utils/log.h" -#include "utils/utils.h" #include "utils/nsoption.h" #include "desktop/browser.h" #include "desktop/font.h" -#include "desktop/gui_window.h" #include "amiga/font.h" +#include "amiga/font_bullet.h" +#include "amiga/font_diskfont.h" #include "amiga/font_scan.h" -#include "amiga/gui.h" -#include "amiga/utf8.h" void ami_font_setdevicedpi(int id) { @@ -51,7 +39,7 @@ void ami_font_setdevicedpi(int id) ULONG ydpi = nsoption_int(screen_ydpi); ULONG xdpi = nsoption_int(screen_ydpi); - if(nsoption_bool(use_diskfont) == true) { + if(nsoption_bool(bitmap_fonts) == true) { LOG("WARNING: Using diskfont.library for text. Forcing DPI to 72."); nsoption_int(screen_ydpi) = 72; } @@ -103,7 +91,7 @@ void ami_font_close_disk_font(struct TextFont *tfont) /* Font initialisation */ void ami_font_init(void) { - if(nsoption_bool(use_diskfont) == false) { + if(nsoption_bool(bitmap_fonts) == false) { ami_font_bullet_init(); } else { ami_font_diskfont_init(); @@ -112,7 +100,7 @@ void ami_font_init(void) void ami_font_fini(void) { - if(nsoption_bool(use_diskfont) == false) { + if(nsoption_bool(bitmap_fonts) == false) { ami_font_bullet_fini(); } } |