11 files changed, 51 insertions, 43 deletions

diff --git a/src/FbTk/I18n.cc b/src/FbTk/I18n.cc
index c41f98c..62fda06 100644
--- a/src/FbTk/I18n.cc
+++ b/src/FbTk/I18n.cc
@@ -75,7 +75,7 @@ I18n::I18n():m_multibyte(false), m_catalog_fd((nl_catd)(-1)) {
 #ifdef  HAVE_SETLOCALE
     //make sure we don't get 0 to m_locale string
     char *temp = setlocale(LC_MESSAGES, "");
-    m_locale = ( temp ?  temp : ""); 
+    m_locale = ( temp ?  temp : "");
     if (m_locale.empty()) {
         cerr<<"Warning: Failed to set locale, reverting to \"C\""<<endl;
 #endif // HAVE_SETLOCALE
@@ -90,9 +90,9 @@ I18n::I18n():m_multibyte(false), m_catalog_fd((nl_catd)(-1)) {
         // MB_CUR_MAX returns the size of a char in the current locale
         if (MB_CUR_MAX > 1)
             m_multibyte = true;
-                
+
         // truncate any encoding off the end of the locale
-                                
+
         // remove everything after @
         string::size_type index = m_locale.find('@');
         if (index != string::npos)
@@ -150,12 +150,17 @@ void I18n::openCatalog(const char *catalog) {
 }
 
 
-const char *I18n::getMessage(int set_number, int message_number, 
+FbString I18n::getMessage(int set_number, int message_number, 
                              const char *default_message) const {
 
 #if defined(NLS) && defined(HAVE_CATGETS)
-    if (m_catalog_fd != (nl_catd)-1)
-        return (const char *) catgets(m_catalog_fd, set_number, message_number, default_message);
+    if (m_catalog_fd != (nl_catd)-1) {
+        const char *ret = catgets(m_catalog_fd, set_number, message_number, default_message);
+        if (ret == default_message || ret == NULL)
+            return default_message; // don't recode the default
+
+        return FbStringUtil::LocaleStrToFb(ret);
+    }
     else
 #endif // NLS && HAVE_CATGETS
         return default_message;
diff --git a/src/FbTk/I18n.hh b/src/FbTk/I18n.hh
index 7891961..b8fef0f 100644
--- a/src/FbTk/I18n.hh
+++ b/src/FbTk/I18n.hh
@@ -30,6 +30,8 @@
 // TODO: FIXME
 #include "../../nls/fluxbox-nls.hh"
 
+#include "FbString.hh"
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif // HAVE_CONFIG_H
@@ -93,7 +95,7 @@ public:
     inline bool multibyte() const { return m_multibyte; }
     inline const nl_catd &getCatalogFd() const { return m_catalog_fd; }
 
-    const char *getMessage(int set_number, int message_number, 
+    FbString getMessage(int set_number, int message_number, 
                            const char *default_messsage = 0) const;
     void openCatalog(const char *catalog);
 private:
diff --git a/src/FbTk/Menu.cc b/src/FbTk/Menu.cc
index d99c9ba..63f3958 100644
--- a/src/FbTk/Menu.cc
+++ b/src/FbTk/Menu.cc
@@ -193,15 +193,15 @@ Menu::~Menu() {
         s_focused = 0;
 }
 
-int Menu::insert(const char *label, RefCount<Command> &cmd, int pos) {
+int Menu::insert(const FbString &label, RefCount<Command> &cmd, int pos) {
     return insert(new MenuItem(label, cmd), pos);
 }
 
-int Menu::insert(const char *label, int pos) {
+int Menu::insert(const FbString &label, int pos) {
     return insert(new MenuItem(label), pos);
 }
 
-int Menu::insert(const char *label, Menu *submenu, int pos) {
+int Menu::insert(const FbString &label, Menu *submenu, int pos) {
     submenu->m_parent = this;
     return insert(new MenuItem(label, submenu), pos);
 }
@@ -392,7 +392,7 @@ void Menu::enableTitle() {
 
 void Menu::updateMenu(int active_index) {
     if (m_title_vis) {
-        menu.item_w = theme().titleFont().textWidth(menu.label.c_str(),
+        menu.item_w = theme().titleFont().textWidth(menu.label,
                                                     menu.label.size());
         menu.item_w += (theme().bevelWidth() * 2);
     } else
@@ -427,14 +427,14 @@ void Menu::updateMenu(int active_index) {
     int itmp = (theme().itemHeight() * menu.persub);
     menu.frame_h = itmp < 1 ? 1 : itmp;
 
-    int new_width = (menu.sublevels * menu.item_w);
-    int new_height = menu.frame_h;
+    unsigned int new_width = (menu.sublevels * menu.item_w);
+    unsigned int new_height = menu.frame_h;
 
     if (m_title_vis)
         new_height += theme().titleHeight() + ((menu.frame_h > 0)?menu.title.borderWidth():0);
 
 
-    if (new_width < 1) {
+    if (new_width == 0) {
         if (menu.item_w > 0) 
             new_width = menu.item_w;
         else
@@ -638,12 +638,11 @@ void Menu::move(int x, int y) {
 
 
 void Menu::redrawTitle(FbDrawable &drawable) {
-    const char *text = menu.label.c_str();
 
     const FbTk::Font &font = theme().titleFont();
     int dx = theme().bevelWidth();
     size_t len = menu.label.size();
-    unsigned int l = font.textWidth(text, len) + theme().bevelWidth()*2;
+    unsigned int l = font.textWidth(menu.label, len) + theme().bevelWidth()*2;
 
     switch (theme().titleFontJustify()) {
     case FbTk::RIGHT:
@@ -662,7 +661,7 @@ void Menu::redrawTitle(FbDrawable &drawable) {
     font.drawText(drawable, // drawable
                   screenNumber(),
                   theme().titleTextGC().gc(), // graphic context
-                  text, len,  // text string with length
+                  menu.label, len,  // text string with length
                   dx, font.ascent() + theme().bevelWidth() + height_offset/2);  // position
 }
 
@@ -784,9 +783,9 @@ int Menu::drawItem(FbDrawable &drawable, unsigned int index,
     return item_y;
 }
 
-void Menu::setLabel(const char *labelstr) {
+void Menu::setLabel(const FbString &labelstr) {
     //make sure we don't send 0 to std::string
-    menu.label = (labelstr ? labelstr : "");
+    menu.label = labelstr;
     reconfigure();
 }
 
diff --git a/src/FbTk/Menu.hh b/src/FbTk/Menu.hh
index 2f098d7..26262f2 100644
--- a/src/FbTk/Menu.hh
+++ b/src/FbTk/Menu.hh
@@ -40,6 +40,7 @@
 #include "FbPixmap.hh"
 #include "MenuTheme.hh"
 #include "Timer.hh"
+#include "FbString.hh"
 
 namespace FbTk {
 
@@ -65,11 +66,11 @@ public:
     */
     //@{
     /// add a menu item with a label and a command
-    int insert(const char *label, RefCount<Command> &cmd, int pos=-1);
+    int insert(const FbString &label, RefCount<Command> &cmd, int pos=-1);
     /// add empty menu item
-    int insert(const char *label, int pos=-1);
+    int insert(const FbString &label, int pos=-1);
     /// add submenu
-    int insert(const char *label, Menu *submenu, int pos= -1);
+    int insert(const FbString &label, Menu *submenu, int pos= -1);
     /// add menu item
     int insert(MenuItem *item, int pos=-1);
     /// remove an item
@@ -113,7 +114,7 @@ public:
     void grabInputFocus();
     virtual void reconfigure();
     /// set label string
-    void setLabel(const char *labelstr);
+    void setLabel(const FbString &labelstr);
     /// move menu to x,y
     void move(int x, int y);
     virtual void updateMenu(int active_index = -1);
diff --git a/src/FbTk/MenuIcon.cc b/src/FbTk/MenuIcon.cc
index aa71b5d..d64d876 100644
--- a/src/FbTk/MenuIcon.cc
+++ b/src/FbTk/MenuIcon.cc
@@ -30,8 +30,8 @@
 
 namespace FbTk {
 
-MenuIcon::MenuIcon(const std::string &filename, const std::string &label, int screen_num):
-    MenuItem(label.c_str()),
+MenuIcon::MenuIcon(const std::string &filename, FbString &label, int screen_num):
+    MenuItem(label),
     m_filename(filename) {
     FbTk::PixmapWithMask *pm = Image::load(filename.c_str(), screen_num);
     if (pm != 0) {
diff --git a/src/FbTk/MenuIcon.hh b/src/FbTk/MenuIcon.hh
index 7fbd12a..90cf320 100644
--- a/src/FbTk/MenuIcon.hh
+++ b/src/FbTk/MenuIcon.hh
@@ -34,7 +34,7 @@ namespace FbTk {
 
 class MenuIcon: public MenuItem {
 public:
-    MenuIcon(const std::string &filename, const std::string &label, int screen_num);
+    MenuIcon(const std::string &filename, FbString &label, int screen_num);
     void draw(FbDrawable &drawable, 
               const MenuTheme &theme,
               bool highlight,
diff --git a/src/FbTk/MenuItem.cc b/src/FbTk/MenuItem.cc
index f8ec4e9..fafedc0 100644
--- a/src/FbTk/MenuItem.cc
+++ b/src/FbTk/MenuItem.cc
@@ -284,7 +284,7 @@ unsigned int MenuItem::height(const MenuTheme &theme) const {
 unsigned int MenuItem::width(const MenuTheme &theme) const {
     // textwidth + bevel width on each side of the text
     const unsigned int icon_width = height(theme);
-    const unsigned int normal = theme.frameFont().textWidth(label().c_str(), label().size()) +
+    const unsigned int normal = theme.frameFont().textWidth(label(), label().size()) +
                                 2 * (theme.bevelWidth() + icon_width);
     return m_icon.get() == 0 ? normal : normal + icon_width;
 }
diff --git a/src/FbTk/MenuItem.hh b/src/FbTk/MenuItem.hh
index 0bf66be..94f0775 100644
--- a/src/FbTk/MenuItem.hh
+++ b/src/FbTk/MenuItem.hh
@@ -27,6 +27,7 @@
 #include "RefCount.hh"
 #include "Command.hh"
 #include "PixmapWithMask.hh"
+#include "FbString.hh"
 
 #include <string>
 #include <memory>
@@ -49,8 +50,8 @@ public:
           m_toggle_item(false)
     { }
     explicit MenuItem(
-             const char *label)
-        : m_label(label ? label : ""),
+        const FbString &label)
+        : m_label(label),
           m_menu(0),
           m_submenu(0),
           m_enabled(true),
@@ -58,8 +59,8 @@ public:
           m_toggle_item(false)
     { }
 
-    MenuItem(const char *label, Menu &host_menu)
-        : m_label(label ? label : ""),
+    MenuItem(const FbString &label, Menu &host_menu)
+        : m_label(label),
           m_menu(&host_menu),
           m_submenu(0),
           m_enabled(true),
@@ -67,8 +68,8 @@ public:
           m_toggle_item(false)
     { }
     /// create a menu item with a specific command to be executed on click
-    MenuItem(const char *label, RefCount<Command> &cmd, Menu *menu = 0):
-        m_label(label ? label : ""),
+    MenuItem(const FbString &label, RefCount<Command> &cmd, Menu *menu = 0):
+        m_label(label),
         m_menu(menu),
         m_submenu(0),
         m_command(cmd),
@@ -78,8 +79,8 @@ public:
                 
     }
 
-    MenuItem(const char *label, Menu *submenu, Menu *host_menu = 0)
-        : m_label(label ? label : "")
+    MenuItem(const FbString &label, Menu *submenu, Menu *host_menu = 0)
+        : m_label(label)
         , m_menu(host_menu)
         , m_submenu(submenu)
         , m_enabled(true)
@@ -91,7 +92,7 @@ public:
     inline void setCommand(RefCount<Command> &cmd) { m_command = cmd; }
     virtual inline void setSelected(bool selected) { m_selected = selected; }
     virtual inline void setEnabled(bool enabled) { m_enabled = enabled; }
-    virtual inline void setLabel(const char *label) { m_label = (label ? label : ""); }
+    virtual inline void setLabel(const FbString &label) { m_label = label; }
     virtual inline void setToggleItem(bool val) { m_toggle_item = val; }
     void setIcon(const std::string &filename, int screen_num);
     virtual Menu *submenu() { return m_submenu; }
@@ -130,7 +131,7 @@ public:
     Menu *menu() { return m_menu; }
         
 private:
-    std::string m_label; ///< label of this item
+    FbString m_label; ///< label of this item
     Menu *m_menu; ///< the menu we live in
     Menu *m_submenu; ///< a submenu, 0 if we don't have one
     RefCount<Command> m_command; ///< command to be executed
diff --git a/src/FbTk/MultiButtonMenuItem.cc b/src/FbTk/MultiButtonMenuItem.cc
index 964668f..b3fa1aa 100644
--- a/src/FbTk/MultiButtonMenuItem.cc
+++ b/src/FbTk/MultiButtonMenuItem.cc
@@ -27,14 +27,14 @@
 
 namespace FbTk {
 
-MultiButtonMenuItem::MultiButtonMenuItem(int buttons, const char *label):
+MultiButtonMenuItem::MultiButtonMenuItem(int buttons, const FbString &label):
     MenuItem(label),
     m_button_exe(0),
     m_buttons(buttons) {
     init(buttons);
 }
 
-MultiButtonMenuItem::MultiButtonMenuItem(int buttons, const char *label, Menu *submenu):
+MultiButtonMenuItem::MultiButtonMenuItem(int buttons, const FbString &label, Menu *submenu):
     MenuItem(label, submenu),
     m_button_exe(0),
     m_buttons(buttons) {
diff --git a/src/FbTk/MultiButtonMenuItem.hh b/src/FbTk/MultiButtonMenuItem.hh
index ccefff9..3e82d67 100644
--- a/src/FbTk/MultiButtonMenuItem.hh
+++ b/src/FbTk/MultiButtonMenuItem.hh
@@ -32,8 +32,8 @@ namespace FbTk {
 /// Handles commands for the specified numbers of buttons
 class MultiButtonMenuItem: public FbTk::MenuItem {
 public:
-    MultiButtonMenuItem(int buttons, const char *label);  
-    MultiButtonMenuItem(int buttons, const char *label, Menu *submenu);
+    MultiButtonMenuItem(int buttons, const FbString &label);  
+    MultiButtonMenuItem(int buttons, const FbString &label, Menu *submenu);
     virtual ~MultiButtonMenuItem();
     /// sets command to specified button
     void setCommand(int button, FbTk::RefCount<FbTk::Command> &cmd);
diff --git a/src/FbTk/Transparent.cc b/src/FbTk/Transparent.cc
index 8b248b8..edbab62 100644
--- a/src/FbTk/Transparent.cc
+++ b/src/FbTk/Transparent.cc
@@ -234,7 +234,7 @@ void Transparent::setDest(Drawable dest, int screen_num) {
         if (format == 0) {
             _FB_USES_NLS;
             cerr<<"FbTk::Transparent: ";
-            fprintf(stderr, _FBTKTEXT(Error, NoRenderVisualFormat, "Failed to find format for screen(%d)", "XRenderFindVisualFormat failed... include %d for screen number"), screen_num);
+            fprintf(stderr, _FBTKTEXT(Error, NoRenderVisualFormat, "Failed to find format for screen(%d)", "XRenderFindVisualFormat failed... include %d for screen number").c_str(), screen_num);
             cerr<<endl;
         }
         m_dest_pic = XRenderCreatePicture(disp, dest, format, 0, 0);
@@ -273,7 +273,7 @@ void Transparent::setSource(Drawable source, int screen_num) {
         if (format == 0) {
             _FB_USES_NLS;
             cerr<<"FbTk::Transparent: ";
-            fprintf(stderr, _FBTKTEXT(Error, NoRenderVisualFormat, "Failed to find format for screen(%d)", "XRenderFindVisualFormat failed... include %d for screen number"), screen_num);
+            fprintf(stderr, _FBTKTEXT(Error, NoRenderVisualFormat, "Failed to find format for screen(%d)", "XRenderFindVisualFormat failed... include %d for screen number").c_str(), screen_num);
             cerr<<endl;
         }
         m_src_pic = XRenderCreatePicture(disp, m_source, format,