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

comp-scale: fix some compilation issue. still borken with software backend. 

SVN revision: 84104
This commit is contained in:
Cedric BAIL 2013-02-19 10:32:22 +00:00 committed by Tom Hacohen
parent 9745386f7a
commit 990b907a6d
4 changed files with 36 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -1 +1,2 @@
Hannes Janetzek <hannes.janetzek@gmail.com> Hannes Janetzek <hannes.janetzek@gmail.com>
Moritz Maxeiner <moritzmaxeiner@googlemail.com>

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()); man = eina_list_data_get(e_manager_list());
if (!man) return; if (!man) return;
e = e_comp_evas_get(man->comp); e = man->comp->evas;
if (!e) return; if (!e) return;
if (!strncmp(params, "go_pager", 8)) if (!strncmp(params, "go_pager", 8))

28
src/e_mod_pager.c
View File

@ -171,7 +171,7 @@ _pager_redraw(void *data EINA_UNUSED)
if (scale_state == SCALE_STATE_HOLD) if (scale_state == SCALE_STATE_HOLD)
{ {
E_Manager *man = e_manager_current_get(); E_Manager *man = e_manager_current_get();
e_comp_update(man->comp); e_comp_render_update(man->comp);
return ECORE_CALLBACK_RENEW; return ECORE_CALLBACK_RENEW;
} }
@ -628,7 +628,7 @@ _pager_win_del(Item *it)
if (it->bd && !it->o) 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)); 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)) if ((it->bd->desk != current_desk) && (!it->bd->sticky))
e_border_hide(it->bd, 2); 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_win);
evas_object_del(it->o); evas_object_del(it->o);
@ -674,17 +674,17 @@ _pager_win_new(Evas *e, E_Manager *man, E_Comp_Win *src)
Evas_Object *o, *sh_obj, *obj; Evas_Object *o, *sh_obj, *obj;
E_Border *bd; E_Border *bd;
sh_obj = e_comp_src_shadow_get(src); sh_obj = src->shobj;
if (!sh_obj) return NULL; if (!sh_obj) return NULL;
obj = e_comp_src_image_get(src); obj = src->obj;
if (!obj) return NULL; if (!obj) return NULL;
bd = e_comp_src_border_get(src); bd = src->bd;
if (!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) 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) 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)) if ((pop) && (pop->zone != zone))
return NULL; return NULL;
@ -738,7 +738,7 @@ _pager_win_new(Evas *e, E_Manager *man, E_Comp_Win *src)
it->src = src; it->src = src;
e_object_ref(E_OBJECT(it->bd)); 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); 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))) (e_mod_border_ignore(it->bd)))
return NULL; 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); /* it->o_win = evas_object_image_filled_add(e);
* o = e_manager_comp_src_image_get(man, src); * o = e_manager_comp_src_image_get(man, src);
* evas_object_image_source_set(it->o_win, o); */ * evas_object_image_source_set(it->o_win, o); */
@ -1072,7 +1072,7 @@ _pager_run(E_Manager *man)
if (input_win) return EINA_FALSE; if (input_win) return EINA_FALSE;
e = e_comp_evas_get(man->comp); e = man->comp->evas;
if (!e) return EINA_FALSE; if (!e) return EINA_FALSE;
zone = e_util_zone_current_get(man); 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_resize(zone_clip, zone_w, zone_h);
evas_object_show(zone_clip); 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); _pager_win_new(e, man, src);
edje_object_file_get(zone->bg_object, &file, &group); edje_object_file_get(zone->bg_object, &file, &group);
@ -1265,7 +1265,7 @@ _pager_handler(void *data EINA_UNUSED,
/* XXX disabled for now. */ /* XXX disabled for now. */
/* return; */ /* return; */
e = e_comp_evas_get(man->comp); e = man->comp->evas;
if (!strcmp(info, "change.comp")) if (!strcmp(info, "change.comp"))
{ {
if (!e) if (!e)
@ -1284,7 +1284,7 @@ _pager_handler(void *data EINA_UNUSED,
else if (!strcmp(info, "add.src")) else if (!strcmp(info, "add.src"))
{ {
DBG("%s: %p | %p\n", info, man, 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")) else if (!strcmp(info, "del.src"))
{ {

38
src/e_mod_scale.c
View File

@ -298,7 +298,7 @@ _scale_redraw(void *data EINA_UNUSED)
} }
man = e_manager_current_get(); man = e_manager_current_get();
e_comp_update(man->comp); e_comp_render_update(man->comp);
if (finish) if (finish)
{ {
@ -480,12 +480,12 @@ _scale_finish()
E_Comp_Win *src; E_Comp_Win *src;
E_Manager *man = zone->container->manager; E_Manager *man = zone->container->manager;
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)
e_comp_src_hidden_set(src, EINA_FALSE); e_comp_win_hidden_set(src, EINA_FALSE);
} }
man = e_manager_current_get(); man = e_manager_current_get();
e_comp_update(man->comp); e_comp_render_update(man->comp);
if (!bd_move) if (!bd_move)
{ {
@ -697,17 +697,17 @@ _scale_win_del(Item *it)
evas_object_event_callback_del(it->o, EVAS_CALLBACK_MOUSE_UP, evas_object_event_callback_del(it->o, EVAS_CALLBACK_MOUSE_UP,
_scale_win_cb_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)) if ((it->bd->desk != current_desk) && (!it->bd->sticky))
{ {
e_border_hide(it->bd, 2); 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) else if (it->was_hidden)
{ {
e_border_hide(it->bd, 1); 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) if (it->was_shaded)
{ {
@ -733,21 +733,21 @@ _scale_win_new(Evas *e, E_Manager *man, E_Comp_Win *src, E_Desk *desk)
Item *it; Item *it;
E_Border *bd; E_Border *bd;
if (!e_comp_src_image_get(src)) if (!src->obj)
return NULL; return NULL;
bd = e_comp_src_border_get(src); bd = src->bd;
if (!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) && if ((win == zone->container->bg_win) &&
(scale_conf->fade_desktop)) (scale_conf->fade_desktop))
{ {
it = E_NEW(Item, 1); it = E_NEW(Item, 1);
it->man = man; 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, evas_object_event_callback_add(it->o_win, EVAS_CALLBACK_DEL,
_scale_win_cb_delorig, it); _scale_win_cb_delorig, it);
background = 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) 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)) if ((pop) && (pop->zone != zone))
return NULL; return NULL;
it = E_NEW(Item, 1); it = E_NEW(Item, 1);
it->man = man; 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, evas_object_event_callback_add(it->o_win, EVAS_CALLBACK_DEL,
_scale_win_cb_delorig, it); _scale_win_cb_delorig, it);
popups = eina_list_append(popups, 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->bd = bd;
it->man = man; it->man = man;
it->src = src; 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); evas_object_show(it->o_win);
it->o = edje_object_add(e); it->o = edje_object_add(e);
@ -1128,7 +1128,7 @@ _scale_run(E_Manager *man)
mouse_y = -1; mouse_y = -1;
warp_pointer = 0; warp_pointer = 0;
e = e_comp_evas_get(man->comp); e = man->comp->evas;
if (!e) return EINA_FALSE; if (!e) return EINA_FALSE;
zone = e_util_zone_current_get(e_manager_current_get()); 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_resize(zone_clip, zone->w, zone->h);
evas_object_show(zone_clip); 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); Item *it = _scale_win_new(e, man, src, current_desk);
if (it) evas_object_clip_set(it->o, zone_clip); if (it) evas_object_clip_set(it->o, zone_clip);
@ -1566,7 +1566,7 @@ _scale_handler(void *data EINA_UNUSED,
/* XXX disabled for now. */ /* XXX disabled for now. */
/* return; */ /* return; */
e = e_comp_evas_get(man->comp); e = man->comp->evas;
if (!strcmp(info, "change.comp")) if (!strcmp(info, "change.comp"))
{ {
if (!e) if (!e)
@ -1585,7 +1585,7 @@ _scale_handler(void *data EINA_UNUSED,
else if (!strcmp(info, "add.src")) else if (!strcmp(info, "add.src"))
{ {
DBG("%s: %p | %p\n", info, man, 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")) else if (!strcmp(info, "del.src"))
{ {