mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-31 09:21:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

fontrenderer: scale fonts for nonstandard FB resolutions

Browse Source
This commit is contained in:
Stefan Seyfried
2012-02-12 21:55:08 +01:00
parent 3eb307d296
commit 7e6a49e8b8
2 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/driver/fontrenderer.cpp
View File

@@ -37,6 +37,9 @@
#include <system/debug.h> #include <system/debug.h>
#include <global.h> #include <global.h>
/* the multiplier for the SPARK scale feature */
#define SCALE_MULT 2048
/* Drawing pixels is actually faster without the GXA accelerator (wich OTOH is /* Drawing pixels is actually faster without the GXA accelerator (wich OTOH is
faster for drawing lines, so disable it here. */ faster for drawing lines, so disable it here. */
#undef USE_NEVIS_GXA #undef USE_NEVIS_GXA
@@ -241,6 +244,9 @@ Font::Font(FBFontRenderClass *render, FTC_FaceID faceid, const int isize, const
scaler.x_res = render->xres; scaler.x_res = render->xres;
scaler.y_res = render->yres; scaler.y_res = render->yres;
xmult = frameBuffer->scaleX(SCALE_MULT, false);
ymult = frameBuffer->scaleY(SCALE_MULT, false);
setSize(isize); setSize(isize);
} }
@@ -252,9 +258,10 @@ FT_Error Font::getGlyphBitmap(FT_ULong glyph_index, FTC_SBit *sbit)
int Font::setSize(int isize) int Font::setSize(int isize)
{ {
int temp = font.width; int temp = font.width;
font.width = font.height = isize; font.width = isize * xmult / SCALE_MULT;
scaler.width = isize * 64; font.height = isize * ymult / SCALE_MULT;
scaler.height = isize * 64; scaler.width = font.width * 64;
scaler.height = font.height * 64;
FT_Error err = FTC_Manager_LookupSize(renderer->cacheManager, &scaler, &size); FT_Error err = FTC_Manager_LookupSize(renderer->cacheManager, &scaler, &size);
if (err != 0) if (err != 0)
@@ -304,12 +311,12 @@ return 0;
int Font::getWidth(void) int Font::getWidth(void)
{ {
return fontwidth; return fontwidth * SCALE_MULT / xmult;
} }
int Font::getHeight(void) int Font::getHeight(void)
{ {
return height; return height * SCALE_MULT / ymult;
} }
int Font::getDigitHeight(void) int Font::getDigitHeight(void)
@@ -367,11 +374,17 @@ int UTF8ToUnicode(const char * &text, const bool utf8_encoded) // returns -1 on
return unicode_value; return unicode_value;
} }
void Font::RenderString(int x, int y, const int width, const char *text, const unsigned char color, const int boxheight, const bool utf8_encoded) void Font::RenderString(int _x, int _y, const int _width, const char *text, const unsigned char color, const int _boxheight, const bool utf8_encoded)
{ {
if (!frameBuffer->getActive()) if (!frameBuffer->getActive())
return; return;
int x = _x * xmult / SCALE_MULT;
int y = _y * ymult / SCALE_MULT;
int boxheight = _boxheight * ymult / SCALE_MULT;
int width = _width * xmult / SCALE_MULT;
int step_y = height * ymult / SCALE_MULT;
pthread_mutex_lock( &renderer->render_mutex ); pthread_mutex_lock( &renderer->render_mutex );
FT_Error err = FTC_Manager_LookupSize(renderer->cacheManager, &scaler, &size); FT_Error err = FTC_Manager_LookupSize(renderer->cacheManager, &scaler, &size);
@@ -386,7 +399,6 @@ void Font::RenderString(int x, int y, const int width, const char *text, const u
int use_kerning=FT_HAS_KERNING(face); int use_kerning=FT_HAS_KERNING(face);
int left=x; int left=x;
int step_y=height;
// ----------------------------------- box upper end (this is NOT a font metric, this is our method for y centering) // ----------------------------------- box upper end (this is NOT a font metric, this is our method for y centering)
// //
@@ -682,7 +694,7 @@ int Font::getRenderWidth(const char *text, const bool utf8_encoded)
pthread_mutex_unlock( &renderer->render_mutex ); pthread_mutex_unlock( &renderer->render_mutex );
return x; return x * SCALE_MULT / xmult;
} }
int Font::getRenderWidth(const std::string & text, const bool utf8_encoded) int Font::getRenderWidth(const std::string & text, const bool utf8_encoded)

1
src/driver/fontrenderer.h
View File

@@ -53,6 +53,7 @@ class Font
// these are HACKED values, because the font metrics were unusable. // these are HACKED values, because the font metrics were unusable.
int height,DigitHeight,DigitOffset,ascender,descender,upper,lower; int height,DigitHeight,DigitOffset,ascender,descender,upper,lower;
int fontwidth; int fontwidth;
int xmult, ymult;
public: public:
enum fontmodifier enum fontmodifier