mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-12-23 20:46:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

Aspect-corrected font DPI. Needs testing on a mode with non-square pixels and on a

Browse Source 
widescreen monitor.

svn path=/trunk/netsurf/; revision=12230
This commit is contained in:
Chris Young 2011-04-22 16:48:29 +00:00
parent 83914b9c3e
commit 1bc9a86109
1 changed files with 40 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
amiga/font.c
View File

@ -17,26 +17,31 @@
*/ */
#include <assert.h> #include <assert.h>
#include "css/css.h"
#include "render/font.h"
#include "amiga/gui.h"
#include <proto/graphics.h>
#include <proto/diskfont.h>
#include <graphics/rpattr.h>
#include "amiga/font.h" #include "amiga/font.h"
#include "desktop/options.h" #include "amiga/gui.h"
#include "amiga/utf8.h" #include "amiga/utf8.h"
#include "amiga/options.h"
#include "css/css.h"
#include "css/utils.h"
#include "render/font.h"
#include "utils/log.h"
#include "utils/utf8.h" #include "utils/utf8.h"
#include "utils/utils.h"
#include <proto/diskfont.h>
#include <proto/exec.h>
#include <proto/graphics.h>
#include <proto/Picasso96API.h>
#include <proto/utility.h>
#include <diskfont/diskfonttag.h> #include <diskfont/diskfonttag.h>
#include <diskfont/oterrors.h> #include <diskfont/oterrors.h>
#include <proto/Picasso96API.h> #include <graphics/rpattr.h>
#include <proto/exec.h>
#ifdef __amigaos4__ #ifdef __amigaos4__
#include <graphics/blitattr.h> #include <graphics/blitattr.h>
#endif #endif
#include "amiga/options.h"
#include <proto/utility.h>
#include "utils/utils.h"
#define NSA_UNICODE_FONT PLOT_FONT_FAMILY_COUNT #define NSA_UNICODE_FONT PLOT_FONT_FAMILY_COUNT
@ -613,9 +618,29 @@ void ami_close_fonts(void)
} }
} }
ULONG ami_font_setdevicedpi(int dpi) void ami_font_setdevicedpi(int id)
{ {
ami_devicedpi = (dpi<<16) | dpi; DisplayInfoHandle dih;
struct DisplayInfo dinfo;
Point dinfo_res;
ULONG ydpi = FIXTOINT(nscss_screen_dpi);
ULONG xdpi = ydpi;
return ami_devicedpi; if(id)
{
if(dih = FindDisplayInfo(id))
{
if(GetDisplayInfoData(dih, &dinfo, sizeof(struct DisplayInfo),
DTAG_DISP, 0))
{
dinfo_res = dinfo.Resolution;
xdpi = (dinfo_res.y / dinfo_res.x) * ydpi;
LOG(("XDPI = %ld, YDPI = %ld (DisplayInfo resolution %ld x %ld)",
xdpi, ydpi, dinfo_res.x , dinfo_res.y));
}
}
}
ami_devicedpi = (xdpi << 16) | ydpi;
} }