1 files changed, 149 insertions, 98 deletions

diff --git a/src/FbTk/MenuItem.cc b/src/FbTk/MenuItem.cc
index 1f3125c..1ed3ebd 100644
--- a/src/FbTk/MenuItem.cc
+++ b/src/FbTk/MenuItem.cc
@@ -39,142 +39,194 @@ void MenuItem::click(int button, int time) {
 
 void MenuItem::draw(FbDrawable &draw,
                     const MenuTheme &theme,
-                    bool highlight,
+                    bool highlight, bool draw_foreground, bool draw_background,
                     int x, int y,
                     unsigned int width, unsigned int height) const {
 
+    // text and submenu icon are background
+    // selected pixmaps are foreground
+
     Display *disp = App::instance()->display();
     //
     // Icon
     //
-    if (m_icon.get() != 0 && m_icon->pixmap.get() != 0) {
-        // scale pixmap to right size
-        if (height - 2*theme.bevelWidth() != m_icon->pixmap->height() &&
-            !m_icon->filename.empty()) {
-            unsigned int scale_size = height - 2*theme.bevelWidth();
-            m_icon->pixmap->scale(scale_size, scale_size);
-        }
-
-        if (m_icon->pixmap->pixmap().drawable() != 0) {
-            GC gc = theme.frameTextGC().gc();
-            int icon_x = x + theme.bevelWidth();
-            int icon_y = y + theme.bevelWidth();
-            // enable clip mask
-            XSetClipMask(disp, gc, m_icon->pixmap->mask().drawable());
-            XSetClipOrigin(disp, gc, icon_x, icon_y);
-
-            draw.copyArea(m_icon->pixmap->pixmap().drawable(),
-                          gc,
-                          0, 0,
-                          icon_x, icon_y,
-                          m_icon->pixmap->width(), m_icon->pixmap->height());
+    if (draw_background) {
+        if (m_icon.get() != 0 && m_icon->pixmap.get() != 0) {
+            // scale pixmap to right size
+            if (height - 2*theme.bevelWidth() != m_icon->pixmap->height() &&
+                !m_icon->filename.empty()) {
+                unsigned int scale_size = height - 2*theme.bevelWidth();
+                m_icon->pixmap->scale(scale_size, scale_size);
+            }
 
-            // restore clip mask
-            XSetClipMask(disp, gc, None);
+            if (m_icon->pixmap->pixmap().drawable() != 0) {
+                GC gc = theme.frameTextGC().gc();
+                int icon_x = x + theme.bevelWidth();
+                int icon_y = y + theme.bevelWidth();
+                // enable clip mask
+                XSetClipMask(disp, gc, m_icon->pixmap->mask().drawable());
+                XSetClipOrigin(disp, gc, icon_x, icon_y);
+
+                draw.copyArea(m_icon->pixmap->pixmap().drawable(),
+                              gc,
+                              0, 0,
+                              icon_x, icon_y,
+                              m_icon->pixmap->width(), m_icon->pixmap->height());
+
+                // restore clip mask
+                XSetClipMask(disp, gc, None);
+            }
         }
-
     }
 
     if (label().empty())
         return;
 
-    const GContext &tgc =
-        (highlight ? theme.hiliteTextGC() :
-         (isEnabled() ? theme.frameTextGC() : theme.disableTextGC() ) );
-    //
-    // Text
-    //
-    int text_y = y, text_x = x;
-
-    int text_w = theme.frameFont().textWidth(label().c_str(), label().size());
-
-    int height_offset = theme.itemHeight() - (theme.frameFont().height() + 2*theme.bevelWidth());
-    text_y = y + theme.bevelWidth() + theme.frameFont().ascent() + height_offset/2; ///2 + height/2;
-
-    switch(theme.frameFontJustify()) {
-    case FbTk::LEFT:
-        text_x = x + theme.bevelWidth() + height + 1;
-        break;
+    // text is background
+    if (draw_background) {
+        const GContext &tgc =
+            (highlight ? theme.hiliteTextGC() :
+             (isEnabled() ? theme.frameTextGC() : theme.disableTextGC() ) );
+        //
+        // Text
+        //
+        int text_y = y, text_x = x;
+
+        int text_w = theme.frameFont().textWidth(label().c_str(), label().size());
+
+        int height_offset = theme.itemHeight() - (theme.frameFont().height() + 2*theme.bevelWidth());
+        text_y = y + theme.bevelWidth() + theme.frameFont().ascent() + height_offset/2;
+
+        switch(theme.frameFontJustify()) {
+        case FbTk::LEFT:
+            text_x = x + theme.bevelWidth() + height + 1;
+            break;
+
+        case FbTk::RIGHT:
+            text_x = x +  width - (height + theme.bevelWidth() + text_w);
+            break;
+        default: //center
+            text_x = x + ((width + 1 - text_w) / 2);
+            break;
+        }
 
-    case FbTk::RIGHT:
-        text_x = x +  width - (height + theme.bevelWidth() + text_w);
-        break;
-    default: //center
-        text_x = x + ((width + 1 - text_w) / 2);
-        break;
+        theme.frameFont().drawText(draw, // drawable
+                                   theme.screenNum(),
+                                   tgc.gc(),
+                                   m_label.c_str(), m_label.size(), // text string and lenght
+                                   text_x, text_y); // position
     }
 
-    theme.frameFont().drawText(draw, // drawable
-                               theme.screenNum(),
-                               tgc.gc(),
-                               m_label.c_str(), m_label.size(), // text string and lenght
-                               text_x, text_y); // position
-
-    GC gc =
-        ((highlight || isSelected()) ? theme.hiliteTextGC().gc() :
-         theme.frameTextGC().gc());
+    GC gc = (highlight) ? theme.hiliteTextGC().gc() :
+        theme.frameTextGC().gc();
+    int sel_x = x;
+    int sel_y = y;
+    unsigned int item_pm_height = theme.itemHeight();
 
-    int sel_x = x + height/4;
+    if (theme.bulletPos() == FbTk::RIGHT)
+        sel_x += width - height - theme.bevelWidth();
 
+    // selected pixmap is foreground
+    if (draw_foreground && isToggleItem()) {
 
-    if (theme.bulletPos() == FbTk::RIGHT)
-        sel_x += width - height - 2*theme.bevelWidth();
+        //
+        // ToggleItem
+        //
+        const PixmapWithMask *pm = 0;
 
-    //
-    // ToggleItem
-    //
-    if (isToggleItem() && theme.unselectedPixmap().pixmap().drawable() != 0) {
-        XSetClipMask(disp, gc, theme.unselectedPixmap().mask().drawable());
-        XSetClipOrigin(disp, gc, sel_x, y);
-        // copy bullet pixmap to drawable
-        draw.copyArea(theme.unselectedPixmap().pixmap().drawable(),
-                      gc,
-                      0, 0,
-                      sel_x, y,
-                      theme.unselectedPixmap().width(),
-                      theme.unselectedPixmap().height());
-        // disable clip mask
-        XSetClipMask(disp, gc, None);
+        if (isSelected()) {
+            if (highlight && theme.highlightSelectedPixmap().pixmap().drawable() != 0)
+                pm = &theme.highlightSelectedPixmap();
+            else
+                pm = &theme.selectedPixmap();
+        } else {
+            if (highlight && theme.highlightUnselectedPixmap().pixmap().drawable() != 0)
+                pm = &theme.highlightUnselectedPixmap();
+            else
+                pm = &theme.unselectedPixmap();
+        }
+        if (pm != 0 && pm->pixmap().drawable() != 0) {
+            unsigned int selw = pm->width();
+            unsigned int selh = pm->height();
+            int offset_x = 0;
+            int offset_y = 0;
+            if (selw < item_pm_height)
+                offset_x += (item_pm_height - selw) / 2;
+            if (selh < item_pm_height)
+                offset_y += (item_pm_height - selh) / 2;
+
+            XSetClipMask(disp, gc, pm->mask().drawable());
+            XSetClipOrigin(disp, gc, sel_x+offset_x, sel_y+offset_y);
+            // copy bullet pixmap to drawable
+            draw.copyArea(pm->pixmap().drawable(),
+                          gc,
+                          0, 0,
+                          sel_x+offset_x, sel_y+offset_y,
+                          selw,
+                          selh);
+            // disable clip mask
+            XSetClipMask(disp, gc, None);
+        } else if (isSelected()) {
+                draw.fillRectangle(theme.hiliteGC().gc(),
+                                   sel_x+item_pm_height/4, sel_y+item_pm_height/4, item_pm_height/2, item_pm_height/2);
+        }
     }
 
     //
-    // Submenu
+    // Submenu (background)
     //
-    if (submenu()) {
-        if (theme.bulletPixmap().pixmap().drawable() != 0) {
-            // enable clip mask
-            XSetClipMask(disp, gc, theme.bulletPixmap().mask().drawable());
-            XSetClipOrigin(disp, gc, sel_x, y);
-            // copy bullet pixmap to frame
-            draw.copyArea(theme.bulletPixmap().pixmap().drawable(),
+    if (draw_background && submenu()) {
+
+        const PixmapWithMask *pm = 0;
+
+        if (highlight && theme.highlightBulletPixmap().pixmap().drawable() != 0)
+            pm = &theme.highlightBulletPixmap();
+        else
+            pm = &theme.bulletPixmap();
+
+        if (pm && pm->pixmap().drawable() != 0) {
+            unsigned int selw = pm->width();
+            unsigned int selh = pm->height();
+
+            int offset_x = 0;
+            int offset_y = 0;
+            if (selw < item_pm_height)
+                offset_x += (item_pm_height - selw) / 2;
+            if (selh < item_pm_height)
+                offset_y += (item_pm_height - selh) / 2;
+
+            XSetClipMask(disp, gc, pm->mask().drawable());
+            XSetClipOrigin(disp, gc, sel_x+offset_x, sel_y+offset_y);
+            // copy bullet pixmap to drawable
+            draw.copyArea(pm->pixmap().drawable(),
                           gc,
                           0, 0,
-                          sel_x, y,
-                          theme.bulletPixmap().width(),
-                          theme.bulletPixmap().height());
+                          sel_x+offset_x, sel_y+offset_y,
+                          selw,
+                          selh);
             // disable clip mask
             XSetClipMask(disp, gc, None);
+
         } else {
-            unsigned int half_w = height / 2, quarter_w = height / 4;
-            int sel_y = y + height/4;
+            unsigned int half_w = item_pm_height / 2, quarter_w = item_pm_height / 4;
             switch (theme.bullet()) {
             case MenuTheme::SQUARE:
-                draw.drawRectangle(gc, sel_x, sel_y, half_w, half_w);
+                draw.drawRectangle(gc, sel_x+quarter_w, y+quarter_w, half_w, half_w);
                 break;
 
             case MenuTheme::TRIANGLE:
                 XPoint tri[3];
 
                 if (theme.bulletPos() == FbTk::RIGHT) {
-                    tri[0].x = sel_x + quarter_w - 2;
-                    tri[0].y = sel_y + quarter_w - 2;
+                    tri[0].x = sel_x + half_w - 2;
+                    tri[0].y = sel_y + half_w - 2;
                     tri[1].x = 4;
                     tri[1].y = 2;
                     tri[2].x = -4;
                     tri[2].y = 2;
-                } else {
-                    tri[0].x = sel_x + quarter_w - 2;
-                    tri[0].y = y + half_w;
+                } else { // point the other way
+                    tri[0].x = sel_x + half_w - 2;
+                    tri[0].y = sel_y + half_w;
                     tri[1].x = 4;
                     tri[1].y = 2;
                     tri[2].x = 0;
@@ -188,8 +240,8 @@ void MenuItem::draw(FbDrawable &draw,
             case MenuTheme::DIAMOND:
                 XPoint dia[4];
 
-                dia[0].x = sel_x + quarter_w - 3;
-                dia[0].y = y + half_w;
+                dia[0].x = sel_x + half_w - 3;
+                dia[0].y = sel_y + half_w;
                 dia[1].x = 3;
                 dia[1].y = -3;
                 dia[2].x = 3;
@@ -225,7 +277,7 @@ void MenuItem::setIcon(const std::string &filename, int screen_num) {
 }
 
 unsigned int MenuItem::height(const MenuTheme &theme) const {
-    return std::max(theme.frameFont().height() + theme.bevelWidth(), theme.itemHeight());
+    return std::max(theme.frameFont().height() + 2*theme.bevelWidth(), theme.itemHeight());
 }
 
 unsigned int MenuItem::width(const MenuTheme &theme) const {
@@ -233,7 +285,6 @@ unsigned int MenuItem::width(const MenuTheme &theme) const {
     const unsigned int icon_width = height(theme);
     const unsigned int normal = theme.frameFont().textWidth(label().c_str(), label().size()) +
                                 2 * (theme.bevelWidth() + icon_width);
-
     return m_icon.get() == 0 ? normal : normal + icon_width;
 }