X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmenu_render.c;h=1f03459c368897ca4fcba7a01a72b0db3704d2d3;hb=7120face258ee4bd71fb19ded271665acde6465c;hp=d3b0e0169fac3d976c4df7950accd82b3114aad1;hpb=7af1c6a9c3a57f3ded34fad3f9f4a30fe377a65e;p=chaz%2Fopenbox diff --git a/openbox/menu_render.c b/openbox/menu_render.c index d3b0e016..1f03459c 100644 --- a/openbox/menu_render.c +++ b/openbox/menu_render.c @@ -1,23 +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->invalid) { - if (self->update) { - self->update(self); - } else { - 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 */ @@ -29,34 +17,38 @@ 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); } /* 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) { - MenuEntry *e = it->data; + ObMenuEntry *e = it->data; int h; if (e->a_item == NULL) { 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,22 +73,25 @@ void menu_render_full(Menu *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); 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; } @@ -104,43 +99,60 @@ 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; - RrAppearance *a; + ObMenu *menu = self->parent; + RrAppearance *a, *s = NULL; switch (self->render_type) { - case MenuEntryRenderType_Submenu: - /* TODO: submenu mask */ - case MenuEntryRenderType_Boolean: + case OB_MENU_ENTRY_RENDER_TYPE_SUBMENU: + 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) : 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); 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); }