fixed rotated text on vertical tab in XFontImp and a rotate function in FontImp interface

1 files changed, 36 insertions, 2 deletions

diff --git a/src/XFontImp.hh b/src/XFontImp.hh
index 8ea7af1..b293fdd 100644
--- a/src/XFontImp.hh
+++ b/src/XFontImp.hh
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: XFontImp.hh,v 1.3 2002/10/19 13:58:47 fluxgen Exp $
+// $Id: XFontImp.hh,v 1.4 2002/11/25 14:07:21 fluxgen Exp $
 
 #ifndef XFONTIMP_HH
 #define XFONTIMP_HH
@@ -33,12 +33,46 @@ public:
         bool load(const std::string &filename);
         unsigned int textWidth(const char * const text, unsigned int size) const;
         unsigned int height() const;
-        int ascent() const { return m_fontstruct ? m_fontstruct->ascent : 0; }
+        float angle() const { return m_angle; }
+        int ascent() const;
         int descent() const { return m_fontstruct ? m_fontstruct->descent : 0; }
         void drawText(Drawable w, int screen, GC gc, const char *text, size_t len, int x, int y) const;
         bool loaded() const { return m_fontstruct != 0; }
+        void rotate(float angle);
 private:
+        void freeRotFont();
+        void drawRotText(Drawable w, int screen, GC gc, const char *text, size_t len, int x, int y) const;
+        unsigned int rotTextWidth(const char * const text, unsigned int size) const;
+        struct BitmapStruct {
+                int     bit_w;
+                int bit_h;
+
+                Pixmap bm;
+        };
+
+        struct XRotCharStruct {
+                int     ascent;
+                int     descent;
+                int     lbearing;
+                int     rbearing;
+                int width;
+
+                BitmapStruct glyph;
+        };
+
+        struct XRotFontStruct {
+                int     dir;
+                int     height;
+                int     max_ascent;
+                int     max_descent;
+                int     max_char;
+                int min_char;
+
+                XRotCharStruct per_char[95];
+        };
+        XRotFontStruct *m_rotfont;
         XFontStruct *m_fontstruct;
+        float m_angle;
 };
 
 #endif // XFONTIMP_HH