Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src
Modified Files:
ewl_config.c ewl_config.h ewl_misc.c ewl_theme.c
Log Message:
change the name --ewl-debug-hier to --ewl-print-theme-keys and
/ewl/debug/hierarchy to /ewl/theme/print_keys
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_config.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -3 -r1.38 -r1.39
--- ewl_config.c 25 Aug 2004 04:24:27 -0000 1.38
+++ ewl_config.c 25 Aug 2004 05:05:44 -0000 1.39
@@ -8,13 +8,13 @@
enum Ewl_Config_Types {
EWL_CONFIG_DEBUG_ENABLE,
EWL_CONFIG_DEBUG_LEVEL,
- EWL_CONFIG_DEBUG_HIER,
EWL_CONFIG_EVAS_RENDER_METHOD,
EWL_CONFIG_EVAS_FONT_CACHE,
EWL_CONFIG_EVAS_IMAGE_CACHE,
EWL_CONFIG_THEME_NAME,
EWL_CONFIG_THEME_CACHE,
- EWL_CONFIG_THEME_COLOR_CLASSES_OVERRIDE
+ EWL_CONFIG_THEME_COLOR_CLASSES_OVERRIDE,
+ EWL_CONFIG_THEME_PRINT_KEYS
};
extern Ecore_List *ewl_embed_list;
@@ -189,12 +189,12 @@
nc.debug.enable = ewl_config_int_get("/ewl/debug/enable");
nc.debug.level = ewl_config_int_get("/ewl/debug/level");
- nc.debug.hierarchy = ewl_config_int_get("/ewl/debug/hierarchy");
nc.evas.font_cache = ewl_config_int_get("/ewl/evas/font_cache");
nc.evas.image_cache = ewl_config_int_get("/ewl/evas/image_cache");
nc.evas.render_method = ewl_config_str_get("/ewl/evas/render_method");
nc.theme.name = ewl_config_str_get("/ewl/theme/name");
nc.theme.cache = ewl_config_int_get("/ewl/theme/cache");
+ nc.theme.print_keys = ewl_config_int_get("/ewl/theme/print_keys");
nc.theme.cclass_override =
ewl_config_int_get("/ewl/theme/color_classes/override");
@@ -338,12 +338,12 @@
ewl_config.debug.enable = nc.debug.enable;
ewl_config.debug.level = nc.debug.level;
- ewl_config.debug.hierarchy = nc.debug.hierarchy;
ewl_config.evas.font_cache = nc.evas.font_cache;
ewl_config.evas.image_cache = nc.evas.image_cache;
ewl_config.evas.render_method = nc.evas.render_method;
ewl_config.theme.name = nc.theme.name;
ewl_config.theme.cache = nc.theme.cache;
+ ewl_config.theme.print_keys = nc.theme.print_keys;
ewl_config.theme.cclass_override = nc.theme.cclass_override;
DLEAVE_FUNCTION(DLEVEL_STABLE);
@@ -355,13 +355,13 @@
ecore_config_int_default("/ewl/debug/enable", 0);
ecore_config_int_default("/ewl/debug/level", 0);
- ecore_config_int_default("/ewl/debug/hierarchy", 0);
ecore_config_string_default("/ewl/evas/render_method", "software_x11");
ecore_config_int_default("/ewl/evas/font_cache", 2097152);
ecore_config_int_default("/ewl/evas/image_cache", 8388608);
ecore_config_theme_default("/ewl/theme/name", "default");
ecore_config_int_default("/ewl/theme/cache", 0);
ecore_config_int_default("/ewl/theme/color_classes/override", 0);
+ ecore_config_int_default("/ewl/theme/print_keys", 0);
/* need to set each of these keys into the system section */
{
@@ -370,13 +370,13 @@
char *keys [] = {
"/ewl/debug/enable",
"/ewl/debug/level",
- "/ewl/debug/hierarchy",
"/ewl/evas/render_method",
"/ewl/evas/font_cache",
"/ewl/evas/image_cache",
"/ewl/theme/name",
"/ewl/theme/cache",
"/ewl/theme/color_classes/override",
+ "/ewl/theme/print_keys",
NULL
};
@@ -390,8 +390,6 @@
ewl_config_listener, EWL_CONFIG_DEBUG_ENABLE, NULL);
ecore_config_listen("ewl_debug_level", "/ewl/debug/level",
ewl_config_listener, EWL_CONFIG_DEBUG_LEVEL, NULL);
- ecore_config_listen("ewl_debug_hierarchy", "/ewl/debug/hierarchy",
- ewl_config_listener, EWL_CONFIG_DEBUG_HIER, NULL);
ecore_config_listen("ewl_render_method", "/ewl/evas/render_method",
ewl_config_listener, EWL_CONFIG_EVAS_RENDER_METHOD, NULL);
ecore_config_listen("ewl_font_cache", "/ewl/evas/font_cache",
@@ -402,6 +400,8 @@
ewl_config_listener, EWL_CONFIG_THEME_NAME, NULL);
ecore_config_listen("ewl_theme_cache", "/ewl/theme/cache",
ewl_config_listener, EWL_CONFIG_THEME_CACHE, NULL);
+ ecore_config_listen("ewl_theme_print_keys", "/ewl/theme/print_keys",
+ ewl_config_listener, EWL_CONFIG_THEME_PRINT_KEYS, NULL);
ecore_config_listen("ewl_theme_cclases_override",
"/ewl/theme/color_classes/override",
ewl_config_listener, EWL_CONFIG_THEME_COLOR_CLASSES_OVERRIDE,
NULL);
}
@@ -421,10 +421,6 @@
ewl_config.debug.level = ewl_config_int_get(key);
break;
- case EWL_CONFIG_DEBUG_HIER:
- ewl_config.debug.hierarchy = ewl_config_int_get(key);
- break;
-
case EWL_CONFIG_EVAS_RENDER_METHOD:
IF_FREE(ewl_config.evas.render_method);
ewl_config.evas.render_method = ewl_config_str_get(key);
@@ -450,6 +446,10 @@
case EWL_CONFIG_THEME_COLOR_CLASSES_OVERRIDE:
ewl_config.theme.cclass_override = ewl_config_int_get(key);
break;
+
+ case EWL_CONFIG_THEME_PRINT_KEYS:
+ ewl_config.theme.print_keys = ewl_config_int_get(key);
+ break;
}
return 0;
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_config.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -3 -r1.29 -r1.30
--- ewl_config.h 25 Aug 2004 04:24:28 -0000 1.29
+++ ewl_config.h 25 Aug 2004 05:05:44 -0000 1.30
@@ -15,7 +15,6 @@
struct {
int enable;
int level;
- int hierarchy;
} debug;
struct {
int font_cache;
@@ -26,6 +25,7 @@
char *name;
int cache;
int cclass_override;
+ int print_keys;
} theme;
};
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_misc.c,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -3 -r1.81 -r1.82
--- ewl_misc.c 25 Aug 2004 04:24:28 -0000 1.81
+++ ewl_misc.c 25 Aug 2004 05:05:44 -0000 1.82
@@ -25,7 +25,7 @@
static unsigned int debug_segv = 0;
static unsigned int use_engine = EWL_ENGINE_ALL;
static unsigned int phase_status = 0;
-static unsigned int debug_hier = 0;
+static unsigned int print_theme_keys = 0;
static int _ewl_init_count = 0;
@@ -146,8 +146,8 @@
ewl_shutdown();
DRETURN_INT(_ewl_init_count, DLEVEL_STABLE);
}
- if (debug_hier)
- ewl_config.debug.hierarchy = debug_hier;
+ if (print_theme_keys)
+ ewl_config.theme.print_keys = print_theme_keys;
if (!ewl_ev_init()) {
DERROR("Could not init event data....");
@@ -338,8 +338,8 @@
}
matched++;
}
- else if (!strcmp(argv[i], "--ewl-debug-hier")) {
- debug_hier = 1;
+ else if (!strcmp(argv[i], "--ewl-print-theme-keys")) {
+ print_theme_keys = 1;
matched++;
}
else if (!strcmp(argv[i], "--ewl-software-x11")) {
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_theme.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -3 -r1.69 -r1.70
--- ewl_theme.c 25 Aug 2004 04:24:28 -0000 1.69
+++ ewl_theme.c 25 Aug 2004 05:05:44 -0000 1.70
@@ -344,7 +344,7 @@
else
snprintf(key, PATH_MAX, "%s", k);
- if (ewl_config.debug.hierarchy)
+ if (ewl_config.theme.print_keys)
printf("%s\n", key);
-------------------------------------------------------
SF.Net email is sponsored by Shop4tech.com-Lowest price on Blank Media
100pk Sonic DVD-R 4x for only $29 -100pk Sonic DVD+R for only $33
Save 50% off Retail on Ink & Toner - Free Shipping and Free Gift.
http://www.shop4tech.com/z/Inkjet_Cartridges/9_108_r285
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs