mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-12-17 01:33:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

Set fonts to sensible defaults on OS3

Browse Source 
Try to avoid a crash initialising the picture datatypes handler
This commit is contained in:
Chris Young 2015-01-30 00:05:40 +00:00
parent 8443bf8034
commit 84700f1d9c
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
amiga/dt_picture.c
View File

@ -75,7 +75,7 @@ nserror amiga_dt_picture_init(void)
DTA_GroupID, GID_PICTURE, // we only support images for now DTA_GroupID, GID_PICTURE, // we only support images for now
TAG_DONE)) != NULL) TAG_DONE)) != NULL)
{ {
ReleaseDataType(prevdt); if(prevdt) ReleaseDataType(prevdt);
prevdt = dt; prevdt = dt;
do { do {

21
amiga/gui.c
View File

@ -3,7 +3,6 @@
* *
* This file is part of NetSurf, http://www.netsurf-browser.org/ * 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 * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; version 2 of the License. * 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)); (char *)strdup(temp));
/* font defaults */ /* font defaults */
#ifdef __amigaos4__
nsoption_setnull_charp(font_sans, (char *)strdup("DejaVu Sans")); nsoption_setnull_charp(font_sans, (char *)strdup("DejaVu Sans"));
nsoption_setnull_charp(font_serif, (char *)strdup("DejaVu Serif")); nsoption_setnull_charp(font_serif, (char *)strdup("DejaVu Serif"));
nsoption_setnull_charp(font_mono, (char *)strdup("DejaVu Sans Mono")); nsoption_setnull_charp(font_mono, (char *)strdup("DejaVu Sans Mono"));
nsoption_setnull_charp(font_cursive, (char *)strdup("DejaVu Sans")); nsoption_setnull_charp(font_cursive, (char *)strdup("DejaVu Sans"));
nsoption_setnull_charp(font_fantasy, (char *)strdup("DejaVu Serif")); 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) if (nsoption_charp(font_unicode) == NULL)
{ {
@ -5202,10 +5209,14 @@ Object *ami_gui_splash_open(void)
IA_Left, &left, IA_Left, &left,
TAG_DONE); TAG_DONE);
SetRPAttrs(win->RPort, RPTAG_APenColor, 0xFF3F6DFE, TAG_DONE);
SetDrMd(win->RPort, JAM1); SetDrMd(win->RPort, JAM1);
#ifdef __amigaos4__
SetRPAttrs(win->RPort, RPTAG_APenColor, 0xFF3F6DFE, TAG_DONE);
tattr.ta_Name = "DejaVu Serif Italic.font"; tattr.ta_Name = "DejaVu Serif Italic.font";
#else
SetAPen(win->RPort, 3);
tattr.ta_Name = "CGTriumvirate.font";
#endif
tattr.ta_YSize = 24; tattr.ta_YSize = 24;
tattr.ta_Style = 0; tattr.ta_Style = 0;
tattr.ta_Flags = 0; tattr.ta_Flags = 0;
@ -5226,7 +5237,11 @@ Object *ami_gui_splash_open(void)
if(tfont) ami_font_close_disk_font(tfont); if(tfont) ami_font_close_disk_font(tfont);
#ifdef __amigaos4__
tattr.ta_Name = "DejaVu Sans.font"; tattr.ta_Name = "DejaVu Sans.font";
#else
tattr.ta_Name = "CGTriumvirate.font";
#endif
tattr.ta_YSize = 16; tattr.ta_YSize = 16;
tattr.ta_Style = 0; tattr.ta_Style = 0;
tattr.ta_Flags = 0; tattr.ta_Flags = 0;