Shape text using Pango and HarfBuzz; gives us nice ligatures and exotic scripts.

diff --git a/bigscreen/Makefile b/bigscreen/Makefile
index c25f7e97879e19ce0550304cbb7dd69bd1646e27..fe010eef26f8cf5b292a9a1da51c77c860ffabc1 100644 (file)
--- a/bigscreen/Makefile
+++ b/bigscreen/Makefile
@@ -1,9 +1,9 @@
 CC=gcc
 CXX=g++
-CPPFLAGS=-I/usr/include/postgresql $(shell freetype-config --cflags) $(shell sdl-config --cflags)
+CPPFLAGS=-I/usr/include/postgresql $(shell freetype-config --cflags) $(shell sdl-config --cflags) $(shell pkg-config harfbuzz-icu --cflags) $(shell pkg-config pango --cflags) $(shell pkg-config pangoft2 --cflags)
 CXXFLAGS=-O2 -Wall -g
 LDFLAGS=-L/usr/X11R6/lib
-LIBS=$(shell freetype-config --libs) -lpqxx $(shell sdl-config --libs)
+LIBS=$(shell freetype-config --libs) -lpqxx $(shell sdl-config --libs) $(shell pkg-config harfbuzz-icu --libs) $(shell pkg-config pango --libs) $(shell pkg-config pangoft2 --libs)
 
 CCBS_BIGSCREEN_SQL_OBJS=fetch_current_tournament.o fetch_list_of_active_groups.o \
        fetch_list_of_finished_groups.o \

diff --git a/bigscreen/fonts.cpp b/bigscreen/fonts.cpp
index 1a2c1045144b5f1fe854ae1f3fcec847d033c625..b9a02c5aecf24e0f0be6111dd8e5f08b050dc888 100644 (file)
--- a/bigscreen/fonts.cpp
+++ b/bigscreen/fonts.cpp
@@ -3,6 +3,13 @@
 #include <stdexcept>
 #include <map>
 #include <string>
+#include <harfbuzz/hb.h>
+#include <harfbuzz/hb-ft.h>
+#include <harfbuzz/hb-glib.h>
+#include <harfbuzz/hb-icu.h>
+#include <pango/pango-context.h>
+#include <pango/pango-fontmap.h>
+#include <pango/pangoft2.h>
 #include "fonts.h"
 #include "resolution.h"
 #include "theme.h"
@@ -60,18 +67,6 @@ void init_freetype()
        }
 }
 
-void get_glyph(const std::vector<FT_Face> &fonts, wchar_t ch, FT_Face *face, int *glyph_index)
-{
-       *glyph_index = 0;
-       for (std::vector<FT_Face>::const_iterator i = fonts.begin(); i != fonts.end(); ++i) {
-               *glyph_index = FT_Get_Char_Index(*i, ch);
-               if (*glyph_index == 0)
-                       continue;
-               *face = *i;
-               return;
-       }
-}
-
 // this should really be done somehow else :-)
 static unsigned screen_width, screen_height;
 void set_screen_size(unsigned width, unsigned height)
@@ -146,30 +141,89 @@ unsigned my_draw_text(const widestring &str, unsigned char *buf, double size, co
        xpos = xpos * screen_width / LOGICAL_SCREEN_WIDTH;
        ypos = ypos * screen_height / LOGICAL_SCREEN_HEIGHT;
 
-       for (widestring::const_iterator i = str.begin(); i != str.end(); ++i) {
-               FT_Face face;
-               int glyph_index;
-               get_glyph(fonts, *i, &face, &glyph_index);
-               if (glyph_index == 0) {
-                       std::fprintf(stderr, "Warning: Could not find a glyph in any font for U+%04x, ignoring\n", *i);
-                       continue;
-               }
+       // Itemize the text into parts that will be shaped and rendered separately.
+       PangoContext *context = pango_context_new();
+       PangoFontMap *fontmap = pango_ft2_font_map_new();
+       pango_context_set_font_map(context, fontmap);
+       PangoAttrList *attrs = pango_attr_list_new();
+       std::string utf8str = str.to_utf8();
+       GList *items = pango_itemize(context, utf8str.data(), 0, utf8str.size(), attrs, NULL);
+       for (GList *item_it = items; item_it != NULL; item_it = item_it->next) {
+               PangoItem *item = (PangoItem *)(item_it->data);
+               PangoAnalysis *analysis = &item->analysis;
 
-               if (use_lcd) {
-                       if (FT_Load_Glyph(face, glyph_index, FT_LOAD_RENDER | FT_LOAD_TARGET_LCD))
-                               throw std::runtime_error("Couldn't load glyph");
-               } else {
-                       if (FT_Load_Glyph(face, glyph_index, FT_LOAD_RENDER))
-                               throw std::runtime_error("Couldn't load glyph");
-               }
+               // Try to shape and render it in each of the fonts in turn.
+               for (std::vector<FT_Face>::const_iterator face_it = fonts.begin(); face_it != fonts.end(); ++face_it) {
+                       // The buffer seemingly needs to be created anew for each try.
+                       hb_buffer_t *hbuf = hb_buffer_create();
+                       hb_buffer_set_unicode_funcs(hbuf, hb_icu_get_unicode_funcs());
+                       hb_direction_t dir = PANGO_GRAVITY_IS_VERTICAL(analysis->gravity) ? HB_DIRECTION_TTB : HB_DIRECTION_LTR;
+                       if (analysis->level % 2)
+                               dir = HB_DIRECTION_REVERSE(dir);
+                       if (PANGO_GRAVITY_IS_IMPROPER (analysis->gravity))
+                               dir = HB_DIRECTION_REVERSE(dir);
 
-               if (buf != NULL) {
-                       render_glyph(face->glyph, xpos, ypos, buf, r, g, b, use_lcd);
-               }
+                       hb_buffer_set_direction(hbuf, dir);
+                       hb_buffer_set_script(hbuf, hb_glib_script_to_script((GUnicodeScript)analysis->script));
+                       hb_buffer_set_language(hbuf, hb_language_from_string(pango_language_to_string(analysis->language), -1));
+                       hb_buffer_add_utf8(hbuf, utf8str.data(), utf8str.size(), item->offset, item->length);
+
+                       // Font-specifics.
+                       FT_Face face = *face_it;
+                       hb_font_t *font = hb_ft_font_create(face, NULL);
+                       hb_shape(font, hbuf, NULL, 0);
+                       unsigned glyph_count;
+                       hb_glyph_info_t *glyph_info = hb_buffer_get_glyph_infos(hbuf, &glyph_count);
+                       hb_glyph_position_t *glyph_pos = hb_buffer_get_glyph_positions(hbuf, &glyph_count);
+
+                       bool found_all = true;
+                       for (unsigned i = 0; i < glyph_count; ++i) {
+                               if (glyph_info[i].codepoint == 0) {
+                                       found_all = false;
+                               }
+                               break;
+                       }
+
+                       if (!found_all) {
+                               std::string utf8itemstr(&utf8str[item->offset], &utf8str[item->offset + item->length]);
+                               if (face_it + 1 == fonts.end()) {
+                                       std::fprintf(stderr, "Warning: Could not find any font to render item '%s', rendering in last font anyway\n", utf8itemstr.c_str());
+                               } else {
+                                       hb_font_destroy(font);
+                                       hb_buffer_destroy(hbuf);
+                                       continue;
+                               }
+                       }
 
-               xpos += face->glyph->advance.x / 64;
-               ypos -= face->glyph->advance.y / 64;
+                       for (unsigned i = 0; i < glyph_count; ++i) {
+                               if (use_lcd) {
+                                       if (FT_Load_Glyph(face, glyph_info[i].codepoint, FT_LOAD_RENDER | FT_LOAD_TARGET_LCD))
+                                               throw std::runtime_error("Couldn't load glyph");
+                               } else {
+                                       if (FT_Load_Glyph(face, glyph_info[i].codepoint, FT_LOAD_RENDER))
+                                               throw std::runtime_error("Couldn't load glyph");
+                               }
+
+                               int glyphx = xpos + glyph_pos[i].x_offset / 64;
+                               int glyphy = ypos - glyph_pos[i].y_offset / 64;
+
+                               if (buf != NULL) {
+                                       render_glyph(face->glyph, glyphx, glyphy, buf, r, g, b, use_lcd);
+                               }
+
+                               xpos += glyph_pos[i].x_advance / 64;
+                               ypos -= glyph_pos[i].y_advance / 64;
+                       }
+                       hb_font_destroy(font);
+                       hb_buffer_destroy(hbuf);
+                       break;
+               }
+               pango_item_free(item);
        }
+       g_list_free(items);
+       pango_attr_list_unref(attrs);
+       g_object_unref(fontmap);
+       g_object_unref(context);
 
        return (xpos - start_xpos) * LOGICAL_SCREEN_WIDTH / screen_width;
 }

diff --git a/bigscreen/widestring.cpp b/bigscreen/widestring.cpp
index 241183650819a700b9bc36e48c49c5d16c561412..f486aaec8dde5e9b5ec96a811324ed92839aa1d8 100644 (file)
--- a/bigscreen/widestring.cpp
+++ b/bigscreen/widestring.cpp
@@ -6,9 +6,25 @@
 #include <pqxx/util>
 #include "widestring.h"
 
-static iconv_t ucs4_iconv;
+static iconv_t ucs4_iconv, ucs4_reverse_iconv;
 static bool iconv_initialized = false;
 
+void ensure_iconv_initialized()
+{
+       if (iconv_initialized) {
+               return;
+       }
+#if __BYTE_ORDER == __LITTLE_ENDIAN
+       ucs4_iconv = iconv_open("ucs-4le", "utf-8");
+       ucs4_reverse_iconv = iconv_open("utf-8", "ucs-4le");
+#else
+       ucs4_iconv = iconv_open("ucs-4be", "utf-8");
+       ucs4_reverse_iconv = iconv_open("utf-8", "ucs-4be");
+#endif
+
+       iconv_initialized = true;
+}
+
 widestring::widestring()
 {
 }
@@ -30,15 +46,7 @@ widestring::widestring(const std::wstring &from)
 
 void widestring::operator= (const char *from)
 {
-       if (!iconv_initialized) {
-#if __BYTE_ORDER == __LITTLE_ENDIAN
-               ucs4_iconv = iconv_open("ucs-4le", "utf-8");
-#else
-               ucs4_iconv = iconv_open("ucs-4be", "utf-8");
-#endif
-
-               iconv_initialized = true;
-       }
+       ensure_iconv_initialized();
        
        unsigned bytes = std::strlen(from);
        char *from_buf = strdup(from);
@@ -66,3 +74,35 @@ void widestring::operator= (const char *from)
        free(from_buf);
        delete[] to_buf;
 }
+
+std::string widestring::to_utf8() const
+{
+       ensure_iconv_initialized();
+
+       wchar_t *from_buf = wcsdup(c_str());
+       size_t out_max_size = size() * 6;
+       char *to_buf = new char[out_max_size];
+
+       char *inptr = reinterpret_cast<char *>(from_buf), *outptr = to_buf;
+
+       size_t in_left = size() * sizeof(wchar_t);
+       size_t out_left = out_max_size;
+
+       size_t ret = iconv(ucs4_reverse_iconv, NULL, NULL, &outptr, &out_left);
+       if (ret == (size_t)(-1)) {
+               throw std::runtime_error("Error in iconv during initialization");
+       }
+
+       ret = iconv(ucs4_reverse_iconv, &inptr, &in_left, &outptr, &out_left);
+       if (ret == (size_t)(-1)) {
+               perror("iconv");
+               throw std::runtime_error("Error in iconv during conversion");
+       }
+
+       std::string utf8(to_buf, outptr);
+
+       free(from_buf);
+       delete[] to_buf;
+
+       return utf8;
+}

diff --git a/bigscreen/widestring.h b/bigscreen/widestring.h
index a2f2a245423322042d234d226df6e1be89ac9d89..1e4f9a2640cd2cd09d35af5b84cbdc5fd96f2f6a 100644 (file)
--- a/bigscreen/widestring.h
+++ b/bigscreen/widestring.h
@@ -13,6 +13,7 @@ public:
        widestring(const std::string &from);
        widestring(const std::wstring &from);
        void operator= (const char *from);
+       std::string to_utf8() const;
 };
 
 namespace pqxx