From: Steinar H. Gunderson Date: Sat, 19 Feb 2005 15:03:00 +0000 (+0000) Subject: Moved the font stuff into its own file. X-Git-Url: https://git.sesse.net/?p=ccbs;a=commitdiff_plain;h=eb548f080c1bfba8b4e5c23a8d5d1a8da229a78c Moved the font stuff into its own file. --- diff --git a/bigscreen/Makefile b/bigscreen/Makefile index 00a8e92..55ba613 100644 --- a/bigscreen/Makefile +++ b/bigscreen/Makefile @@ -4,7 +4,7 @@ CPPFLAGS=-I/usr/include/postgresql $(shell freetype-config --cflags) -Itinyptc/ CXXFLAGS=-g -Wall LDFLAGS=-L/usr/X11R6/lib LIBS=$(shell freetype-config --libs) $(shell libpq3-config) -lpqxx tinyptc/libtinyptc.a -lX11 -CCBS_BIGSCREEN_OBJS=ccbs_bigscreen.o flagtrigger.o widestring.o fetch_current_tournament.o +CCBS_BIGSCREEN_OBJS=ccbs_bigscreen.o flagtrigger.o widestring.o fetch_current_tournament.o fonts.o all: ccbs-bigscreen diff --git a/bigscreen/ccbs_bigscreen.cpp b/bigscreen/ccbs_bigscreen.cpp index 745faa5..c233f47 100644 --- a/bigscreen/ccbs_bigscreen.cpp +++ b/bigscreen/ccbs_bigscreen.cpp @@ -3,17 +3,14 @@ #include #include #include -#include -#include FT_FREETYPE_H #include #include "flagtrigger.h" #include "widestring.h" #include "fetch_current_tournament.h" - -int my_draw_text(const widestring &str, unsigned char *buf, int xpos, int ypos, bool real_render, int r, int g, int b, std::vector &fontlist); +#include "fonts.h" Tournament active_tournament; -std::vector fonts; +unsigned char framebuf[800 * 600 * 4]; void init(pqxx::connection &conn) { @@ -27,8 +24,6 @@ void init(pqxx::connection &conn) } } -unsigned char framebuf[800 * 600 * 4]; - void main_loop(pqxx::connection &conn) { if (active_tournament.id == -1) { @@ -45,7 +40,7 @@ void main_loop(pqxx::connection &conn) pqxx::result res( t.exec("SELECT * FROM songs WHERE title LIKE 'M%'") ); unsigned y = 0; for (pqxx::result::const_iterator i = res.begin(); i != res.end(); ++i) { - my_draw_text(i["title"].as(widestring()), framebuf, 0, y, 1, 255, 255, 255, fonts); + my_draw_text(i["title"].as(widestring()), framebuf, 0, y, 1, 255, 255, 255); y += 20; // std::fprintf(stderr, "%s\n", i["title"].c_str()); } @@ -55,91 +50,6 @@ void main_loop(pqxx::connection &conn) sleep(1); } -void init_freetype() -{ - FT_Library library; - FT_Face face; - if (FT_Init_FreeType(&library)) - throw std::runtime_error("FreeType init failed."); - - // Georgia - if (FT_New_Face(library, "/usr/share/fonts/truetype/msttcorefonts/Georgia.ttf", 0, &face)) - throw std::runtime_error("Face opening failed."); - if (FT_Set_Char_Size(face, 0, 12 * 64, 96, 96)) - throw std::runtime_error("Size set failed."); - fonts.push_back(face); - - // FreeSerif - if (FT_New_Face(library, "/usr/share/fonts/truetype/freefont/FreeSerif.ttf", 0, &face)) { - std::fprintf(stderr, "Warning: Couldn't open FreeSerif, some glyphs might not be available\n"); - } else { - if (FT_Set_Char_Size(face, 0, 12 * 64, 96, 96)) - throw std::runtime_error("Size set failed."); - fonts.push_back(face); - } - - // Arial Unicode MS - if (FT_New_Face(library, "arialuni.ttf", 0, &face)) { - std::fprintf(stderr, "Warning: Couldn't open Arial Unicode MS, some glyphs might not be available\n"); - } else { - if (FT_Set_Char_Size(face, 0, 12 * 64, 96, 96)) - throw std::runtime_error("Size set failed."); - fonts.push_back(face); - } -} - -int my_draw_text(const widestring &str, unsigned char *buf, int xpos, int ypos, bool real_render, int r, int g, int b, std::vector &fontlist) -{ - FT_GlyphSlot slot; - int x = 0; - - for (widestring::const_iterator i = str.begin(); i != str.end(); ++i) { - int glyph_index; - for (std::vector::const_iterator j = fontlist.begin(); j != fontlist.end(); ++j) { - glyph_index = FT_Get_Char_Index(*j, *i); - if (glyph_index == 0) - continue; - - if (FT_Load_Glyph(*j, glyph_index, FT_LOAD_RENDER)) - throw std::runtime_error("Couldn't load glyph"); - slot = (*j)->glyph; - break; - } - if (glyph_index == 0) { - std::fprintf(stderr, "Warning: Could not find a glyph in any font for U+%x, ignoring\n", *i); - continue; - } - - if (real_render) { - int y; - FT_Bitmap *bm = &(slot->bitmap); - for (y = 0; y < bm->rows; y++) { - int xx; - int dsty = ypos - slot->bitmap_top + y; - if (dsty < 0 || dsty > 599) continue; - - unsigned char *dst = buf + dsty * 800*4 + (x + xpos + slot->bitmap_left)*4; - unsigned char *src = bm->buffer + y * bm->width; - for (xx = 0; xx < bm->width; xx++) { - *dst = (*dst * (256-*src) + r * *src) >> 8; - *dst++; - *dst = (*dst * (256-*src) + g * *src) >> 8; - *dst++; - *dst = (*dst * (256-*src) + b * *src) >> 8; - *dst++; - *dst++ = 0; - src++; - } - } - } - - x += slot->advance.x >> 6; - } - - return x; -} - - int main(int argc, char **argv) { ptc_open("CCBS bigscreen", 800, 600); diff --git a/bigscreen/fonts.cpp b/bigscreen/fonts.cpp new file mode 100644 index 0000000..b7a4cbd --- /dev/null +++ b/bigscreen/fonts.cpp @@ -0,0 +1,89 @@ +#include +#include +#include "fonts.h" + +std::vector fonts; + +void init_freetype() +{ + FT_Library library; + FT_Face face; + if (FT_Init_FreeType(&library)) + throw std::runtime_error("FreeType init failed."); + + // Georgia + if (FT_New_Face(library, "/usr/share/fonts/truetype/msttcorefonts/Georgia.ttf", 0, &face)) + throw std::runtime_error("Face opening failed."); + if (FT_Set_Char_Size(face, 0, 12 * 64, 96, 96)) + throw std::runtime_error("Size set failed."); + fonts.push_back(face); + + // FreeSerif + if (FT_New_Face(library, "/usr/share/fonts/truetype/freefont/FreeSerif.ttf", 0, &face)) { + std::fprintf(stderr, "Warning: Couldn't open FreeSerif, some glyphs might not be available\n"); + } else { + if (FT_Set_Char_Size(face, 0, 12 * 64, 96, 96)) + throw std::runtime_error("Size set failed."); + fonts.push_back(face); + } + + // Arial Unicode MS + if (FT_New_Face(library, "arialuni.ttf", 0, &face)) { + std::fprintf(stderr, "Warning: Couldn't open Arial Unicode MS, some glyphs might not be available\n"); + } else { + if (FT_Set_Char_Size(face, 0, 12 * 64, 96, 96)) + throw std::runtime_error("Size set failed."); + fonts.push_back(face); + } +} + +int my_draw_text(const widestring &str, unsigned char *buf, int xpos, int ypos, bool real_render, int r, int g, int b) +{ + FT_GlyphSlot slot; + int x = 0; + + for (widestring::const_iterator i = str.begin(); i != str.end(); ++i) { + int glyph_index; + for (std::vector::const_iterator j = fonts.begin(); j != fonts.end(); ++j) { + glyph_index = FT_Get_Char_Index(*j, *i); + if (glyph_index == 0) + continue; + + if (FT_Load_Glyph(*j, glyph_index, FT_LOAD_RENDER)) + throw std::runtime_error("Couldn't load glyph"); + slot = (*j)->glyph; + break; + } + if (glyph_index == 0) { + std::fprintf(stderr, "Warning: Could not find a glyph in any font for U+%x, ignoring\n", *i); + continue; + } + + if (real_render) { + int y; + FT_Bitmap *bm = &(slot->bitmap); + for (y = 0; y < bm->rows; y++) { + int xx; + int dsty = ypos - slot->bitmap_top + y; + if (dsty < 0 || dsty > 599) continue; + + unsigned char *dst = buf + dsty * 800*4 + (x + xpos + slot->bitmap_left)*4; + unsigned char *src = bm->buffer + y * bm->width; + for (xx = 0; xx < bm->width; xx++) { + *dst = (*dst * (256-*src) + r * *src) >> 8; + *dst++; + *dst = (*dst * (256-*src) + g * *src) >> 8; + *dst++; + *dst = (*dst * (256-*src) + b * *src) >> 8; + *dst++; + *dst++ = 0; + src++; + } + } + } + + x += slot->advance.x >> 6; + } + + return x; +} diff --git a/bigscreen/fonts.h b/bigscreen/fonts.h new file mode 100644 index 0000000..533e4ff --- /dev/null +++ b/bigscreen/fonts.h @@ -0,0 +1,12 @@ +#ifndef _FONTS_H +#define _FONTS_H 1 + +#include +#include FT_FREETYPE_H +#include +#include "widestring.h" + +void init_freetype(); +int my_draw_text(const widestring &str, unsigned char *buf, int xpos, int ypos, bool real_render, int r, int g, int b); + +#endif /* !defined(_FONTS_H) */