16 files changed, 71 insertions, 53 deletions

diff --git a/src/ButtonTheme.hh b/src/ButtonTheme.hh
index a293b71..50358fa 100644
--- a/src/ButtonTheme.hh
+++ b/src/ButtonTheme.hh
@@ -41,7 +41,7 @@ public:
     const FbTk::Texture &pressed() const { return *m_pressed_texture; }
     GC gc() const { return m_gc.gc(); }
     int scale() const { return *m_scale; } // scale factor for inside objects
-    const std::string &name() { return m_name; }
+    const std::string &name() const { return m_name; }
 
     virtual FbTk::Signal<> &reconfigSig() { return FbTk::Theme::reconfigSig(); }
 
diff --git a/src/ColSmartPlacement.cc b/src/ColSmartPlacement.cc
index b0bcf68..66f3a02 100644
--- a/src/ColSmartPlacement.cc
+++ b/src/ColSmartPlacement.cc
@@ -99,6 +99,8 @@ bool ColSmartPlacement::placeWindow(const FluxboxWindow &win, int head,
             std::list<FluxboxWindow *>::const_iterator it_end = windowlist.end();
             for (; it != it_end && placed; ++it) {
                 if (*it == &win) continue;
+                if ((*it)->layerNum() != win.layerNum() ){ continue; } //windows are in different layers - skip it
+                
                 int bw = 2 * (*it)->fbWindow().borderWidth();
                 int curr_x = (*it)->x() - (*it)->xOffset();
                 int curr_y = (*it)->y() - (*it)->yOffset();
diff --git a/src/CommandDialog.cc b/src/CommandDialog.cc
index 023c22f..e777390 100644
--- a/src/CommandDialog.cc
+++ b/src/CommandDialog.cc
@@ -40,7 +40,7 @@ using std::less;
 using std::out_of_range;
 
 CommandDialog::CommandDialog(BScreen &screen, const string &title,
-                             const string precommand) : 
+                             const string &precommand) : 
     TextDialog(screen, title),
     m_precommand(precommand) { }
 
diff --git a/src/CommandDialog.hh b/src/CommandDialog.hh
index 0e12ce3..a976bc4 100644
--- a/src/CommandDialog.hh
+++ b/src/CommandDialog.hh
@@ -35,7 +35,7 @@ class Command;
 class CommandDialog: public TextDialog {
 public:
     CommandDialog(BScreen &screen, const std::string &title,
-                  const std::string pre_command = "");
+                  const std::string &pre_command = "");
 
     /**
      * Sets the command to be executed after the command is done.
diff --git a/src/FbTk/FbString.cc b/src/FbTk/FbString.cc
index 2bc7516..9c7fca7 100644
--- a/src/FbTk/FbString.cc
+++ b/src/FbTk/FbString.cc
@@ -168,6 +168,10 @@ void init() {
     s_inited = true;
     setlocale(LC_CTYPE, "");
 
+    for (int i = 0; i < CONVSIZE; i++) {
+        s_iconv_convs[i] = ICONV_NULL;
+    }
+
 #ifdef HAVE_ICONV
 #if defined(CODESET) && !defined(_WIN32)
     s_locale_codeset = nl_langinfo(CODESET);
@@ -186,8 +190,6 @@ void init() {
     s_iconv_convs[X2FB] = iconv_open("UTF-8", "ISO8859-1");
     s_iconv_convs[FB2LOCALE] = iconv_open(s_locale_codeset.c_str(), "UTF-8");
     s_iconv_convs[LOCALE2FB] = iconv_open("UTF-8", s_locale_codeset.c_str());
-#else
-    memset(s_iconv_convs, 0, sizeof(s_iconv_convs));
 #endif // HAVE_ICONV
 
 }
@@ -195,11 +197,13 @@ void init() {
 void shutdown() {
 #ifdef HAVE_ICONV
     int i;
-    for (i = 0; i < CONVSIZE; ++i)
-        if (s_iconv_convs[i] != ICONV_NULL)
+    for (i = 0; i < CONVSIZE; ++i) {
+        if (s_iconv_convs[i] != ICONV_NULL) {
             iconv_close(s_iconv_convs[i]);
+            s_iconv_convs[i] = ICONV_NULL;
+        }
+    }
 
-    memset(s_iconv_convs, 0, sizeof(s_iconv_convs));
     s_inited = false;
 #endif // HAVE_ICONV
 }
diff --git a/src/FbTk/Layer.hh b/src/FbTk/Layer.hh
index 536ce00..ed28ec6 100644
--- a/src/FbTk/Layer.hh
+++ b/src/FbTk/Layer.hh
@@ -43,7 +43,7 @@ public:
     //typedef std::list<LayerItem *>::reverse_iterator reverse_iterator;
 
     void setLayerNum(int layernum) { m_layernum = layernum; };
-    int  getLayerNum() { return m_layernum; };
+    int  getLayerNum() const { return m_layernum; };
     // Put all items on the same layer (called when layer item added to)
     void alignItem(LayerItem &item);
     int countWindows();
diff --git a/src/FbTk/MenuSearch.cc b/src/FbTk/MenuSearch.cc
index d87bfaf..689323c 100644
--- a/src/FbTk/MenuSearch.cc
+++ b/src/FbTk/MenuSearch.cc
@@ -19,7 +19,7 @@ size_t search_str_textstart(const std::string& text, const std::string& pattern)
 
     size_t i;
     for (i = l; i > 0; i--) {
-        if (std::tolower(text[i-1]) != std::tolower(pattern[i-1])) {
+        if (std::tolower(text[i-1]) != pattern[i-1]) {
             return std::string::npos;
         }
     }
@@ -40,12 +40,13 @@ size_t search_str_bmh(const std::string& text, const std::string& pattern) {
         return std::string::npos;
     }
 
-    size_t t;
-    size_t tlen = text.size();
+    const size_t tlen = text.size();
+    const size_t plen = pattern.size();
+    size_t t; // index in text
 
     // simple case, no need to be too clever
-    if (pattern.size() == 1) {
-        int b = std::tolower(pattern[0]);
+    if (plen == 1) {
+        int b = pattern[0];
         for (t = 0; t < tlen; t++) {
             if (b == std::tolower(text[t])) {
                 return t;
@@ -54,28 +55,28 @@ size_t search_str_bmh(const std::string& text, const std::string& pattern) {
         return std::string::npos;
     }
 
-
-    size_t plast = pattern.size() - 1;
-    size_t p;
-
     // prepare skip-table
     //
-    size_t skip[256];
+    size_t       skip[256];
+    const size_t pe = plen - 1; // end index in pattern
+    size_t       p;             // index in pattern
+
     for (p = 0; p < sizeof(skip)/sizeof(skip[0]); p++) {
-        skip[p] = plast + 1;
+        skip[p] = plen;
     }
-    for (p = 0; p < plast; p++) {
-        skip[std::tolower(pattern[p])] = plast - p;
+    for (p = 0; p < pe; p++) {
+        skip[pattern[p]] = pe - p;
     }
 
     // match
-    for (t = 0; t + plast < tlen; ) {
-        for (p = plast; std::tolower(text[t+p]) == std::tolower(pattern[p]); p--) {
+    //
+    for (t = 0; (t+pe) < tlen; ) {
+        for (p = pe; std::tolower(text[t+p]) == pattern[p]; p--) {
             if (p == 0) {
-                return t+p;
+                return t;
             }
         }
-        t += skip[std::tolower(text[t+p])];
+        t += skip[std::tolower(text[t+pe])];
     }
 
     return std::string::npos;
@@ -117,7 +118,7 @@ void MenuSearch::clear() {
 }
 
 void MenuSearch::add(char c) {
-    pattern.push_back(c);
+    pattern.push_back(std::tolower(c));
 }
 
 void MenuSearch::backspace() {
diff --git a/src/FbTk/MenuSearch.hh b/src/FbTk/MenuSearch.hh
index d642929..e06b39b 100644
--- a/src/FbTk/MenuSearch.hh
+++ b/src/FbTk/MenuSearch.hh
@@ -13,9 +13,10 @@ class MenuItem;
 // a small helper which applies search operations on a list of MenuItems*.
 // the former incarnation of this class was FbTk::TypeAhead in combination with
 // the now non-existent FbTk::SearchResults, but the complexity of these
-// are not needed for our use case. as a bonus we have less lose parts
+// are not needed for our use case. as a bonus, we have less lose parts
 // flying around.
-
+//
+// MenuSearch is case insensitive.
 class MenuSearch {
 public:
 
diff --git a/src/FbTk/StringUtil.hh b/src/FbTk/StringUtil.hh
index b3908d8..2f7c6fc 100644
--- a/src/FbTk/StringUtil.hh
+++ b/src/FbTk/StringUtil.hh
@@ -98,10 +98,10 @@ static void stringTokensBetween(Container &container, const std::string &in,
         const char *ok_chars = " \t\n", bool allow_nesting = true) {
 
     std::string token;
-    int err = 0, pos = 0;
+    int pos = 0;
 
     while (true) {
-        err = getStringBetween(token, in.c_str() + pos, first, last, ok_chars,
+        int err = getStringBetween(token, in.c_str() + pos, first, last, ok_chars,
                                allow_nesting);
         if (err <= 0)
             break;
diff --git a/src/FbTk/TextBox.hh b/src/FbTk/TextBox.hh
index 7b42bd1..40a7c3c 100644
--- a/src/FbTk/TextBox.hh
+++ b/src/FbTk/TextBox.hh
@@ -63,7 +63,7 @@ public:
     const Font &font() const { return *m_font; }
     GC gc() const { return m_gc; }
     int cursorPosition() const { return m_cursor_pos; }
-    int textStartPos(){ return m_start_pos; }
+    int textStartPos() const { return m_start_pos; }
 
     unsigned int findEmptySpaceLeft();
     unsigned int findEmptySpaceRight();
diff --git a/src/FocusableList.cc b/src/FocusableList.cc
index 0850943..3689283 100644
--- a/src/FocusableList.cc
+++ b/src/FocusableList.cc
@@ -164,7 +164,7 @@ void FocusableList::checkUpdate(Focusable &win) {
 
 // returns whether or not the window was moved
 bool FocusableList::insertFromParent(Focusable &win) {
-    const Focusables list = m_parent->clientList();
+    const Focusables &list = m_parent->clientList();
     Focusables::const_iterator p_it = list.begin(), p_it_end = list.end();
     Focusables::iterator our_it = m_list.begin(), our_it_end = m_list.end();
     // walk through our list looking for corresponding entries in
@@ -189,7 +189,7 @@ void FocusableList::addMatching() {
     if (!m_parent)
         return;
 
-    const Focusables list = m_parent->clientList();
+    const Focusables &list = m_parent->clientList();
     Focusables::const_iterator it = list.begin(), it_end = list.end();
     for (; it != it_end; ++it) {
         if (m_pat->match(**it)) {
diff --git a/src/MinOverlapPlacement.cc b/src/MinOverlapPlacement.cc
index 78cadb4..b715f70 100644
--- a/src/MinOverlapPlacement.cc
+++ b/src/MinOverlapPlacement.cc
@@ -144,7 +144,8 @@ bool MinOverlapPlacement::placeWindow(const FluxboxWindow &win, int head,
                                                    it_end = const_windowlist.rend();
     for (; it != it_end; ++it) {
         if (*it == &win) continue;
-
+        if ((*it)->layerNum() != win.layerNum() ){ continue; } //windows are in different layers - skip it
+        
         getWindowDimensions(*(*it), left, top, right, bottom);
 
         // go through the list of regions
diff --git a/src/RowSmartPlacement.cc b/src/RowSmartPlacement.cc
index eca867f..95a8257 100644
--- a/src/RowSmartPlacement.cc
+++ b/src/RowSmartPlacement.cc
@@ -115,6 +115,7 @@ bool RowSmartPlacement::placeWindow(const FluxboxWindow &win, int head,
             for (; win_it != win_it_end && placed; ++win_it) {
                 FluxboxWindow &window = **win_it;
                 if (&window == &win) continue;
+                if (window.layerNum() != win.layerNum() ){ continue; } //windows are in different layers - skip it
 
                 int curr_x = window.x() - window.xOffset(); // minus offset to get back up to fake place
                 int curr_y = window.y() - window.yOffset();
diff --git a/src/Toolbar.cc b/src/Toolbar.cc
index 933c217..b607f21 100644
--- a/src/Toolbar.cc
+++ b/src/Toolbar.cc
@@ -80,18 +80,18 @@ const struct {
     unsigned int shape;
 } _values[] = {
     { /* unused */ },
-    { Toolbar::TOPLEFT,      "TopLeft",      FbTk::ROT0,   FbTk::Shape::BOTTOMRIGHT | FbTk::Shape::BOTTOMLEFT},
-    { Toolbar::TOPCENTER,    "TopCenter",    FbTk::ROT0,   FbTk::Shape::TOPRIGHT | FbTk::Shape::TOPLEFT},
-    { Toolbar::TOPRIGHT,     "TopRight",     FbTk::ROT0,   FbTk::Shape::BOTTOMRIGHT | FbTk::Shape::BOTTOMLEFT},
-    { Toolbar::BOTTOMLEFT,   "BottomLeft",   FbTk::ROT0,   FbTk::Shape::TOPRIGHT | FbTk::Shape::TOPLEFT},
-    { Toolbar::BOTTOMCENTER, "BottomCenter", FbTk::ROT0,   FbTk::Shape::TOPRIGHT | FbTk::Shape::TOPLEFT},
-    { Toolbar::BOTTOMRIGHT,  "BottomRight",  FbTk::ROT0,   FbTk::Shape::TOPRIGHT | FbTk::Shape::TOPLEFT},
-    { Toolbar::LEFTBOTTOM,   "LeftBottom",   FbTk::ROT270, FbTk::Shape::TOPRIGHT | FbTk::Shape::BOTTOMRIGHT},
-    { Toolbar::LEFTCENTER,   "LeftCenter",   FbTk::ROT270, FbTk::Shape::TOPRIGHT | FbTk::Shape::BOTTOMRIGHT},
-    { Toolbar::LEFTTOP,      "LeftTop",      FbTk::ROT270, FbTk::Shape::TOPRIGHT | FbTk::Shape::BOTTOMRIGHT},
-    { Toolbar::RIGHTBOTTOM,  "RightBottom",  FbTk::ROT90,  FbTk::Shape::TOPLEFT | FbTk::Shape::BOTTOMLEFT},
-    { Toolbar::RIGHTCENTER,  "RightCenter",  FbTk::ROT90,  FbTk::Shape::TOPLEFT | FbTk::Shape::BOTTOMLEFT},
-    { Toolbar::RIGHTTOP,     "RightTop",     FbTk::ROT90,  FbTk::Shape::TOPLEFT | FbTk::Shape::BOTTOMLEFT},
+    { Toolbar::TOPLEFT,      "TopLeft",      FbTk::ROT0,   FbTk::Shape::BOTTOMRIGHT                            },
+    { Toolbar::TOPCENTER,    "TopCenter",    FbTk::ROT0,   FbTk::Shape::BOTTOMRIGHT | FbTk::Shape::BOTTOMLEFT  },
+    { Toolbar::TOPRIGHT,     "TopRight",     FbTk::ROT0,   FbTk::Shape::BOTTOMLEFT                             },
+    { Toolbar::BOTTOMLEFT,   "BottomLeft",   FbTk::ROT0,   FbTk::Shape::TOPRIGHT                               },
+    { Toolbar::BOTTOMCENTER, "BottomCenter", FbTk::ROT0,   FbTk::Shape::TOPRIGHT    | FbTk::Shape::TOPLEFT     },
+    { Toolbar::BOTTOMRIGHT,  "BottomRight",  FbTk::ROT0,   FbTk::Shape::TOPLEFT                                },
+    { Toolbar::LEFTBOTTOM,   "LeftBottom",   FbTk::ROT270, FbTk::Shape::TOPRIGHT                               },
+    { Toolbar::LEFTCENTER,   "LeftCenter",   FbTk::ROT270, FbTk::Shape::TOPRIGHT    | FbTk::Shape::BOTTOMRIGHT },
+    { Toolbar::LEFTTOP,      "LeftTop",      FbTk::ROT270, FbTk::Shape::BOTTOMRIGHT                            },
+    { Toolbar::RIGHTBOTTOM,  "RightBottom",  FbTk::ROT90,  FbTk::Shape::TOPLEFT                                },
+    { Toolbar::RIGHTCENTER,  "RightCenter",  FbTk::ROT90,  FbTk::Shape::TOPLEFT     | FbTk::Shape::BOTTOMLEFT  },
+    { Toolbar::RIGHTTOP,     "RightTop",     FbTk::ROT90,  FbTk::Shape::BOTTOMLEFT                             },
 };
 
 }
@@ -648,24 +648,29 @@ void Toolbar::setPlacement(Toolbar::Placement where) {
         break;
     case TOPCENTER:
         frame.x += (head_w - static_cast<int>(frame.width))/2 - bw;
+        frame.x_hidden = frame.x;
         frame.y_hidden += pixel - bw - static_cast<int>(frame.height);
         break;
     case TOPRIGHT:
         frame.x += head_w - static_cast<int>(frame.width) - bw*2;
+        frame.x_hidden = frame.x;
         frame.y_hidden += pixel - bw - static_cast<int>(frame.height);
         break;
     case BOTTOMRIGHT:
         frame.x += head_w - static_cast<int>(frame.width) - bw*2;
         frame.y += head_h - static_cast<int>(frame.height) - bw*2;
+        frame.x_hidden = frame.x;
         frame.y_hidden += head_h - bw - pixel;
         break;
     case BOTTOMCENTER: // default is BOTTOMCENTER
         frame.x += (head_w - static_cast<int>(frame.width))/2 - bw;
         frame.y += head_h - static_cast<int>(frame.height) - bw*2;
+        frame.x_hidden = frame.x;
         frame.y_hidden += head_h - bw - pixel;
         break;
     case LEFTCENTER:
         frame.y += (head_h - static_cast<int>(frame.height))/2 - bw;
+        frame.y_hidden = frame.y;
         frame.x_hidden += pixel - static_cast<int>(frame.width) - bw;
         break;
     case LEFTTOP:
@@ -673,21 +678,24 @@ void Toolbar::setPlacement(Toolbar::Placement where) {
         break;
     case LEFTBOTTOM:
         frame.y = head_h - static_cast<int>(frame.height) - bw*2;
+        frame.y_hidden = frame.y;
         frame.x_hidden += pixel - static_cast<int>(frame.width) - bw;
         break;
     case RIGHTCENTER:
         frame.x += head_w - static_cast<int>(frame.width) - bw*2;
-        frame.y += (head_h - static_cast<int>(frame.height))/2 * bw;
-        frame.x_hidden += static_cast<int>(frame.width) + bw - pixel;
+        frame.y += (head_h - static_cast<int>(frame.height))/2 - bw;
+        frame.x_hidden += head_w - bw - pixel;
+        frame.y_hidden = frame.y;
         break;
     case RIGHTTOP:
         frame.x += head_w - static_cast<int>(frame.width) - bw*2;
-        frame.x_hidden += static_cast<int>(frame.width) + bw - pixel;
+        frame.x_hidden += head_w - bw - pixel;
         break;
     case RIGHTBOTTOM:
         frame.x += head_w - static_cast<int>(frame.width) - bw*2;
         frame.y += head_h - static_cast<int>(frame.height) - bw*2;
-        frame.x_hidden +=   static_cast<int>(frame.width) + bw - pixel;
+        frame.x_hidden += head_w - bw - pixel;
+        frame.y_hidden = frame.y;
         break;
     }
 
diff --git a/src/tests/menutest.cc b/src/tests/menutest.cc
index 0008ff0..6a8bd43 100644
--- a/src/tests/menutest.cc
+++ b/src/tests/menutest.cc
@@ -44,7 +44,7 @@ using namespace std;
 void doSubmenu(Parser &parser, FbTk::Menu &menu, 
                FbTk::MenuTheme &theme,
                FbTk::ImageControl &image_ctrl,
-               const std::string labelstr) {
+               const std::string &labelstr) {
 
     Parser::Item key, label, cmd, icon;
 
diff --git a/util/fbsetbg b/util/fbsetbg
index e277317..17c2efe 100644
--- a/util/fbsetbg
+++ b/util/fbsetbg
@@ -523,7 +523,7 @@ if [ "$option" = random ]; then
         wallpaper="$wallpaperdir/`ls \"$wallpaperdir\"|sed -n ${wallpapernumber}p`"
         option=$option2 # have to choose something...
     else
-        message "Invalid random wallpaper directory specified."
+        message "Invalid random wallpaper directory specified: '$wallpaperdir'."
         exit 1
     fi
 fi