Improved vertical alignment of text in FbTk::TextButton

The old formula for vertical align text inside FbTk::TextButton ('height/2 +
font_ascent/2 - 1') produced not always good looking results, escpecially
when different fonts are involved (eg, ClockTool and WorkspaceName have
different fonts and font-sizes).

'(height - font_ascent) / 2 - 1' produces better results.

Additional changes:

* added ASCII-Art to document the involved entities when calculating the
  baseline
* rewritten tests/testFont.cc to accept multiples texts and multiple
  fonts
* removed some internal parts of FbTk::Font from the public interface

1 files changed, 106 insertions, 106 deletions

diff --git a/src/tests/testFont.cc b/src/tests/testFont.cc
index 1ba63f7..3fdc0a6 100644
--- a/src/tests/testFont.cc
+++ b/src/tests/testFont.cc
@@ -19,13 +19,16 @@
 // DEALINGS IN THE SOFTWARE.
 
 #include "FbTk/App.hh"
+#include "FbTk/FbString.hh"
 #include "FbTk/FbWindow.hh"
 #include "FbTk/Font.hh"
+#include "FbTk/TextButton.hh"
 #include "FbTk/EventHandler.hh"
 #include "FbTk/EventManager.hh"
 #include "FbTk/GContext.hh"
 #include "FbTk/Color.hh"
 #include "FbTk/FbString.hh"
+#include "FbTk/StringUtil.hh"
 
 #include <X11/Xutil.h>
 #include <X11/keysym.h>
@@ -34,124 +37,103 @@
 #include <cstring>
 #include <cstdlib>
 #include <iostream>
+#include <vector>
 using namespace std;
 
-class App:public FbTk::App, public FbTk::EventHandler {
+
+class App:public FbTk::App, public FbTk::FbWindow, public FbTk::EventHandler {
 public:
-    App(const char *displayname, const string &foreground, const string background):
+    App(const char *displayname, const string& foreground, const string& background):
         FbTk::App(displayname),
-        m_win(DefaultScreen(display()),
-              0, 0, 640, 480, KeyPressMask | ExposureMask) { 
-        m_background = background;
-        m_foreground = foreground;
-        m_orient = FbTk::ROT0;
-        m_win.show();
-        m_win.setBackgroundColor(FbTk::Color(background.c_str(), m_win.screenNumber()));
-        FbTk::EventManager::instance()->add(*this, m_win);
-    }
-    ~App() {
+        FbTk::FbWindow(DefaultScreen(this->FbTk::App::display()), 0, 0, 640, 480, KeyPressMask|ExposureMask|StructureNotifyMask),
+        m_gc(drawable()),
+        m_foreground(foreground.c_str(), screenNumber()),
+        m_background(background.c_str(), screenNumber()) {
+
+        m_gc.setLineAttributes(1, FbTk::GContext::JOINMITER, FbTk::GContext::LINESOLID, FbTk::GContext::CAPNOTLAST);
+        m_gc.setForeground(m_foreground);
+        m_gc.setBackground(m_background);
+        setBackgroundColor(m_background);
+
+        FbTk::EventManager::instance()->add(*this, *this);
     }
+
+    ~App() { }
+
     void keyPressEvent(XKeyEvent &ke) {
         KeySym ks;
         char keychar[1];
         XLookupString(&ke, keychar, 1, &ks, 0);
-        if (ks == XK_Escape)
+        if (ks == XK_Escape) {
             end();
-        /*
-        else { // toggle antialias
-            m_font.setAntialias(!m_font.isAntialias());
-            cerr<<boolalpha;
-            cerr<<"antialias: "<<m_font.isAntialias()<<endl;
-            redraw();
-        } */
+        }
     }
 
+    virtual void handleEvent(XEvent& event) {
+        if (event.type == ConfigureNotify) {
+            resize(event.xconfigure.width, event.xconfigure.height);
+        }
+    }
+
+
     void exposeEvent(XExposeEvent &event) {
         redraw();
     }
 
     void redraw() {
-        size_t text_w = m_font.textWidth(m_text.c_str(), m_text.size());
-        int mult = 1;
-        if (m_orient == FbTk::ROT180)
-            mult = -1;
-        size_t text_h = m_font.height();
-        int x = 640/2 - mult* text_w/2;
-        int y = 480/2 - mult*text_h/2;
-        m_win.clear();
-        FbTk::GContext wingc(m_win.drawable());
-
-        int bx1 = 0;
-        int by1 = 0;
-        int bx2 = text_w;
-        int by2 = 0;
-
-        switch (m_orient) {
-        case FbTk::ROT90:
-            by2 = bx2;
-            bx2 = 0;
-            break;
-        case FbTk::ROT180:
-            bx2 = -bx2;
-            break;
-        case FbTk::ROT270:
-            by2 = -bx2;
-            bx2 = 0;
-            break;
-        default:
-            break;
+        size_t i;
+        for (i = 0; i < m_buttons.size(); ++i) {
+            FbTk::TextButton* b = m_buttons[i];
+            b->clear();
+            b->drawLine(m_gc.gc(), 0, b->height() / 2, b->width(), b->height() / 2);
         }
+        this->clear();
+    }
 
-/*
-        m_win.drawLine(wingc.gc(),
-                       x, y + m_font.descent(),
-                       x + text_w, y + m_font.descent());
-        m_win.drawLine(wingc.gc(),
-                       x, y - text_h, 
-                       x + text_w, y - text_h);
-*/
-        // draw the baseline in red
-        wingc.setForeground(FbTk::Color("red", m_win.screenNumber()));
-        m_win.drawLine(wingc.gc(),
-                       x + bx1, y + by1, x + bx2, y+by2);
-        wingc.setForeground(FbTk::Color(m_foreground.c_str(), m_win.screenNumber()));
-        cerr<<"text size "<<text_w<<"x"<<text_h<<endl;
-        m_font.drawText(m_win,
-                        0, wingc.gc(),
-                        m_text.c_str(), m_text.size(),
-                        x, y, m_orient);
-
+    void resize(unsigned int width, unsigned int height) {
+        FbTk::FbWindow::resize(width, height);
+        unsigned w = width / m_buttons.size();
+        size_t i;
+        for (i = 0; i < m_buttons.size(); ++i) {
+            m_buttons[i]->moveResize(i * w, 0, w, height);
+        }
+        redraw();
     }
 
-    FbTk::Font &font() { return m_font; }
-    void setText(const std::string& text, const FbTk::Orientation orient) { m_text = text; m_orient = orient; }
+    void addText(const FbTk::BiDiString& text, FbTk::Font& font, const FbTk::Orientation orient) {
+
+        FbTk::FbWindow* win = this;
+        FbTk::TextButton* button = new FbTk::TextButton(*win, font, text);
+
+        button->setGC(m_gc.gc());
+        button->setOrientation(orient);
+        button->setBackgroundColor(m_background);
+        button->show();
+
+        m_buttons.push_back(button);
+    }
 
 private:
-    string m_foreground, m_background;
-    FbTk::FbWindow m_win;
-    FbTk::Font m_font;
-    FbTk::Orientation m_orient;
-    string m_text;
+    vector<FbTk::TextButton*> m_buttons;
+    FbTk::GContext m_gc;
+    FbTk::Color m_foreground;
+    FbTk::Color m_background;
 };
 
+
+
 int main(int argc, char **argv) {
-    //bool antialias = false;
+
+    vector<string> texts_and_fonts;
     FbTk::Orientation orient = FbTk::ROT0;
-    bool xft = false;
-    string fontname("");
     string displayname("");
-    string background("black");
-    string foreground("white");
-    string text("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789,.-_¯åäöÅÄÖ^~+=`\"!#¤%&/()=¡@£$½¥{[]}¶½§±");
-    for (int a=1; a<argc; ++a) {
-        if (strcmp("-font", argv[a])==0 && a + 1 < argc) {
-            fontname = argv[++a];
-        } else if (strcmp("-xft", argv[a])==0) {
-            xft = true;
-        } else if (strcmp("-display", argv[a]) == 0 && a + 1 < argc) {
+    string background("white");
+    string foreground("black");
+
+    int a;
+    for (a = 1; a < argc; ++a) {
+        if (strcmp("-display", argv[a]) == 0 && a + 1 < argc) {
             displayname = argv[++a];
-        } else if (strcmp("-text", argv[a]) == 0 && a + 1 < argc) {
-            text = argv[++a];
         } else if (strcmp("-orient", argv[a]) == 0) {
             orient = (FbTk::Orientation) (atoi(argv[++a]) % 4);
         } else if (strcmp("-bg", argv[a]) == 0 && a + 1 < argc) {
@@ -159,35 +141,53 @@ int main(int argc, char **argv) {
         } else if (strcmp("-fg", argv[a]) == 0 && a + 1 < argc) {
             foreground = argv[++a];
         } else if (strcmp("-h", argv[a]) == 0) {
-            cerr<<"Arguments: "<<endl;
-            cerr<<"-font <fontname>"<<endl;
-         //   cerr<<"-antialias"<<endl;
+            cerr<<"Arguments: \"text|fontname\" [\"text|fontname2\"]"<<endl;
             cerr<<"-display <display>"<<endl;
-            cerr<<"-text <text>"<<endl;
             cerr<<"-orient"<<endl;
             cerr<<"-fg <foreground color>"<<endl;
             cerr<<"-bg <background color>"<<endl;
             cerr<<"-h"<<endl;
             exit(0);
+        } else {
+            texts_and_fonts.push_back(argv[a]);
         }
-            
     }
-    
 
-    App app(displayname.c_str(), foreground, background);
-    //app.font().setAntialias(antialias);
-    if (!app.font().load(fontname.c_str()))
-        cerr<<"Failed to load: "<<fontname<<endl;
-    if (orient && !app.font().validOrientation(orient)) {
-        cerr<<"Orientation not valid ("<<orient<<")"<<endl;
-        orient = FbTk::ROT0;
+    if (texts_and_fonts.empty()) {
+        texts_and_fonts.push_back("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789,.-_¯åäöÅÄÖ^~+=`\"!#¤%&/()=¡@£$½¥{[]}¶½§±|default");
     }
-    // utf-8 it
 
-    cerr<<"Setting text: "<<text<<endl;
-    app.setText(FbTk::FbStringUtil::XStrToFb(text), orient);
+    App app(displayname.c_str(), foreground, background);
+    app.show();
+
+    for (a = 0; a < texts_and_fonts.size(); ++a) {
+
+        vector<string> tf;
+        FbTk::StringUtil::stringtok(tf, texts_and_fonts[a], "|");
+        if (tf.size() < 2) {
+            tf.push_back("default");
+        }
+
+        FbTk::Font* f = new FbTk::Font(0);
+        if (f->load(tf[1])) {
+
+            if (orient && !f->validOrientation(orient)) {
+                cerr<<"Orientation not valid ("<<orient<<")"<<endl;
+                orient = FbTk::ROT0;
+            }
 
+            app.addText(FbTk::FbStringUtil::XStrToFb(tf[0]), *f, orient);
+
+        } else {
+            cerr<<"Failed to load: "<<tf[1]<<endl;
+            delete f;
+        }
+    }
+
+    app.resize(app.width(), app.height());
     app.redraw();
     app.eventLoop();
-        
+
+    return 0;
 }
+