X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Fmenu_render.c;h=d5342534bc8b339e8b87d9021b7c602743d346f7;hb=fd19711e6a7cdc63f10b79cedc7ff54d7a9d2e81;hp=87ffa9136061e44e86c47700a475df452cf0d70a;hpb=b61a41c6b12a181d70b9976080fde6accf558218;p=chaz%2Fopenbox

diff --git a/openbox/menu_render.c b/openbox/menu_render.c
index 87ffa913..d5342534 100644
--- a/openbox/menu_render.c
+++ b/openbox/menu_render.c
@@ -4,20 +4,17 @@
 #include "openbox.h"
 #include "render/theme.h"
 
-void menu_render_full(Menu *self);
-
-void menu_render(Menu *self) {
-    if (self->invalid) {
-	if (self->update) {
-	    self->update(self);
-	} else {
-	    menu_render_full(self);
-	}
+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(Menu *self) {
+void menu_render_full(ObMenu *self) {
     GList *it;
     int items_h = 0;
     int nitems = 0; /* each item, only one is used */
@@ -29,10 +26,12 @@ void menu_render_full(Menu *self) {
     if (self->a_title == NULL) {
         XSetWindowBorderWidth(ob_display, self->frame, ob_rr_theme->bwidth);
         XSetWindowBackground(ob_display, self->frame,
-                             ob_rr_theme->b_color->pixel);
+                             RrColorPixel(ob_rr_theme->b_color));
         XSetWindowBorderWidth(ob_display, self->title, ob_rr_theme->bwidth);
-        XSetWindowBorder(ob_display, self->frame, ob_rr_theme->b_color->pixel);
-        XSetWindowBorder(ob_display, self->title, ob_rr_theme->b_color->pixel);
+        XSetWindowBorder(ob_display, self->frame,
+                         RrColorPixel(ob_rr_theme->b_color));
+        XSetWindowBorder(ob_display, self->title,
+                         RrColorPixel(ob_rr_theme->b_color));
 
         self->a_title = RrAppearanceCopy(ob_rr_theme->a_menu_title);
         self->a_items = RrAppearanceCopy(ob_rr_theme->a_menu);
@@ -48,7 +47,7 @@ void menu_render_full(Menu *self) {
     }
 
     for (it = self->entries; it; it = it->next) {
-        MenuEntry *e = it->data;
+        ObMenuEntry *e = it->data;
         int h;
 
         if (e->a_item == NULL) {
@@ -79,8 +78,8 @@ void menu_render_full(Menu *self) {
     self->item_h += ob_rr_theme->bevel * 2;
     items_h = self->item_h * MAX(nitems, 1);
 
-    XResizeWindow(ob_display, self->frame, self->size.width,
-		  MAX(self->title_h + items_h + ob_rr_theme->bwidth, 1));
+    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)
 	XMoveResizeWindow(ob_display, self->title, -ob_rr_theme->bwidth,
 			  -ob_rr_theme->bwidth,
@@ -96,33 +95,32 @@ void menu_render_full(Menu *self) {
 
     item_y = 0;
     for (it = self->entries; it; it = it->next) {
-        ((MenuEntry*)it->data)->y = item_y;
+        ((ObMenuEntry*)it->data)->y = item_y;
         menu_entry_render(it->data);
         item_y += self->item_h;
     }
     
-    self->size.height = item_y;
     self->invalid = FALSE;
 }
 
-void menu_entry_render(MenuEntry *self)
+void menu_entry_render(ObMenuEntry *self)
 {
-    Menu *menu = self->parent;
+    ObMenu *menu = self->parent;
     RrAppearance *a;
     
     switch (self->render_type) {
-    case MenuEntryRenderType_Submenu:
+    case OB_MENU_ENTRY_RENDER_TYPE_SUBMENU:
 	/* TODO: submenu mask */
-    case MenuEntryRenderType_Boolean:
+    case OB_MENU_ENTRY_RENDER_TYPE_BOOLEAN:
 	/* TODO: boolean check */
 	a = self->enabled ? (self->hilite ? self->a_hilite : self->a_item) 
 	    : self->a_disabled;
 	break;
-    case MenuEntryRenderType_None:
+    case OB_MENU_ENTRY_RENDER_TYPE_NONE:
 	a = self->enabled ? (self->hilite ? self->a_hilite : self->a_item )
 	    : self->a_disabled;
 	break;
-    case MenuEntryRenderType_Separator:
+    case OB_MENU_ENTRY_RENDER_TYPE_SEPARATOR:
 	a = self->a_item;
 	break;
 
@@ -130,10 +128,12 @@ void menu_entry_render(MenuEntry *self)
 	g_message("unhandled render_type");
 	a = !self->enabled ? self->a_disabled :
         (self->hilite && 
-         (self->action || self->render_type == MenuEntryRenderType_Submenu) ? 
+         (self->action ||
+          self->render_type == OB_MENU_ENTRY_RENDER_TYPE_SUBMENU) ? 
          self->a_hilite : self->a_item);
 	break;
     }
+    g_message ("%s %d", self->label, self->hilite);
 
     XMoveResizeWindow(ob_display, self->item, 0, self->y,
                       menu->size.width, menu->item_h);