include Xutil for shape.h on old X versions

[chaz/openbox] / openbox / menu_render.c

diff --git a/openbox/menu_render.c b/openbox/menu_render.c
index 60f02976e1350c9f41115bb126563a03eb98fc96..8759a1b9a331591637f790d63086520dafe7dbd6 100644 (file)
--- a/openbox/menu_render.c
+++ b/openbox/menu_render.c
@@ -45,8 +45,9 @@ void menu_render(ObMenu *self) {
             e->a_item = RrAppearanceCopy(ob_rr_theme->a_menu_item);
             e->a_disabled = RrAppearanceCopy(ob_rr_theme->a_menu_disabled);
             e->a_hilite = RrAppearanceCopy(ob_rr_theme->a_menu_hilite);
+            e->a_submenu = RrAppearanceCopy(ob_rr_theme->a_menu_bullet);
         }
-
+        
         e->a_item->texture[0].data.text.string = e->label;
         RrMinsize(e->a_item, &e->min_w, &self->item_h);
         self->size.width = MAX(self->size.width, e->min_w);
@@ -97,11 +98,14 @@ void menu_render(ObMenu *self) {
 void menu_entry_render(ObMenuEntry *self)
 {
     ObMenu *menu = self->parent;
-    RrAppearance *a;
+    RrAppearance *a, *s = NULL;
     
     switch (self->render_type) {
     case OB_MENU_ENTRY_RENDER_TYPE_SUBMENU:
-       /* TODO: submenu mask */
+        a = self->enabled ? (self->hilite ? self->a_hilite : self->a_item)
+            : self->a_disabled;
+        s = self->a_submenu;
+        break;
     case OB_MENU_ENTRY_RENDER_TYPE_BOOLEAN:
        /* TODO: boolean check */
        a = self->enabled ? (self->hilite ? self->a_hilite : self->a_item) 
@@ -119,14 +123,32 @@ void menu_entry_render(ObMenuEntry *self)
        g_assert_not_reached(); /* unhandled rendering type */
        break;
     }
-    ob_debug("%s %d\n", self->label, self->hilite);
 
     XMoveResizeWindow(ob_display, self->item, 0, self->y,
                       menu->size.width, menu->item_h);
+    if (s) {
+        XMoveResizeWindow(ob_display, self->submenu_pic,
+                          menu->size.width -
+                          menu->bullet_w + (menu->bullet_w - 8) / 2,
+                          self->y + (menu->item_h - 8) / 2,
+                          8, 8);
+        XMapWindow(ob_display, self->submenu_pic);
+    } else
+        XUnmapWindow(ob_display, self->submenu_pic);
 
     a->surface.parent = menu->a_items;
     a->surface.parentx = 0;
     a->surface.parenty = self->y;
 
+    if (s) {
+        s->surface.parent = a;
+        s->surface.parentx = menu->size.width -
+            menu->bullet_w + (menu->bullet_w - 8) / 2,
+        s->surface.parenty = (menu->item_h - 8) / 2;
+    }
+
     RrPaint(a, self->item, menu->size.width, menu->item_h);
+
+    if (s) 
+        RrPaint(s, self->submenu_pic, 8, 8);
 }