From 2e2a1c7337b9e1e39752543d33864eb62b3a14c0 Mon Sep 17 00:00:00 2001
From: Nick Gasson <nick@nickg.me.uk>
Date: Sun, 25 Oct 2009 14:22:47 +0000
Subject: [PATCH] Make new GUI use the new font engine

---
 include/gui2/Theme.hpp     |   4 +-
 layouts/demo.xml           |   3 +-
 src/UIDemo.cpp             |   6 +-
 src/ft/Font.cpp            | 110 ++++++++++++++++++++-----------------
 src/ft/IFont.hpp           |   2 +
 src/gui/Font.cpp           |   2 +-
 src/gui2/Button.cpp        |   7 ++-
 src/gui2/Label.cpp         |   4 +-
 src/gui2/RenderContext.cpp |   4 +-
 src/gui2/Theme.cpp         |   5 +-
 10 files changed, 84 insertions(+), 63 deletions(-)

diff --git a/include/gui2/Theme.hpp b/include/gui2/Theme.hpp
index bdfe1b1..796bc05 100644
--- a/include/gui2/Theme.hpp
+++ b/include/gui2/Theme.hpp
@@ -22,10 +22,12 @@
 
 #include "Platform.hpp"
 #include "gui2/Colour.hpp"
-#include "gui/IFont.hpp"
+#include "ft/IFont.hpp"
 
 namespace gui {
 
+   using namespace ft;
+   
    class Theme {
    public:
       Theme();
diff --git a/layouts/demo.xml b/layouts/demo.xml
index 5d45643..a1f684b 100644
--- a/layouts/demo.xml
+++ b/layouts/demo.xml
@@ -5,6 +5,7 @@
     <button name="btn1" label="One"
             x="5" y="5" width="80" height="25" />
     <button name="btn2" label="Two"/>
-    <label text="Hello, World!"/>
+    <button label="Hello, World!"
+           x="5" y="60" width="100" height="20"/>
   </window>
 </layout>
diff --git a/src/UIDemo.cpp b/src/UIDemo.cpp
index e0f55ba..afd89f8 100644
--- a/src/UIDemo.cpp
+++ b/src/UIDemo.cpp
@@ -38,20 +38,16 @@ public:
    
 private:
    gui::ILayoutPtr layout;
-   ft::IFontPtr font;
 };
 
 UIDemo::UIDemo()
 {
    layout = gui::make_layout("layouts/demo.xml");
-   font = ft::load_font("data/fonts/Vera.ttf", 16, ft::FONT_NORMAL);
 }
 
 void UIDemo::overlay() const
 {
-   //layout->render();
-
-   font->print(100, 100, gui::make_colour(0.0f, 1.0f, 0.0f), "yah");
+   layout->render();
 }
 
 IScreenPtr make_ui_demo()
diff --git a/src/ft/Font.cpp b/src/ft/Font.cpp
index 156643c..559e777 100644
--- a/src/ft/Font.cpp
+++ b/src/ft/Font.cpp
@@ -70,71 +70,71 @@ Glyph::Glyph(FT_Face& face, FT_ULong uch, FontType type)
    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
       
-      err = FT_Render_Glyph(face->glyph,
-         type == FONT_NORMAL
-         ? FT_RENDER_MODE_NORMAL : FT_RENDER_MODE_MONO);
-      assert(err == 0);
+   err = FT_Render_Glyph(face->glyph,
+      type == FONT_NORMAL
+      ? FT_RENDER_MODE_NORMAL : FT_RENDER_MODE_MONO);
+   assert(err == 0);
 
-      FT_Bitmap& bmp = face->glyph->bitmap;
+   FT_Bitmap& bmp = face->glyph->bitmap;
       
-      // Pad out the bitmap to be a power-of-2 square
+   // Pad out the bitmap to be a power-of-2 square
       
-      int tex_width = next_power_of_2(bmp.width);
-      int tex_height = next_power_of_2(bmp.rows);
+   int tex_width = next_power_of_2(bmp.width);
+   int tex_height = next_power_of_2(bmp.rows);
 
-      GLubyte* expanded = new GLubyte[2 * tex_width * tex_height];
+   GLubyte* expanded = new GLubyte[2 * tex_width * tex_height];
 
-      if (type == FONT_NORMAL) {
-         // Anti-aliased font
+   if (type == FONT_NORMAL) {
+      // Anti-aliased font
          
-         for (int j = 0; j < tex_height; j++) {
-            for (int i = 0; i < tex_width; i++) {
-               expanded[2*(i + j*tex_width)]
-                  = expanded[2*(i + j*tex_width) + 1]
-                  = (i >= bmp.width || j >= bmp.rows)
-                  ? 0
-                  : bmp.buffer[i + bmp.width*j];
-            }
+      for (int j = 0; j < tex_height; j++) {
+         for (int i = 0; i < tex_width; i++) {
+            expanded[2*(i + j*tex_width)]
+               = expanded[2*(i + j*tex_width) + 1]
+               = (i >= bmp.width || j >= bmp.rows)
+               ? 0
+               : bmp.buffer[i + bmp.width*j];
          }
       }
-      else {
-         // Monochrome font
+   }
+   else {
+      // Monochrome font
          
-         int bmp_bit = 7, bmp_byte = 0;      
+      int bmp_bit = 7, bmp_byte = 0;      
          
-         for (int j = 0; j < tex_height; j++) {
-            for (int i = 0; i < tex_width; i++) {
+      for (int j = 0; j < tex_height; j++) {
+         for (int i = 0; i < tex_width; i++) {
                
-               int val;
-               if (i >= bmp.width || j >= bmp.rows)
-                  val = 0;
-               else
-                  val = bmp.buffer[bmp_byte + j*bmp.pitch] & (1<<bmp_bit);
+            int val;
+            if (i >= bmp.width || j >= bmp.rows)
+               val = 0;
+            else
+               val = bmp.buffer[bmp_byte + j*bmp.pitch] & (1<<bmp_bit);
                
-               expanded[2*(i + j*tex_width)]
-                  = expanded[2*(i + j*tex_width) + 1]
-                  = (val ? 255 : 0);
-
-               if (bmp_bit-- == 0) {
-                  bmp_bit = 7;
-                  bmp_byte++;
-               }
+            expanded[2*(i + j*tex_width)]
+               = expanded[2*(i + j*tex_width) + 1]
+               = (val ? 255 : 0);
+
+            if (bmp_bit-- == 0) {
+               bmp_bit = 7;
+               bmp_byte++;
             }
-            
-            bmp_byte = 0;
          }
+            
+         bmp_byte = 0;
       }
+   }
       
-      glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, tex_width,
-         tex_height, 0, GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE, expanded);
+   glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, tex_width,
+      tex_height, 0, GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE, expanded);
 
-      delete[] expanded;
+   delete[] expanded;
 
-      width_ = static_cast<float>(bmp.width);
-      height_ = static_cast<float>(bmp.rows);   
+   width_ = static_cast<float>(bmp.width);
+   height_ = static_cast<float>(bmp.rows);   
 
-      tex_xmax = width_ / tex_width;
-      tex_ymax = height_ / tex_height;
+   tex_xmax = width_ / tex_width;
+   tex_ymax = height_ / tex_height;
       
    top = face->glyph->bitmap_top;
    left = face->glyph->bitmap_left;
@@ -165,7 +165,7 @@ void Glyph::render() const
    
    glTexCoord2f(tex_xmax, tex_ymax);
    glVertex2f(left + width_, height_ - top);
-   
+
    glEnd();
 
    glTranslatef(advance_x_, advance_y_, 0.0f);
@@ -188,9 +188,13 @@ public:
    ~Font();
    
    void print(int x, int y, Colour c, const string& s) const;
+
+   int height() const { return height_; }
 private:
    FT_Face face;
    vector<Glyph*> glyphs;
+   int height_;
+   int line_skip_;
    
    static FT_Library library;
    static int library_ref_count;
@@ -199,7 +203,7 @@ private:
 FT_Library Font::library;
 int Font::library_ref_count = 0;
 
-   Font::Font(const string& file, int h, FontType type)
+Font::Font(const string& file, int h, FontType type)
 {
    if (++library_ref_count == 1) {
       if (FT_Init_FreeType(&library))
@@ -219,7 +223,13 @@ int Font::library_ref_count = 0;
 
    for (char ch = 0; ch < 127; ch++)
       glyphs.push_back(new Glyph(face, ch, type));
+   
+   int ascent  = static_cast<int>(face->size->metrics.ascender / 64.0);
+   int descent  = static_cast<int>(face->size->metrics.descender / 64.0);
+   height_ = ascent - descent + 1;
 
+   line_skip_ = static_cast<int>(face->size->metrics.height / 64.0); 
+    
    log() << "Loaded font " << file;
 }
 
@@ -228,6 +238,8 @@ Font::~Font()
    for (vector<Glyph*>::iterator it = glyphs.begin();
         it != glyphs.end(); ++it)
       delete *it;
+
+   FT_Done_Face(face);
    
    if (--library_ref_count == 0)
       FT_Done_FreeType(library);
@@ -243,7 +255,7 @@ void Font::print(int x, int y, Colour c, const string& s) const
    glPushMatrix();
 
    glColor4f(get<0>(c), get<1>(c), get<2>(c), get<3>(c));
-   glTranslatef(x, y, 0.0f);
+   glTranslatef(x, y + (face->size->metrics.ascender>>6), 0.0f);
 
    for (string::const_iterator it = s.begin();
         it != s.end(); ++it)
diff --git a/src/ft/IFont.hpp b/src/ft/IFont.hpp
index 669ac00..a55ac37 100644
--- a/src/ft/IFont.hpp
+++ b/src/ft/IFont.hpp
@@ -29,6 +29,8 @@ namespace ft {
 
       virtual void print(int x, int y, Colour c,
          const string& s) const = 0;
+
+      virtual int height() const = 0;
    };
 
    typedef shared_ptr<IFont> IFontPtr;
diff --git a/src/gui/Font.cpp b/src/gui/Font.cpp
index 1751803..79db3d5 100644
--- a/src/gui/Font.cpp
+++ b/src/gui/Font.cpp
@@ -162,7 +162,7 @@ void Font::makeDisplayList(FT_Face face, char ch, GLuint listBase,
       throw runtime_error("FT_Get_Glyph failed");
 
    // Convert the glyph to a bitmap
-   FT_Glyph_To_Bitmap(&glyph, FT_RENDER_MODE_MONO, 0, 1);
+   FT_Glyph_To_Bitmap(&glyph, FT_RENDER_MODE_NORMAL, 0, 1);
    FT_BitmapGlyph bitmapGlyph = (FT_BitmapGlyph)glyph;
 
    // Get a reference to the bitmap
diff --git a/src/gui2/Button.cpp b/src/gui2/Button.cpp
index fbf2f17..c1fc4c2 100644
--- a/src/gui2/Button.cpp
+++ b/src/gui2/Button.cpp
@@ -30,8 +30,11 @@ void Button::render(RenderContext& rc) const
    rc.rectangle(x(), y(), width(), height(),
       rc.theme().background());
 
-   rc.print(rc.theme().normal_font(), x() + 5, y() + 5,
-      "Yahyahyah");
+   IFontPtr f = rc.theme().normal_font();
+
+   int center = (height() - f->height()) / 2;
+   
+   rc.print(f, x() + 5, y() + center, label_);
 
    rc.border(x(), y(), width(), height(),
       rc.theme().border());
diff --git a/src/gui2/Label.cpp b/src/gui2/Label.cpp
index 002a753..82dd929 100644
--- a/src/gui2/Label.cpp
+++ b/src/gui2/Label.cpp
@@ -16,6 +16,7 @@
 //
 
 #include "gui2/Label.hpp"
+#include "ILogger.hpp"
 
 using namespace gui;
 
@@ -27,5 +28,6 @@ Label::Label(const AttributeSet& attrs)
 
 void Label::render(RenderContext& rc) const
 {
-
+   debug() << "Label::render x=" << x() << " y=" << y();
+   rc.print(rc.theme().normal_font(), x(), y(), text_);
 }
diff --git a/src/gui2/RenderContext.cpp b/src/gui2/RenderContext.cpp
index c839ac3..78dfb54 100644
--- a/src/gui2/RenderContext.cpp
+++ b/src/gui2/RenderContext.cpp
@@ -107,7 +107,7 @@ void RenderContext::border(int x, int y, int w, int h, Colour c)
 void RenderContext::print(IFontPtr font, int x, int y, const string& s)
 {
    offset(x, y);
-   font->print(x, y, "%s", s.c_str());
+   font->print(x, y, make_colour(1.0f, 1.0f, 1.0f), s);
 }
 
 void RenderContext::scissor(Widget* w)
@@ -120,5 +120,5 @@ void RenderContext::scissor(Widget* w)
 
    y = wh - y - w->height() - 1;
    
-   glScissor(x, y, w->width() + 1, w->height() + 1);
+   glScissor(x, y, w->width() + 1, w->height());
 }
diff --git a/src/gui2/Theme.cpp b/src/gui2/Theme.cpp
index 39d1b63..c069099 100644
--- a/src/gui2/Theme.cpp
+++ b/src/gui2/Theme.cpp
@@ -17,11 +17,14 @@
 
 #include "gui2/Theme.hpp"
 
+#include <string>
+
 using namespace gui;
 
 Theme::Theme()
 {
-   normal_font_ = load_font("data/fonts/DejaVuSansMono.ttf", 15, false);
+   normal_font_ = ft::load_font("data/fonts/Vera.ttf",
+      15, ft::FONT_MONO);
 }
       
 Colour Theme::background() const
-- 
2.39.2