From 6a237b91bcbc2c25f2bf8d368535430ba6a1bf26 Mon Sep 17 00:00:00 2001
From: Scott Moynes <smoynes@nexus.carleton.ca>
Date: Tue, 22 Apr 2003 01:04:29 +0000
Subject: Render menus only when they are invalid.

---
 openbox/menu.c | 68 ++++++----------------------------------------------------
 1 file changed, 6 insertions(+), 62 deletions(-)

(limited to 'openbox/menu.c')

diff --git a/openbox/menu.c b/openbox/menu.c
index 52903dcd..314c2f5e 100644
--- a/openbox/menu.c
+++ b/openbox/menu.c
@@ -188,10 +188,6 @@ void menu_add_entry(Menu *menu, MenuEntry *entry)
 void menu_show(char *name, int x, int y, Client *client)
 {
     Menu *self;
-    GList *it;
-    int items_h;
-    int nitems = 0; /* each item, only one is used */
-    int item_y;
 
     self = g_hash_table_lookup(menu_hash, name);
     if (!self) {
@@ -199,66 +195,14 @@ void menu_show(char *name, int x, int y, Client *client)
                   name);
         return;
     }
+    
+    if(self->invalid) {
+      menu_render(self);
+    }
 
-    self->client = client;
-
-    self->width = 1;
-    self->item_h = 0;
-
-    /* set texture data and size them mofos out */
-    self->a_title->texture[0].data.text.string = self->label;
-    appearance_minsize(self->a_title, &self->title_min_w, &self->title_h);
-    self->title_min_w += theme_bevel * 2;
-    self->title_h += theme_bevel * 2;
-    self->width = MAX(self->width, self->title_min_w);
-
-    for (it = self->entries; it; it = it->next) {
-        MenuEntry *e = it->data;
-        int h;
-
-        e->a_item->texture[0].data.text.string = e->label;
-        appearance_minsize(e->a_item, &e->min_w, &self->item_h);
-        self->width = MAX(self->width, e->min_w);
-
-        e->a_disabled->texture[0].data.text.string = e->label;
-        appearance_minsize(e->a_disabled, &e->min_w, &h);
-        self->item_h = MAX(self->item_h, h);
-        self->width = MAX(self->width, e->min_w);
-
-        e->a_hilite->texture[0].data.text.string = e->label;
-        appearance_minsize(e->a_hilite, &e->min_w, &h);
-        self->item_h = MAX(self->item_h, h);
-        self->width = MAX(self->width, e->min_w);
+    XMoveWindow(ob_display, self->frame, x, y);
 
-        e->min_w += theme_bevel * 2;
-        ++nitems;
-    }
-    self->bullet_w = self->item_h + theme_bevel;
-    self->width += 2 * self->bullet_w;
-    self->item_h += theme_bevel * 2;
-    items_h = self->item_h * nitems;
-
-    RECT_SET(self->a_title->area, 0, 0, self->width, self->title_h);
-    RECT_SET(self->a_title->texture[0].position, 0, 0, self->width,
-             self->title_h);
-    RECT_SET(self->a_items->area, 0, 0, self->width, items_h);
-
-    XMoveResizeWindow(ob_display, self->frame, x, y, self->width,
-                      self->title_h + items_h);
-    XMoveResizeWindow(ob_display, self->title, -theme_bwidth, -theme_bwidth,
-                      self->width, self->title_h);
-    XMoveResizeWindow(ob_display, self->items, 0, self->title_h + theme_bwidth,
-                      self->width, items_h);
-
-    paint(self->title, self->a_title);
-    paint(self->items, self->a_items);
-
-    item_y = 0;
-    for (it = self->entries; it; it = it->next) {
-        ((MenuEntry*)it->data)->y = item_y;
-        menu_entry_render(it->data);
-        item_y += self->item_h;
-    }
+    self->client = client;
 
     if (!self->shown) {
         stacking_raise_internal(self->frame);
-- 
cgit v1.2.3