summaryrefslogtreecommitdiff
path: root/amiga/font.c
diff options
context:
space:
mode:
authorChris Young <chris@unsatisfactorysoftware.co.uk>2016-01-20 23:32:34 +0000
committerChris Young <chris@unsatisfactorysoftware.co.uk>2016-01-20 23:32:34 +0000
commit239f999936663c9832bc7569133e694c1ce72741 (patch)
tree87dba34352fd8a6f8924ea3bfddd67999c3e44c3 /amiga/font.c
parent1724e2835028daf90de80b151ab8fd4c3064fd02 (diff)
parent750677795ba1ca41627edd68a4de24e0d6c07a20 (diff)
downloadnetsurf-239f999936663c9832bc7569133e694c1ce72741.tar.gz
netsurf-239f999936663c9832bc7569133e694c1ce72741.tar.bz2
Merge branch 'master' of git://git.netsurf-browser.org/netsurf
Diffstat (limited to 'amiga/font.c')
-rw-r--r--amiga/font.c19
1 files changed, 16 insertions, 3 deletions
diff --git a/amiga/font.c b/amiga/font.c
index ac5fd129f..39cb38602 100644
--- a/amiga/font.c
+++ b/amiga/font.c
@@ -32,18 +32,31 @@
#include "amiga/font_diskfont.h"
#include "amiga/font_scan.h"
+static ULONG ami_devicedpi = 72;
+static ULONG ami_xdpi = 72;
+
+ULONG ami_font_dpi_get_devicedpi(void)
+{
+ return ami_devicedpi;
+}
+
+ULONG ami_font_dpi_get_xdpi(void)
+{
+ return ami_xdpi;
+}
+
void ami_font_setdevicedpi(int id)
{
DisplayInfoHandle dih;
struct DisplayInfo dinfo;
- ULONG ydpi = nsoption_int(screen_ydpi);
- ULONG xdpi = nsoption_int(screen_ydpi);
if(nsoption_bool(bitmap_fonts) == true) {
LOG("WARNING: Using diskfont.library for text. Forcing DPI to 72.");
- nsoption_int(screen_ydpi) = 72;
+ nsoption_set_int(screen_ydpi, 72);
}
+ ULONG ydpi = nsoption_int(screen_ydpi);
+ ULONG xdpi = nsoption_int(screen_ydpi);
browser_set_dpi(nsoption_int(screen_ydpi));
if(id && (nsoption_int(monitor_aspect_x) != 0) && (nsoption_int(monitor_aspect_y) != 0))