5 files changed, 28 insertions, 18 deletions

diff --git a/src/FbTk/Menu.cc b/src/FbTk/Menu.cc
index 696d847..ff57bde 100644
--- a/src/FbTk/Menu.cc
+++ b/src/FbTk/Menu.cc
@@ -832,8 +832,7 @@ void Menu::handleEvent(XEvent &event) {
         if (validIndex(m_which_sub) &&
                 menuitems[m_which_sub]->submenu()->isVisible())
             menuitems[m_which_sub]->submenu()->grabInputFocus();
-    } else if (event.type == LeaveNotify)
-        m_closing = false;
+    }
 }
 
 void Menu::buttonPressEvent(XButtonEvent &be) {
@@ -1091,6 +1090,18 @@ void Menu::keyPressEvent(XKeyEvent &event) {
     }
 }
 
+void Menu::leaveNotifyEvent(XCrossingEvent &ce) {
+    m_closing = false;
+    // if there's a submenu open, highlight its index and stop hide
+    if (validIndex(m_which_sub) && m_active_index != m_which_sub &&
+        menuitems[m_which_sub]->submenu()->isVisible()) {
+        int old = m_active_index;
+        m_active_index = m_which_sub;
+        clearItem(m_active_index);
+        clearItem(old);
+        menuitems[m_which_sub]->submenu()->stopHide();
+    }
+}
 
 void Menu::reconfigure() {
     m_shape->setPlaces(theme()->shapePlaces());
diff --git a/src/FbTk/Menu.hh b/src/FbTk/Menu.hh
index 4ebab83..2675502 100644
--- a/src/FbTk/Menu.hh
+++ b/src/FbTk/Menu.hh
@@ -103,6 +103,7 @@ public:
     void motionNotifyEvent(XMotionEvent &mn);
     void exposeEvent(XExposeEvent &ee);
     void keyPressEvent(XKeyEvent &ke);
+    void leaveNotifyEvent(XCrossingEvent &ce);
     //@}
     /// get input focus
     void grabInputFocus();
diff --git a/src/FbTk/Shape.cc b/src/FbTk/Shape.cc
index c8cfb46..251d4d4 100644
--- a/src/FbTk/Shape.cc
+++ b/src/FbTk/Shape.cc
@@ -43,6 +43,7 @@
 #endif // SHAPE
 
 #include <algorithm>
+#include <vector>
 
 using std::min;
 
@@ -92,9 +93,17 @@ Pixmap makePixmap(FbWindow &drawable, const unsigned char rows[]) {
     return pm.release();
 }
 
+struct CornerPixmaps {
+    FbPixmap topleft;
+    FbPixmap topright;
+    FbPixmap botleft;
+    FbPixmap botright;
 };
 
-std::vector<Shape::CornerPixmaps> Shape::s_corners;
+// unfortunately, we need a separate pixmap per screen
+std::vector<CornerPixmaps> s_corners;
+
+}; // end of anonymous namespace
 
 Shape::Shape(FbWindow &win, int shapeplaces):
     m_win(&win),
@@ -134,7 +143,7 @@ Shape::~Shape() {
 void Shape::initCorners(int screen_num) {
     if (s_corners.size() == 0)
         s_corners.resize(ScreenCount(App::instance()->display()));
- 
+
     static const unsigned char left_bits[] = { 0xc0, 0xf8, 0xfc, 0xfe, 0xfe, 0xfe, 0xff, 0xff };
     static const unsigned char right_bits[] = { 0x03, 0x1f, 0x3f, 0x7f, 0x7f, 0x7f, 0xff, 0xff};
     static const unsigned char bottom_left_bits[] = { 0xff, 0xff, 0xfe, 0xfe, 0xfe, 0xfc, 0xf8, 0xc0 };
diff --git a/src/FbTk/Shape.hh b/src/FbTk/Shape.hh
index 04382cf..3539959 100644
--- a/src/FbTk/Shape.hh
+++ b/src/FbTk/Shape.hh
@@ -24,8 +24,6 @@
 
 #include "FbPixmap.hh"
 
-#include <vector>
-
 namespace FbTk {
 class FbWindow;
 
@@ -67,17 +65,8 @@ private:
 
     void initCorners(int screen_num);
 
-    struct CornerPixmaps {
-        FbPixmap topleft;
-        FbPixmap topright;
-        FbPixmap botleft;
-        FbPixmap botright;
-    };
 
-    // unfortunately, we need a separate pixmap per screen
-    static std::vector<CornerPixmaps> s_corners;
     int m_shapeplaces; ///< places to shape
-
 };
 
 }; // end namespace FbTk
diff --git a/src/FbTk/TextUtils.hh b/src/FbTk/TextUtils.hh
index efb6020..dcc222c 100644
--- a/src/FbTk/TextUtils.hh
+++ b/src/FbTk/TextUtils.hh
@@ -72,7 +72,7 @@ inline void translateCoords(Orientation orient, int &x, int &y, unsigned int w,
 }
 
 // still require w and h in ROT0 coords
-inline void untranslateCoords(Orientation orient, int orig_x, int orig_y, unsigned int w, unsigned int h) {
+inline void untranslateCoords(Orientation orient, int &orig_x, int &orig_y, unsigned int w, unsigned int h) {
 
     int x = orig_x;
     int y = orig_y;
@@ -98,7 +98,7 @@ inline void untranslateCoords(Orientation orient, int orig_x, int orig_y, unsign
 
 // When positioning an X11 box inside another area, we need to
 // relocate the x,y coordinates
-inline void translatePosition(Orientation orient, int x, int y, unsigned int w, unsigned int h, unsigned int bw) {
+inline void translatePosition(Orientation orient, int &x, int &y, unsigned int w, unsigned int h, unsigned int bw) {
 
     switch(orient) {
     case ROT0:
@@ -117,7 +117,7 @@ inline void translatePosition(Orientation orient, int x, int y, unsigned int w,
 
 }
 
-inline void translateSize(Orientation orient, unsigned int w, unsigned int h) {
+inline void translateSize(Orientation orient, unsigned int &w, unsigned int &h) {
     if (orient == ROT0 || orient == ROT180)
         return;