add e_comp_object_agent_add()

an agent object can be used when a client should be represented on the
canvas solely by its window geometry and not including any csd

this creates and manages a mutable object which maintains the same geom
as ec->x/y/w/h and can be operated upon to modify those values
This commit is contained in:
Mike Blumenkrantz 2016-03-17 13:37:00 -04:00
parent bd0f2595b3
commit 80595756b7
2 changed files with 80 additions and 10 deletions

View File

@ -88,6 +88,7 @@ typedef struct _E_Comp_Object
Evas_Object *effect_obj; // effects object Evas_Object *effect_obj; // effects object
unsigned int layer; //e_comp_canvas_layer_map(cw->ec->layer) unsigned int layer; //e_comp_canvas_layer_map(cw->ec->layer)
Eina_List *obj_mirror; // extra mirror objects Eina_List *obj_mirror; // extra mirror objects
Eina_List *obj_agent; // extra agent objects
Eina_Tiler *updates; //render update regions Eina_Tiler *updates; //render update regions
Eina_Tiler *pending_updates; //render update regions which are about to render Eina_Tiler *pending_updates; //render update regions which are about to render
@ -126,6 +127,8 @@ typedef struct _E_Comp_Object
Eina_Bool force_move : 1; Eina_Bool force_move : 1;
Eina_Bool frame_extends : 1; //frame may extend beyond object size Eina_Bool frame_extends : 1; //frame may extend beyond object size
Eina_Bool blanked : 1; //window is rendering blank content (externally composited) Eina_Bool blanked : 1; //window is rendering blank content (externally composited)
Eina_Bool agent_updating : 1; //updating agents
} E_Comp_Object; } E_Comp_Object;
@ -184,6 +187,38 @@ _e_comp_object_event_add(Evas_Object *obj)
///////////////////////////////////// /////////////////////////////////////
static void
_e_comp_object_cb_agent_del(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
{
E_Comp_Object *cw = data;
cw->obj_agent = eina_list_remove(cw->obj_agent, obj);
}
static void
_e_comp_object_cb_agent_resize(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
{
E_Comp_Object *cw = data;
int w, h;
if (cw->agent_updating) return;
evas_object_geometry_get(obj, NULL, NULL, &w, &h);
evas_object_resize(cw->smart_obj, w, h);
}
static void
_e_comp_object_cb_agent_move(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
{
E_Comp_Object *cw = data;
int x, y;
if (cw->agent_updating) return;
evas_object_geometry_get(obj, &x, &y, NULL, NULL);
evas_object_move(cw->smart_obj, x, y);
}
/////////////////////////////////////
static void static void
_e_comp_object_cb_mirror_del(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED) _e_comp_object_cb_mirror_del(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
{ {
@ -2265,6 +2300,7 @@ static void
_e_comp_smart_del(Evas_Object *obj) _e_comp_smart_del(Evas_Object *obj)
{ {
Eina_List *l; Eina_List *l;
Evas_Object *o;
INTERNAL_ENTRY; INTERNAL_ENTRY;
@ -2273,17 +2309,18 @@ _e_comp_smart_del(Evas_Object *obj)
E_FREE_FUNC(cw->pending_updates, eina_tiler_free); E_FREE_FUNC(cw->pending_updates, eina_tiler_free);
free(cw->ns); free(cw->ns);
if (cw->obj_mirror) EINA_LIST_FREE(cw->obj_mirror, o)
{ {
Evas_Object *o; evas_object_image_data_set(o, NULL);
evas_object_freeze_events_set(o, 1);
EINA_LIST_FREE(cw->obj_mirror, o) evas_object_event_callback_del_full(o, EVAS_CALLBACK_DEL, _e_comp_object_cb_mirror_del, cw);
{ evas_object_del(o);
evas_object_image_data_set(o, NULL); }
evas_object_freeze_events_set(o, 1); EINA_LIST_FREE(cw->obj_agent, o)
evas_object_event_callback_del_full(o, EVAS_CALLBACK_DEL, _e_comp_object_cb_mirror_del, cw); {
evas_object_del(o); evas_object_freeze_events_set(o, 1);
} evas_object_event_callback_del_full(o, EVAS_CALLBACK_DEL, _e_comp_object_cb_agent_del, cw);
evas_object_del(o);
} }
_e_comp_object_layers_remove(cw); _e_comp_object_layers_remove(cw);
l = evas_object_data_get(obj, "comp_object-to_del"); l = evas_object_data_get(obj, "comp_object-to_del");
@ -2314,9 +2351,16 @@ _e_comp_smart_del(Evas_Object *obj)
static void static void
_e_comp_smart_move(Evas_Object *obj, int x, int y) _e_comp_smart_move(Evas_Object *obj, int x, int y)
{ {
Eina_List *l;
Evas_Object *o;
INTERNAL_ENTRY; INTERNAL_ENTRY;
cw->x = x, cw->y = y; cw->x = x, cw->y = y;
cw->agent_updating = 1;
EINA_LIST_FOREACH(cw->obj_agent, l, o)
evas_object_move(o, cw->ec->x, cw->ec->x);
cw->agent_updating = 0;
evas_object_move(cw->clip, 0, 0); evas_object_move(cw->clip, 0, 0);
evas_object_move(cw->effect_obj, x, y); evas_object_move(cw->effect_obj, x, y);
if (cw->input_obj) if (cw->input_obj)
@ -2333,6 +2377,8 @@ static void
_e_comp_smart_resize(Evas_Object *obj, int w, int h) _e_comp_smart_resize(Evas_Object *obj, int w, int h)
{ {
Eina_Bool first = EINA_FALSE; Eina_Bool first = EINA_FALSE;
Eina_List *l;
Evas_Object *o;
INTERNAL_ENTRY; INTERNAL_ENTRY;
@ -2384,6 +2430,10 @@ _e_comp_smart_resize(Evas_Object *obj, int w, int h)
{ {
evas_object_resize(cw->effect_obj, w, h); evas_object_resize(cw->effect_obj, w, h);
} }
cw->agent_updating = 1;
EINA_LIST_FOREACH(cw->obj_agent, l, o)
evas_object_resize(o, cw->ec->w, cw->ec->h);
cw->agent_updating = 0;
if (!cw->visible) return; if (!cw->visible) return;
e_comp_render_queue(); e_comp_render_queue();
if (!cw->animating) if (!cw->animating)
@ -3822,6 +3872,25 @@ end:
return ret; return ret;
} }
E_API Evas_Object *
e_comp_object_agent_add(Evas_Object *obj)
{
Evas_Object *o;
API_ENTRY NULL;
o = evas_object_rectangle_add(e_comp->evas);
evas_object_color_set(o, 0, 0, 0, 0);
evas_object_pass_events_set(o, 1);
evas_object_geometry_set(o, cw->ec->x, cw->ec->y, cw->ec->w, cw->ec->h);
cw->obj_agent = eina_list_append(cw->obj_agent, o);
evas_object_event_callback_add(o, EVAS_CALLBACK_RESIZE, _e_comp_object_cb_agent_resize, cw);
evas_object_event_callback_add(o, EVAS_CALLBACK_MOVE, _e_comp_object_cb_agent_move, cw);
evas_object_event_callback_add(o, EVAS_CALLBACK_DEL, _e_comp_object_cb_agent_del, cw);
return o;
}
/* create a duplicate of an evas object */ /* create a duplicate of an evas object */
E_API Evas_Object * E_API Evas_Object *
e_comp_object_util_mirror_add(Evas_Object *obj) e_comp_object_util_mirror_add(Evas_Object *obj)

View File

@ -77,6 +77,7 @@ E_API void e_comp_object_shape_apply(Evas_Object *obj);
E_API void e_comp_object_redirected_set(Evas_Object *obj, Eina_Bool set); E_API void e_comp_object_redirected_set(Evas_Object *obj, Eina_Bool set);
E_API void e_comp_object_native_surface_set(Evas_Object *obj, Eina_Bool set); E_API void e_comp_object_native_surface_set(Evas_Object *obj, Eina_Bool set);
E_API void e_comp_object_native_surface_override(Evas_Object *obj, Evas_Native_Surface *ns); E_API void e_comp_object_native_surface_override(Evas_Object *obj, Evas_Native_Surface *ns);
E_API Evas_Object *e_comp_object_agent_add(Evas_Object *obj);
E_API void e_comp_object_blank(Evas_Object *obj, Eina_Bool set); E_API void e_comp_object_blank(Evas_Object *obj, Eina_Bool set);
E_API void e_comp_object_dirty(Evas_Object *obj); E_API void e_comp_object_dirty(Evas_Object *obj);
E_API Eina_Bool e_comp_object_render(Evas_Object *obj); E_API Eina_Bool e_comp_object_render(Evas_Object *obj);