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

Only open the default font once, then ref it.

Browse source 
As suggested in #3622, we don't need to open the default font for every
place that wasn't specified in the theme. Solved a bit differently than
the patch given there.
This commit is contained in:
Mikael Magnusson 2009-07-04 14:16:47 +02:00
parent d48e720c39
commit 795e9ebbac
1 changed files with 22 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
render/theme.c
View file

@ -46,6 +46,22 @@ static int parse_inline_number(const char *p);
static RrPixel32* read_c_image(gint width, gint height, const guint8 *data); static RrPixel32* read_c_image(gint width, gint height, const guint8 *data);
static void set_default_appearance(RrAppearance *a); static void set_default_appearance(RrAppearance *a);
static RrFont *get_font(RrFont *target, RrFont **default_font, const RrInstance *inst)
{
if (target) {
RrFontRef(target);
return target;
} else {
/* Only load the default font once */
if (*default_font) {
RrFontRef(*default_font);
} else {
*default_font = RrFontOpenDefault(inst);
}
return *default_font;
}
}
RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name,
gboolean allow_fallback, gboolean allow_fallback,
RrFont *active_window_font, RrFont *inactive_window_font, RrFont *active_window_font, RrFont *inactive_window_font,
@ -56,6 +72,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name,
RrJustify winjust, mtitlejust; RrJustify winjust, mtitlejust;
gchar *str; gchar *str;
RrTheme *theme; RrTheme *theme;
RrFont *default_font = NULL;
gchar *path; gchar *path;
gboolean userdef; gboolean userdef;
@ -130,17 +147,8 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name,
theme->osd_unhilite_fg = RrAppearanceNew(inst, 0); theme->osd_unhilite_fg = RrAppearanceNew(inst, 0);
/* load the font stuff */ /* load the font stuff */
if (active_window_font) { theme->win_font_focused = get_font(active_window_font, &default_font, inst);
theme->win_font_focused = active_window_font; theme->win_font_unfocused = get_font(inactive_window_font, &default_font, inst);
RrFontRef(active_window_font);
} else
theme->win_font_focused = RrFontOpenDefault(inst);
if (inactive_window_font) {
theme->win_font_unfocused = inactive_window_font;
RrFontRef(inactive_window_font);
} else
theme->win_font_unfocused = RrFontOpenDefault(inst);
winjust = RR_JUSTIFY_LEFT; winjust = RR_JUSTIFY_LEFT;
if (read_string(db, "window.label.text.justify", &str)) { if (read_string(db, "window.label.text.justify", &str)) {
@ -150,11 +158,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name,
winjust = RR_JUSTIFY_CENTER; winjust = RR_JUSTIFY_CENTER;
} }
if (menu_title_font) { theme->menu_title_font = get_font(menu_title_font, &default_font, inst);
theme->menu_title_font = menu_title_font;
RrFontRef(menu_title_font);
} else
theme->menu_title_font = RrFontOpenDefault(inst);
mtitlejust = RR_JUSTIFY_LEFT; mtitlejust = RR_JUSTIFY_LEFT;
if (read_string(db, "menu.title.text.justify", &str)) { if (read_string(db, "menu.title.text.justify", &str)) {
@ -164,17 +168,9 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name,
mtitlejust = RR_JUSTIFY_CENTER; mtitlejust = RR_JUSTIFY_CENTER;
} }
if (menu_item_font) { theme->menu_font = get_font(menu_item_font, &default_font, inst);
theme->menu_font = menu_item_font;
RrFontRef(menu_item_font);
} else
theme->menu_font = RrFontOpenDefault(inst);
if (osd_font) { theme->osd_font = get_font(osd_font, &default_font, inst);
theme->osd_font = osd_font;
RrFontRef(osd_font);
} else
theme->osd_font = RrFontOpenDefault(inst);
/* load direct dimensions */ /* load direct dimensions */
if ((!read_int(db, "menu.overlap.x", &theme->menu_overlap_x) && if ((!read_int(db, "menu.overlap.x", &theme->menu_overlap_x) &&