}
// this should really be done somehow else :-)
-static unsigned screen_width = SCREEN_WIDTH, screen_height = SCREEN_HEIGHT;
+static unsigned screen_width, screen_height;
void set_screen_size(unsigned width, unsigned height)
{
screen_width = width;
int r = atoi(get_theme_config(theme_element, "red").c_str());
int g = atoi(get_theme_config(theme_element, "green").c_str());
int b = atoi(get_theme_config(theme_element, "blue").c_str());
+ bool use_lcd = atoi(get_theme_config("screen", "lcd").c_str());
// Find font faces.
std::vector<FT_Face> fonts;
if (glyph_index == 0)
continue;
-#if SCREEN_LCD
- if (FT_Load_Glyph(*j, glyph_index, FT_LOAD_RENDER | FT_LOAD_TARGET_LCD))
-#else
- if (FT_Load_Glyph(*j, glyph_index, FT_LOAD_RENDER))
-#endif
- throw std::runtime_error("Couldn't load glyph");
+ if (use_lcd) {
+ if (FT_Load_Glyph(*j, glyph_index, FT_LOAD_RENDER | FT_LOAD_TARGET_LCD))
+ throw std::runtime_error("Couldn't load glyph");
+ } else {
+ if (FT_Load_Glyph(*j, glyph_index, FT_LOAD_RENDER))
+ throw std::runtime_error("Couldn't load glyph");
+ }
slot = (*j)->glyph;
break;
}
if (dsty < 0 || dsty > signed(screen_height-1)) continue;
unsigned char *dst = buf + dsty * screen_width*4 + (x + xpos + slot->bitmap_left)*4;
-#if SCREEN_LCD
- unsigned char *src = bm->buffer + y * bm->pitch;
- int width = (x + xpos + slot->bitmap_left + bm->width/3 >= signed(screen_width)) ? ((screen_width-1) - x - xpos - slot->bitmap_left) : bm->width/3;
-#else
unsigned char *src = bm->buffer + y * bm->pitch;
- int width = (x + xpos + slot->bitmap_left + bm->width >= signed(screen_width)) ? ((screen_width-1) - x - xpos - slot->bitmap_left) : bm->width;
-#endif
-
-#if SCREEN_LCD
- for (xx = 0; xx < width; xx++) {
- *dst = (*dst * (256-src[2]) + b * src[2]) >> 8;
- ++dst;
- *dst = (*dst * (256-src[1]) + g * src[1]) >> 8;
- ++dst;
- *dst = (*dst * (256-src[0]) + r * src[0]) >> 8;
- ++dst;
- *dst++ = 0;
-
- src += 3;
- }
-#else
- for (xx = 0; xx < width; xx++) {
- *dst = (*dst * (256-*src) + b * *src) >> 8;
- ++dst;
- *dst = (*dst * (256-*src) + g * *src) >> 8;
- ++dst;
- *dst = (*dst * (256-*src) + r * *src) >> 8;
- ++dst;
- *dst++ = 0;
- ++src;
+ if (use_lcd) {
+ int width = (x + xpos + slot->bitmap_left + bm->width/3 >= signed(screen_width)) ? ((screen_width-1) - x - xpos - slot->bitmap_left) : bm->width/3;
+ for (xx = 0; xx < width; xx++) {
+ *dst = (*dst * (256-src[2]) + b * src[2]) >> 8;
+ ++dst;
+ *dst = (*dst * (256-src[1]) + g * src[1]) >> 8;
+ ++dst;
+ *dst = (*dst * (256-src[0]) + r * src[0]) >> 8;
+ ++dst;
+ *dst++ = 0;
+
+ src += 3;
+ }
+ } else {
+ int width = (x + xpos + slot->bitmap_left + bm->width >= signed(screen_width)) ? ((screen_width-1) - x - xpos - slot->bitmap_left) : bm->width;
+ for (xx = 0; xx < width; xx++) {
+ *dst = (*dst * (256-*src) + b * *src) >> 8;
+ ++dst;
+ *dst = (*dst * (256-*src) + g * *src) >> 8;
+ ++dst;
+ *dst = (*dst * (256-*src) + r * *src) >> 8;
+ ++dst;
+ *dst++ = 0;
+ ++src;
+ }
}
-#endif
}
}