nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

get rid of copying the rrappearances for each menu frame, except for the one that is actually useful

Browse source
This commit is contained in:
Dana Jansens 2008-01-27 04:59:39 -05:00
parent de2d970ce1
commit d409936faa
2 changed files with 71 additions and 114 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

165
openbox/menuframe.c
View file

@ -93,7 +93,6 @@ ObMenuFrame* menu_frame_new(ObMenu *menu, guint show_from, ObClient *client)
XSetWindowBorder(ob_display, self->window,
RrColorPixel(ob_rr_theme->menu_border_color));
self->a_title = RrAppearanceCopy(ob_rr_theme->a_menu_title);
self->a_items = RrAppearanceCopy(ob_rr_theme->a_menu);
stacking_add(MENU_AS_WINDOW(self));
@ -111,10 +110,9 @@ void menu_frame_free(ObMenuFrame *self)
stacking_remove(MENU_AS_WINDOW(self));
XDestroyWindow(ob_display, self->window);
RrAppearanceFree(self->a_items);
RrAppearanceFree(self->a_title);
XDestroyWindow(ob_display, self->window);
g_free(self);
}
@ -149,37 +147,6 @@ static ObMenuEntryFrame* menu_entry_frame_new(ObMenuEntry *entry,
XMapWindow(ob_display, self->window);
XMapWindow(ob_display, self->text);
self->a_normal = RrAppearanceCopy(ob_rr_theme->a_menu_normal);
self->a_selected = RrAppearanceCopy(ob_rr_theme->a_menu_selected);
self->a_disabled = RrAppearanceCopy(ob_rr_theme->a_menu_disabled);
self->a_disabled_selected =
RrAppearanceCopy(ob_rr_theme->a_menu_disabled_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_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_normal);
self->a_text_selected =
RrAppearanceCopy(ob_rr_theme->a_menu_text_selected);
self->a_text_disabled =
RrAppearanceCopy(ob_rr_theme->a_menu_text_disabled);
self->a_text_disabled_selected =
RrAppearanceCopy(ob_rr_theme->a_menu_text_disabled_selected);
self->a_text_title =
RrAppearanceCopy(ob_rr_theme->a_menu_text_title);
return self;
}
@ -201,22 +168,6 @@ static void menu_entry_frame_free(ObMenuEntryFrame *self)
g_hash_table_remove(menu_frame_map, &self->bullet);
}
RrAppearanceFree(self->a_normal);
RrAppearanceFree(self->a_selected);
RrAppearanceFree(self->a_disabled);
RrAppearanceFree(self->a_disabled_selected);
RrAppearanceFree(self->a_separator);
RrAppearanceFree(self->a_icon);
RrAppearanceFree(self->a_mask);
RrAppearanceFree(self->a_text_normal);
RrAppearanceFree(self->a_text_selected);
RrAppearanceFree(self->a_text_disabled);
RrAppearanceFree(self->a_text_disabled_selected);
RrAppearanceFree(self->a_text_title);
RrAppearanceFree(self->a_bullet_normal);
RrAppearanceFree(self->a_bullet_selected);
g_free(self);
}
}
@ -362,18 +313,20 @@ static void menu_entry_frame_render(ObMenuEntryFrame *self)
!self->entry->data.normal.enabled ?
/* disabled */
(self == self->frame->selected ?
self->a_disabled_selected : self->a_disabled) :
ob_rr_theme->a_menu_disabled_selected :
ob_rr_theme->a_menu_disabled) :
/* enabled */
(self == self->frame->selected ?
self->a_selected : self->a_normal));
ob_rr_theme->a_menu_selected :
ob_rr_theme->a_menu_normal));
th = ITEM_HEIGHT;
break;
case OB_MENU_ENTRY_TYPE_SEPARATOR:
if (self->entry->data.separator.label) {
item_a = self->frame->a_title;
item_a = ob_rr_theme->a_menu_title;
th = ob_rr_theme->menu_title_height;
} else {
item_a = self->a_normal;
item_a = ob_rr_theme->a_menu_normal;
th = SEPARATOR_HEIGHT + 2*PADDING;
}
break;
@ -394,10 +347,12 @@ static void menu_entry_frame_render(ObMenuEntryFrame *self)
!self->entry->data.normal.enabled ?
/* disabled */
(self == self->frame->selected ?
self->a_text_disabled_selected : self->a_text_disabled) :
ob_rr_theme->a_menu_text_disabled_selected :
ob_rr_theme->a_menu_text_disabled) :
/* enabled */
(self == self->frame->selected ?
self->a_text_selected : self->a_text_normal));
ob_rr_theme->a_menu_text_selected :
ob_rr_theme->a_menu_text_normal));
text_a->texture[0].data.text.string = self->entry->data.normal.label;
if (self->entry->data.normal.shortcut &&
(self->frame->menu->show_all_shortcuts ||
@ -412,8 +367,8 @@ static void menu_entry_frame_render(ObMenuEntryFrame *self)
break;
case OB_MENU_ENTRY_TYPE_SUBMENU:
text_a = (self == self->frame->selected ?
self->a_text_selected :
self->a_text_normal);
ob_rr_theme->a_menu_text_selected :
ob_rr_theme->a_menu_text_normal);
sub = self->entry->data.submenu.submenu;
text_a->texture[0].data.text.string = sub ? sub->title : "";
if (sub->shortcut && (self->frame->menu->show_all_shortcuts ||
@ -427,9 +382,9 @@ static void menu_entry_frame_render(ObMenuEntryFrame *self)
break;
case OB_MENU_ENTRY_TYPE_SEPARATOR:
if (self->entry->data.separator.label != NULL)
text_a = self->a_text_title;
text_a = ob_rr_theme->a_menu_text_title;
else
text_a = self->a_text_normal;
text_a = ob_rr_theme->a_menu_text_normal;
break;
}
@ -472,20 +427,24 @@ static void menu_entry_frame_render(ObMenuEntryFrame *self)
ob_rr_theme->menu_title_height -
2*ob_rr_theme->paddingy);
} else {
RrAppearance *clear;
/* unlabeled separaator */
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 =
clear = ob_rr_theme->a_clear_tex;
clear->texture[0].type = RR_TEXTURE_LINE_ART;
clear->surface.parent = item_a;
clear->surface.parentx = PADDING;
clear->surface.parenty = PADDING;
clear->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,
clear->texture[0].data.lineart.x1 = 2*PADDING;
clear->texture[0].data.lineart.y1 = SEPARATOR_HEIGHT/2;
clear->texture[0].data.lineart.x2 = self->area.width - 4*PADDING;
clear->texture[0].data.lineart.y2 = SEPARATOR_HEIGHT/2;
RrPaint(clear, self->text,
self->area.width - 2*PADDING, SEPARATOR_HEIGHT);
}
break;
@ -494,24 +453,29 @@ static void menu_entry_frame_render(ObMenuEntryFrame *self)
if (self->entry->type == OB_MENU_ENTRY_TYPE_NORMAL &&
self->entry->data.normal.icon_data)
{
RrAppearance *clear;
XMoveResizeWindow(ob_display, self->icon,
PADDING, frame->item_margin.top,
ITEM_HEIGHT - frame->item_margin.top
- frame->item_margin.bottom,
ITEM_HEIGHT - frame->item_margin.top
- frame->item_margin.bottom);
self->a_icon->texture[0].data.rgba.width =
clear = ob_rr_theme->a_clear_tex;
clear->texture[0].type = RR_TEXTURE_RGBA;
clear->texture[0].data.rgba.width =
self->entry->data.normal.icon_width;
self->a_icon->texture[0].data.rgba.height =
clear->texture[0].data.rgba.height =
self->entry->data.normal.icon_height;
self->a_icon->texture[0].data.rgba.alpha =
clear->texture[0].data.rgba.alpha =
self->entry->data.normal.icon_alpha;
self->a_icon->texture[0].data.rgba.data =
clear->texture[0].data.rgba.data =
self->entry->data.normal.icon_data;
self->a_icon->surface.parent = item_a;
self->a_icon->surface.parentx = PADDING;
self->a_icon->surface.parenty = frame->item_margin.top;
RrPaint(self->a_icon, self->icon,
clear->surface.parent = item_a;
clear->surface.parentx = PADDING;
clear->surface.parenty = frame->item_margin.top;
RrPaint(clear, self->icon,
ITEM_HEIGHT - frame->item_margin.top
- frame->item_margin.bottom,
ITEM_HEIGHT - frame->item_margin.top
@ -521,6 +485,7 @@ static void menu_entry_frame_render(ObMenuEntryFrame *self)
self->entry->data.normal.mask)
{
RrColor *c;
RrAppearance *clear;
XMoveResizeWindow(ob_display, self->icon,
PADDING, frame->item_margin.top,
@ -528,7 +493,10 @@ static void menu_entry_frame_render(ObMenuEntryFrame *self)
- frame->item_margin.bottom,
ITEM_HEIGHT - frame->item_margin.top
- frame->item_margin.bottom);
self->a_mask->texture[0].data.mask.mask =
clear = ob_rr_theme->a_clear_tex;
clear->texture[0].type = RR_TEXTURE_MASK;
clear->texture[0].data.mask.mask =
self->entry->data.normal.mask;
c = (self->entry->type == OB_MENU_ENTRY_TYPE_NORMAL &&
@ -541,12 +509,12 @@ static void menu_entry_frame_render(ObMenuEntryFrame *self)
(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;
clear->texture[0].data.mask.color = c;
self->a_mask->surface.parent = item_a;
self->a_mask->surface.parentx = PADDING;
self->a_mask->surface.parenty = frame->item_margin.top;
RrPaint(self->a_mask, self->icon,
clear->surface.parent = item_a;
clear->surface.parentx = PADDING;
clear->surface.parenty = frame->item_margin.top;
RrPaint(clear, self->icon,
ITEM_HEIGHT - frame->item_margin.top
- frame->item_margin.bottom,
ITEM_HEIGHT - frame->item_margin.top
@ -563,8 +531,8 @@ static void menu_entry_frame_render(ObMenuEntryFrame *self)
ITEM_HEIGHT - 2*PADDING,
ITEM_HEIGHT - 2*PADDING);
bullet_a = (self == self->frame->selected ?
self->a_bullet_selected :
self->a_bullet_normal);
ob_rr_theme->a_menu_bullet_selected :
ob_rr_theme->a_menu_bullet_normal);
bullet_a->surface.parent = item_a;
bullet_a->surface.parentx =
self->frame->text_x + self->frame->text_w - ITEM_HEIGHT + PADDING;
@ -640,31 +608,31 @@ void menu_frame_render(ObMenuFrame *self)
gint l, t, r, b;
e = self->entries->data;
e->a_text_normal->texture[0].data.text.string = "";
tw = RrMinWidth(e->a_text_normal);
ob_rr_theme->a_menu_text_normal->texture[0].data.text.string = "";
tw = RrMinWidth(ob_rr_theme->a_menu_text_normal);
tw += 2*PADDING;
th = ITEM_HEIGHT;
RrMargins(e->a_normal, &l, &t, &r, &b);
RrMargins(ob_rr_theme->a_menu_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);
RrMargins(ob_rr_theme->a_menu_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);
RrMargins(ob_rr_theme->a_menu_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));
RrMargins(e->a_disabled_selected, &l, &t, &r, &b);
RrMargins(ob_rr_theme->a_menu_disabled_selected, &l, &t, &r, &b);
STRUT_SET(self->item_margin,
MAX(self->item_margin.left, l),
MAX(self->item_margin.top, t),
@ -705,10 +673,12 @@ void menu_frame_render(ObMenuFrame *self)
!e->entry->data.normal.enabled ?
/* disabled */
(e == self->selected ?
e->a_text_disabled_selected : e->a_text_disabled) :
ob_rr_theme->a_menu_text_disabled_selected :
ob_rr_theme->a_menu_text_disabled) :
/* enabled */
(e == self->selected ?
e->a_text_selected : e->a_text_normal));
ob_rr_theme->a_menu_text_selected :
ob_rr_theme->a_menu_text_normal));
switch (e->entry->type) {
case OB_MENU_ENTRY_TYPE_NORMAL:
text_a->texture[0].data.text.string = e->entry->data.normal.label;
@ -735,9 +705,10 @@ void menu_frame_render(ObMenuFrame *self)
break;
case OB_MENU_ENTRY_TYPE_SEPARATOR:
if (e->entry->data.separator.label != NULL) {
e->a_text_title->texture[0].data.text.string =
ob_rr_theme->a_menu_text_title->texture[0].data.text.string =
e->entry->data.separator.label;
tw = RrMinWidth(e->a_text_title) + 2*ob_rr_theme->paddingx;
tw = RrMinWidth(ob_rr_theme->a_menu_text_title) +
2*ob_rr_theme->paddingx;
tw = MIN(tw, MAX_MENU_WIDTH);
th = ob_rr_theme->menu_title_height +
(ob_rr_theme->mbwidth - PADDING) *2;

20
openbox/menuframe.h
View file

@ -71,7 +71,9 @@ struct _ObMenuFrame
gint monitor; /* monitor on which to show the menu in xinerama */
RrAppearance *a_title;
/* We make a copy of this for each menu, so that we don't have to re-render
the background of the entire menu each time we render an item inside it.
*/
RrAppearance *a_items;
gboolean got_press; /* don't allow a KeyRelease event to run things in the
@ -94,22 +96,6 @@ struct _ObMenuEntryFrame
Window icon;
Window text;
Window bullet;
RrAppearance *a_normal;
RrAppearance *a_selected;
RrAppearance *a_disabled;
RrAppearance *a_disabled_selected;
RrAppearance *a_icon;
RrAppearance *a_mask;
RrAppearance *a_bullet_normal;
RrAppearance *a_bullet_selected;
RrAppearance *a_separator;
RrAppearance *a_text_normal;
RrAppearance *a_text_selected;
RrAppearance *a_text_disabled;
RrAppearance *a_text_disabled_selected;
RrAppearance *a_text_title;
};
extern GHashTable *menu_frame_map;