X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=openbox%2Fmenuframe.c;h=6f91e0b1649f0f6304ed17170bc02d326de2d0ae;hb=78dfba0195c7e930b0b327afc9bf0bea4c8c0f35;hp=df45b873e93e2e7fad57dbcab0d9099585d89b6b;hpb=6486ba2cd5a8011cbe624a9d3e96f461ae5a7cc6;p=chaz%2Fopenbox diff --git a/openbox/menuframe.c b/openbox/menuframe.c index df45b873..6f91e0b1 100644 --- a/openbox/menuframe.c +++ b/openbox/menuframe.c @@ -7,7 +7,7 @@ #include "render/theme.h" #define PADDING 2 -#define SEPARATOR_HEIGHT 5 +#define SEPARATOR_HEIGHT 3 #define FRAME_EVENTMASK (ButtonPressMask |ButtonMotionMask | EnterWindowMask |\ LeaveWindowMask) @@ -94,28 +94,36 @@ static ObMenuEntryFrame* menu_entry_frame_new(ObMenuEntry *entry, attr.event_mask = ENTRY_EVENTMASK; self->window = createWindow(self->frame->items, CWEventMask, &attr); - self->icon = createWindow(self->window, 0, NULL); self->text = createWindow(self->window, 0, NULL); - self->bullet = createWindow(self->window, 0, NULL); + if (entry->type != OB_MENU_ENTRY_TYPE_SEPARATOR) { + self->icon = createWindow(self->window, 0, NULL); + self->bullet = createWindow(self->window, 0, NULL); + } XMapWindow(ob_display, self->window); XMapWindow(ob_display, self->text); self->a_normal = RrAppearanceCopy(ob_rr_theme->a_menu_item); self->a_disabled = RrAppearanceCopy(ob_rr_theme->a_menu_disabled); - self->a_selected = RrAppearanceCopy(ob_rr_theme->a_menu_hilite); - - self->a_icon = RrAppearanceCopy(ob_rr_theme->a_clear_tex); - self->a_icon->texture[0].type = RR_TEXTURE_RGBA; - self->a_bullet = RrAppearanceCopy(ob_rr_theme->a_menu_bullet); - self->a_bullet->texture[0].type = RR_TEXTURE_MASK; + self->a_selected = RrAppearanceCopy(ob_rr_theme->a_menu_selected); + + if (entry->type == OB_MENU_ENTRY_TYPE_SEPARATOR) { + self->a_separator = RrAppearanceCopy(ob_rr_theme->a_clear_tex); + self->a_separator->texture[0].type = RR_TEXTURE_LINE_ART; + } else { + self->a_icon = RrAppearanceCopy(ob_rr_theme->a_clear_tex); + self->a_icon->texture[0].type = RR_TEXTURE_RGBA; + self->a_mask = RrAppearanceCopy(ob_rr_theme->a_clear_tex); + self->a_mask->texture[0].type = RR_TEXTURE_MASK; + self->a_bullet = RrAppearanceCopy(ob_rr_theme->a_menu_bullet); + } self->a_text_normal = RrAppearanceCopy(ob_rr_theme->a_menu_text_item); self->a_text_disabled = RrAppearanceCopy(ob_rr_theme->a_menu_text_disabled); self->a_text_selected = - RrAppearanceCopy(ob_rr_theme->a_menu_text_hilite); + RrAppearanceCopy(ob_rr_theme->a_menu_text_selected); return self; } @@ -123,16 +131,20 @@ static ObMenuEntryFrame* menu_entry_frame_new(ObMenuEntry *entry, static void menu_entry_frame_free(ObMenuEntryFrame *self) { if (self) { - XDestroyWindow(ob_display, self->icon); XDestroyWindow(ob_display, self->text); - XDestroyWindow(ob_display, self->bullet); XDestroyWindow(ob_display, self->window); + if (self->entry->type != OB_MENU_ENTRY_TYPE_SEPARATOR) { + XDestroyWindow(ob_display, self->icon); + XDestroyWindow(ob_display, self->bullet); + } RrAppearanceFree(self->a_normal); RrAppearanceFree(self->a_disabled); RrAppearanceFree(self->a_selected); + RrAppearanceFree(self->a_separator); RrAppearanceFree(self->a_icon); + RrAppearanceFree(self->a_mask); RrAppearanceFree(self->a_text_normal); RrAppearanceFree(self->a_text_disabled); RrAppearanceFree(self->a_text_selected); @@ -195,7 +207,7 @@ static void menu_entry_frame_render(ObMenuEntryFrame *self) th = self->frame->item_h; break; case OB_MENU_ENTRY_TYPE_SEPARATOR: - th = SEPARATOR_HEIGHT; + th = SEPARATOR_HEIGHT + 2*PADDING; break; } RECT_SET_SIZE(self->area, self->frame->inner_w, th); @@ -235,7 +247,6 @@ static void menu_entry_frame_render(ObMenuEntryFrame *self) text_a->surface.parenty = PADDING; RrPaint(text_a, self->text, self->frame->text_w, self->frame->item_h - 2*PADDING); - XMapWindow(ob_display, self->text); break; case OB_MENU_ENTRY_TYPE_SUBMENU: XMoveResizeWindow(ob_display, self->text, @@ -247,14 +258,26 @@ static void menu_entry_frame_render(ObMenuEntryFrame *self) text_a->surface.parenty = PADDING; RrPaint(text_a, self->text, self->frame->text_w - self->frame->item_h, self->frame->item_h - 2*PADDING); - XMapWindow(ob_display, self->text); break; case OB_MENU_ENTRY_TYPE_SEPARATOR: - XUnmapWindow(ob_display, self->text); + XMoveResizeWindow(ob_display, self->text, PADDING, PADDING, + self->area.width - 2*PADDING, SEPARATOR_HEIGHT); + self->a_separator->surface.parent = item_a; + self->a_separator->surface.parentx = PADDING; + self->a_separator->surface.parenty = PADDING; + self->a_separator->texture[0].data.lineart.color = + text_a->texture[0].data.text.color; + self->a_separator->texture[0].data.lineart.x1 = 2*PADDING; + self->a_separator->texture[0].data.lineart.y1 = SEPARATOR_HEIGHT / 2; + self->a_separator->texture[0].data.lineart.x2 = + self->area.width - 4*PADDING; + self->a_separator->texture[0].data.lineart.y2 = SEPARATOR_HEIGHT / 2; + RrPaint(self->a_separator, self->text, + self->area.width - 2*PADDING, SEPARATOR_HEIGHT); break; } - if (self->entry->type == OB_MENU_ENTRY_TYPE_NORMAL && + if (self->entry->type != OB_MENU_ENTRY_TYPE_SEPARATOR && self->entry->data.normal.icon_data) { XMoveResizeWindow(ob_display, self->icon, PADDING, 0, @@ -272,6 +295,22 @@ static void menu_entry_frame_render(ObMenuEntryFrame *self) RrPaint(self->a_icon, self->icon, self->frame->item_h, self->frame->item_h); XMapWindow(ob_display, self->icon); + } else if (self->entry->type != OB_MENU_ENTRY_TYPE_SEPARATOR && + self->entry->data.normal.mask) + { + XMoveResizeWindow(ob_display, self->icon, PADDING, 0, + self->frame->item_h, + self->frame->item_h); + self->a_mask->texture[0].data.mask.mask = + self->entry->data.normal.mask; + self->a_mask->texture[0].data.mask.color = + self->entry->data.normal.mask_color; + self->a_mask->surface.parent = item_a; + self->a_mask->surface.parentx = PADDING; + self->a_mask->surface.parenty = 0; + RrPaint(self->a_mask, self->icon, + self->frame->item_h, self->frame->item_h); + XMapWindow(ob_display, self->icon); } else XUnmapWindow(ob_display, self->icon); @@ -284,7 +323,7 @@ static void menu_entry_frame_render(ObMenuEntryFrame *self) self->a_bullet->surface.parent = item_a; self->a_bullet->surface.parentx = self->frame->text_x + self->frame->text_w - self->frame->item_h - - PADDING; + + PADDING; self->a_bullet->surface.parenty = PADDING; RrPaint(self->a_bullet, self->bullet, self->frame->item_h - 2*PADDING, @@ -353,7 +392,8 @@ static void menu_frame_render(ObMenuFrame *self) text_a->texture[0].data.text.string = e->entry->data.normal.label; RrMinsize(text_a, &tw, &th); - if (e->entry->data.normal.icon_data) + if (e->entry->data.normal.icon_data || + e->entry->data.normal.mask) has_icon = TRUE; break; case OB_MENU_ENTRY_TYPE_SUBMENU: @@ -361,6 +401,10 @@ static void menu_frame_render(ObMenuFrame *self) text_a->texture[0].data.text.string = sub ? sub->title : ""; RrMinsize(text_a, &tw, &th); + if (e->entry->data.normal.icon_data || + e->entry->data.normal.mask) + has_icon = TRUE; + tw += self->item_h - PADDING; break; case OB_MENU_ENTRY_TYPE_SEPARATOR: @@ -575,12 +619,12 @@ void menu_frame_select(ObMenuFrame *self, ObMenuEntryFrame *entry) ObMenuEntryFrame *old = self->selected; ObMenuFrame *oldchild = self->child; + if (entry && entry->entry->type == OB_MENU_ENTRY_TYPE_SEPARATOR) + entry = old; + if (old == entry) return; - if (entry && entry->entry->type != OB_MENU_ENTRY_TYPE_SEPARATOR) - self->selected = entry; - else - self->selected = NULL; + self->selected = entry; if (old) menu_entry_frame_render(old); @@ -625,7 +669,8 @@ void menu_entry_frame_execute(ObMenuEntryFrame *self, gboolean hide) ObClient *client = self->frame->client; /* release grabs before executing the shit */ - menu_frame_hide_all(); + if (hide) + menu_frame_hide_all(); if (func) func(entry, data);