X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmenuframe.c;h=030f38bd0706feba6dfd242aa8eeaf12f02b57d5;hb=3e7b4478ee8fdfd5c255723c006ac9292582e747;hp=e27bde0169ed9e8644bfef2f54dc9c8cf90e55c1;hpb=7b06426b51dd81b1c1eacd67d8edb2976ea10456;p=chaz%2Fopenbox diff --git a/openbox/menuframe.c b/openbox/menuframe.c index e27bde01..030f38bd 100644 --- a/openbox/menuframe.c +++ b/openbox/menuframe.c @@ -8,6 +8,7 @@ #define PADDING 2 #define SEPARATOR_HEIGHT 3 +#define MAX_MENU_WIDTH 400 #define FRAME_EVENTMASK (ButtonPressMask |ButtonMotionMask | EnterWindowMask |\ LeaveWindowMask) @@ -29,7 +30,6 @@ static Window createWindow(Window parent, unsigned long mask, return XCreateWindow(ob_display, parent, 0, 0, 1, 1, 0, RrDepth(ob_rr_inst), InputOutput, RrVisual(ob_rr_inst), mask, attrib); - } ObMenuFrame* menu_frame_new(ObMenu *menu, ObClient *client) @@ -94,16 +94,18 @@ 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_normal = RrAppearanceCopy(ob_rr_theme->a_menu_normal); self->a_disabled = RrAppearanceCopy(ob_rr_theme->a_menu_disabled); - self->a_selected = RrAppearanceCopy(ob_rr_theme->a_menu_hilite); + 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); @@ -113,15 +115,18 @@ static ObMenuEntryFrame* menu_entry_frame_new(ObMenuEntry *entry, 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_bullet_normal = + RrAppearanceCopy(ob_rr_theme->a_menu_bullet_normal); + self->a_bullet_selected = + RrAppearanceCopy(ob_rr_theme->a_menu_bullet_selected); } self->a_text_normal = - RrAppearanceCopy(ob_rr_theme->a_menu_text_item); + RrAppearanceCopy(ob_rr_theme->a_menu_text_normal); 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; } @@ -129,10 +134,12 @@ 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); @@ -144,7 +151,8 @@ static void menu_entry_frame_free(ObMenuEntryFrame *self) RrAppearanceFree(self->a_text_normal); RrAppearanceFree(self->a_text_disabled); RrAppearanceFree(self->a_text_selected); - RrAppearanceFree(self->a_bullet); + RrAppearanceFree(self->a_bullet_normal); + RrAppearanceFree(self->a_bullet_selected); g_free(self); } @@ -190,6 +198,7 @@ static void menu_entry_frame_render(ObMenuEntryFrame *self) RrAppearance *item_a, *text_a; gint th; /* temp */ ObMenu *sub; + ObMenuFrame *frame = self->frame; item_a = ((self->entry->type == OB_MENU_ENTRY_TYPE_NORMAL && !self->entry->data.normal.enabled) ? @@ -256,31 +265,32 @@ static void menu_entry_frame_render(ObMenuEntryFrame *self) self->frame->item_h - 2*PADDING); break; case OB_MENU_ENTRY_TYPE_SEPARATOR: - XMoveResizeWindow(ob_display, self->text, - self->frame->text_x, PADDING, - self->frame->text_w - 2*PADDING, - SEPARATOR_HEIGHT); + 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 = self->frame->text_x; + 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->frame->text_w - 6*PADDING; + self->area.width - 4*PADDING; self->a_separator->texture[0].data.lineart.y2 = SEPARATOR_HEIGHT / 2; RrPaint(self->a_separator, self->text, - self->frame->text_w - 2*PADDING, SEPARATOR_HEIGHT); + self->area.width - 2*PADDING, SEPARATOR_HEIGHT); break; } if (self->entry->type != OB_MENU_ENTRY_TYPE_SEPARATOR && self->entry->data.normal.icon_data) { - XMoveResizeWindow(ob_display, self->icon, PADDING, 0, - self->frame->item_h, - self->frame->item_h); + XMoveResizeWindow(ob_display, self->icon, + PADDING, frame->item_margin.top, + self->frame->item_h - frame->item_margin.top + - frame->item_margin.bottom, + self->frame->item_h - frame->item_margin.top + - frame->item_margin.bottom); self->a_icon->texture[0].data.rgba.width = self->entry->data.normal.icon_width; self->a_icon->texture[0].data.rgba.height = @@ -289,41 +299,63 @@ static void menu_entry_frame_render(ObMenuEntryFrame *self) self->entry->data.normal.icon_data; self->a_icon->surface.parent = item_a; self->a_icon->surface.parentx = PADDING; - self->a_icon->surface.parenty = 0; + self->a_icon->surface.parenty = frame->item_margin.top; RrPaint(self->a_icon, self->icon, - self->frame->item_h, self->frame->item_h); + self->frame->item_h - frame->item_margin.top + - frame->item_margin.bottom, + self->frame->item_h - frame->item_margin.top + - frame->item_margin.bottom); 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); + RrColor *c; + + XMoveResizeWindow(ob_display, self->icon, + PADDING, frame->item_margin.top, + self->frame->item_h - frame->item_margin.top + - frame->item_margin.bottom, + self->frame->item_h - frame->item_margin.top + - frame->item_margin.bottom); 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; + + c = ((self->entry->type == OB_MENU_ENTRY_TYPE_NORMAL && + !self->entry->data.normal.enabled) ? + self->entry->data.normal.mask_disabled_color : + (self == self->frame->selected ? + self->entry->data.normal.mask_selected_color : + self->entry->data.normal.mask_normal_color)); + self->a_mask->texture[0].data.mask.color = c; + self->a_mask->surface.parent = item_a; self->a_mask->surface.parentx = PADDING; - self->a_mask->surface.parenty = 0; + self->a_mask->surface.parenty = frame->item_margin.top; RrPaint(self->a_mask, self->icon, - self->frame->item_h, self->frame->item_h); + self->frame->item_h - frame->item_margin.top + - frame->item_margin.bottom, + self->frame->item_h - frame->item_margin.top + - frame->item_margin.bottom); XMapWindow(ob_display, self->icon); } else XUnmapWindow(ob_display, self->icon); if (self->entry->type == OB_MENU_ENTRY_TYPE_SUBMENU) { + RrAppearance *bullet_a; XMoveResizeWindow(ob_display, self->bullet, self->frame->text_x + self->frame->text_w - self->frame->item_h + PADDING, PADDING, self->frame->item_h - 2*PADDING, self->frame->item_h - 2*PADDING); - self->a_bullet->surface.parent = item_a; - self->a_bullet->surface.parentx = + bullet_a = (self == self->frame->selected ? + self->a_bullet_selected : + self->a_bullet_normal); + bullet_a->surface.parent = item_a; + bullet_a->surface.parentx = self->frame->text_x + self->frame->text_w - self->frame->item_h - - PADDING; - self->a_bullet->surface.parenty = PADDING; - RrPaint(self->a_bullet, self->bullet, + + PADDING; + bullet_a->surface.parenty = PADDING; + RrPaint(bullet_a, self->bullet, self->frame->item_h - 2*PADDING, self->frame->item_h - 2*PADDING); XMapWindow(ob_display, self->bullet); @@ -350,6 +382,7 @@ static void menu_frame_render(ObMenuFrame *self) self->a_title->texture[0].data.text.string = self->menu->title; RrMinsize(self->a_title, &tw, &th); + tw = MIN(tw, MAX_MENU_WIDTH); tw += 2*PADDING; th += 2*PADDING; w = MAX(w, tw); @@ -362,13 +395,36 @@ static void menu_frame_render(ObMenuFrame *self) XMoveWindow(ob_display, self->items, 0, h); + STRUT_SET(self->item_margin, 0, 0, 0, 0); + if (self->entries) { ObMenuEntryFrame *e = self->entries->data; + gint l, t, r, b; + e->a_text_normal->texture[0].data.text.string = ""; RrMinsize(e->a_text_normal, &tw, &th); tw += 2*PADDING; th += 2*PADDING; self->item_h = th; + + RrMargins(e->a_normal, &l, &t, &r, &b); + STRUT_SET(self->item_margin, + MAX(self->item_margin.left, l), + MAX(self->item_margin.top, t), + MAX(self->item_margin.right, r), + MAX(self->item_margin.bottom, b)); + RrMargins(e->a_selected, &l, &t, &r, &b); + STRUT_SET(self->item_margin, + MAX(self->item_margin.left, l), + MAX(self->item_margin.top, t), + MAX(self->item_margin.right, r), + MAX(self->item_margin.bottom, b)); + RrMargins(e->a_disabled, &l, &t, &r, &b); + STRUT_SET(self->item_margin, + MAX(self->item_margin.left, l), + MAX(self->item_margin.top, t), + MAX(self->item_margin.right, r), + MAX(self->item_margin.bottom, b)); } else self->item_h = 0; @@ -389,6 +445,7 @@ static void menu_frame_render(ObMenuFrame *self) case OB_MENU_ENTRY_TYPE_NORMAL: text_a->texture[0].data.text.string = e->entry->data.normal.label; RrMinsize(text_a, &tw, &th); + tw = MIN(tw, MAX_MENU_WIDTH); if (e->entry->data.normal.icon_data || e->entry->data.normal.mask) @@ -398,6 +455,7 @@ static void menu_frame_render(ObMenuFrame *self) sub = e->entry->data.submenu.submenu; text_a->texture[0].data.text.string = sub ? sub->title : ""; RrMinsize(text_a, &tw, &th); + tw = MIN(tw, MAX_MENU_WIDTH); if (e->entry->data.normal.icon_data || e->entry->data.normal.mask)