enlightenment
/
enlightenment-module-comp-scale
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

e-modules/comp-scale: follow e17 comp api changes 

SVN revision: 84419
This commit is contained in:
Hannes Janetzek 2013-03-10 14:46:39 +00:00 committed by Tom Hacohen
parent 990b907a6d
commit 3514907b51
3 changed files with 46 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/e_mod_main.c
View File

@ -159,7 +159,7 @@ _e_mod_action(const char *params, int modifiers, int method)
man = eina_list_data_get(e_manager_list());
if (!man) return;
e = man->comp->evas;
e = e_manager_comp_evas_get(man);
if (!e) return;
if (!strncmp(params, "go_pager", 8))

38
src/e_mod_pager.c
View File

@ -10,7 +10,7 @@ struct _Item
Evas_Object *o, *o_win;
E_Border *bd;
E_Desk *desk;
E_Comp_Win *src;
E_Manager_Comp_Source *src;
E_Manager *man;
double x;
@ -64,7 +64,7 @@ static void _pager_win_cb_delorig(void *data,
Evas_Object *obj,
void *event_info);
static Item *_pager_win_new(Evas *e, E_Manager *man, E_Comp_Win *src);
static Item *_pager_win_new(Evas *e, E_Manager *man, E_Manager_Comp_Source *src);
static void _pager_win_del(Item *it);
static void _pager_finish();
@ -171,7 +171,7 @@ _pager_redraw(void *data EINA_UNUSED)
if (scale_state == SCALE_STATE_HOLD)
{
E_Manager *man = e_manager_current_get();
e_comp_render_update(man->comp);
e_manager_comp_evas_update(man);
return ECORE_CALLBACK_RENEW;
}
@ -628,7 +628,7 @@ _pager_win_del(Item *it)
if (it->bd && !it->o)
{
e_comp_win_hidden_set(it->src, EINA_FALSE);
e_manager_comp_src_hidden_set(it->man, it->src, EINA_FALSE);
e_object_unref(E_OBJECT(it->bd));
}
@ -652,7 +652,7 @@ _pager_win_del(Item *it)
if ((it->bd->desk != current_desk) && (!it->bd->sticky))
e_border_hide(it->bd, 2);
e_comp_win_hidden_set(it->src, EINA_FALSE);
e_manager_comp_src_hidden_set(it->man, it->src, EINA_FALSE);
evas_object_del(it->o_win);
evas_object_del(it->o);
@ -668,23 +668,23 @@ _pager_win_del(Item *it)
}
static Item *
_pager_win_new(Evas *e, E_Manager *man, E_Comp_Win *src)
_pager_win_new(Evas *e, E_Manager *man, E_Manager_Comp_Source *src)
{
Item *it;
Evas_Object *o, *sh_obj, *obj;
E_Border *bd;
sh_obj = src->shobj;
sh_obj = e_manager_comp_src_shadow_get(man, src);
if (!sh_obj) return NULL;
obj = src->obj;
obj = e_manager_comp_src_image_get(man, src);
if (!obj) return NULL;
bd = src->bd;
bd = e_manager_comp_src_border_get(man, src);
if (!bd)
{
Ecore_X_Window win = src-win;
Ecore_X_Window win = e_manager_comp_src_window_get(man, src);
if (win == zone->container->bg_win)
{
@ -707,7 +707,7 @@ _pager_win_new(Evas *e, E_Manager *man, E_Comp_Win *src)
}
else if (scale_conf->pager_fade_popups)
{
E_Popup *pop = src->pop;
E_Popup *pop = e_manager_comp_src_popup_get(man, src);
if ((pop) && (pop->zone != zone))
return NULL;
@ -738,7 +738,7 @@ _pager_win_new(Evas *e, E_Manager *man, E_Comp_Win *src)
it->src = src;
e_object_ref(E_OBJECT(it->bd));
e_comp_win_hidden_set(src, EINA_TRUE);
e_manager_comp_src_hidden_set(man, src, EINA_TRUE);
items = eina_list_append(items, it);
@ -749,7 +749,7 @@ _pager_win_new(Evas *e, E_Manager *man, E_Comp_Win *src)
(e_mod_border_ignore(it->bd)))
return NULL;
it->o_win = e_comp_win_image_mirror_add(src);
it->o_win = e_manager_comp_src_image_mirror_add(man, 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); */
@ -1059,7 +1059,7 @@ static Eina_Bool
_pager_run(E_Manager *man)
{
Evas *e;
E_Comp_Win *src;
E_Manager_Comp_Source *src;
Ecore_Event_Handler *h;
const char *file, *group;
Eina_List *l;
@ -1072,7 +1072,7 @@ _pager_run(E_Manager *man)
if (input_win) return EINA_FALSE;
e = man->comp->evas;
e = e_manager_comp_evas_get(man);
if (!e) return EINA_FALSE;
zone = e_util_zone_current_get(man);
@ -1147,7 +1147,7 @@ _pager_run(E_Manager *man)
evas_object_resize(zone_clip, zone_w, zone_h);
evas_object_show(zone_clip);
EINA_LIST_FOREACH((Eina_List *)e_comp_win_list_get(man->comp), l, src)
EINA_LIST_FOREACH((Eina_List *)e_manager_comp_src_list(man), l, src)
_pager_win_new(e, man, src);
edje_object_file_get(zone->bg_object, &file, &group);
@ -1253,7 +1253,7 @@ _pager_handler(void *data EINA_UNUSED,
void *msgdata)
{
E_Manager *man = (E_Manager *)obj;
E_Comp_Win *src = (E_Comp_Win *)msgdata;
E_Manager_Comp_Source *src = (E_Manager_Comp_Source *)msgdata;
Evas *e;
/* if (!scale_state) return; */
@ -1265,7 +1265,7 @@ _pager_handler(void *data EINA_UNUSED,
/* XXX disabled for now. */
/* return; */
e = man->comp->evas;
e = e_manager_comp_evas_get(man);
if (!strcmp(info, "change.comp"))
{
if (!e)
@ -1284,7 +1284,7 @@ _pager_handler(void *data EINA_UNUSED,
else if (!strcmp(info, "add.src"))
{
DBG("%s: %p | %p\n", info, man, src);
e_comp_win_hidden_set(src, EINA_TRUE);
e_manager_comp_src_hidden_set(man, src, EINA_TRUE);
}
else if (!strcmp(info, "del.src"))
{

52
src/e_mod_scale.c
View File

@ -14,7 +14,7 @@ struct _Item
{
Evas_Object *o, *o_win;
E_Border *bd;
E_Comp_Win *src;
E_Manager_Comp_Source *src;
E_Manager *man;
double scale;
@ -94,7 +94,7 @@ static void _scale_win_cb_delorig(void *data,
static Item *_scale_win_new(Evas *e,
E_Manager *man,
E_Comp_Win *src,
E_Manager_Comp_Source *src,
E_Desk *desk);
static void _scale_win_del(Item *it);
@ -298,7 +298,7 @@ _scale_redraw(void *data EINA_UNUSED)
}
man = e_manager_current_get();
e_comp_render_update(man->comp);
e_manager_comp_evas_update(man);
if (finish)
{
@ -477,15 +477,15 @@ _scale_finish()
{
Eina_List *l;
E_Comp_Win *src;
E_Manager_Comp_Source *src;
E_Manager *man = zone->container->manager;
EINA_LIST_FOREACH((Eina_List *)e_comp_win_list_get(man->comp), l, src)
e_comp_win_hidden_set(src, EINA_FALSE);
EINA_LIST_FOREACH((Eina_List *)e_manager_comp_src_list(man), l, src)
e_manager_comp_src_hidden_set(man, src, EINA_FALSE);
}
man = e_manager_current_get();
e_comp_render_update(man->comp);
e_manager_comp_evas_update(man);
if (!bd_move)
{
@ -697,17 +697,17 @@ _scale_win_del(Item *it)
evas_object_event_callback_del(it->o, EVAS_CALLBACK_MOUSE_UP,
_scale_win_cb_mouse_up);
e_comp_win_hidden_set(it->src, EINA_FALSE);
e_manager_comp_src_hidden_set(it->man, it->src, EINA_FALSE);
if ((it->bd->desk != current_desk) && (!it->bd->sticky))
{
e_border_hide(it->bd, 2);
evas_object_hide(it->src->shobj);
//FIXME evas_object_hide(it->src->shobj);
}
else if (it->was_hidden)
{
e_border_hide(it->bd, 1);
evas_object_hide(it->src->shobj);
//FIXME evas_object_hide(it->src->shobj);
}
if (it->was_shaded)
{
@ -728,26 +728,26 @@ _scale_win_del(Item *it)
}
static Item *
_scale_win_new(Evas *e, E_Manager *man, E_Comp_Win *src, E_Desk *desk)
_scale_win_new(Evas *e, E_Manager *man, E_Manager_Comp_Source *src, E_Desk *desk)
{
Item *it;
E_Border *bd;
if (!src->obj)
return NULL;
//if (!src->obj)
// return NULL;
bd = src->bd;
bd = e_manager_comp_src_border_get(man, src);
if (!bd)
{
Ecore_X_Window win = src->win;
Ecore_X_Window win = e_manager_comp_src_window_get(man, src);
if ((win == zone->container->bg_win) &&
(scale_conf->fade_desktop))
{
it = E_NEW(Item, 1);
it->man = man;
it->o_win = src->shobj;
it->o_win = e_manager_comp_src_shadow_get(man, src);
evas_object_event_callback_add(it->o_win, EVAS_CALLBACK_DEL,
_scale_win_cb_delorig, it);
background = it;
@ -755,14 +755,14 @@ _scale_win_new(Evas *e, E_Manager *man, E_Comp_Win *src, E_Desk *desk)
}
else if (scale_conf->fade_popups)
{
E_Popup *pop = src->pop;
E_Popup *pop = e_manager_comp_src_popup_get(man, src);
if ((pop) && (pop->zone != zone))
return NULL;
it = E_NEW(Item, 1);
it->man = man;
it->o_win = src->shobj;
it->o_win = e_manager_comp_src_shadow_get(man, src);
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 @@ _scale_win_new(Evas *e, E_Manager *man, E_Comp_Win *src, E_Desk *desk)
it->bd = bd;
it->man = man;
it->src = src;
e_comp_win_hidden_set(src, EINA_TRUE);
e_manager_comp_src_hidden_set(man, src, EINA_TRUE);
it->o_win = e_comp_win_image_mirror_add(src);
it->o_win = e_manager_comp_src_image_mirror_add(man, src);
evas_object_show(it->o_win);
it->o = edje_object_add(e);
@ -1116,7 +1116,7 @@ static Eina_Bool
_scale_run(E_Manager *man)
{
Eina_List *l;
E_Comp_Win *src;
E_Manager_Comp_Source *src;
Ecore_Event_Handler *h;
Evas *e;
int i;
@ -1128,7 +1128,7 @@ _scale_run(E_Manager *man)
mouse_y = -1;
warp_pointer = 0;
e = man->comp->evas;
e = e_manager_comp_evas_get(man);
if (!e) return EINA_FALSE;
zone = e_util_zone_current_get(e_manager_current_get());
@ -1177,7 +1177,7 @@ _scale_run(E_Manager *man)
evas_object_resize(zone_clip, zone->w, zone->h);
evas_object_show(zone_clip);
EINA_LIST_FOREACH((Eina_List *)e_comp_win_list_get(man->comp), l, src)
EINA_LIST_FOREACH((Eina_List *)e_manager_comp_src_list(man), l, src)
{
Item *it = _scale_win_new(e, man, src, current_desk);
if (it) evas_object_clip_set(it->o, zone_clip);
@ -1556,7 +1556,7 @@ _scale_handler(void *data EINA_UNUSED,
E_Object *obj, void *msgdata)
{
E_Manager *man = (E_Manager *)obj;
E_Comp_Win *src = (E_Comp_Win *)msgdata;
E_Manager_Comp_Source *src = (E_Manager_Comp_Source *)msgdata;
Evas *e;
if (strcmp(name, "comp.manager")) return;
@ -1566,7 +1566,7 @@ _scale_handler(void *data EINA_UNUSED,
/* XXX disabled for now. */
/* return; */
e = man->comp->evas;
e = e_manager_comp_evas_get(man);
if (!strcmp(info, "change.comp"))
{
if (!e)
@ -1585,7 +1585,7 @@ _scale_handler(void *data EINA_UNUSED,
else if (!strcmp(info, "add.src"))
{
DBG("%s: %p | %p\n", info, man, src);
e_comp_win_hidden_set(src, EINA_TRUE);
e_manager_comp_src_hidden_set(man, src, EINA_TRUE);
}
else if (!strcmp(info, "del.src"))
{