add partial struts tho they arent useful eyt

[chaz/openbox] / openbox / menu_render.c

diff --git a/openbox/menu_render.c b/openbox/menu_render.c
index deebfd8999541a70171e57e6ca7c0fe44b1eca4d..60f02976e1350c9f41115bb126563a03eb98fc96 100644 (file)
--- a/openbox/menu_render.c
+++ b/openbox/menu_render.c
@@ -1,20 +1,11 @@
 /* Functions for default rendering of menus. Might become pluginnable */
 
+#include "debug.h"
 #include "menu.h"
 #include "openbox.h"
 #include "render/theme.h"
 
-void menu_render_full(Menu *self);
-
-void menu_render(Menu *self) {
-    if (self->update) {
-        self->update(self);
-    } else if (self->invalid) {
-        menu_render_full(self);
-    }
-}
-
-void menu_render_full(Menu *self) {
+void menu_render(ObMenu *self) {
     GList *it;
     int items_h = 0;
     int nitems = 0; /* each item, only one is used */
@@ -26,10 +17,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);
@@ -45,7 +38,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) {
@@ -93,7 +86,7 @@ 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;
     }
@@ -101,36 +94,32 @@ void menu_render_full(Menu *self) {
     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;
 
     default:
-       g_message("unhandled render_type");
-       a = !self->enabled ? self->a_disabled :
-        (self->hilite && 
-         (self->action || self->render_type == MenuEntryRenderType_Submenu) ? 
-         self->a_hilite : self->a_item);
+       g_assert_not_reached(); /* unhandled rendering type */
        break;
     }
-    g_message ("%s %d", self->label, self->hilite);
+    ob_debug("%s %d\n", self->label, self->hilite);
 
     XMoveResizeWindow(ob_display, self->item, 0, self->y,
                       menu->size.width, menu->item_h);