X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmenu_render.c;h=deebfd8999541a70171e57e6ca7c0fe44b1eca4d;hb=71b7b043a2ca6fc99a41a1e47e76f96eb7218ad9;hp=cf961f24c8acdc1f471845d65c35020d1dc2b59d;hpb=574dd66b326bb3c5893b6bf6bfe7307229def653;p=chaz%2Fopenbox diff --git a/openbox/menu_render.c b/openbox/menu_render.c index cf961f24..deebfd89 100644 --- a/openbox/menu_render.c +++ b/openbox/menu_render.c @@ -4,62 +4,92 @@ #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) { GList *it; - int items_h; + int items_h = 0; int nitems = 0; /* each item, only one is used */ int item_y; - self->width = 1; - self->item_h = 0; + self->size.width = 1; + self->item_h = 1; + + 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); + 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); + 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 */ - 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); + if (self->label) { + 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); + } for (it = self->entries; it; it = it->next) { MenuEntry *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_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); + RrMinsize(e->a_item, &e->min_w, &self->item_h); + self->size.width = MAX(self->size.width, e->min_w); e->a_disabled->texture[0].data.text.string = e->label; - appearance_minsize(e->a_disabled, &e->min_w, &h); + RrMinsize(e->a_disabled, &e->min_w, &h); self->item_h = MAX(self->item_h, h); - self->width = MAX(self->width, e->min_w); - + self->size.width = MAX(self->size.width, e->min_w); + e->a_hilite->texture[0].data.text.string = e->label; - appearance_minsize(e->a_hilite, &e->min_w, &h); + RrMinsize(e->a_hilite, &e->min_w, &h); self->item_h = MAX(self->item_h, h); - self->width = MAX(self->width, e->min_w); + self->size.width = MAX(self->size.width, e->min_w); - e->min_w += theme_bevel * 2; + e->min_w += ob_rr_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); - - XResizeWindow(ob_display, self->frame, 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); + self->bullet_w = self->item_h + ob_rr_theme->bevel; + self->size.width += 2 * self->bullet_w + 2 * ob_rr_theme->bevel; + self->item_h += ob_rr_theme->bevel * 2; + items_h = self->item_h * MAX(nitems, 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, + self->size.width, self->title_h); + + XMoveResizeWindow(ob_display, self->items, 0, + self->title_h + ob_rr_theme->bwidth, self->size.width, + items_h); + + if (self->label) + 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) { @@ -67,6 +97,47 @@ void menu_render(Menu *self) { menu_entry_render(it->data); item_y += self->item_h; } - + self->invalid = FALSE; } + +void menu_entry_render(MenuEntry *self) +{ + Menu *menu = self->parent; + RrAppearance *a; + + switch (self->render_type) { + case MenuEntryRenderType_Submenu: + /* TODO: submenu mask */ + case MenuEntryRenderType_Boolean: + /* TODO: boolean check */ + a = self->enabled ? (self->hilite ? self->a_hilite : self->a_item) + : self->a_disabled; + break; + case MenuEntryRenderType_None: + a = self->enabled ? (self->hilite ? self->a_hilite : self->a_item ) + : self->a_disabled; + break; + case MenuEntryRenderType_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); + break; + } + g_message ("%s %d", self->label, self->hilite); + + XMoveResizeWindow(ob_display, self->item, 0, self->y, + menu->size.width, menu->item_h); + + a->surface.parent = menu->a_items; + a->surface.parentx = 0; + a->surface.parenty = self->y; + + RrPaint(a, self->item, menu->size.width, menu->item_h); +}