raster pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=f0ea0c94cadb0b8100ad10603f52f35208e3fe97
commit f0ea0c94cadb0b8100ad10603f52f35208e3fe97
Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
Date: Tue Sep 22 14:06:40 2015 +0900
e config - cache sizes in config don't actually work, so remove
remove several config vars in advanced performance that frankly don't
work (unless you change them int he dialog). they are not set up on
startup or not even used at all. remove things that don't work anymore!
@fix
---
src/bin/e_config.c | 10 ---
src/bin/e_config.h | 7 +-
src/bin/e_module.h | 2 +-
.../conf_performance/e_int_config_performance.c | 82 +++-------------------
4 files changed, 10 insertions(+), 91 deletions(-)
diff --git a/src/bin/e_config.c b/src/bin/e_config.c
index fbaefd6..0d5a22d 100644
--- a/src/bin/e_config.c
+++ b/src/bin/e_config.c
@@ -438,10 +438,6 @@ _e_config_edd_init(Eina_Bool old)
E_CONFIG_VAL(D, T, border_shade_speed, DOUBLE); /**/
E_CONFIG_VAL(D, T, framerate, DOUBLE); /**/
E_CONFIG_VAL(D, T, priority, INT); /**/
- E_CONFIG_VAL(D, T, image_cache, INT); /**/
- E_CONFIG_VAL(D, T, font_cache, INT); /**/
- E_CONFIG_VAL(D, T, edje_cache, INT); /**/
- E_CONFIG_VAL(D, T, edje_collection_cache, INT); /**/
E_CONFIG_VAL(D, T, zone_desks_x_count, INT); /**/
E_CONFIG_VAL(D, T, zone_desks_y_count, INT); /**/
E_CONFIG_VAL(D, T, show_desktop_icons, INT); /**/
@@ -646,7 +642,6 @@ _e_config_edd_init(Eina_Bool old)
E_CONFIG_VAL(D, T, menu_gadcon_client_toplevel, INT);
E_CONFIG_VAL(D, T, ping_clients_interval, INT);
- E_CONFIG_VAL(D, T, cache_flush_poll_interval, INT);
E_CONFIG_VAL(D, T, thumbscroll_enable, INT);
E_CONFIG_VAL(D, T, thumbscroll_threshhold, INT);
@@ -1348,11 +1343,6 @@ e_config_load(void)
E_CONFIG_LIMIT(e_config->border_shade_speed, 1.0, 20000.0);
E_CONFIG_LIMIT(e_config->framerate, 1.0, 200.0);
E_CONFIG_LIMIT(e_config->priority, 0, 19);
- E_CONFIG_LIMIT(e_config->image_cache, 0, 256 * 1024);
- E_CONFIG_LIMIT(e_config->font_cache, 0, 32 * 1024);
- E_CONFIG_LIMIT(e_config->edje_cache, 0, 256);
- E_CONFIG_LIMIT(e_config->edje_collection_cache, 0, 512);
- E_CONFIG_LIMIT(e_config->cache_flush_poll_interval, 8, 32768);
E_CONFIG_LIMIT(e_config->zone_desks_x_count, 1, 64);
E_CONFIG_LIMIT(e_config->zone_desks_y_count, 1, 64);
E_CONFIG_LIMIT(e_config->show_desktop_icons, 0, 1);
diff --git a/src/bin/e_config.h b/src/bin/e_config.h
index c3362f2..7fe67c4 100644
--- a/src/bin/e_config.h
+++ b/src/bin/e_config.h
@@ -71,10 +71,6 @@ struct _E_Config
double border_shade_speed; // GUI
double framerate; // GUI
int priority; // GUI
- int image_cache; // GUI
- int font_cache; // GUI
- int edje_cache; // GUI
- int edje_collection_cache; // GUI
int zone_desks_x_count; // GUI
int zone_desks_y_count; // GUI
int show_desktop_icons; // GUI
@@ -282,13 +278,12 @@ struct _E_Config
Eina_List *mime_icons; // GUI
int desk_auto_switch; // GUI;
-
+
int screen_limits;
int thumb_nice;
int ping_clients_interval; // GUI
- int cache_flush_poll_interval; // GUI
int thumbscroll_enable; // GUI
int thumbscroll_threshhold; // GUI
diff --git a/src/bin/e_module.h b/src/bin/e_module.h
index 07a51f8..192810e 100644
--- a/src/bin/e_module.h
+++ b/src/bin/e_module.h
@@ -1,6 +1,6 @@
#ifdef E_TYPEDEFS
-#define E_MODULE_API_VERSION 16
+#define E_MODULE_API_VERSION 17
typedef struct _E_Module E_Module;
typedef struct _E_Module_Api E_Module_Api;
diff --git a/src/modules/conf_performance/e_int_config_performance.c
b/src/modules/conf_performance/e_int_config_performance.c
index f99c84b..d420ecf 100644
--- a/src/modules/conf_performance/e_int_config_performance.c
+++ b/src/modules/conf_performance/e_int_config_performance.c
@@ -11,11 +11,6 @@ struct _E_Config_Dialog_Data
double framerate;
int priority;
int module_delay;
- int cache_flush_poll_interval;
- double font_cache;
- double image_cache;
- int edje_cache;
- int edje_collection_cache;
};
E_Config_Dialog *
@@ -34,8 +29,8 @@ e_int_config_performance(Evas_Object *parent EINA_UNUSED,
const char *params EIN
v->basic.check_changed = _basic_check_changed;
cfd = e_config_dialog_new(NULL, _("Performance Settings"),
- "E", "advanced/performance",
- "preferences-system-performance", 0, v, NULL);
+ "E", "advanced/performance",
+ "preferences-system-performance", 0, v, NULL);
return cfd;
}
@@ -49,11 +44,6 @@ _create_data(E_Config_Dialog *cfd EINA_UNUSED)
cfdata->framerate = e_config->framerate;
cfdata->priority = e_config->priority;
cfdata->module_delay = !e_config->no_module_delay;
- cfdata->font_cache = ((double)e_config->font_cache / 1024);
- cfdata->image_cache = ((double)e_config->image_cache / 1024);
- cfdata->edje_cache = e_config->edje_cache;
- cfdata->edje_collection_cache = e_config->edje_collection_cache;
- cfdata->cache_flush_poll_interval = e_config->cache_flush_poll_interval;
return cfdata;
}
@@ -68,17 +58,10 @@ _basic_apply(E_Config_Dialog *cfd EINA_UNUSED,
E_Config_Dialog_Data *cfdata)
{
if (cfdata->framerate <= 0.0) cfdata->framerate = 1.0;
e_config->framerate = cfdata->framerate;
- e_config->cache_flush_poll_interval = cfdata->cache_flush_poll_interval;
- e_config->font_cache = (cfdata->font_cache * 1024);
- e_config->image_cache = (cfdata->image_cache * 1024);
- e_config->edje_cache = cfdata->edje_cache;
- e_config->edje_collection_cache = cfdata->edje_collection_cache;
edje_frametime_set(1.0 / e_config->framerate);
e_config->priority = cfdata->priority;
e_config->no_module_delay = !cfdata->module_delay;
ecore_exe_run_priority_set(e_config->priority);
- elm_config_cache_image_cache_size_set(cfdata->image_cache);
- elm_config_cache_font_cache_size_set(cfdata->font_cache);
e_config_save_queue();
return 1;
}
@@ -88,79 +71,30 @@ _basic_check_changed(E_Config_Dialog *cfd EINA_UNUSED,
E_Config_Dialog_Data *cfd
{
if (cfdata->framerate <= 0.0) cfdata->framerate = 1.0;
return ((e_config->framerate != cfdata->framerate) ||
- (e_config->cache_flush_poll_interval !=
cfdata->cache_flush_poll_interval) ||
- (e_config->font_cache != (cfdata->font_cache * 1024)) ||
- (e_config->image_cache != (cfdata->image_cache * 1024)) ||
- (e_config->edje_cache != cfdata->edje_cache) ||
- (e_config->edje_collection_cache != cfdata->edje_collection_cache) ||
- (e_config->priority != cfdata->priority) ||
+ (e_config->priority != cfdata->priority) ||
(e_config->no_module_delay != (!cfdata->module_delay)));
}
static Evas_Object *
_basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas,
E_Config_Dialog_Data *cfdata)
{
- Evas_Object *otb, *ob, *ol;
-
- otb = e_widget_toolbook_add(evas, (24 * e_scale), (24 * e_scale));
+ Evas_Object *ob, *ol;
ol = e_widget_list_add(evas, 0, 0);
ob = e_widget_label_add(evas, _("Framerate"));
e_widget_list_object_append(ol, ob, 1, 1, 0.5);
- ob = e_widget_slider_add(evas, 1, 0, _("%1.0f fps"), 5.0, 200.0, 1.0, 0,
+ ob = e_widget_slider_add(evas, 1, 0, _("%1.0f fps"), 5.0, 200.0, 1.0, 0,
&(cfdata->framerate), NULL, 100);
e_widget_list_object_append(ol, ob, 1, 0, 0.5);
ob = e_widget_label_add(evas, _("Application priority"));
e_widget_list_object_append(ol, ob, 1, 1, 0.5);
- ob = e_widget_slider_add(evas, 1, 0, "%1.0f", 0, 19, 1, 0, NULL,
+ ob = e_widget_slider_add(evas, 1, 0, "%1.0f", 0, 19, 1, 0, NULL,
&(cfdata->priority), 100);
e_widget_list_object_append(ol, ob, 1, 0, 0.5);
-
- ob = e_widget_check_add(evas, _("Allow module load delay"),
&(cfdata->module_delay));
- e_widget_list_object_append(ol, ob, 1, 0, 0.5);
-
- e_widget_toolbook_page_append(otb, NULL, _("General"), ol,
- 1, 0, 1, 0, 0.5, 0.0);
- ol = e_widget_list_add(evas, 0, 0);
- ob = e_widget_label_add(evas, _("Cache flush interval"));
- e_widget_list_object_append(ol, ob, 1, 1, 0.5);
- ob = e_widget_slider_add(evas, 1, 0, _("%1.0f ticks"), 8, 4096, 8, 0, NULL,
- &(cfdata->cache_flush_poll_interval), 100);
- e_widget_list_object_append(ol, ob, 1, 0, 0.5);
-
- ob = e_widget_label_add(evas, _("Font cache size"));
- e_widget_list_object_append(ol, ob, 1, 1, 0.5);
- ob = e_widget_slider_add(evas, 1, 0, _("%1.1f MiB"), 0, 4, 0.1, 0,
- &(cfdata->font_cache), NULL, 100);
- e_widget_list_object_append(ol, ob, 1, 0, 0.5);
-
- ob = e_widget_label_add(evas, _("Image cache size"));
- e_widget_list_object_append(ol, ob, 1, 1, 0.5);
- ob = e_widget_slider_add(evas, 1, 0, _("%1.0f MiB"), 0, 32, 1, 0,
- &(cfdata->image_cache), NULL, 100);
- e_widget_list_object_append(ol, ob, 1, 0, 0.5);
-
- e_widget_toolbook_page_append(otb, NULL, _("Caches"), ol,
- 1, 0, 1, 0, 0.5, 0.0);
-
- ol = e_widget_list_add(evas, 0, 0);
- ob = e_widget_label_add(evas, _("Number of Edje files to cache"));
- e_widget_list_object_append(ol, ob, 1, 1, 0.5);
- ob = e_widget_slider_add(evas, 1, 0, _("%1.0f files"), 0, 256, 1, 0, NULL,
- &(cfdata->edje_cache), 100);
- e_widget_list_object_append(ol, ob, 1, 0, 0.5);
-
- ob = e_widget_label_add(evas, _("Number of Edje collections to cache"));
- e_widget_list_object_append(ol, ob, 1, 1, 0.5);
- ob = e_widget_slider_add(evas, 1, 0, _("%1.0f collections"), 0, 512, 1, 0,
- NULL, &(cfdata->edje_collection_cache), 100);
+ ob = e_widget_check_add(evas, _("Allow module load delay"),
&(cfdata->module_delay));
e_widget_list_object_append(ol, ob, 1, 0, 0.5);
- e_widget_toolbook_page_append(otb, NULL, _("Edje Cache"), ol,
- 1, 0, 1, 0, 0.5, 0.0);
-
- e_widget_toolbook_page_show(otb, 0);
- return otb;
+ return ol;
}
--
