With the following changes, e_comp.h exposes struct members and with it
drops their accessor functions,
as well as rename a few functions. Currently the comp-scale module won't
work anymore, because it still calls
the dropped accessor functions and the renamed functions by their old
names, this patch
addresses that by changing all of comp-scales calls to these functions
to the new ones.
http://trac.enlightenment.org/e/changeset/83745/trunk/e/src/bin/e_comp.h
http://trac.enlightenment.org/e/changeset/83752/trunk/e/src/bin/e_comp.h
Index: src/e_mod_main.c
===================================================================
--- src/e_mod_main.c (revision 83956)
+++ src/e_mod_main.c (working copy)
@@ -159,7 +159,7 @@
man = eina_list_data_get(e_manager_list());
if (!man) return;
- e = e_comp_evas_get(man->comp);
+ e = man->comp->evas;
if (!e) return;
if (!strncmp(params, "go_pager", 8))
Index: src/e_mod_pager.c
===================================================================
--- src/e_mod_pager.c (revision 83956)
+++ src/e_mod_pager.c (working copy)
@@ -171,7 +171,7 @@
if (scale_state == SCALE_STATE_HOLD)
{
E_Manager *man = e_manager_current_get();
- e_comp_update(man->comp);
+ e_comp_render_update(man->comp);
return ECORE_CALLBACK_RENEW;
}
@@ -628,7 +628,7 @@
if (it->bd && !it->o)
{
- e_comp_src_hidden_set(it->src, EINA_FALSE);
+ e_comp_win_hidden_set(it->src, EINA_FALSE);
e_object_unref(E_OBJECT(it->bd));
}
@@ -652,7 +652,7 @@
if ((it->bd->desk != current_desk) && (!it->bd->sticky))
e_border_hide(it->bd, 2);
- e_comp_src_hidden_set(it->src, EINA_FALSE);
+ e_comp_win_hidden_set(it->src, EINA_FALSE);
evas_object_del(it->o_win);
evas_object_del(it->o);
@@ -674,17 +674,17 @@
Evas_Object *o, *sh_obj, *obj;
E_Border *bd;
- sh_obj = e_comp_src_shadow_get(src);
+ sh_obj = src->shobj;
if (!sh_obj) return NULL;
- obj = e_comp_src_image_get(src);
+ obj = src->obj;
if (!obj) return NULL;
- bd = e_comp_src_border_get(src);
+ bd = src->bd;
if (!bd)
{
- Ecore_X_Window win = e_comp_src_window_get(src);
+ Ecore_X_Window win = src-win;
if (win == zone->container->bg_win)
{
@@ -707,7 +707,7 @@
}
else if (scale_conf->pager_fade_popups)
{
- E_Popup *pop = e_comp_src_popup_get(src);
+ E_Popup *pop = src->pop;
if ((pop) && (pop->zone != zone))
return NULL;
@@ -738,7 +738,7 @@
it->src = src;
e_object_ref(E_OBJECT(it->bd));
- e_comp_src_hidden_set(src, EINA_TRUE);
+ e_comp_win_hidden_set(src, EINA_TRUE);
items = eina_list_append(items, it);
@@ -749,7 +749,7 @@
(e_mod_border_ignore(it->bd)))
return NULL;
- it->o_win = e_comp_src_image_mirror_add(src);
+ it->o_win = e_comp_win_image_mirror_add(src);
/* it->o_win = evas_object_image_filled_add(e);
* o = e_manager_comp_src_image_get(man, src);
* evas_object_image_source_set(it->o_win, o); */
@@ -1072,7 +1072,7 @@
if (input_win) return EINA_FALSE;
- e = e_comp_evas_get(man->comp);
+ e = man->comp->evas;
if (!e) return EINA_FALSE;
zone = e_util_zone_current_get(man);
@@ -1147,7 +1147,7 @@
evas_object_resize(zone_clip, zone_w, zone_h);
evas_object_show(zone_clip);
- EINA_LIST_FOREACH((Eina_List *)e_comp_src_list_get(man->comp), l, src)
+ EINA_LIST_FOREACH((Eina_List *)e_comp_win_list_get(man->comp), l, src)
_pager_win_new(e, man, src);
edje_object_file_get(zone->bg_object, &file, &group);
@@ -1265,7 +1265,7 @@
/* XXX disabled for now. */
/* return; */
- e = e_comp_evas_get(man->comp);
+ e = man->comp->evas;
if (!strcmp(info, "change.comp"))
{
if (!e)
@@ -1284,7 +1284,7 @@
else if (!strcmp(info, "add.src"))
{
DBG("%s: %p | %p\n", info, man, src);
- e_comp_src_hidden_set(src, EINA_TRUE);
+ e_comp_win_hidden_set(src, EINA_TRUE);
}
else if (!strcmp(info, "del.src"))
{
Index: src/e_mod_scale.c
===================================================================
--- src/e_mod_scale.c (revision 83956)
+++ src/e_mod_scale.c (working copy)
@@ -298,7 +298,7 @@
}
man = e_manager_current_get();
- e_comp_update(man->comp);
+ e_comp_render_update(man->comp);
if (finish)
{
@@ -480,12 +480,12 @@
E_Comp_Win *src;
E_Manager *man = zone->container->manager;
- EINA_LIST_FOREACH((Eina_List *)e_comp_src_list_get(man->comp), l, src)
- e_comp_src_hidden_set(src, EINA_FALSE);
+ EINA_LIST_FOREACH((Eina_List *)e_comp_win_list_get(man->comp), l, src)
+ e_comp_win_hidden_set(src, EINA_FALSE);
}
man = e_manager_current_get();
- e_comp_update(man->comp);
+ e_comp_render_update(man->comp);
if (!bd_move)
{
@@ -697,17 +697,17 @@
evas_object_event_callback_del(it->o, EVAS_CALLBACK_MOUSE_UP,
_scale_win_cb_mouse_up);
- e_comp_src_hidden_set(it->src, EINA_FALSE);
+ e_comp_win_hidden_set(it->src, EINA_FALSE);
if ((it->bd->desk != current_desk) && (!it->bd->sticky))
{
e_border_hide(it->bd, 2);
- evas_object_hide(e_comp_src_shadow_get(it->src));
+ evas_object_hide(it->src->shobj);
}
else if (it->was_hidden)
{
e_border_hide(it->bd, 1);
- evas_object_hide(e_comp_src_shadow_get(it->src));
+ evas_object_hide(it->src->shobj);
}
if (it->was_shaded)
{
@@ -733,21 +733,21 @@
Item *it;
E_Border *bd;
- if (!e_comp_src_image_get(src))
+ if (!src->obj)
return NULL;
- bd = e_comp_src_border_get(src);
+ bd = src->bd;
if (!bd)
{
- Ecore_X_Window win = e_comp_src_window_get(src);
+ Ecore_X_Window win = src->win;
if ((win == zone->container->bg_win) &&
(scale_conf->fade_desktop))
{
it = E_NEW(Item, 1);
it->man = man;
- it->o_win = e_comp_src_shadow_get(src);
+ it->o_win = src->shobj;
evas_object_event_callback_add(it->o_win, EVAS_CALLBACK_DEL,
_scale_win_cb_delorig, it);
background = it;
@@ -755,14 +755,14 @@
}
else if (scale_conf->fade_popups)
{
- E_Popup *pop = e_comp_src_popup_get(src);
+ E_Popup *pop = src->pop;
if ((pop) && (pop->zone != zone))
return NULL;
it = E_NEW(Item, 1);
it->man = man;
- it->o_win = e_comp_src_shadow_get(src);
+ it->o_win = src->shobj;
evas_object_event_callback_add(it->o_win, EVAS_CALLBACK_DEL,
_scale_win_cb_delorig, it);
popups = eina_list_append(popups, it);
@@ -809,9 +809,9 @@
it->bd = bd;
it->man = man;
it->src = src;
- e_comp_src_hidden_set(src, EINA_TRUE);
+ e_comp_win_hidden_set(src, EINA_TRUE);
- it->o_win = e_comp_src_image_mirror_add(src);
+ it->o_win = e_comp_win_image_mirror_add(src);
evas_object_show(it->o_win);
it->o = edje_object_add(e);
@@ -1128,7 +1128,7 @@
mouse_y = -1;
warp_pointer = 0;
- e = e_comp_evas_get(man->comp);
+ e = man->comp->evas;
if (!e) return EINA_FALSE;
zone = e_util_zone_current_get(e_manager_current_get());
@@ -1177,7 +1177,7 @@
evas_object_resize(zone_clip, zone->w, zone->h);
evas_object_show(zone_clip);
- EINA_LIST_FOREACH((Eina_List *)e_comp_src_list_get(man->comp), l, src)
+ EINA_LIST_FOREACH((Eina_List *)e_comp_win_list_get(man->comp), l, src)
{
Item *it = _scale_win_new(e, man, src, current_desk);
if (it) evas_object_clip_set(it->o, zone_clip);
@@ -1566,7 +1566,7 @@
/* XXX disabled for now. */
/* return; */
- e = e_comp_evas_get(man->comp);
+ e = man->comp->evas;
if (!strcmp(info, "change.comp"))
{
if (!e)
@@ -1585,7 +1585,7 @@
else if (!strcmp(info, "add.src"))
{
DBG("%s: %p | %p\n", info, man, src);
- e_comp_src_hidden_set(src, EINA_TRUE);
+ e_comp_win_hidden_set(src, EINA_TRUE);
}
else if (!strcmp(info, "del.src"))
{
------------------------------------------------------------------------------
Free Next-Gen Firewall Hardware Offer
Buy your Sophos next-gen firewall before the end March 2013
and get the hardware for free! Learn more.
http://p.sf.net/sfu/sophos-d2d-feb
_______________________________________________
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
