summaryrefslogtreecommitdiff
path: root/amiga/gui.c
diff options
context:
space:
mode:
authorChris Young <chris@unsatisfactorysoftware.co.uk>2015-01-30 00:05:40 +0000
committerChris Young <chris@unsatisfactorysoftware.co.uk>2015-01-30 00:05:40 +0000
commit84700f1d9cd92a1525809552f205b50428ba185f (patch)
treef638ac38bd429e195edf01ba843e83c369e309bb /amiga/gui.c
parent8443bf80348fa460483a646441b0c0a47b321aa6 (diff)
downloadnetsurf-84700f1d9cd92a1525809552f205b50428ba185f.tar.gz
netsurf-84700f1d9cd92a1525809552f205b50428ba185f.tar.bz2
Set fonts to sensible defaults on OS3
Try to avoid a crash initialising the picture datatypes handler
Diffstat (limited to 'amiga/gui.c')
-rw-r--r--amiga/gui.c21
1 files changed, 18 insertions, 3 deletions
diff --git a/amiga/gui.c b/amiga/gui.c
index 0ce952cca..3be928542 100644
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -3,7 +3,6 @@
*
* This file is part of NetSurf, http://www.netsurf-browser.org/
*
- * NetSurf is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; version 2 of the License.
*
@@ -588,11 +587,19 @@ static nserror ami_set_options(struct nsoption_s *defaults)
(char *)strdup(temp));
/* font defaults */
+#ifdef __amigaos4__
nsoption_setnull_charp(font_sans, (char *)strdup("DejaVu Sans"));
nsoption_setnull_charp(font_serif, (char *)strdup("DejaVu Serif"));
nsoption_setnull_charp(font_mono, (char *)strdup("DejaVu Sans Mono"));
nsoption_setnull_charp(font_cursive, (char *)strdup("DejaVu Sans"));
nsoption_setnull_charp(font_fantasy, (char *)strdup("DejaVu Serif"));
+#else
+ nsoption_setnull_charp(font_sans, (char *)strdup("CGTriumvirate"));
+ nsoption_setnull_charp(font_serif, (char *)strdup("CGTimes"));
+ nsoption_setnull_charp(font_mono, (char *)strdup("LetterGothic"));
+ nsoption_setnull_charp(font_cursive, (char *)strdup("CGTriumvirate"));
+ nsoption_setnull_charp(font_fantasy, (char *)strdup("CGTimes"));
+#endif
if (nsoption_charp(font_unicode) == NULL)
{
@@ -5202,10 +5209,14 @@ Object *ami_gui_splash_open(void)
IA_Left, &left,
TAG_DONE);
- SetRPAttrs(win->RPort, RPTAG_APenColor, 0xFF3F6DFE, TAG_DONE);
SetDrMd(win->RPort, JAM1);
-
+#ifdef __amigaos4__
+ SetRPAttrs(win->RPort, RPTAG_APenColor, 0xFF3F6DFE, TAG_DONE);
tattr.ta_Name = "DejaVu Serif Italic.font";
+#else
+ SetAPen(win->RPort, 3);
+ tattr.ta_Name = "CGTriumvirate.font";
+#endif
tattr.ta_YSize = 24;
tattr.ta_Style = 0;
tattr.ta_Flags = 0;
@@ -5226,7 +5237,11 @@ Object *ami_gui_splash_open(void)
if(tfont) ami_font_close_disk_font(tfont);
+#ifdef __amigaos4__
tattr.ta_Name = "DejaVu Sans.font";
+#else
+ tattr.ta_Name = "CGTriumvirate.font";
+#endif
tattr.ta_YSize = 16;
tattr.ta_Style = 0;
tattr.ta_Flags = 0;