Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
E.h fonts.c theme.c
Log Message:
Change configuration of alternative font configuration.
===================================================================
RCS file: /cvs/e/e16/e/src/E.h,v
retrieving revision 1.592
retrieving revision 1.593
diff -u -3 -r1.592 -r1.593
--- E.h 28 Jul 2007 13:58:20 -0000 1.592
+++ E.h 7 Aug 2007 15:05:08 -0000 1.593
@@ -378,10 +378,11 @@
struct
{
char localise;
- char prefer_xft_fonts;
+ char use_alt_font_cfg;
char *name;
char *extra_path;
char *ttfont_path;
+ char *font_cfg;
} theme;
#ifdef ENABLE_THEME_TRANSPARENCY
struct
===================================================================
RCS file: /cvs/e/e16/e/src/fonts.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- fonts.c 28 Jul 2007 13:58:20 -0000 1.12
+++ fonts.c 7 Aug 2007 15:05:08 -0000 1.13
@@ -116,17 +116,17 @@
void
FontConfigLoad(void)
{
-#if USE_XFT
int err;
- if (Conf.theme.prefer_xft_fonts)
+ if (Conf.theme.use_alt_font_cfg)
{
- err = ConfigFileLoad("fonts.cfg.xft", Mode.theme.path,
+ if (!Conf.theme.font_cfg)
+ Conf.theme.font_cfg = Estrdup("fonts.cfg.xft");
+ err = ConfigFileLoad(Conf.theme.font_cfg, Mode.theme.path,
_FontConfigLoad, 0);
if (!err)
return;
}
-#endif
ConfigFileLoad("fonts.cfg", Mode.theme.path, _FontConfigLoad, 0);
}
===================================================================
RCS file: /cvs/e/e16/e/src/theme.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -3 -r1.66 -r1.67
--- theme.c 28 Jul 2007 13:58:20 -0000 1.66
+++ theme.c 7 Aug 2007 15:05:08 -0000 1.67
@@ -500,10 +500,11 @@
static const CfgItem ThemeCfgItems[] = {
CFG_ITEM_BOOL(Conf.theme, localise, 0),
- CFG_ITEM_BOOL(Conf.theme, prefer_xft_fonts, 1),
CFG_ITEM_STR(Conf.theme, name),
CFG_ITEM_STR(Conf.theme, extra_path),
CFG_ITEM_STR(Conf.theme, ttfont_path),
+ CFG_ITEM_BOOL(Conf.theme, use_alt_font_cfg, 1),
+ CFG_ITEM_STR(Conf.theme, font_cfg),
};
#define N_CFG_ITEMS (sizeof(ThemeCfgItems)/sizeof(CfgItem))
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
