From b918f63f3ee64ff9f5a60afcdb6be14656969e8d Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Tue, 28 May 2013 17:00:55 +0100 Subject: fixup atari option names --- amiga/gui.c | 2 +- amiga/gui_options.c | 2 +- atari/plot/font_freetype.c | 20 ++++++++++---------- cocoa/NetsurfApp.m | 2 -- 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/amiga/gui.c b/amiga/gui.c index 4ce629b73..de6b64e9f 100644 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -131,7 +131,7 @@ #include #include -define AMINS_SCROLLERPEN NUMDRIPENS +#define AMINS_SCROLLERPEN NUMDRIPENS #define NSA_KBD_SCROLL_PX 10 diff --git a/amiga/gui_options.c b/amiga/gui_options.c index 16d6fc1f5..1c06e34a3 100755 --- a/amiga/gui_options.c +++ b/amiga/gui_options.c @@ -943,7 +943,7 @@ void ami_gui_opts_open(void) LAYOUT_AddChild, gow->objects[GID_OPTS_DPI_Y] = IntegerObject, GA_ID, GID_OPTS_DPI_Y, GA_RelVerify, TRUE, - INTEGER_Number, nsoption_int(amiga_ydpi), + INTEGER_Number, nsoption_int(screen_ydpi), INTEGER_Minimum, 60, INTEGER_Maximum, 150, INTEGER_Arrows, TRUE, diff --git a/atari/plot/font_freetype.c b/atari/plot/font_freetype.c index 8b3980d6d..49e46c857 100755 --- a/atari/plot/font_freetype.c +++ b/atari/plot/font_freetype.c @@ -318,7 +318,7 @@ static bool ft_font_init(void) /* Default font, Sans Serif */ font_faces[FONT_FACE_SANS_SERIF] = NULL; font_faces[FONT_FACE_SANS_SERIF] = ft_new_face( - nsoption_charp(atari_face_sans_serif), + nsoption_charp(font_face_sans_serif), FONT_RESOURCE_PATH "ss.ttf", FONT_PKG_PATH FONT_FILE_SANS ); @@ -331,55 +331,55 @@ static bool ft_font_init(void) /* Sans Serif Bold*/ font_faces[FONT_FACE_SANS_SERIF_BOLD] = - ft_new_face(nsoption_charp(atari_face_sans_serif_bold), + ft_new_face(nsoption_charp(font_face_sans_serif_bold), FONT_RESOURCE_PATH "ssb.ttf", FONT_PKG_PATH FONT_FILE_SANS_BOLD); /* Sans Serif Italic */ font_faces[FONT_FACE_SANS_SERIF_ITALIC] = - ft_new_face(nsoption_charp(atari_face_sans_serif_italic), + ft_new_face(nsoption_charp(font_face_sans_serif_italic), FONT_RESOURCE_PATH "ssi.ttf", FONT_PKG_PATH FONT_FILE_SANS_OBLIQUE); /* Sans Serif Italic Bold */ font_faces[FONT_FACE_SANS_SERIF_ITALIC_BOLD] = - ft_new_face(nsoption_charp(atari_face_sans_serif_italic_bold), + ft_new_face(nsoption_charp(font_face_sans_serif_italic_bold), FONT_RESOURCE_PATH "ssib.ttf", FONT_PKG_PATH FONT_FILE_SANS_BOLD_OBLIQUE); /* Monospaced */ font_faces[FONT_FACE_MONOSPACE] = - ft_new_face(nsoption_charp(atari_face_monospace), + ft_new_face(nsoption_charp(font_face_monospace), FONT_RESOURCE_PATH "mono.ttf", FONT_PKG_PATH FONT_FILE_MONO); /* Mospaced Bold */ font_faces[FONT_FACE_MONOSPACE_BOLD] = - ft_new_face(nsoption_charp(atari_face_monospace_bold), + ft_new_face(nsoption_charp(font_face_monospace_bold), FONT_RESOURCE_PATH "monob.ttf", FONT_PKG_PATH FONT_FILE_MONO_BOLD); /* Serif */ font_faces[FONT_FACE_SERIF] = - ft_new_face(nsoption_charp(atari_face_serif), + ft_new_face(nsoption_charp(font_face_serif), FONT_RESOURCE_PATH "s.ttf", FONT_PKG_PATH FONT_FILE_SERIF); /* Serif Bold */ font_faces[FONT_FACE_SERIF_BOLD] = - ft_new_face(nsoption_charp(atari_face_serif_bold), + ft_new_face(nsoption_charp(font_face_serif_bold), FONT_RESOURCE_PATH "sb.ttf", FONT_PKG_PATH FONT_FILE_SERIF_BOLD); /* Cursive */ font_faces[FONT_FACE_CURSIVE] = - ft_new_face(nsoption_charp(atari_face_cursive), + ft_new_face(nsoption_charp(font_face_cursive), FONT_RESOURCE_PATH "cursive.ttf", FONT_PKG_PATH FONT_FILE_OBLIQUE); /* Fantasy */ font_faces[FONT_FACE_FANTASY] = - ft_new_face(nsoption_charp(atari_face_fantasy), + ft_new_face(nsoption_charp(font_face_fantasy), FONT_RESOURCE_PATH "fantasy.ttf", FONT_PKG_PATH FONT_FILE_FANTASY); diff --git a/cocoa/NetsurfApp.m b/cocoa/NetsurfApp.m index 073b1687e..333cbe272 100644 --- a/cocoa/NetsurfApp.m +++ b/cocoa/NetsurfApp.m @@ -208,8 +208,6 @@ int main( int argc, char **argv ) die("NetSurf failed to initialise"); } - netsurf_init(&argc, &argv, options, messages); - /* Initialise filename allocator */ filename_initialise(); -- cgit v1.2.3