mirrors
/
netsurf
mirror of https://github.com/netsurf-browser/netsurf
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixup atari option names

This commit is contained in:
Vincent Sanders 2013-05-28 17:00:55 +01:00
parent a92e5930ff
commit b918f63f3e
4 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
amiga/gui.c
View File

@ -131,7 +131,7 @@
#include <math.h> #include <math.h>
#include <string.h> #include <string.h>
define AMINS_SCROLLERPEN NUMDRIPENS #define AMINS_SCROLLERPEN NUMDRIPENS
#define NSA_KBD_SCROLL_PX 10 #define NSA_KBD_SCROLL_PX 10

2
amiga/gui_options.c
View File

@ -943,7 +943,7 @@ void ami_gui_opts_open(void)
LAYOUT_AddChild, gow->objects[GID_OPTS_DPI_Y] = IntegerObject, LAYOUT_AddChild, gow->objects[GID_OPTS_DPI_Y] = IntegerObject,
GA_ID, GID_OPTS_DPI_Y, GA_ID, GID_OPTS_DPI_Y,
GA_RelVerify, TRUE, GA_RelVerify, TRUE,
INTEGER_Number, nsoption_int(amiga_ydpi), INTEGER_Number, nsoption_int(screen_ydpi),
INTEGER_Minimum, 60, INTEGER_Minimum, 60,
INTEGER_Maximum, 150, INTEGER_Maximum, 150,
INTEGER_Arrows, TRUE, INTEGER_Arrows, TRUE,

20
atari/plot/font_freetype.c
View File

@ -318,7 +318,7 @@ static bool ft_font_init(void)
/* Default font, Sans Serif */ /* Default font, Sans Serif */
font_faces[FONT_FACE_SANS_SERIF] = NULL; font_faces[FONT_FACE_SANS_SERIF] = NULL;
font_faces[FONT_FACE_SANS_SERIF] = ft_new_face( 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_RESOURCE_PATH "ss.ttf",
FONT_PKG_PATH FONT_FILE_SANS FONT_PKG_PATH FONT_FILE_SANS
); );
@ -331,55 +331,55 @@ static bool ft_font_init(void)
/* Sans Serif Bold*/ /* Sans Serif Bold*/
font_faces[FONT_FACE_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_RESOURCE_PATH "ssb.ttf",
FONT_PKG_PATH FONT_FILE_SANS_BOLD); FONT_PKG_PATH FONT_FILE_SANS_BOLD);
/* Sans Serif Italic */ /* Sans Serif Italic */
font_faces[FONT_FACE_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_RESOURCE_PATH "ssi.ttf",
FONT_PKG_PATH FONT_FILE_SANS_OBLIQUE); FONT_PKG_PATH FONT_FILE_SANS_OBLIQUE);
/* Sans Serif Italic Bold */ /* Sans Serif Italic Bold */
font_faces[FONT_FACE_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_RESOURCE_PATH "ssib.ttf",
FONT_PKG_PATH FONT_FILE_SANS_BOLD_OBLIQUE); FONT_PKG_PATH FONT_FILE_SANS_BOLD_OBLIQUE);
/* Monospaced */ /* Monospaced */
font_faces[FONT_FACE_MONOSPACE] = 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_RESOURCE_PATH "mono.ttf",
FONT_PKG_PATH FONT_FILE_MONO); FONT_PKG_PATH FONT_FILE_MONO);
/* Mospaced Bold */ /* Mospaced Bold */
font_faces[FONT_FACE_MONOSPACE_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_RESOURCE_PATH "monob.ttf",
FONT_PKG_PATH FONT_FILE_MONO_BOLD); FONT_PKG_PATH FONT_FILE_MONO_BOLD);
/* Serif */ /* Serif */
font_faces[FONT_FACE_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_RESOURCE_PATH "s.ttf",
FONT_PKG_PATH FONT_FILE_SERIF); FONT_PKG_PATH FONT_FILE_SERIF);
/* Serif Bold */ /* Serif Bold */
font_faces[FONT_FACE_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_RESOURCE_PATH "sb.ttf",
FONT_PKG_PATH FONT_FILE_SERIF_BOLD); FONT_PKG_PATH FONT_FILE_SERIF_BOLD);
/* Cursive */ /* Cursive */
font_faces[FONT_FACE_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_RESOURCE_PATH "cursive.ttf",
FONT_PKG_PATH FONT_FILE_OBLIQUE); FONT_PKG_PATH FONT_FILE_OBLIQUE);
/* Fantasy */ /* Fantasy */
font_faces[FONT_FACE_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_RESOURCE_PATH "fantasy.ttf",
FONT_PKG_PATH FONT_FILE_FANTASY); FONT_PKG_PATH FONT_FILE_FANTASY);

2
cocoa/NetsurfApp.m
View File

@ -208,8 +208,6 @@ int main( int argc, char **argv )
die("NetSurf failed to initialise"); die("NetSurf failed to initialise");
} }
netsurf_init(&argc, &argv, options, messages);
/* Initialise filename allocator */ /* Initialise filename allocator */
filename_initialise(); filename_initialise();