Modified the Aethyra client to use the TMW TrueType class, rather than

the inbuilt GUIChan TrueType class. (Didn't use it originally because I
didn't see the difference, when there's a considerable speedup, and that
originally the import for TMW was broken code at the time, which has
been fixed since.)

4 files changed, 244 insertions, 8 deletions

diff --git a/src/gui/browserbox.cpp b/src/gui/browserbox.cpp
index 78f3fef2..ebd92e5a 100644
--- a/src/gui/browserbox.cpp
+++ b/src/gui/browserbox.cpp
@@ -24,9 +24,7 @@
 #include "browserbox.h"
 #include "colour.h"
 #include "linkhandler.h"
-
-#include "../graphics.h"
-#include "../sdltruetypefont.hpp"
+#include "truetypefont.h"
 
 BrowserBox::BrowserBox(unsigned int mode):
     gcn::Widget(),
@@ -70,7 +68,7 @@ void BrowserBox::addRow(const std::string &row)
     std::string newRow;
     BROWSER_LINK bLink;
     int idx1, idx2, idx3;
-    gcn::contrib::SDLTrueTypeFont *font = static_cast<gcn::contrib::SDLTrueTypeFont*>(getFont());
+    TrueTypeFont *font = static_cast<TrueTypeFont*>(getFont());
 
     // Use links and user defined colors
     if (mUseLinksAndUserColors)
@@ -268,7 +266,7 @@ BrowserBox::draw(gcn::Graphics *graphics)
 
     int x = 0, y = 0;
     int wrappedLines = 0;
-    gcn::contrib::SDLTrueTypeFont *font = static_cast<gcn::contrib::SDLTrueTypeFont*>(getFont());
+    TrueTypeFont *font = static_cast<TrueTypeFont*>(getFont());
 
     graphics->setColor(BLACK);
     for (TextRowIterator i = mTextRows.begin(); i != mTextRows.end(); i++)
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index 846a0f44..f33d9495 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -22,12 +22,14 @@
 #include <guichan/exception.hpp>
 #include <guichan/image.hpp>
 #include <guichan/imagefont.hpp>
+#include <SDL/SDL_ttf.h>
 
 // Should stay here because of Guichan being sensitive to headers order
 #include <guichan/sdl/sdlinput.hpp>
 
 #include "focushandler.h"
 #include "gui.h"
+#include "truetypefont.h"
 #include "viewport.h"
 #include "window.h"
 #include "windowcontainer.h"
@@ -36,7 +38,6 @@
 #include "../configuration.h"
 #include "../graphics.h"
 #include "../log.h"
-#include "../sdltruetypefont.hpp"
 
 #include "../resources/image.h"
 #include "../resources/imageset.h"
@@ -113,12 +114,12 @@ Gui::Gui(Graphics *graphics):
 
     // Set global font
     try {
-        mGuiFont = new gcn::contrib::SDLTrueTypeFont("/usr/local/share/aethyra/data/fonts/dejavusans.ttf", 10);
+        mGuiFont = new TrueTypeFont("/usr/local/share/aethyra/data/fonts/dejavusans.ttf", 10);
     }
     catch (gcn::Exception e)
     {
         try {
-            mGuiFont = new gcn::contrib::SDLTrueTypeFont("data/fonts/dejavusans.ttf", 10);
+            mGuiFont = new TrueTypeFont("data/fonts/dejavusans.ttf", 10);
         }
         catch (gcn::Exception e)
         {
diff --git a/src/gui/truetypefont.cpp b/src/gui/truetypefont.cpp
new file mode 100644
index 00000000..bf95ca37
--- /dev/null
+++ b/src/gui/truetypefont.cpp
@@ -0,0 +1,170 @@
+/*
+ *  The Mana World
+ *  Copyright 2004 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id$
+ */
+
+#include "truetypefont.h"
+
+#include <list>
+
+#include <guichan/exception.hpp>
+
+#include "../graphics.h"
+#include "../resources/image.h"
+
+#define CACHE_SIZE 30
+
+class TextChunk
+{
+    public:
+        TextChunk(const std::string &text, gcn::Color color) :
+            img(NULL), text(text), color(color)
+        {
+        }
+
+        ~TextChunk()
+        {
+            delete img;
+        }
+
+        bool operator==(const TextChunk &chunk) const
+        {
+            return (
+                chunk.text == text && chunk.color == color);
+        }
+
+        void generate(TTF_Font *font)
+        {
+            SDL_Color sdlCol;
+            sdlCol.b = color.b;
+            sdlCol.r = color.r;
+            sdlCol.g = color.g;
+
+            SDL_Surface *surface = TTF_RenderUTF8_Blended(
+                    font, text.c_str(), sdlCol);
+
+            if (!surface)
+            {
+                throw "Rendering font to surface failed: " +
+                    std::string(TTF_GetError());
+            }
+
+            img = Image::load(surface);
+
+            SDL_FreeSurface(surface);
+        }
+
+        Image *img;
+        std::string text;
+        gcn::Color color;
+};
+
+
+// Word surfaces cache
+static std::list<TextChunk> cache;
+typedef std::list<TextChunk>::iterator CacheIterator;
+
+
+TrueTypeFont::TrueTypeFont(const std::string& filename, int size)
+{
+    if (!TTF_WasInit() && TTF_Init() == -1)
+    {
+        throw GCN_EXCEPTION("Unable to initialize SDL_ttf: " +
+            std::string(TTF_GetError()));
+    }
+
+    mFont = TTF_OpenFont(filename.c_str(), size);
+
+    if (mFont == NULL)
+    {
+        throw GCN_EXCEPTION("SDLTrueTypeFont::SDLTrueTypeFont: " +
+            std::string(TTF_GetError()));
+    }
+}
+
+TrueTypeFont::~TrueTypeFont()
+{
+    TTF_CloseFont(mFont);
+
+    if (TTF_WasInit())
+    {
+        TTF_Quit();
+    }
+}
+
+void TrueTypeFont::drawString(gcn::Graphics *graphics,
+                               const std::string &text,
+                               int x, int y)
+{
+    if (text.empty())
+    {
+        return;
+    }
+
+    Graphics *g = dynamic_cast<Graphics *>(graphics);
+
+    if (!g)
+    {
+        throw "Not a valid graphics object!";
+    }
+
+    gcn::Color col = g->getColor();
+
+    TextChunk chunk(text, col);
+
+    bool found = false;
+
+    for (CacheIterator i = cache.begin(); i != cache.end(); i++)
+    {
+        if (chunk == (*i))
+        {
+            // Raise priority: move it to front
+            cache.splice(cache.begin(), cache, i);
+            found = true;
+            break;
+        }
+    }
+
+    // Surface not found
+    if (!found)
+    {
+        if (cache.size() >= CACHE_SIZE)
+        {
+            cache.pop_back();
+        }
+        cache.push_front(chunk);
+        cache.front().generate(mFont);
+    }
+
+    g->drawImage(cache.front().img, x, y);
+}
+
+int TrueTypeFont::getWidth(const std::string& text) const
+{
+    int w, h;
+    TTF_SizeUTF8(mFont, text.c_str(), &w, &h);
+    return w;
+}
+
+int TrueTypeFont::getHeight() const
+{
+    return TTF_FontHeight(mFont);
+}
diff --git a/src/gui/truetypefont.h b/src/gui/truetypefont.h
new file mode 100644
index 00000000..d496d82e
--- /dev/null
+++ b/src/gui/truetypefont.h
@@ -0,0 +1,67 @@
+/*
+ *  The Mana World
+ *  Copyright 2004 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id$
+ */
+
+#ifndef _TMW_TRUETYPEFONT_H
+#define _TMW_TRUETYPEFONT_H
+
+#include <string>
+
+#include <guichan/font.hpp>
+#include <guichan/graphics.hpp>
+#include <SDL/SDL_ttf.h>
+
+/**
+ * A wrapper around SDL_ttf for allowing the use of TrueType fonts.
+ *
+ * <b>NOTE:</b> This class needs SDL_ttf to be initialized.
+ */
+class TrueTypeFont : public gcn::Font
+{
+    public:
+        /**
+         * Constructor.
+         *
+         * @param filename  Font filename.
+         * @param size      Font size.
+         */
+        TrueTypeFont(const std::string& filename, int size);
+
+        /**
+         * Destructor.
+         */
+        ~TrueTypeFont();
+
+        virtual int getWidth(const std::string& text) const;
+
+        virtual int getHeight() const;
+
+        /**
+         * @see Font::drawString
+         */
+        void drawString(gcn::Graphics* graphics, const std::string& text, int x, int y);
+
+    private:
+        TTF_Font *mFont;
+};
+
+#endif