oooops RECT_SET_POINT was broken

[chaz/openbox] / openbox / menu_render.c

diff --git a/openbox/menu_render.c b/openbox/menu_render.c
index d3a5373fef42dd3d1d29f3555b2752d3fa9c7f33..1f03459c368897ca4fcba7a01a72b0db3704d2d3 100644 (file)
--- a/openbox/menu_render.c
+++ b/openbox/menu_render.c
@@ -5,17 +5,7 @@
 #include "openbox.h"
 #include "render/theme.h"
 
-void menu_render_full(ObMenu *self);
-
 void menu_render(ObMenu *self) {
-    if (self->update) {
-        self->update(self);
-    } else if (self->invalid) {
-        menu_render_full(self);
-    }
-}
-
-void menu_render_full(ObMenu *self) {
     GList *it;
     int items_h = 0;
     int nitems = 0; /* each item, only one is used */
@@ -39,13 +29,14 @@ void menu_render_full(ObMenu *self) {
     }
     
     /* set texture data and size them mofos out */
-    if (self->label) {
+    if (self->label && !(self->parent && self->parent->shown)) {
        self->a_title->texture[0].data.text.string = self->label;
        RrMinsize(self->a_title, &self->title_min_w, &self->title_h);
        self->title_min_w += ob_rr_theme->bevel * 2;
        self->title_h += ob_rr_theme->bevel * 2;
        self->size.width = MAX(self->size.width, self->title_min_w);
-    }
+    } else
+        self->title_h = -ob_rr_theme->bwidth;
 
     for (it = self->entries; it; it = it->next) {
         ObMenuEntry *e = it->data;
@@ -55,8 +46,9 @@ void menu_render_full(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);
@@ -81,16 +73,19 @@ void menu_render_full(ObMenu *self) {
 
     self->size.height = MAX(self->title_h + items_h + ob_rr_theme->bwidth, 1);
     XResizeWindow(ob_display, self->frame, self->size.width,self->size.height);
-    if (self->label)
+    if (self->label && !(self->parent && self->parent->shown)) {
        XMoveResizeWindow(ob_display, self->title, -ob_rr_theme->bwidth,
                          -ob_rr_theme->bwidth,
                           self->size.width, self->title_h);
+        XMapWindow(ob_display, self->title);
+    } else
+        XUnmapWindow(ob_display, self->title);
 
     XMoveResizeWindow(ob_display, self->items, 0, 
                      self->title_h + ob_rr_theme->bwidth, self->size.width, 
                      items_h);
 
-    if (self->label)
+    if (self->label && !(self->parent && self->parent->shown))
        RrPaint(self->a_title, self->title, self->size.width, self->title_h);
     RrPaint(self->a_items, self->items, self->size.width, items_h);
 
@@ -107,11 +102,14 @@ void menu_render_full(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) 
@@ -129,14 +127,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);
 }