hugok
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

alas por yorrick i knew him well... ok - i was trying to isolate all 

comp objects inot 1 layout per screen but we cant do this due to
objects spanning screens and thus requiring correct stacking, so stick
to simple stacking. yay.



SVN revision: 75734
This commit is contained in:
Carsten Haitzler 2012-08-27 09:22:26 +00:00
parent f18632e2fd
commit e9bb93442d
4 changed files with 238 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
data/themes/default.edc
View File

@ -38330,17 +38330,31 @@ collections {
} }
} }
group { name: "e/modules/comp/screen/default"; group { name: "e/modules/comp/screen/base/default";
parts {
part { name: "black"; type: RECT;
mouse_events: 0;
description { state: "default" 0.0;
visible: 1;
color: 0 0 0 255;
}
}
}
}
group { name: "e/modules/comp/screen/overlay/default";
images { images {
image: "bg_shadow.png" COMP; image: "bg_shadow.png" COMP;
} }
parts { parts {
part { name: "e.swallow.content"; type: SWALLOW; part { name: "clip"; type: RECT;
mouse_events: 0; mouse_events: 0;
description { state: "default" 0.0; } description { state: "default" 0.0;
visible: 1;
}
} }
part { name: "shadow"; part { name: "shadow";
mouse_events: 0; mouse_events: 0;
clip_to: "clip";
description { state: "default" 0.0; description { state: "default" 0.0;
rel1.relative: -1.0 -1.0; rel1.relative: -1.0 -1.0;
rel2.relative: 2.0 2.0; rel2.relative: 2.0 2.0;

2
src/bin/e_layout.c
View File

@ -268,6 +268,8 @@ _e_layout_smart_adopt(E_Smart_Data *sd, Evas_Object *obj)
{ {
E_Layout_Item *li; E_Layout_Item *li;
li = evas_object_data_get(obj, "e_layout_data");
if (li) e_layout_unpack(obj);
li = calloc(1, sizeof(E_Layout_Item)); li = calloc(1, sizeof(E_Layout_Item));
if (!li) return NULL; if (!li) return NULL;
li->sd = sd; li->sd = sd;

338
src/modules/comp/e_mod_comp.c
View File

@ -32,8 +32,8 @@ struct _E_Comp
Ecore_Evas *ee; Ecore_Evas *ee;
Ecore_X_Window ee_win; Ecore_X_Window ee_win;
Evas *evas; Evas *evas;
Evas_Object *base;
Evas_Object *layout; Evas_Object *layout;
Eina_List *zones;
E_Manager *man; E_Manager *man;
Eina_Inlist *wins; Eina_Inlist *wins;
Eina_List *wins_list; Eina_List *wins_list;
@ -43,6 +43,7 @@ struct _E_Comp
Ecore_Timer *new_up_timer; Ecore_Timer *new_up_timer;
Evas_Object *fps_bg; Evas_Object *fps_bg;
Evas_Object *fps_fg; Evas_Object *fps_fg;
Ecore_Job *screen_job;
int animating; int animating;
int render_overflow; int render_overflow;
double frametimes[122]; double frametimes[122];
@ -58,6 +59,16 @@ struct _E_Comp
Eina_Bool saver : 1; Eina_Bool saver : 1;
}; };
struct _E_Comp_Zone
{
E_Zone *zone; // never deref - just use for handle cmp's
Evas_Object *base;
Evas_Object *over;
int container_num;
int zone_num;
int x, y, w, h;
};
struct _E_Comp_Win struct _E_Comp_Win
{ {
EINA_INLIST; EINA_INLIST;
@ -450,6 +461,51 @@ _e_mod_comp_win_ready_timeout_setup(E_Comp_Win *cw)
} }
} }
static void
_e_mod_comp_win_layout_populate(E_Comp_Win *cw)
{
e_layout_pack(cw->c->layout, cw->shobj);
}
static void
_e_mod_comp_win_restack(E_Comp_Win *cw)
{
Eina_Inlist *prev, *next;
Eina_List *l;
E_Comp_Win *cwp = NULL, *cwn = NULL;
next = EINA_INLIST_GET(cw)->next;
if (next) cwn = EINA_INLIST_CONTAINER_GET(next, E_Comp_Win);
prev = EINA_INLIST_GET(cw)->prev;
if (prev) cwp = EINA_INLIST_CONTAINER_GET(prev, E_Comp_Win);
if (cwp)
e_layout_child_raise_above(cw->shobj, cwp->shobj);
else if (cwn)
e_layout_child_raise_above(cw->shobj, cwn->shobj);
if (cw->bd)
{
E_Border *tmp;
EINA_LIST_FOREACH(cw->bd->client.e.state.video_child, l, tmp)
{
E_Comp_Win *tcw;
tcw = eina_hash_find(borders,
e_util_winid_str_get(tmp->client.win));
if (!tcw) continue;
e_layout_child_lower_below(tcw->shobj, cw->shobj);
}
}
}
static void
_e_mod_comp_win_geometry_update(E_Comp_Win *cw)
{
e_layout_child_move(cw->shobj, cw->x, cw->y);
e_layout_child_resize(cw->shobj, cw->pw, cw->ph);
}
static void static void
_e_mod_comp_win_update(E_Comp_Win *cw) _e_mod_comp_win_update(E_Comp_Win *cw)
{ {
@ -534,9 +590,7 @@ _e_mod_comp_win_update(E_Comp_Win *cw)
ecore_x_pixmap_geometry_get(cw->pixmap, NULL, NULL, &(cw->pw), &(cw->ph)); ecore_x_pixmap_geometry_get(cw->pixmap, NULL, NULL, &(cw->pw), &(cw->ph));
_e_mod_comp_win_ready_timeout_setup(cw); _e_mod_comp_win_ready_timeout_setup(cw);
if ((cw->pw > 0) && (cw->ph > 0)) if ((cw->pw > 0) && (cw->ph > 0))
{ _e_mod_comp_win_geometry_update(cw);
evas_object_resize(cw->obj, cw->pw, cw->ph);
}
} }
else else
{ {
@ -597,10 +651,9 @@ _e_mod_comp_win_update(E_Comp_Win *cw)
} }
// evas_object_move(cw->shobj, cw->x, cw->y); // evas_object_move(cw->shobj, cw->x, cw->y);
e_layout_child_move(cw->shobj, cw->x, cw->y);
// was cw->w / cw->h // was cw->w / cw->h
// evas_object_resize(cw->shobj, cw->pw, cw->ph); // evas_object_resize(cw->shobj, cw->pw, cw->ph);
e_layout_child_resize(cw->shobj, cw->pw, cw->ph); _e_mod_comp_win_geometry_update(cw);
if ((cw->c->gl) && (_comp_mod->conf->texture_from_pixmap) && if ((cw->c->gl) && (_comp_mod->conf->texture_from_pixmap) &&
(!cw->shaped) && (!cw->rects)) (!cw->shaped) && (!cw->rects))
@ -1080,13 +1133,9 @@ nocomp:
if (cw->counter) if (cw->counter)
{ {
if (cw->bd) if (cw->bd)
{ ecore_x_e_comp_sync_cancel_send(cw->bd->client.win);
ecore_x_e_comp_sync_cancel_send(cw->bd->client.win);
}
else else
{ ecore_x_e_comp_sync_cancel_send(cw->win);
ecore_x_e_comp_sync_cancel_send(cw->win);
}
ecore_x_sync_counter_inc(cw->counter, 1); ecore_x_sync_counter_inc(cw->counter, 1);
} }
// ecore_x_window_hide(cw->win); // ecore_x_window_hide(cw->win);
@ -1171,13 +1220,9 @@ nocomp:
if (cw->counter) if (cw->counter)
{ {
if (cw->bd) if (cw->bd)
{ ecore_x_e_comp_sync_begin_send(cw->bd->client.win);
ecore_x_e_comp_sync_begin_send(cw->bd->client.win);
}
else else
{ ecore_x_e_comp_sync_begin_send(cw->win);
ecore_x_e_comp_sync_begin_send(cw->win);
}
} }
} }
} }
@ -1330,13 +1375,9 @@ _e_mod_comp_object_del(void *data,
if (cw->counter) if (cw->counter)
{ {
if (cw->bd) if (cw->bd)
{ ecore_x_e_comp_sync_cancel_send(cw->bd->client.win);
ecore_x_e_comp_sync_cancel_send(cw->bd->client.win);
}
else else
{ ecore_x_e_comp_sync_cancel_send(cw->win);
ecore_x_e_comp_sync_cancel_send(cw->win);
}
ecore_x_sync_counter_inc(cw->counter, 1); ecore_x_sync_counter_inc(cw->counter, 1);
} }
if (cw->bd) eina_hash_del(borders, e_util_winid_str_get(cw->bd->client.win), cw); if (cw->bd) eina_hash_del(borders, e_util_winid_str_get(cw->bd->client.win), cw);
@ -1410,9 +1451,7 @@ _e_mod_comp_win_sync_setup(E_Comp_Win *cw,
(_comp_mod->conf->loose_sync)) (_comp_mod->conf->loose_sync))
cw->counter = ecore_x_e_comp_sync_counter_get(win); cw->counter = ecore_x_e_comp_sync_counter_get(win);
else else
{ ecore_x_e_comp_sync_cancel_send(win);
ecore_x_e_comp_sync_cancel_send(win);
}
} }
else else
cw->counter = ecore_x_e_comp_sync_counter_get(win); cw->counter = ecore_x_e_comp_sync_counter_get(win);
@ -1778,8 +1817,6 @@ _e_mod_comp_win_add(E_Comp *c,
(cw->win, ECORE_X_DAMAGE_REPORT_DELTA_RECTANGLES); (cw->win, ECORE_X_DAMAGE_REPORT_DELTA_RECTANGLES);
eina_hash_add(damages, e_util_winid_str_get(cw->damage), cw); eina_hash_add(damages, e_util_winid_str_get(cw->damage), cw);
cw->shobj = edje_object_add(c->evas); cw->shobj = edje_object_add(c->evas);
e_layout_pack(c->layout, cw->shobj);
e_layout_child_raise(cw->shobj);
cw->obj = evas_object_image_filled_add(c->evas); cw->obj = evas_object_image_filled_add(c->evas);
evas_object_image_colorspace_set(cw->obj, EVAS_COLORSPACE_ARGB8888); evas_object_image_colorspace_set(cw->obj, EVAS_COLORSPACE_ARGB8888);
if (cw->argb) evas_object_image_alpha_set(cw->obj, 1); if (cw->argb) evas_object_image_alpha_set(cw->obj, 1);
@ -1794,6 +1831,9 @@ _e_mod_comp_win_add(E_Comp *c,
_e_mod_comp_show_done, cw); _e_mod_comp_show_done, cw);
edje_object_signal_callback_add(cw->shobj, "e,action,hide,done", "e", edje_object_signal_callback_add(cw->shobj, "e,action,hide,done", "e",
_e_mod_comp_hide_done, cw); _e_mod_comp_hide_done, cw);
_e_mod_comp_win_layout_populate(cw);
evas_object_show(cw->obj); evas_object_show(cw->obj);
ecore_x_window_shape_events_select(cw->win, 1); ecore_x_window_shape_events_select(cw->win, 1);
rects = ecore_x_window_shape_rectangles_get(cw->win, &num); rects = ecore_x_window_shape_rectangles_get(cw->win, &num);
@ -1828,8 +1868,9 @@ _e_mod_comp_win_add(E_Comp *c,
else else
{ {
cw->shobj = evas_object_rectangle_add(c->evas); cw->shobj = evas_object_rectangle_add(c->evas);
e_layout_pack(c->layout, cw->shobj);
e_layout_child_raise(cw->shobj); _e_mod_comp_win_layout_populate(cw);
evas_object_color_set(cw->shobj, 0, 0, 0, 0); evas_object_color_set(cw->shobj, 0, 0, 0, 0);
} }
evas_object_pass_events_set(cw->shobj, 1); evas_object_pass_events_set(cw->shobj, 1);
@ -1859,6 +1900,7 @@ _e_mod_comp_win_add(E_Comp *c,
static void static void
_e_mod_comp_win_del(E_Comp_Win *cw) _e_mod_comp_win_del(E_Comp_Win *cw)
{ {
Evas_Object *o;
int pending_count; int pending_count;
if (cw->animating) if (cw->animating)
@ -1935,13 +1977,11 @@ _e_mod_comp_win_del(E_Comp_Win *cw)
} }
if (cw->obj_mirror) if (cw->obj_mirror)
{ {
Evas_Object *o;
EINA_LIST_FREE(cw->obj_mirror, o) EINA_LIST_FREE(cw->obj_mirror, o)
{ {
if (cw->xim) evas_object_image_data_set(o, NULL); if (cw->xim) evas_object_image_data_set(o, NULL);
evas_object_event_callback_del(o, EVAS_CALLBACK_DEL, evas_object_event_callback_del(o, EVAS_CALLBACK_DEL,
_e_mod_comp_cb_win_mirror_del); _e_mod_comp_cb_win_mirror_del);
evas_object_del(o); evas_object_del(o);
} }
} }
@ -1961,6 +2001,7 @@ _e_mod_comp_win_del(E_Comp_Win *cw)
evas_object_del(cw->shobj); evas_object_del(cw->shobj);
cw->shobj = NULL; cw->shobj = NULL;
} }
if (cw->inhash) if (cw->inhash)
eina_hash_del(windows, e_util_winid_str_get(cw->win), cw); eina_hash_del(windows, e_util_winid_str_get(cw->win), cw);
if (cw->damage) if (cw->damage)
@ -2245,25 +2286,7 @@ _e_mod_comp_win_raise_above(E_Comp_Win *cw,
cw->c->wins = eina_inlist_append_relative(cw->c->wins, cw->c->wins = eina_inlist_append_relative(cw->c->wins,
EINA_INLIST_GET(cw), EINA_INLIST_GET(cw),
EINA_INLIST_GET(cw2)); EINA_INLIST_GET(cw2));
// evas_object_stack_above(cw->shobj, cw2->shobj); _e_mod_comp_win_restack(cw);
e_layout_child_raise_above(cw->shobj, cw2->shobj);
if (cw->bd)
{
Eina_List *l;
E_Border *tmp;
EINA_LIST_FOREACH(cw->bd->client.e.state.video_child, l, tmp)
{
E_Comp_Win *tcw;
tcw = eina_hash_find(borders, e_util_winid_str_get(tmp->client.win));
if (!tcw) continue;
// evas_object_stack_below(tcw->shobj, cw->shobj);
e_layout_child_lower_below(tcw->shobj, cw->shobj);
}
}
_e_mod_comp_win_render_queue(cw); _e_mod_comp_win_render_queue(cw);
cw->pending_count++; cw->pending_count++;
e_manager_comp_event_src_config_send e_manager_comp_event_src_config_send
@ -2278,25 +2301,7 @@ _e_mod_comp_win_raise(E_Comp_Win *cw)
cw->c->wins_invalid = 1; cw->c->wins_invalid = 1;
cw->c->wins = eina_inlist_remove(cw->c->wins, EINA_INLIST_GET(cw)); cw->c->wins = eina_inlist_remove(cw->c->wins, EINA_INLIST_GET(cw));
cw->c->wins = eina_inlist_append(cw->c->wins, EINA_INLIST_GET(cw)); cw->c->wins = eina_inlist_append(cw->c->wins, EINA_INLIST_GET(cw));
// evas_object_raise(cw->shobj); _e_mod_comp_win_restack(cw);
e_layout_child_raise(cw->shobj);
if (cw->bd)
{
Eina_List *l;
E_Border *tmp;
EINA_LIST_FOREACH(cw->bd->client.e.state.video_child, l, tmp)
{
E_Comp_Win *tcw;
tcw = eina_hash_find(borders, e_util_winid_str_get(tmp->client.win));
if (!tcw) continue;
// evas_object_stack_below(tcw->shobj, cw->shobj);
e_layout_child_lower_below(tcw->shobj, cw->shobj);
}
}
_e_mod_comp_win_render_queue(cw); _e_mod_comp_win_render_queue(cw);
cw->pending_count++; cw->pending_count++;
e_manager_comp_event_src_config_send e_manager_comp_event_src_config_send
@ -2311,25 +2316,7 @@ _e_mod_comp_win_lower(E_Comp_Win *cw)
cw->c->wins_invalid = 1; cw->c->wins_invalid = 1;
cw->c->wins = eina_inlist_remove(cw->c->wins, EINA_INLIST_GET(cw)); cw->c->wins = eina_inlist_remove(cw->c->wins, EINA_INLIST_GET(cw));
cw->c->wins = eina_inlist_prepend(cw->c->wins, EINA_INLIST_GET(cw)); cw->c->wins = eina_inlist_prepend(cw->c->wins, EINA_INLIST_GET(cw));
// evas_object_lower(cw->shobj); _e_mod_comp_win_restack(cw);
e_layout_child_lower(cw->shobj);
if (cw->bd)
{
Eina_List *l;
E_Border *tmp;
EINA_LIST_FOREACH(cw->bd->client.e.state.video_child, l, tmp)
{
E_Comp_Win *tcw;
tcw = eina_hash_find(borders, e_util_winid_str_get(tmp->client.win));
if (!tcw) continue;
// evas_object_stack_below(tcw->shobj, cw->shobj);
e_layout_child_lower_below(tcw->shobj, cw->shobj);
}
}
_e_mod_comp_win_render_queue(cw); _e_mod_comp_win_render_queue(cw);
cw->pending_count++; cw->pending_count++;
e_manager_comp_event_src_config_send e_manager_comp_event_src_config_send
@ -2345,6 +2332,8 @@ _e_mod_comp_win_configure(E_Comp_Win *cw,
int h, int h,
int border) int border)
{ {
Eina_Bool moved = EINA_FALSE, resized = EINA_FALSE;
if (!cw->visible) if (!cw->visible)
{ {
cw->hidden.x = x; cw->hidden.x = x;
@ -2359,7 +2348,7 @@ _e_mod_comp_win_configure(E_Comp_Win *cw,
cw->x = x; cw->x = x;
cw->y = y; cw->y = y;
// evas_object_move(cw->shobj, cw->x, cw->y); // evas_object_move(cw->shobj, cw->x, cw->y);
e_layout_child_move(cw->shobj, cw->x, cw->y); moved = EINA_TRUE;
} }
cw->hidden.x = x; cw->hidden.x = x;
cw->hidden.y = y; cw->hidden.y = y;
@ -2376,7 +2365,7 @@ _e_mod_comp_win_configure(E_Comp_Win *cw,
cw->needpix = 1; cw->needpix = 1;
// was cw->w / cw->h // was cw->w / cw->h
// evas_object_resize(cw->shobj, cw->pw, cw->ph); // evas_object_resize(cw->shobj, cw->pw, cw->ph);
e_layout_child_resize(cw->shobj, cw->pw, cw->ph); resized = EINA_TRUE;
_e_mod_comp_win_damage(cw, 0, 0, cw->w, cw->h, 0); _e_mod_comp_win_damage(cw, 0, 0, cw->w, cw->h, 0);
#else #else
if (cw->bd) if (cw->bd)
@ -2386,7 +2375,7 @@ _e_mod_comp_win_configure(E_Comp_Win *cw,
cw->needpix = 1; cw->needpix = 1;
// was cw->w / cw->h // was cw->w / cw->h
// evas_object_resize(cw->shobj, cw->pw, cw->ph); // evas_object_resize(cw->shobj, cw->pw, cw->ph);
e_layout_child_resize(cw->shobj, cw->pw, cw->ph); resized = EINA_TRUE;
_e_mod_comp_win_damage(cw, 0, 0, cw->w, cw->h, 0); _e_mod_comp_win_damage(cw, 0, 0, cw->w, cw->h, 0);
} }
else else
@ -2408,7 +2397,7 @@ _e_mod_comp_win_configure(E_Comp_Win *cw,
cw->needpix = 1; cw->needpix = 1;
// was cw->w / cw->h // was cw->w / cw->h
// evas_object_resize(cw->shobj, cw->pw, cw->ph); // evas_object_resize(cw->shobj, cw->pw, cw->ph);
e_layout_child_resize(cw->shobj, cw->pw, cw->ph); resized = EINA_TRUE;
_e_mod_comp_win_damage(cw, 0, 0, cw->w, cw->h, 0); _e_mod_comp_win_damage(cw, 0, 0, cw->w, cw->h, 0);
} }
if ((cw->input_only) || (cw->invalid)) return; if ((cw->input_only) || (cw->invalid)) return;
@ -2423,7 +2412,7 @@ _e_mod_comp_win_configure(E_Comp_Win *cw,
cw->needpix = 1; cw->needpix = 1;
// was cw->w / cw->h // was cw->w / cw->h
// evas_object_resize(cw->shobj, cw->pw, cw->ph); // evas_object_resize(cw->shobj, cw->pw, cw->ph);
e_layout_child_resize(cw->shobj, cw->pw, cw->ph); resized = EINA_TRUE;
_e_mod_comp_win_damage(cw, 0, 0, cw->w, cw->h, 0); _e_mod_comp_win_damage(cw, 0, 0, cw->w, cw->h, 0);
} }
if (cw->border != border) if (cw->border != border)
@ -2431,12 +2420,13 @@ _e_mod_comp_win_configure(E_Comp_Win *cw,
cw->border = border; cw->border = border;
cw->needpix = 1; cw->needpix = 1;
// evas_object_resize(cw->shobj, cw->pw, cw->ph); // evas_object_resize(cw->shobj, cw->pw, cw->ph);
e_layout_child_resize(cw->shobj, cw->pw, cw->ph); resized = EINA_TRUE;
_e_mod_comp_win_damage(cw, 0, 0, cw->w, cw->h, 0); _e_mod_comp_win_damage(cw, 0, 0, cw->w, cw->h, 0);
} }
if ((cw->input_only) || (cw->invalid)) return; if ((cw->input_only) || (cw->invalid)) return;
_e_mod_comp_win_render_queue(cw); _e_mod_comp_win_render_queue(cw);
} }
if (moved || resized) _e_mod_comp_win_geometry_update(cw);
// add pending manager comp event count to match below config send // add pending manager comp event count to match below config send
cw->pending_count++; cw->pending_count++;
e_manager_comp_event_src_config_send(cw->c->man, e_manager_comp_event_src_config_send(cw->c->man,
@ -2772,7 +2762,7 @@ _e_mod_comp_message(void *data __UNUSED__,
cw->needpix = 1; cw->needpix = 1;
// was cw->w / cw->h // was cw->w / cw->h
// evas_object_resize(cw->shobj, cw->pw, cw->ph); // evas_object_resize(cw->shobj, cw->pw, cw->ph);
e_layout_child_resize(cw->shobj, cw->pw, cw->ph); _e_mod_comp_win_geometry_update(cw);
_e_mod_comp_win_damage(cw, 0, 0, cw->w, cw->h, 0); _e_mod_comp_win_damage(cw, 0, 0, cw->w, cw->h, 0);
} }
cw->drawme = 1; cw->drawme = 1;
@ -2838,7 +2828,8 @@ _e_mod_comp_screensaver(void *data __UNUSED__,
void *event) void *event)
{ {
Ecore_X_Event_Screensaver_Notify *ev = event; Ecore_X_Event_Screensaver_Notify *ev = event;
Eina_List *l; Eina_List *l, *ll;
E_Comp_Zone *cz;
E_Comp *c; E_Comp *c;
// fixme: use hash if compositors list > 4 // fixme: use hash if compositors list > 4
@ -2847,15 +2838,105 @@ _e_mod_comp_screensaver(void *data __UNUSED__,
if (ev->on != c->saver) if (ev->on != c->saver)
{ {
c->saver = ev->on; c->saver = ev->on;
if (c->saver) EINA_LIST_FOREACH(c->zones, ll, cz)
edje_object_signal_emit(c->base, "e,state,screensaver,on", "e"); {
else if (c->saver)
edje_object_signal_emit(c->base, "e,state,screensaver,off", "e"); {
edje_object_signal_emit(cz->base,
"e,state,screensaver,on", "e");
edje_object_signal_emit(cz->over,
"e,state,screensaver,on", "e");
}
else
{
edje_object_signal_emit(cz->base,
"e,state,screensaver,off", "e");
edje_object_signal_emit(cz->over,
"e,state,screensaver,off", "e");
}
}
} }
} }
return ECORE_CALLBACK_PASS_ON; return ECORE_CALLBACK_PASS_ON;
} }
static void
_e_mod_comp_zone_fill(E_Comp *c, E_Comp_Zone *cz)
{
Evas_Object *o;
cz->base = o = edje_object_add(c->evas);
e_theme_edje_object_set(o, "base/theme/modules/comp",
"e/modules/comp/screen/base/default");
evas_object_move(o, cz->zone->x, cz->zone->y);
evas_object_resize(o, cz->zone->w, cz->zone->h);
evas_object_lower(o);
evas_object_show(o);
cz->over = o = edje_object_add(c->evas);
e_theme_edje_object_set(o, "base/theme/modules/comp",
"e/modules/comp/screen/overlay/default");
evas_object_move(o, cz->zone->x, cz->zone->y);
evas_object_resize(o, cz->zone->w, cz->zone->h);
evas_object_raise(o);
evas_object_show(o);
}
static void
_e_mod_comp_screens_eval(E_Comp *c)
{
Eina_List *l, *ll;
E_Container *con;
E_Zone *zone;
E_Comp_Zone *cz;
int zn, cn;
EINA_LIST_FREE(c->zones, cz)
{
evas_object_del(cz->base);
evas_object_del(cz->over);
free(cz);
}
cn = 0;
EINA_LIST_FOREACH(c->man->containers, l, con)
{
zn = 0;
EINA_LIST_FOREACH(con->zones, ll, zone)
{
cz = calloc(1, sizeof(E_Comp_Zone));
if (cz)
{
cz->zone = zone;
cz->container_num = cn;
cz->zone_num = zn;
cz->x = zone->x;
cz->y = zone->y;
cz->w = zone->w;
cz->h = zone->h;
_e_mod_comp_zone_fill(c, cz);
c->zones = eina_list_append(c->zones, cz);
}
zn++;
}
cn++;
}
e_layout_freeze(c->layout);
evas_object_move(c->layout, 0, 0);
evas_object_resize(c->layout, c->man->w, c->man->h);
e_layout_virtual_size_set(c->layout, c->man->w, c->man->h);
e_layout_thaw(c->layout);
}
static void
_e_mod_comp_screen_change(void *data)
{
E_Comp *c = data;
c->screen_job = NULL;
ecore_evas_resize(c->ee, c->man->w, c->man->h);
_e_mod_comp_screens_eval(c);
}
static Eina_Bool static Eina_Bool
_e_mod_comp_randr(void *data __UNUSED__, _e_mod_comp_randr(void *data __UNUSED__,
int type __UNUSED__, int type __UNUSED__,
@ -2866,12 +2947,24 @@ _e_mod_comp_randr(void *data __UNUSED__,
EINA_LIST_FOREACH(compositors, l, c) EINA_LIST_FOREACH(compositors, l, c)
{ {
ecore_evas_resize(c->ee, c->man->w, c->man->h); if (c->screen_job) ecore_job_del(c->screen_job);
e_layout_freeze(c->base); c->screen_job = ecore_job_add(_e_mod_comp_screen_change, c);
e_layout_virtual_size_set(c->layout, c->man->w, c->man->h); }
evas_object_move(c->base, 0, 0); return ECORE_CALLBACK_PASS_ON;
evas_object_resize(c->base, c->man->w, c->man->h); }
e_layout_thaw(c->layout);
static Eina_Bool
_e_mod_comp_zonech(void *data __UNUSED__,
int type __UNUSED__,
__UNUSED__ void *event)
{
Eina_List *l;
E_Comp *c;
EINA_LIST_FOREACH(compositors, l, c)
{
if (c->screen_job) ecore_job_del(c->screen_job);
c->screen_job = ecore_job_add(_e_mod_comp_screen_change, c);
} }
return ECORE_CALLBACK_PASS_ON; return ECORE_CALLBACK_PASS_ON;
} }
@ -3031,9 +3124,8 @@ _e_mod_comp_reshadow(E_Comp_Win *cw)
if (cw->visible) evas_object_hide(cw->shobj); if (cw->visible) evas_object_hide(cw->shobj);
_e_mod_comp_win_shadow_setup(cw); _e_mod_comp_win_shadow_setup(cw);
// evas_object_move(cw->shobj, cw->x, cw->y); // evas_object_move(cw->shobj, cw->x, cw->y);
e_layout_child_move(cw->shobj, cw->x, cw->y);
// evas_object_resize(cw->shobj, cw->pw, cw->ph); // evas_object_resize(cw->shobj, cw->pw, cw->ph);
e_layout_child_resize(cw->shobj, cw->pw, cw->ph); _e_mod_comp_win_geometry_update(cw);
if (cw->visible) if (cw->visible)
{ {
evas_object_show(cw->shobj); evas_object_show(cw->shobj);
@ -3380,16 +3472,9 @@ _e_mod_comp_add(E_Manager *man)
ecore_evas_show(c->ee); ecore_evas_show(c->ee);
c->layout = e_layout_add(c->evas); c->layout = e_layout_add(c->evas);
e_layout_virtual_size_set(c->layout, man->w, man->h);
evas_object_show(c->layout); evas_object_show(c->layout);
c->base = edje_object_add(c->evas); _e_mod_comp_screens_eval(c);
e_theme_edje_object_set(c->base, "base/theme/modules/comp",
"e/modules/comp/screen/default");
edje_object_part_swallow(c->base, "e.swallow.content", c->layout);
evas_object_move(c->base, 0, 0);
evas_object_resize(c->base, man->w, man->h);
evas_object_show(c->base);
c->ee_win = ecore_evas_window_get(c->ee); c->ee_win = ecore_evas_window_get(c->ee);
ecore_x_composite_redirect_subwindows ecore_x_composite_redirect_subwindows
@ -3465,6 +3550,7 @@ static void
_e_mod_comp_del(E_Comp *c) _e_mod_comp_del(E_Comp *c)
{ {
E_Comp_Win *cw; E_Comp_Win *cw;
E_Comp_Zone *cz;
Eina_List *l, *hide_bd = NULL; Eina_List *l, *hide_bd = NULL;
E_Border *bd; E_Border *bd;
@ -3515,11 +3601,14 @@ _e_mod_comp_del(E_Comp *c)
_e_mod_comp_win_del(cw); _e_mod_comp_win_del(cw);
} }
evas_object_del(c->layout); EINA_LIST_FREE(c->zones, cz)
c->layout = NULL; {
evas_object_del(cz->base);
evas_object_del(cz->over);
free(cz);
}
evas_object_del(c->base); if (c->layout) evas_object_del(c->layout);
c->base = NULL;
ecore_evas_free(c->ee); ecore_evas_free(c->ee);
ecore_x_composite_unredirect_subwindows ecore_x_composite_unredirect_subwindows
@ -3530,6 +3619,7 @@ _e_mod_comp_del(E_Comp *c)
if (c->new_up_timer) ecore_timer_del(c->new_up_timer); if (c->new_up_timer) ecore_timer_del(c->new_up_timer);
if (c->update_job) ecore_job_del(c->update_job); if (c->update_job) ecore_job_del(c->update_job);
if (c->wins_list) eina_list_free(c->wins_list); if (c->wins_list) eina_list_free(c->wins_list);
if (c->screen_job) ecore_job_del(c->screen_job);
ecore_x_window_free(c->cm_selection); ecore_x_window_free(c->cm_selection);
ecore_x_e_comp_sync_supported_set(c->man->root, 0); ecore_x_e_comp_sync_supported_set(c->man->root, 0);
@ -3576,6 +3666,10 @@ e_mod_comp_init(void)
handlers = eina_list_append(handlers, ecore_event_handler_add(E_EVENT_CONTAINER_RESIZE, _e_mod_comp_randr, NULL)); handlers = eina_list_append(handlers, ecore_event_handler_add(E_EVENT_CONTAINER_RESIZE, _e_mod_comp_randr, NULL));
handlers = eina_list_append(handlers, ecore_event_handler_add(E_EVENT_ZONE_MOVE_RESIZE, _e_mod_comp_zonech, NULL));
handlers = eina_list_append(handlers, ecore_event_handler_add(E_EVENT_ZONE_ADD, _e_mod_comp_zonech, NULL));
handlers = eina_list_append(handlers, ecore_event_handler_add(E_EVENT_ZONE_DEL, _e_mod_comp_zonech, NULL));
handlers = eina_list_append(handlers, ecore_event_handler_add(E_EVENT_BORDER_ADD, _e_mod_comp_bd_add, NULL)); handlers = eina_list_append(handlers, ecore_event_handler_add(E_EVENT_BORDER_ADD, _e_mod_comp_bd_add, NULL));
handlers = eina_list_append(handlers, ecore_event_handler_add(E_EVENT_BORDER_REMOVE, _e_mod_comp_bd_del, NULL)); handlers = eina_list_append(handlers, ecore_event_handler_add(E_EVENT_BORDER_REMOVE, _e_mod_comp_bd_del, NULL));
handlers = eina_list_append(handlers, ecore_event_handler_add(E_EVENT_BORDER_SHOW, _e_mod_comp_bd_show, NULL)); handlers = eina_list_append(handlers, ecore_event_handler_add(E_EVENT_BORDER_SHOW, _e_mod_comp_bd_show, NULL));

5
src/modules/comp/e_mod_comp.h
View File

@ -3,8 +3,9 @@
#ifndef E_MOD_COMP_H #ifndef E_MOD_COMP_H
#define E_MOD_COMP_H #define E_MOD_COMP_H
typedef struct _E_Comp E_Comp; typedef struct _E_Comp E_Comp;
typedef struct _E_Comp_Win E_Comp_Win; typedef struct _E_Comp_Win E_Comp_Win;
typedef struct _E_Comp_Zone E_Comp_Zone;
Eina_Bool e_mod_comp_init(void); Eina_Bool e_mod_comp_init(void);
void e_mod_comp_shutdown(void); void e_mod_comp_shutdown(void);