#include "e_mod_effect.h"
-static E_Effect *_effect = NULL;
+static E_Effect *_eff = NULL;
typedef struct _E_Effect_Client
{
static void
_e_mod_effect_event_send(E_Client *ec, Eina_Bool start, E_Effect_Type type)
{
- struct wl_resource *surface_resource;
- struct wl_resource *effect_resource;
+ struct wl_resource *res_surf;
+ struct wl_resource *res_eff;
struct wl_client *wc;
unsigned int tizen_effect_type = TIZEN_EFFECT_TYPE_NONE;
- if (!_effect) return;
+ if (!_eff) return;
if ((!ec) || (!ec->comp_data)) return;
if (e_object_is_del(E_OBJECT(ec))) return;
- surface_resource = ec->comp_data->surface;
- if (!surface_resource) return;
+ res_surf = ec->comp_data->surface;
+ if (!res_surf) return;
- wc = wl_resource_get_client(surface_resource);
+ wc = wl_resource_get_client(res_surf);
if (!wc) return;
- effect_resource = eina_hash_find(_effect->resources, &wc);
- if (!effect_resource) return;
+ res_eff = eina_hash_find(_eff->resources, &wc);
+ if (!res_eff) return;
switch(type)
{
EFFINF("SEND %.5s|type:%d|win:0x%08x|tz_effect:0x%08x",
ec->pixmap, ec,
- start? "START":"END", type,
+ start ? "START" : "END", type,
(unsigned int)e_client_util_win_get(ec),
- (unsigned int)effect_resource);
+ (unsigned int)res_eff);
if (start)
- tizen_effect_send_start(effect_resource, surface_resource, tizen_effect_type);
+ tizen_effect_send_start(res_eff, res_surf, tizen_effect_type);
else
{
- tizen_effect_send_end(effect_resource, surface_resource, tizen_effect_type);
+ tizen_effect_send_end(res_eff, res_surf, tizen_effect_type);
EFFINF("Un-SET EXTRA_ANIMATING...", ec->pixmap, ec);
ec->extra_animating = EINA_FALSE;
static E_Effect_Client*
_e_mod_effect_client_new(E_Client *ec)
{
- E_Effect_Client* efc;
+ E_Effect_Client *efc;
efc = E_NEW(E_Effect_Client, 1);
efc->ec = ec;
static E_Effect_Client *
_e_mod_effect_client_get(E_Client *ec)
{
- E_Effect_Client *efc;
-
- if (!_effect) return NULL;
-
- efc = eina_hash_find(_effect->clients, &ec);
-
- return efc;
+ if (!_eff) return NULL;
+ return eina_hash_find(_eff->clients, &ec);
}
static E_Effect_Group
{
E_Effect_Client *efc;
- if (!_effect) return EINA_FALSE;
+ if (!_eff) return EINA_FALSE;
if (e_object_is_del(E_OBJECT(ec)))
{
ERR("Client is deleted already! ec(%p)", ec);
- eina_hash_del_by_key(_effect->clients, &ec);
+ eina_hash_del_by_key(_eff->clients, &ec);
return EINA_FALSE;
}
(!e_pixmap_usable_get(ec->pixmap)))
return EINA_FALSE;
- efc->animating ++;
+ efc->animating++;
e_object_ref(E_OBJECT(ec));
efc->ep = e_pixmap_ref(ec->pixmap);
- EFFINF("Effect ref efc(%p) animating:%d",
+ EFFINF("effect ref efc(%p) animating:%d",
efc->ep, efc->ec, efc, efc->animating);
return EINA_TRUE;
E_Effect_Client *efc;
int do_unref = 1;
- if (!_effect) return NULL;
+ if (!_eff) return NULL;
if (!ec) return NULL;
efc = _e_mod_effect_client_get(ec);
e_pixmap_free(efc->ep);
if (!e_object_unref(E_OBJECT(ec)))
{
- EFFINF("Effect unref ec(%p) ep(%p) efc(%p) Client free'd",
+ EFFINF("eff unref ec(%p) ep(%p) efc(%p) Client free'd",
NULL, NULL, ec, efc->ep, efc);
efc->ec = NULL;
efc = NULL;
- eina_hash_del_by_key(_effect->clients, &ec);
+ eina_hash_del_by_key(_eff->clients, &ec);
return NULL;
}
do_unref --;
}
- EFFINF("Effect Unref efc(%p) animating:%d",
+ EFFINF("eff Unref efc(%p) animating:%d",
ec->pixmap, ec, efc, efc->animating);
if ((ec->dead) && (ec->hidden))
static void
_e_mod_effect_object_setup(E_Client *ec)
{
- E_Comp_Config *config;
- config = e_comp_config_get();
+ E_Comp_Config *cfg;
+ cfg = e_comp_config_get();
if (ec->vkbd.vkbd)
- {
- e_comp_object_effect_set(ec->frame, "keyboard");
- }
+ e_comp_object_effect_set(ec->frame, "keyboard");
else
{
- if ((config) && (config->effect_style))
- {
- e_comp_object_effect_set(ec->frame , config->effect_style);
- }
+ if ((cfg) && (cfg->effect_style))
+ e_comp_object_effect_set(ec->frame, cfg->effect_style);
else
e_comp_object_effect_set(ec->frame, "no-effect");
}
static void
_e_mod_effect_object_layer_up(E_Client *ec)
{
- int map_layer;
+ int map_ly;
- map_layer = e_comp_canvas_client_layer_map(ec->layer);
- if (map_layer == 9999) return;
+ map_ly = e_comp_canvas_client_layer_map(ec->layer);
+ if (map_ly == 9999) return;
- if (!_effect->layers[map_layer].obj)
+ if (!_eff->layers[map_ly].obj)
{
- _effect->layers[map_layer].obj = evas_object_rectangle_add(e_comp->evas);
- evas_object_layer_set(_effect->layers[map_layer].obj, ec->layer + 1);
- evas_object_name_set(_effect->layers[map_layer].obj, "layer_obj(effect)");
+ _eff->layers[map_ly].obj = evas_object_rectangle_add(e_comp->evas);
+ evas_object_layer_set(_eff->layers[map_ly].obj, ec->layer + 1);
+ evas_object_name_set(_eff->layers[map_ly].obj, "layer_obj(effect)");
}
ec->layer_block = 1;
{
E_Client *ec;
- ec = _effect->next_done.ec;
+ ec = _eff->next_done.ec;
if (!ec) return;
- EFFINF("Pending Effect Start type(%d)",
- ec->pixmap, ec, _effect->next_done.type);
+ EFFINF("Pending eff Start type(%d)",
+ ec->pixmap, ec, _eff->next_done.type);
- if (_effect->next_done.cb)
+ if (_eff->next_done.cb)
{
- _e_mod_effect_event_send(ec, EINA_TRUE, _effect->next_done.type);
+ _e_mod_effect_event_send(ec, EINA_TRUE, _eff->next_done.type);
e_comp_object_effect_start(ec->frame,
- _effect->next_done.cb,
- _effect->next_done.data);
+ _eff->next_done.cb,
+ _eff->next_done.data);
}
- memset(&_effect->next_done, 0, sizeof(_effect->next_done));
+ memset(&_eff->next_done, 0, sizeof(_eff->next_done));
}
static void
{
_e_mod_effect_pending_effect_start();
- EFFINF("Pending Effect Set type(%d)",
+ EFFINF("Pending eff Set type(%d)",
ec->pixmap, ec, type);
- _effect->next_done.cb = done_cb;
- _effect->next_done.ec = ec;
- _effect->next_done.data = data;
- _effect->next_done.type = type;
+ _eff->next_done.cb = done_cb;
+ _eff->next_done.ec = ec;
+ _eff->next_done.data = data;
+ _eff->next_done.type = type;
}
static void
E_Client *ec;
Evas_Object *o;
- if (!_effect) return;
+ if (!_eff) return;
- _effect->stack.old = eina_list_free(_effect->stack.old);
- _effect->stack.old = eina_list_clone(_effect->stack.cur);
+ _eff->stack.old = eina_list_free(_eff->stack.old);
+ _eff->stack.old = eina_list_clone(_eff->stack.cur);
for (o = evas_object_top_get(e_comp->evas); o; o = evas_object_below_get(o))
{
if (e_client_util_ignored_get(ec)) continue;
if (e_object_is_del(E_OBJECT(ec))) continue;
- _effect->stack.cur = eina_list_remove(_effect->stack.cur, ec);
- _effect->stack.cur = eina_list_append(_effect->stack.cur, ec);
+ _eff->stack.cur = eina_list_remove(_eff->stack.cur, ec);
+ _eff->stack.cur = eina_list_append(_eff->stack.cur, ec);
}
}
if (!evas_object_visible_get(ec->frame)) return NULL;
if (ec->new_client) return NULL;
- v1 = _e_mod_effect_visibility_stack_check(ec, _effect->stack.old);
- v2 = _e_mod_effect_visibility_stack_check(ec, _effect->stack.cur);
+ v1 = _e_mod_effect_visibility_stack_check(ec, _eff->stack.old);
+ v2 = _e_mod_effect_visibility_stack_check(ec, _eff->stack.cur);
if (v1 != v2)
{
}
}
- EFFINF("Restack Effect Check v1(%d) -> v2(%d) iconic:%d "
+ EFFINF("Restack eff Check v1(%d) -> v2(%d) iconic:%d "
"obscured:%d(%d) emission:%s",
ec->pixmap, ec,
v1, v2, ec->iconic,
{
if (_e_mod_effect_client_get(ec))
{
-// e_client_visibility_skip_set(ec, EINA_FALSE);
+ //e_client_visibility_skip_set(ec, EINA_FALSE);
}
}
}
E_Client *ec;
E_Effect_Group group;
- if (!_effect) return EINA_FALSE;
+ if (!_eff) return EINA_FALSE;
ec = e_comp_object_client_get(obj);
if (!ec) return EINA_FALSE;
if (!_e_mod_effect_ref(ec)) return EINA_FALSE;
e_comp_override_add();
-// e_client_visibility_skip_set(ec, EINA_TRUE);
+ //e_client_visibility_skip_set(ec, EINA_TRUE);
EFFINF("SET EXTRA_ANIMATING...", ec->pixmap, ec);
ec->extra_animating = EINA_TRUE;
e_comp_object_effect_params_set(ec->frame, 0, (int[]){0}, 1);
if (e_comp->nocomp)
{
- _e_mod_effect_pending_effect_set(ec,
- (void*)ec,
- E_EFFECT_TYPE_SHOW,
- _e_mod_effect_cb_visible_done);
- return EINA_TRUE;
+ _e_mod_effect_pending_effect_set(ec,
+ (void*)ec,
+ E_EFFECT_TYPE_SHOW,
+ _e_mod_effect_cb_visible_done);
+ return EINA_TRUE;
}
_e_mod_effect_event_send(ec, EINA_TRUE, E_EFFECT_TYPE_SHOW);
{
E_Client *ec = NULL;
-
if ((ec = (E_Client*) data))
{
_e_mod_effect_event_send(ec, EINA_FALSE, E_EFFECT_TYPE_HIDE);
if (_e_mod_effect_client_get(ec))
{
_e_mod_effect_object_layer_down(ec);
-// e_client_visibility_skip_set(ec, EINA_FALSE);
+ //e_client_visibility_skip_set(ec, EINA_FALSE);
evas_object_hide(ec->frame);
}
}
E_Effect_Group group;
Eina_Bool lowered = 0;
Evas_Object *below;
- int map_layer;
+ int map_ly;
- if (!_effect) return EINA_FALSE;
+ if (!_eff) return EINA_FALSE;
ec = e_comp_object_client_get(obj);
if (!ec) return EINA_FALSE;
e_comp_override_add();
- //check if client was lowered
+ // check if client was lowered
below = evas_object_below_get(obj);
- map_layer = e_comp_canvas_layer_map(evas_object_layer_get(obj));
- if ((below) && (map_layer != 9999) &&
+ map_ly = e_comp_canvas_layer_map(evas_object_layer_get(obj));
+ if ((below) && (map_ly != 9999) &&
(evas_object_layer_get(below) != evas_object_layer_get(obj)) &&
- (evas_object_above_get(obj) != e_comp->layers[map_layer].obj))
+ (evas_object_above_get(obj) != e_comp->layers[map_ly].obj))
lowered = 1;
if (lowered)
{
_e_mod_effect_object_layer_up(ec);
-// e_client_visibility_skip_set(ec, EINA_TRUE);
+ //e_client_visibility_skip_set(ec, EINA_TRUE);
}
_e_mod_effect_object_setup(ec);
E_Effect_Group group;
Eina_Bool v1, v2;
- if (!_effect) return EINA_FALSE;
+ if (!_eff) return EINA_FALSE;
ec = e_comp_object_client_get(obj);
if (!ec) return EINA_FALSE;
{
E_Client *below;
- v1 = _e_mod_effect_visibility_stack_check(ec, _effect->stack.old);
- v2 = _e_mod_effect_visibility_stack_check(ec, _effect->stack.cur);
+ v1 = _e_mod_effect_visibility_stack_check(ec, _eff->stack.old);
+ v2 = _e_mod_effect_visibility_stack_check(ec, _eff->stack.cur);
- EFFINF("Uniconify Effect Check v1(%d) -> v2(%d) obscured:%d changed:%d",
+ EFFINF("Uniconify eff Check v1(%d) -> v2(%d) obscured:%d changed:%d",
ec->pixmap, ec,
v1, v2, ec->visibility.obscured, ec->visibility.changed);
group = _e_mod_effect_group_get(below);
if (group != E_EFFECT_GROUP_NORMAL) return EINA_FALSE;
- EFFINF("Uniconify HOME group do hide effect of %p",
+ EFFINF("Uniconify HOME group do hide eff of %p",
ec->pixmap, ec, below);
e_comp_object_signal_emit(below->frame, "e,action,restack,hide", "e");
/* for NORMAL group */
else if (group == E_EFFECT_GROUP_NORMAL)
{
- v1 = _e_mod_effect_visibility_stack_check(ec, _effect->stack.old);
- v2 = _e_mod_effect_visibility_stack_check(ec, _effect->stack.cur);
+ v1 = _e_mod_effect_visibility_stack_check(ec, _eff->stack.old);
+ v2 = _e_mod_effect_visibility_stack_check(ec, _eff->stack.cur);
- EFFINF("Uniconify Effect Check v1(%d) -> v2(%d) obscured:%d changed:%d",
+ EFFINF("Uniconify eff Check v1(%d) -> v2(%d) obscured:%d changed:%d",
ec->pixmap, ec,
v1, v2, ec->visibility.obscured, ec->visibility.changed);
{
E_Client *ec = NULL;
- if ((ec = (E_Client*) data))
+ if ((ec = (E_Client *)data))
{
_e_mod_effect_event_send(ec, EINA_FALSE, E_EFFECT_TYPE_HIDE);
if (_e_mod_effect_unref(ec))
E_Effect_Group group;
Eina_Bool v1, v2;
- if (!_effect) return EINA_FALSE;
+ if (!_eff) return EINA_FALSE;
ec = e_comp_object_client_get(obj);
if (!ec) return EINA_FALSE;
if (!evas_object_visible_get(obj)) return EINA_FALSE;
- v1 = _e_mod_effect_visibility_stack_check(ec, _effect->stack.old);
- v2 = _e_mod_effect_visibility_stack_check(ec, _effect->stack.cur);
+ v1 = _e_mod_effect_visibility_stack_check(ec, _eff->stack.old);
+ v2 = _e_mod_effect_visibility_stack_check(ec, _eff->stack.cur);
- EFFINF("Iconify Effect Check v1(%d) -> v2(%d) obscured:%d changed:%d",
+ EFFINF("Iconify eff Check v1(%d) -> v2(%d) obscured:%d changed:%d",
ec->pixmap, ec,
v1, v2, ec->visibility.obscured, ec->visibility.changed);
{
E_Client *ec = NULL;
- if ((ec = (E_Client*)data))
+ if ((ec = (E_Client *)data))
{
_e_mod_effect_event_send(ec, EINA_FALSE, E_EFFECT_TYPE_RESTACK_SHOW);
if (_e_mod_effect_unref(ec))
if (_e_mod_effect_client_get(ec))
{
_e_mod_effect_object_layer_down(ec);
-// e_client_visibility_skip_set(ec, EINA_FALSE);
+ //e_client_visibility_skip_set(ec, EINA_FALSE);
}
}
}
{
E_Client *ec = NULL;
- if ((ec = (E_Client*)data))
+ if ((ec = (E_Client *)data))
{
if (_e_mod_effect_unref(ec))
{
if (_e_mod_effect_client_get(ec))
{
_e_mod_effect_object_layer_down(ec);
-// e_client_visibility_skip_set(ec, EINA_FALSE);
+ //e_client_visibility_skip_set(ec, EINA_FALSE);
e_comp_object_signal_emit(ec->frame,
"e,action,restack,finish", "e");
}
{
E_Client *ec = NULL;
- if ((ec = (E_Client*)data))
+ if ((ec = (E_Client *)data))
{
_e_mod_effect_event_send(ec, EINA_FALSE, E_EFFECT_TYPE_RESTACK_HIDE);
const char *emission;
E_Client *ec_home = NULL;
- if (!_effect) return EINA_FALSE;
+ if (!_eff) return EINA_FALSE;
ec = e_comp_object_client_get(obj);
if (!ec) return EINA_FALSE;
group = _e_mod_effect_group_get(ec);
emission = eina_stringshare_add(signal);
- /* for HOME group: replace effect target client */
+ /* for HOME group: replace eff target client */
if (group == E_EFFECT_GROUP_HOME)
{
E_Client *below;
e_comp_override_add();
_e_mod_effect_object_layer_up(ec);
-// e_client_visibility_skip_set(ec, EINA_TRUE);
+ //e_client_visibility_skip_set(ec, EINA_TRUE);
_e_mod_effect_object_setup(ec);
e_comp_object_effect_params_set(ec->frame, 0, (int[]){2}, 1);
e_comp_override_add();
_e_mod_effect_object_layer_up(ec);
-// e_client_visibility_skip_set(ec, EINA_TRUE);
+ //e_client_visibility_skip_set(ec, EINA_TRUE);
_e_mod_effect_object_setup(ec);
e_comp_object_effect_params_set(ec->frame, 0, (int[]){3}, 1);
_e_mod_effect_cb_launch(void *data, Evas_Object *obj, const char *signal)
{
E_Client *ec;
- struct wl_resource *surface_resource;
- struct wl_resource *effect_resource;
+ struct wl_resource *res_surf;
+ struct wl_resource *res_eff;
struct wl_client *wc;
unsigned int tizen_effect_type = 4;
- if (!_effect) return EINA_FALSE;
+ if (!_eff) return EINA_FALSE;
ec = e_comp_object_client_get(obj);
if ((!ec) || (!ec->comp_data)) return EINA_FALSE;
if (e_object_is_del(E_OBJECT(ec))) return EINA_FALSE;
- surface_resource = ec->comp_data->surface;
- if (!surface_resource) return EINA_FALSE;
+ res_surf = ec->comp_data->surface;
+ if (!res_surf) return EINA_FALSE;
- wc = wl_resource_get_client(surface_resource);
+ wc = wl_resource_get_client(res_surf);
if (!wc) return EINA_FALSE;
- effect_resource = eina_hash_find(_effect->resources, &wc);
- if (!effect_resource) return EINA_FALSE;
+ res_eff = eina_hash_find(_eff->resources, &wc);
+ if (!res_eff) return EINA_FALSE;
EFFINF("SEND END |type:LAUNCH|win:0x%08x|tz_effect:0x%08x",
ec->pixmap, ec,
(unsigned int)e_client_util_win_get(ec),
- (unsigned int)effect_resource);
+ (unsigned int)res_eff);
- tizen_effect_send_end(effect_resource, surface_resource, tizen_effect_type);
+ tizen_effect_send_end(res_eff, res_surf, tizen_effect_type);
return EINA_TRUE;
}
-static Eina_Bool
+static void
_e_mod_effect_cb_hook_client_new(void *d EINA_UNUSED, E_Client *ec)
{
E_Effect_Client *efc;
- if (!_effect) return;
+ if (!_eff) return;
efc = _e_mod_effect_client_get(ec);
- if (!efc)
- {
- efc = _e_mod_effect_client_new(ec);
- if (efc)
- eina_hash_add(_effect->clients, &ec, efc);
- }
+ if (efc) return;
+
+ efc = _e_mod_effect_client_new(ec);
+ if (efc)
+ eina_hash_add(_eff->clients, &ec, efc);
}
static void
{
E_Effect_Client *efc = NULL;
- if (!_effect) return ECORE_CALLBACK_PASS_ON;
+ if (!_eff) return;
- _effect->stack.old = eina_list_remove(_effect->stack.old, ec);
- _effect->stack.cur = eina_list_remove(_effect->stack.cur, ec);
+ _eff->stack.old = eina_list_remove(_eff->stack.old, ec);
+ _eff->stack.cur = eina_list_remove(_eff->stack.cur, ec);
- if (_effect->next_done.ec == ec)
- memset(&_effect->next_done, 0, sizeof(_effect->next_done));
+ if (_eff->next_done.ec == ec)
+ memset(&_eff->next_done, 0, sizeof(_eff->next_done));
if ((efc = _e_mod_effect_client_get(ec)))
{
if (!efc->animating)
- eina_hash_del_by_key(_effect->clients, &ec);
+ eina_hash_del_by_key(_eff->clients, &ec);
}
}
E_Event_Client *ev = event;
const char* emission = NULL;
- if (!_effect) return ECORE_CALLBACK_PASS_ON;
+ if (!_eff) return ECORE_CALLBACK_PASS_ON;
ec = ev->ec;
if (!ec) return ECORE_CALLBACK_PASS_ON;
static Eina_Bool
_e_mod_effect_cb_comp_enabled(void *data, int ev_type, void *event)
{
- if (!_effect) return ECORE_CALLBACK_PASS_ON;
+ if (!_eff) return ECORE_CALLBACK_PASS_ON;
_e_mod_effect_pending_effect_start();
E_Effect_Client *efc;
E_Comp_Wl_Buffer *buffer = NULL;
- if (!_effect) return ECORE_CALLBACK_PASS_ON;
+ if (!_eff) return ECORE_CALLBACK_PASS_ON;
ec = ev->ec;
if (!ec) return ECORE_CALLBACK_PASS_ON;
if (ec->pixmap)
{
buffer = e_pixmap_resource_get(ec->pixmap);
-
if (buffer != efc->buffer_ref.buffer)
{
e_comp_wl_buffer_reference(&efc->buffer_ref, buffer);
}
static void
-_tz_effect_cb_destroy(struct wl_client *client EINA_UNUSED, struct wl_resource *tizen_effect_resource)
+_tz_effect_cb_destroy(struct wl_client *client EINA_UNUSED, struct wl_resource *tz_res_eff)
{
- wl_resource_destroy(tizen_effect_resource);
+ wl_resource_destroy(tz_res_eff);
}
static const struct tizen_effect_interface _tz_effect_interface =
};
static void
-_tz_effect_cb_effect_destroy(struct wl_resource *tizen_effect_resource)
+_tz_effect_cb_effect_destroy(struct wl_resource *tz_res_eff)
{
- if ((!_effect) || (!_effect->resources)) return;
+ if ((!_eff) || (!_eff->resources)) return;
- eina_hash_del_by_data(_effect->resources, tizen_effect_resource);
+ eina_hash_del_by_data(_eff->resources, tz_res_eff);
}
static void
NULL,
_tz_effect_cb_effect_destroy);
- eina_hash_add(_effect->resources, &client, res);
+ eina_hash_add(_eff->resources, &client, res);
}
static void
} \
while (0)
+#undef E_COMP_OBJ_EFF_MOVER_APPEND
+#define E_COMP_OBJ_EFF_MOVER_APPEND(l, i, s, p, d) \
+ do \
+ { \
+ E_Comp_Object_Mover *_m; \
+ _m = e_comp_object_effect_mover_add(i, s, p, d); \
+ assert(_m); \
+ l = eina_list_append(l, _m); \
+ } \
+ while (0)
+
EAPI Eina_Bool
e_mod_effect_init(void)
{
- E_Effect *effect;
- E_Comp_Config *config;
+ E_Effect *eff;
+ E_Comp_Config *cfg;
Eina_List *l;
E_Client *ec;
E_Effect_Client *efc;
EINA_SAFETY_ON_NULL_RETURN_VAL(e_comp, EINA_FALSE);
EINA_SAFETY_ON_NULL_RETURN_VAL(e_comp->evas, EINA_FALSE);
- effect = E_NEW(E_Effect, 1);
- EINA_SAFETY_ON_NULL_RETURN_VAL(effect, EINA_FALSE);
+ eff = E_NEW(E_Effect, 1);
+ EINA_SAFETY_ON_NULL_RETURN_VAL(eff, EINA_FALSE);
- if ((config = e_comp_config_get()))
+ if ((cfg = e_comp_config_get()))
{
- effect->file = eina_stringshare_add(config->effect_file);
- effect->style = eina_stringshare_add(config->effect_style);
+ eff->file = eina_stringshare_add(cfg->effect_file);
+ eff->style = eina_stringshare_add(cfg->effect_style);
}
else
{
- effect->file = "";
- effect->style = "no-effect";
+ eff->file = "";
+ eff->style = "no-eff";
}
- effect->clients = eina_hash_pointer_new(_e_mod_effect_cb_client_data_free);
- EINA_SAFETY_ON_NULL_GOTO(effect->clients, err);
+ eff->clients = eina_hash_pointer_new(_e_mod_effect_cb_client_data_free);
+ EINA_SAFETY_ON_NULL_GOTO(eff->clients, err);
EINA_LIST_FOREACH(e_comp->clients, l, ec)
{
- if (!ec->ignored)
- {
- efc = _e_mod_effect_client_get(ec);
- if (!efc)
- efc = _e_mod_effect_client_new(ec);
- if (efc)
- eina_hash_add(effect->clients, &ec, efc);
- }
+ if (ec->ignored) continue;
+
+ efc = _e_mod_effect_client_get(ec);
+ if (!efc)
+ efc = _e_mod_effect_client_new(ec);
+ if (efc)
+ eina_hash_add(eff->clients, &ec, efc);
}
- effect->resources = eina_hash_pointer_new(NULL);
- EINA_SAFETY_ON_NULL_GOTO(effect->resources, err);
+ eff->resources = eina_hash_pointer_new(NULL);
+ EINA_SAFETY_ON_NULL_GOTO(eff->resources, err);
- effect->global = wl_global_create(e_comp_wl->wl.disp, &tizen_effect_interface, 1, effect, _e_mod_effect_cb_bind);
- if (!effect->global)
+ eff->global = wl_global_create(e_comp_wl->wl.disp,
+ &tizen_effect_interface,
+ 1,
+ eff,
+ _e_mod_effect_cb_bind);
+ if (!eff->global)
{
ERR("Could not add tizen_efffect wayland globals: %m");
goto err;
}
- E_LIST_HANDLER_APPEND(effect->event_hdlrs, E_EVENT_COMPOSITOR_ENABLE,
- _e_mod_effect_cb_comp_enabled, effect);
-
- E_LIST_HANDLER_APPEND(effect->event_hdlrs, E_EVENT_CLIENT_BUFFER_CHANGE,
- _e_mod_effect_cb_client_buffer_change, effect);
- E_LIST_HANDLER_APPEND(effect->event_hdlrs, E_EVENT_CLIENT_STACK,
- _e_mod_effect_cb_client_restack, effect);
-
- E_CLIENT_HOOK_APPEND(effect->hooks_ec,
- E_CLIENT_HOOK_NEW_CLIENT,
- _e_mod_effect_cb_hook_client_new, effect);
- E_CLIENT_HOOK_APPEND(effect->hooks_ec,
- E_CLIENT_HOOK_DEL,
- _e_mod_effect_cb_hook_client_del, effect);
-
- effect->providers =
- eina_list_append(effect->providers,
- e_comp_object_effect_mover_add(100,
- "e,state,visible",
- _e_mod_effect_cb_visible,
- effect));
- effect->providers =
- eina_list_append(effect->providers,
- e_comp_object_effect_mover_add(100,
- "e,state,hidden",
- _e_mod_effect_cb_hidden,
- effect));
- effect->providers =
- eina_list_append(effect->providers,
- e_comp_object_effect_mover_add(100,
- "e,action,iconify",
- _e_mod_effect_cb_iconify,
- effect));
- effect->providers =
- eina_list_append(effect->providers,
- e_comp_object_effect_mover_add(100,
- "e,action,uniconify",
- _e_mod_effect_cb_uniconify,
- effect));
- effect->providers =
- eina_list_append(effect->providers,
- e_comp_object_effect_mover_add(100,
- "e,action,restack*",
- _e_mod_effect_cb_restack,
- effect));
- effect->providers =
- eina_list_append(effect->providers,
- e_comp_object_effect_mover_add(100,
- "e,action,launch,done",
- _e_mod_effect_cb_launch,
- effect));
-
- _effect = effect;
+ E_LIST_HANDLER_APPEND(eff->event_hdlrs, E_EVENT_COMPOSITOR_ENABLE, _e_mod_effect_cb_comp_enabled, eff);
+ E_LIST_HANDLER_APPEND(eff->event_hdlrs, E_EVENT_CLIENT_BUFFER_CHANGE, _e_mod_effect_cb_client_buffer_change, eff);
+ E_LIST_HANDLER_APPEND(eff->event_hdlrs, E_EVENT_CLIENT_STACK, _e_mod_effect_cb_client_restack, eff);
+ E_CLIENT_HOOK_APPEND(eff->hooks_ec, E_CLIENT_HOOK_NEW_CLIENT, _e_mod_effect_cb_hook_client_new, eff);
+ E_CLIENT_HOOK_APPEND(eff->hooks_ec, E_CLIENT_HOOK_DEL, _e_mod_effect_cb_hook_client_del, eff);
+ E_COMP_OBJ_EFF_MOVER_APPEND(eff->providers, 100, "e,state,visible", _e_mod_effect_cb_visible, eff);
+ E_COMP_OBJ_EFF_MOVER_APPEND(eff->providers, 100, "e,state,hidden", _e_mod_effect_cb_hidden, eff);
+ E_COMP_OBJ_EFF_MOVER_APPEND(eff->providers, 100, "e,action,iconify", _e_mod_effect_cb_iconify, eff);
+ E_COMP_OBJ_EFF_MOVER_APPEND(eff->providers, 100, "e,action,uniconify", _e_mod_effect_cb_uniconify, eff);
+ E_COMP_OBJ_EFF_MOVER_APPEND(eff->providers, 100, "e,action,restack*", _e_mod_effect_cb_restack, eff);
+ E_COMP_OBJ_EFF_MOVER_APPEND(eff->providers, 100, "e,action,launch,done", _e_mod_effect_cb_launch, eff);
+
+ _eff = eff;
return EINA_TRUE;
EAPI void
e_mod_effect_shutdown()
{
- if (!_effect) return;
+ if (!_eff) return;
- E_FREE_FUNC(_effect->stack.old, eina_list_free);
- E_FREE_FUNC(_effect->stack.cur, eina_list_free);
+ E_FREE_FUNC(_eff->stack.old, eina_list_free);
+ E_FREE_FUNC(_eff->stack.cur, eina_list_free);
- E_FREE_LIST(_effect->providers, e_comp_object_effect_mover_del);
- E_FREE_LIST(_effect->event_hdlrs, ecore_event_handler_del);
- E_FREE_LIST(_effect->hooks_ec, e_client_hook_del);
+ E_FREE_LIST(_eff->providers, e_comp_object_effect_mover_del);
+ E_FREE_LIST(_eff->event_hdlrs, ecore_event_handler_del);
+ E_FREE_LIST(_eff->hooks_ec, e_client_hook_del);
- if (_effect->global)
- wl_global_destroy(_effect->global);
+ if (_eff->global)
+ wl_global_destroy(_eff->global);
- E_FREE_FUNC(_effect->resources, eina_hash_free);
- E_FREE_FUNC(_effect->clients, eina_hash_free);
+ E_FREE_FUNC(_eff->resources, eina_hash_free);
+ E_FREE_FUNC(_eff->clients, eina_hash_free);
- E_FREE(_effect);
+ E_FREE(_eff);
}
projects / platform / core / uifw / e-mod-tizen-effect.git / commitdiff