rotated fonts, buttons, containers. Used for tabs for now

1 files changed, 13 insertions, 5 deletions

diff --git a/src/FbTk/XftFontImp.hh b/src/FbTk/XftFontImp.hh
index 21a80b6..f660303 100644
--- a/src/FbTk/XftFontImp.hh
+++ b/src/FbTk/XftFontImp.hh
@@ -26,6 +26,7 @@
 
 #include <X11/Xft/Xft.h>
 #include "FontImp.hh"
+#include <string>
 
 namespace FbTk {
 
@@ -35,16 +36,23 @@ public:
     XftFontImp(const char *fontname, bool utf8);
     ~XftFontImp();
     bool load(const std::string &name);
-    void drawText(const FbDrawable &w, int screen, GC gc, const char *text, size_t len, int x, int y) const;
+    void drawText(const FbDrawable &w, int screen, GC gc, const char *text, size_t len, int x, int y , FbTk::Orientation orient) const;
     unsigned int textWidth(const char * const text, unsigned int len) const;
     unsigned int height() const;
-    int ascent() const { return m_xftfont ? m_xftfont->ascent : 0; }
-    int descent() const { return m_xftfont ? m_xftfont->descent : 0; }
-    bool loaded() const { return m_xftfont != 0; }
+    int ascent() const { return m_xftfonts[0] ? m_xftfonts[0]->ascent : 0; }
+    int descent() const { return m_xftfonts[0] ? m_xftfonts[0]->descent : 0; }
+    bool loaded() const { return m_xftfonts[0] != 0; }
     bool utf8() const { return m_utf8mode; }
+    bool validOrientation(FbTk::Orientation orient);
+
 private:
-    XftFont *m_xftfont;
+    XftFont *m_xftfonts[4]; // 4 possible orientations
+    // rotated xft fonts don't give proper extents info, so we keep the "real"
+    // one around for it
     bool m_utf8mode;
+
+    std::string m_name;
+    int m_angle;
 };
 
 } // end namespace FbTk