jf_simon
/
enlightenment_my
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

make client class population gadcon-specific so we don't end up populating every gadcon site with 500 client classes if they're only used on a single shelf 

SVN revision: 74485
This commit is contained in:
Mike Blumenkrantz 2012-07-27 10:54:00 +00:00
parent 3d2b75b3de
commit 5a6e5ec964
2 changed files with 66 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

127
src/bin/e_gadcon.c
View File

@ -79,7 +79,7 @@ static void e_gadcon_layout_pack_min_size_set(Evas_Object *o
static void e_gadcon_layout_pack_aspect_set(Evas_Object *obj, int w, int h); static void e_gadcon_layout_pack_aspect_set(Evas_Object *obj, int w, int h);
static void e_gadcon_layout_pack_aspect_pad_set(Evas_Object *obj, int w, int h); static void e_gadcon_layout_pack_aspect_pad_set(Evas_Object *obj, int w, int h);
static void e_gadcon_layout_unpack(Evas_Object *obj); static void e_gadcon_layout_unpack(Evas_Object *obj);
static void _e_gadcon_provider_populate_request(const E_Gadcon_Client_Class *cc); static void _e_gadcon_provider_populate_request(E_Gadcon *gc, const E_Gadcon_Client_Class *cc);
static void _e_gadcon_provider_populate_unrequest(const E_Gadcon_Client_Class *cc); static void _e_gadcon_provider_populate_unrequest(const E_Gadcon_Client_Class *cc);
static Eina_Bool _e_gadcon_provider_populate_idler(void *data); static Eina_Bool _e_gadcon_provider_populate_idler(void *data);
static Eina_Bool _e_gadcon_custom_populate_idler(void *data); static Eina_Bool _e_gadcon_custom_populate_idler(void *data);
@ -184,10 +184,7 @@ struct _E_Layout_Item_Container
static Eina_Hash *providers = NULL; static Eina_Hash *providers = NULL;
static Eina_List *providers_list = NULL; static Eina_List *providers_list = NULL;
static Eina_List *gadcons = NULL; static Eina_List *gadcons = NULL;
static Eina_List *gadcon_idle_pos = NULL;
static Eina_List *gadcon_custom_idle_pos = NULL;
static Eina_List *dummies = NULL; static Eina_List *dummies = NULL;
static Eina_List *populate_requests = NULL;
static Ecore_Idler *populate_idler = NULL; static Ecore_Idler *populate_idler = NULL;
static Eina_List *custom_populate_requests = NULL; static Eina_List *custom_populate_requests = NULL;
static Ecore_Idler *custom_populate_idler = NULL; static Ecore_Idler *custom_populate_idler = NULL;
@ -208,7 +205,6 @@ e_gadcon_init(void)
EINTERN int EINTERN int
e_gadcon_shutdown(void) e_gadcon_shutdown(void)
{ {
populate_requests = eina_list_free(populate_requests);
if (populate_idler) if (populate_idler)
{ {
ecore_idler_del(populate_idler); ecore_idler_del(populate_idler);
@ -1356,7 +1352,7 @@ _e_gadcon_client_populate(E_Gadcon *gc, const E_Gadcon_Client_Class *cc, E_Confi
if (!eina_list_data_find(gc->populated_classes, cc)) if (!eina_list_data_find(gc->populated_classes, cc))
{ {
_e_gadcon_provider_populate_request(cc); _e_gadcon_provider_populate_request(gc, cc);
return EINA_TRUE; return EINA_TRUE;
} }
@ -5176,21 +5172,19 @@ _e_gadcon_custom_populate_idler(void *data __UNUSED__)
if (ecore_loop_time_get() - loop >= ecore_animator_frametime_get()) break; if (ecore_loop_time_get() - loop >= ecore_animator_frametime_get()) break;
if (!gc->cf) continue; if (!gc->cf) continue;
e_gadcon_layout_freeze(gc->o_container); e_gadcon_layout_freeze(gc->o_container);
EINA_LIST_FOREACH(gadcon_custom_idle_pos ?: providers_list, gadcon_custom_idle_pos, cc) EINA_LIST_FOREACH(gc->cf->clients, l, cf_gcc)
{ {
EINA_LIST_FOREACH(gc->cf->clients, l, cf_gcc) cc = eina_hash_find(providers, cf_gcc->name);
if (!cc) continue;
if (ecore_loop_time_get() - loop >= ecore_animator_frametime_get())
{ {
if (e_util_strcmp(cf_gcc->name, cc->name)) continue; e_gadcon_layout_thaw(gc->o_container);
if (ecore_loop_time_get() - loop >= ecore_animator_frametime_get()) goto out;
{
e_gadcon_layout_thaw(gc->o_container);
goto out;
}
if (gc->populate_class.func)
gc->populate_class.func(gc->populate_class.data, gc, cc);
else
e_gadcon_populate_class(gc, cc);
} }
if (gc->populate_class.func)
gc->populate_class.func(gc->populate_class.data, gc, cc);
else
e_gadcon_populate_class(gc, cc);
} }
e_gadcon_layout_thaw(gc->o_container); e_gadcon_layout_thaw(gc->o_container);
} }
@ -5217,6 +5211,7 @@ _e_gadcon_provider_populate_idler(void *data __UNUSED__)
Eina_List *l; Eina_List *l;
E_Gadcon *gc; E_Gadcon *gc;
double loop; double loop;
Eina_Bool more = EINA_FALSE;
loop = ecore_loop_time_get(); loop = ecore_loop_time_get();
EINA_LIST_FOREACH(gadcons, l, gc) EINA_LIST_FOREACH(gadcons, l, gc)
@ -5227,46 +5222,47 @@ _e_gadcon_provider_populate_idler(void *data __UNUSED__)
if (first) if (first)
e_main_ts("gadcon populate idler start"); e_main_ts("gadcon populate idler start");
#endif #endif
EINA_LIST_FREE(populate_requests, cc) EINA_LIST_FOREACH(gadcons, l, gc)
{ EINA_LIST_FREE(gc->populate_requests, cc)
if (ecore_loop_time_get() - loop >= ecore_animator_frametime_get()) break; {
if (ecore_loop_time_get() - loop >= ecore_animator_frametime_get())
{
more = EINA_TRUE;
goto out;
}
#ifndef E17_RELEASE_BUILD #ifndef E17_RELEASE_BUILD
if (first) e_main_ts(cc->name); if (first) e_main_ts(cc->name);
#endif #endif
EINA_LIST_FOREACH(gadcon_idle_pos ?: gadcons, gadcon_idle_pos, gc) if (gc->populate_class.func)
{ gc->populate_class.func(gc->populate_class.data, gc, cc);
if (ecore_loop_time_get() - loop >= ecore_animator_frametime_get()) goto out; else
if (gc->populate_class.func) e_gadcon_populate_class(gc, cc);
gc->populate_class.func(gc->populate_class.data, gc, cc); if (!eina_list_data_find(gc->populated_classes, cc))
else {
e_gadcon_populate_class(gc, cc); gc->populated_classes = eina_list_append(gc->populated_classes, cc);
if (!eina_list_data_find(gc->populated_classes, cc)) if (gc->cf)
{ {
gc->populated_classes = eina_list_append(gc->populated_classes, cc); Eina_List *ll, *lll;
if (gc->cf) E_Config_Gadcon_Client *cf_gcc;
{ E_Gadcon_Client *gcc;
Eina_List *ll, *lll; EINA_LIST_FOREACH_SAFE(gc->cf->clients, ll, lll, cf_gcc)
E_Config_Gadcon_Client *cf_gcc; {
E_Gadcon_Client *gcc; if (!e_util_strcmp(cf_gcc->name, cc->name))
EINA_LIST_FOREACH_SAFE(gc->cf->clients, ll, lll, cf_gcc) {
{ Eina_Bool found = EINA_FALSE;
if (!e_util_strcmp(cf_gcc->name, cc->name)) EINA_LIST_FOREACH(gc->clients, ll, gcc)
{ if (gcc->cf == cf_gcc)
Eina_Bool found = EINA_FALSE; {
EINA_LIST_FOREACH(gc->clients, ll, gcc) found = EINA_TRUE;
if (gcc->cf == cf_gcc) break;
{ }
found = EINA_TRUE; if (!found)
break; _e_gadcon_client_populate(gc, cc, cf_gcc);
} }
if (!found) }
_e_gadcon_client_populate(gc, cc, cf_gcc); }
} }
} }
}
}
}
}
out: out:
#ifndef E17_RELEASE_BUILD #ifndef E17_RELEASE_BUILD
if (first) if (first)
@ -5275,7 +5271,7 @@ out:
EINA_LIST_FOREACH(gadcons, l, gc) EINA_LIST_FOREACH(gadcons, l, gc)
e_gadcon_layout_thaw(gc->o_container); e_gadcon_layout_thaw(gc->o_container);
if (!populate_requests) if (!more)
{ {
populate_idler = NULL; populate_idler = NULL;
#ifndef E17_RELEASE_BUILD #ifndef E17_RELEASE_BUILD
@ -5287,10 +5283,10 @@ out:
} }
static void static void
_e_gadcon_provider_populate_request(const E_Gadcon_Client_Class *cc) _e_gadcon_provider_populate_request(E_Gadcon *gc, const E_Gadcon_Client_Class *cc)
{ {
if (eina_list_data_find(populate_requests, cc)) return; if (eina_list_data_find(gc->populate_requests, cc)) return;
populate_requests = eina_list_append(populate_requests, cc); gc->populate_requests = eina_list_append(gc->populate_requests, cc);
if (!populate_idler) if (!populate_idler)
populate_idler = ecore_idler_add(_e_gadcon_provider_populate_idler, NULL); populate_idler = ecore_idler_add(_e_gadcon_provider_populate_idler, NULL);
} }
@ -5298,8 +5294,15 @@ _e_gadcon_provider_populate_request(const E_Gadcon_Client_Class *cc)
static void static void
_e_gadcon_provider_populate_unrequest(const E_Gadcon_Client_Class *cc) _e_gadcon_provider_populate_unrequest(const E_Gadcon_Client_Class *cc)
{ {
populate_requests = eina_list_remove(populate_requests, cc); E_Gadcon *gc;
if ((!populate_requests) && (populate_idler)) Eina_List *l;
unsigned int more = 0;
EINA_LIST_FOREACH(gadcons, l, gc)
{
gc->populate_requests = eina_list_remove(gc->populate_requests, cc);
more += eina_list_count(gc->populate_requests);
}
if ((!more) && (populate_idler))
{ {
ecore_idler_del(populate_idler); ecore_idler_del(populate_idler);
populate_idler = NULL; populate_idler = NULL;

1
src/bin/e_gadcon.h
View File

@ -76,6 +76,7 @@ struct _E_Gadcon
Evas *evas; Evas *evas;
Evas_Object *o_container; Evas_Object *o_container;
Eina_List *clients; Eina_List *clients;
Eina_List *populate_requests;
Eina_List *populated_classes; Eina_List *populated_classes;
Eina_List *waiting_classes; Eina_List *waiting_classes;