#include "e_comp_object_intern.h"
#include "e_bindings_intern.h"
#include "e_utils_intern.h"
-#ifdef REFACTOR_DESK_AREA
-#else
#include "e_comp_canvas_intern.h"
-#endif
#include "e_comp_cfdata_intern.h"
#include "e_comp_wl_subsurface_intern.h"
#include "e_comp_wl_tbm_intern.h"
#ifdef REFACTOR_DESK_AREA
#else
static void
+_e_comp_input_thread_layers_update(void *data)
+{
+ E_Comp_Input_Layer_Data *layer_data = data;
+ EINA_SAFETY_ON_NULL_RETURN(layer_data);
+
+ INF("[input thread|%s] layer(%u), function type(%d), item(%p), relative(%p)\n",
+ __func__, layer_data->layer, layer_data->type, layer_data->item, layer_data->relative);
+ e_comp_input_layers_update(layer_data);
+}
+
+static void
+_e_comp_object_layers_update(unsigned int layer, E_Comp_Input_Inlist_Function_Type type, E_Client *item, E_Client *relative)
+{
+ E_Comp_Input_Layer_Data layer_data;
+ memset(&layer_data, 0, sizeof(E_Comp_Input_Layer_Data));
+
+ layer_data.layer = layer;
+ layer_data.type = type;
+ layer_data.item = item;
+ layer_data.relative = relative;
+
+ INF("[%s] layer(%u), function type(%d), item(%p), relative(%p)\n", __func__, layer, type, item, relative);
+ e_input_thread_safe_call(_e_comp_input_thread_layers_update, &layer_data, sizeof(E_Comp_Input_Layer_Data));
+}
+
+static void
_e_comp_object_layers_add(E_Comp_Object *cw, E_Comp_Object *above, E_Comp_Object *below, Eina_Bool prepend)
{
g_rec_mutex_lock(&e_comp->ec_list_mutex);
if (above)
- e_comp->layers[above->layer].clients = eina_inlist_append_relative(e_comp->layers[above->layer].clients, EINA_INLIST_GET(cw->ec), EINA_INLIST_GET(above->ec));
+ {
+ e_comp->layers[above->layer].clients = eina_inlist_append_relative(e_comp->layers[above->layer].clients, EINA_INLIST_GET(cw->ec), EINA_INLIST_GET(above->ec));
+ _e_comp_object_layers_update(above->layer, E_COMP_INPUT_INLIST_APPEND_RELATIVE, e_comp->layers[above->layer].clients, cw->ec, above->ec);
+ }
else if (below)
- e_comp->layers[below->layer].clients = eina_inlist_prepend_relative(e_comp->layers[below->layer].clients, EINA_INLIST_GET(cw->ec), EINA_INLIST_GET(below->ec));
+ {
+ e_comp->layers[below->layer].clients = eina_inlist_prepend_relative(e_comp->layers[below->layer].clients, EINA_INLIST_GET(cw->ec), EINA_INLIST_GET(below->ec));
+ _e_comp_object_layers_update(above->layer, E_COMP_INPUT_INLIST_APPEND_RELATIVE, cw->ec, above->ec);
+ }
if ((!above) && (!below))
{
if (prepend)
- e_comp->layers[cw->layer].clients = eina_inlist_prepend(e_comp->layers[cw->layer].clients, EINA_INLIST_GET(cw->ec));
+ {
+ e_comp->layers[cw->layer].clients = eina_inlist_prepend(e_comp->layers[cw->layer].clients, EINA_INLIST_GET(cw->ec));
+ _e_comp_object_layers_update(cw->layer, E_COMP_INPUT_INLIST_PREPEND, cw->ec, NULL);
+ }
else //this is either the layer object or a tough actin tinactin^W^W^Wfast stacking client
- e_comp->layers[cw->layer].clients = eina_inlist_append(e_comp->layers[cw->layer].clients, EINA_INLIST_GET(cw->ec));
+ {
+ e_comp->layers[cw->layer].clients = eina_inlist_append(e_comp->layers[cw->layer].clients, EINA_INLIST_GET(cw->ec));
+ _e_comp_object_layers_update(cw->layer, E_COMP_INPUT_INLIST_APPEND, cw->ec, NULL);
+ }
}
e_comp->layers[cw->layer].clients_count++;
if (cw->ec && e_comp->layers[cw->layer].clients)
{
e_comp->layers[cw->layer].clients = eina_inlist_remove(e_comp->layers[cw->layer].clients, EINA_INLIST_GET(cw->ec));
+ _e_comp_object_layers_update(cw->layer, E_COMP_INPUT_INLIST_REMOVE, cw->ec, NULL);
e_comp->layers[cw->layer].clients_count--;
}
e_comp_object_signal_emit(cw->smart_obj, "e,state,focused", "e");
else
e_comp_object_signal_emit(cw->smart_obj, "e,state,unfocused", "e");
- if (cw->ec->sticky)
- e_comp_object_signal_emit(cw->smart_obj, "e,state,sticky", "e");
- if (cw->ec->hung)
- e_comp_object_signal_emit(cw->smart_obj, "e,state,hung", "e");
/* visibility must always be enabled for re_manage clients to prevent
* pop-in animations every time the user sees a persistent client again;
* applying visibility for iconic clients prevents the client from getting
cw->set_mouse_callbacks = EINA_FALSE;
}
+static Eina_Bool
+_e_comp_object_color_visible_set(E_Comp_Object *cw, Eina_Bool set)
+{
+ if (cw->color_visible == set) return EINA_TRUE;
+
+ cw->color_visible = set;
+
+ ELOGF("COMP", "color_visible set:%d", cw->ec, set);
+
+ wl_signal_emit(&cw->events.color_visible_set, NULL);
+
+ return EINA_TRUE;
+}
+
+static void
+_e_comp_object_color_visible_update(E_Comp_Object *cw)
+{
+ int a;
+
+ e_comp_object_color_get(cw->smart_obj, NULL, NULL, NULL, &a);
+ if (a <= 0)
+ {
+ _e_comp_object_color_visible_set(cw, EINA_FALSE);
+ return;
+ }
+
+ if (cw->effect_obj)
+ {
+ evas_object_color_get(cw->effect_obj, NULL, NULL, NULL, &a);
+ if (a <= 0)
+ {
+ _e_comp_object_color_visible_set(cw, EINA_FALSE);
+ return;
+ }
+ }
+
+
+ if (cw->shobj)
+ {
+ evas_object_color_get(cw->shobj, NULL, NULL, NULL, &a);
+ if (a <= 0)
+ {
+ _e_comp_object_color_visible_set(cw, EINA_FALSE);
+ return;
+ }
+ }
+
+ if (cw->obj)
+ {
+ evas_object_color_get(cw->obj, NULL, NULL, NULL, &a);
+ if (a <= 0)
+ {
+ _e_comp_object_color_visible_set(cw, EINA_FALSE);
+ return;
+ }
+ }
+
+ _e_comp_object_color_visible_set(cw, EINA_TRUE);
+}
+
+static void
+_e_comp_intercept_effect_obj_color_set(void *data, Evas_Object *obj, int r, int g, int b, int a)
+{
+ E_Comp_Object *cw = data;
+
+ evas_object_color_set(obj, r, g, b, a);
+
+ _e_comp_object_color_visible_update(cw);
+}
+
+static void
+_e_comp_intercept_shobj_color_set(void *data, Evas_Object *obj, int r, int g, int b, int a)
+{
+ E_Comp_Object *cw = data;
+
+ evas_object_color_set(obj, r, g, b, a);
+
+ _e_comp_object_color_visible_update(cw);
+}
+
+static void
+_e_comp_intercept_obj_color_set(void *data, Evas_Object *obj, int r, int g, int b, int a)
+{
+ E_Comp_Object *cw = data;
+
+ evas_object_color_set(obj, r, g, b, a);
+
+ _e_comp_object_color_visible_update(cw);
+}
+
static void
_e_comp_object_setup(E_Comp_Object *cw)
{
evas_object_move(cw->effect_obj, cw->x, cw->y);
evas_object_clip_set(cw->effect_obj, cw->clip);
evas_object_smart_member_add(cw->effect_obj, cw->smart_obj);
+ evas_object_intercept_color_set_callback_add(cw->effect_obj, _e_comp_intercept_effect_obj_color_set, cw);
e_theme_edje_object_set(cw->effect_obj, "base/theme/comp", "e/comp/effects/none");
cw->shobj = edje_object_add(e_comp->evas);
evas_object_data_set(cw->shobj, "comp_smart_obj", cw->smart_obj);
edje_object_part_swallow(cw->effect_obj, "e.swallow.content", cw->shobj);
edje_object_signal_callback_add(cw->shobj, "e,action,*,done", "e", _e_comp_object_done_defer, cw);
+ evas_object_intercept_color_set_callback_add(cw->shobj, _e_comp_intercept_shobj_color_set, cw);
/* name objects appropriately for nicer printing when using e_comp_util_wins_print() */
if (cw->ec->override)
e_client_size_set(cw->ec, w, h);
cw->ec->client.w = w - cw->client_inset.l - cw->client_inset.r;
cw->ec->client.h = h - cw->client_inset.t - cw->client_inset.b;
- evas_object_smart_callback_call(obj, "client_resize", NULL);
+ wl_signal_emit(&cw->events.resize, NULL);
}
return;
}
(((w - fw != pw) || (h - fh != ph))))
{
//INF("CALLBACK: REQ(%dx%d) != CUR(%dx%d)", w - fw, h - fh, pw, ph);
- evas_object_smart_callback_call(obj, "client_resize", NULL);
+ wl_signal_emit(&cw->events.resize, NULL);
/* flip for CSD */
if (cw->frame_object || cw->ec->input_only)
e_comp_object_frame_wh_adjust(obj, pw, ph, &w, &h);
}
else
{
- evas_object_smart_callback_call(obj, "client_resize", NULL);
-
/* flip for CSD */
if ((!cw->frame_object) && (!cw->ec->input_only))
w = pw, h = ph;
+
+ wl_signal_emit(&cw->events.resize, NULL);
/* "just do it" for overrides */
evas_object_resize(obj, w, h);
}
layer_set_data.cw = cw;
layer_set_data.layer = layer;
- wl_signal_emit_mutable(&cw->events.set_layer, &layer_set_data);
+ wl_signal_emit(&cw->events.set_layer, &layer_set_data);
if (cw->visible)
{
/* clamp to valid client layer */
layer = e_comp_canvas_client_layer_map_nearest(layer);
cw->ec->layer = layer;
+ e_client_input_thread_layer_set(cw->ec, layer);
if (e_config->transient.layer)
{
E_Client *child;
{
_e_comp_object_hook_call(E_COMP_OBJECT_HOOK_RESTACK, ec);
#ifdef REFACTOR_DESK_AREA
- wl_signal_emit_mutable(&cw->events.lower_done, NULL);
+ wl_signal_emit(&cw->events.lower_done, NULL);
#else
- wl_signal_emit_mutable(&cw->events.lower, NULL);
+ wl_signal_emit(&cw->events.lower, NULL);
#endif
}
}
stack_above_data.cw = cw;
stack_above_data.above_obj = above;
- wl_signal_emit_mutable(&cw->events.stack_above, &stack_above_data);
+ wl_signal_emit(&cw->events.stack_above, &stack_above_data);
#else
if (evas_object_below_get(obj) == above)
{
stack_below_data.cw = cw;
stack_below_data.below_obj = below;
- wl_signal_emit_mutable(&cw->events.stack_below, &stack_below_data);
+ wl_signal_emit(&cw->events.stack_below, &stack_below_data);
if (!cw->visible)
e_comp_render_queue();
TRACE_DS_BEGIN(COMP:INTERCEPT LOWER);
#ifdef REFACTOR_DESK_AREA
- wl_signal_emit_mutable(&cw->events.lower, cw);
+ wl_signal_emit(&cw->events.lower, cw);
#else
if ((cw->ec->layer_block) || (cw->ec->layer_pending))
{
TRACE_DS_BEGIN(COMP:INTERCEPT RAISE);
#ifdef REFACTOR_DESK_AREA
- wl_signal_emit_mutable(&cw->events.raise, cw);
+ wl_signal_emit(&cw->events.raise, cw);
#else
if ((cw->ec->layer_block) || (cw->ec->layer_pending))
{
{
ELOGF("COMP", "Hide. Cancel launching flag", cw->ec);
cw->ec->launching = EINA_FALSE;
+ e_comp_object_signal_emit(cw->ec->frame, "e,action,launch,cancel", "e");
}
if (cw->ec->hidden)
ELOGF("COMP", "Hide hidden evas_object:%p", cw->ec, obj);
evas_object_hide(obj);
- wl_signal_emit_mutable(&cw->events.hide, NULL);
+ wl_signal_emit(&cw->events.hide, NULL);
return;
}
ELOGF("COMP", "Hide input_only evas_object:%p", cw->ec, obj);
evas_object_hide(obj);
- wl_signal_emit_mutable(&cw->events.hide, NULL);
+ wl_signal_emit(&cw->events.hide, NULL);
return;
}
_e_comp_object_animating_begin(cw);
if (!_e_comp_object_effect_visibility_start(cw, 0)) return;
}
- evas_object_smart_callback_call(obj, "hiding", cw->ec);
+
+ wl_signal_emit(&cw->events.hiding, NULL);
+
cw->defer_hide = !!cw->animating;
if (!cw->animating)
e_comp_object_effect_set(obj, NULL);
ELOGF("COMP", "Hide normal object:%p", cw->ec, obj);
evas_object_hide(obj);
- wl_signal_emit_mutable(&cw->events.hide, NULL);
+ wl_signal_emit(&cw->events.hide, NULL);
}
static void
cw->visible, cw->animating, cw->defer_hide, cw->content_type, cw->updates, cw->w, cw->h,
ec->iconic, ec->exp_iconify.by_client, ec->exp_iconify.type, ec->input_only, ec->ignored, ec->new_client);
- if (ec->sticky)
- e_comp_object_signal_emit(cw->smart_obj, "e,state,sticky", "e");
if (cw->visible)
{
if (ec->iconic && cw->animating)
}
}
- wl_signal_emit_mutable(&cw->events.show, NULL);
+ wl_signal_emit(&cw->events.show, NULL);
}
static void
evas_object_image_smooth_scale_set(cw->obj, e_comp_config_get()->smooth_windows);
evas_object_name_set(cw->obj, "cw->obj");
evas_object_image_colorspace_set(cw->obj, EVAS_COLORSPACE_ARGB8888);
+ evas_object_intercept_color_set_callback_add(cw->obj, _e_comp_intercept_obj_color_set, cw);
}
_e_comp_object_alpha_set(cw);
if (focus)
{
+ /* check for modal child and set focus to modal child */
+ E_Client *modal_child = e_client_modal_child_get(ec);
+ if ((modal_child) && (modal_child != ec) &&
+ (!e_client_is_iconified_by_client(modal_child)) &&
+ (modal_child->visible) && (!e_object_is_del(E_OBJECT(modal_child))))
+ {
+ // add ec to latest focus stack
+ e_client_focus_latest_set(ec);
+
+ ELOGF("FOCUS", "FOCUS SET to MODAL (ec:%p, win:0x%08zx, frame:%p)", ec, modal_child, e_client_util_win_get(modal_child), modal_child->frame);
+ //e_client_focused_set(modal_child);
+ evas_object_focus_set(modal_child->frame, focus);
+ return;
+ }
if (!cw->visible)
{
/* not yet visible, wait till the next time... */
evas_object_color_set(obj, r, g, b, a);
}
- wl_signal_emit_mutable(&cw->events.color_set, NULL);
+ wl_signal_emit(&cw->events.color_set, NULL);
+
+ _e_comp_object_color_visible_update(cw);
}
+
////////////////////////////////////////////////////
static void
}
static void
-_e_comp_smart_cb_sticky(void *data EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
-{
- e_comp_object_signal_emit(obj, "e,state,sticky", "e");
-}
-
-static void
-_e_comp_smart_cb_unsticky(void *data EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
-{
- e_comp_object_signal_emit(obj, "e,state,unsticky", "e");
-}
-
-static void
-_e_comp_smart_cb_unhung(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
-{
- E_Comp_Object *cw = data;
-
- if (!cw->ec) return; //NYI
- e_comp_object_signal_emit(cw->smart_obj, "e,state,unhung", "e");
-}
-
-static void
-_e_comp_smart_cb_hung(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
-{
- E_Comp_Object *cw = data;
-
- if (!cw->ec) return; //NYI
- e_comp_object_signal_emit(cw->smart_obj, "e,state,hung", "e");
-}
-
-static void
_e_comp_smart_focus_in(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
{
e_comp_object_signal_emit(obj, "e,state,focused", "e");
#endif
wl_signal_init(&cw->events.show);
wl_signal_init(&cw->events.hide);
+ wl_signal_init(&cw->events.hiding);
#ifdef REFACTOR_DESK_AREA
wl_signal_init(&cw->events.set_layer);
wl_signal_init(&cw->events.stack_above);
wl_signal_init(&cw->events.render_op_set);
wl_signal_init(&cw->events.content_type_set);
wl_signal_init(&cw->events.color_set);
+ wl_signal_init(&cw->events.color_visible_set);
+ wl_signal_init(&cw->events.resize);
cw->smart_obj = obj;
cw->x = cw->y = cw->w = cw->h = -1;
cw->transform_bg_color.g = 0;
cw->transform_bg_color.b = 0;
cw->transform_bg_color.a = 255;
+ cw->color_visible = EINA_TRUE;
evas_object_data_set(obj, "comp_obj", cw);
evas_object_move(obj, -1, -1);
/* intercept ALL the callbacks! */
evas_object_smart_callback_add(obj, "unmaximize", _e_comp_smart_cb_unmaximize, cw);
evas_object_smart_callback_add(obj, "unfullscreen", _e_comp_smart_cb_unfullscreen, cw);
- evas_object_smart_callback_add(obj, "stick", _e_comp_smart_cb_sticky, cw);
- evas_object_smart_callback_add(obj, "unstick", _e_comp_smart_cb_unsticky, cw);
-
- evas_object_smart_callback_add(obj, "hung", _e_comp_smart_cb_hung, cw);
- evas_object_smart_callback_add(obj, "unhung", _e_comp_smart_cb_unhung, cw);
-
evas_object_smart_callback_add(obj, "frame_recalc", _e_comp_smart_cb_frame_recalc, cw);
evas_object_event_callback_add(obj, EVAS_CALLBACK_FOCUS_IN, _e_comp_smart_focus_in, cw);
{
INTERNAL_ENTRY;
evas_object_color_set(cw->clip, r, g, b, a);
- evas_object_smart_callback_call(obj, "color_set", NULL);
}
}
EINTERN Eina_Bool
-e_comp_object_frame_title_set(Evas_Object *obj, const char *name)
-{
- API_ENTRY EINA_FALSE;
- if (!e_util_strcmp(cw->frame_name, name)) return EINA_FALSE;
- eina_stringshare_replace(&cw->frame_name, name);
- if (cw->frame_object)
- edje_object_part_text_set(cw->frame_object, "e.text.title", cw->frame_name);
- return EINA_TRUE;
-}
-
-EINTERN Eina_Bool
e_comp_object_frame_exists(Evas_Object *obj)
{
API_ENTRY EINA_FALSE;
if (set)
{
evas_object_color_get(obj, &r, &g, &b, &a);
- evas_object_color_set(obj, 0, 0, 0, 0);
cw->transparent.user_r = r;
cw->transparent.user_g = g;
cw->transparent.user_b = b;
cw->transparent.user_a = a;
+ cw->transparent.setting = EINA_TRUE;
+ evas_object_color_set(obj, 0, 0, 0, 0);
+ cw->transparent.setting = EINA_FALSE;
+
ELOGF("COMP", "Transparent enabled user_color(%d,%d,%d,%d)",
cw->ec,
cw->transparent.user_r,
if (cw->shobj)
_e_comp_object_shadow_setup(cw);
- wl_signal_emit_mutable(&cw->events.content_type_set, NULL);
+ wl_signal_emit(&cw->events.content_type_set, NULL);
return EINA_TRUE;
}
evas_object_image_smooth_scale_set(cw->obj, e_comp_config_get()->smooth_windows);
evas_object_name_set(cw->obj, "cw->obj");
evas_object_image_colorspace_set(cw->obj, EVAS_COLORSPACE_ARGB8888);
+ evas_object_intercept_color_set_callback_add(obj, _e_comp_intercept_obj_color_set, cw);
_e_comp_object_alpha_set(cw);
if (cw->shobj)
e_comp_object_render(cw->smart_obj);
e_comp_object_render_update_add(obj);
- wl_signal_emit_mutable(&cw->events.content_type_set, NULL);
+ wl_signal_emit(&cw->events.content_type_set, NULL);
return EINA_TRUE;
}
cw->image_filter = filter;
- wl_signal_emit_mutable(&cw->events.image_filter_set, NULL);
+ wl_signal_emit(&cw->events.image_filter_set, NULL);
return EINA_TRUE;
}
e_comp_object_color_visible_get(Evas_Object *obj)
{
API_ENTRY EINA_FALSE;
- int a;
-
- EINA_SAFETY_ON_NULL_RETURN_VAL(cw->ec, EINA_FALSE);
-
- e_comp_object_color_get(obj, NULL, NULL, NULL, &a);
- if (a <= 0)
- return EINA_FALSE;
-
- evas_object_color_get(cw->effect_obj, NULL, NULL, NULL, &a);
- if (a <= 0)
- return EINA_FALSE;
-
- evas_object_color_get(cw->shobj, NULL, NULL, NULL, &a);
- if (a <= 0)
- return EINA_FALSE;
- evas_object_color_get(cw->obj, NULL, NULL, NULL, &a);
- if (a <= 0)
- return EINA_FALSE;
-
- return EINA_TRUE;
+ return cw->color_visible;
}
E_API Eina_Bool
{
API_ENTRY;
- if (cw->transparent.set)
+ if ((cw->transparent.set) || (cw->transparent.setting))
{
if (r) *r = cw->transparent.user_r;
if (g) *g = cw->transparent.user_g;
evas_object_render_op_set(cw->obj, op);
- wl_signal_emit_mutable(&cw->events.render_op_set, NULL);
+ wl_signal_emit(&cw->events.render_op_set, NULL);
}
EINTERN Evas_Render_Op
wl_signal_add(&cw->events.hide, listener);
}
+EINTERN void
+e_comp_object_hiding_listener_add(Evas_Object *obj, struct wl_listener *listener)
+{
+ API_ENTRY;
+ wl_signal_add(&cw->events.hiding, listener);
+}
+
#ifdef REFACTOR_DESK_AREA
EINTERN void
e_comp_object_set_layer_listener_add(Evas_Object *obj, struct wl_listener *listener)
API_ENTRY;
wl_signal_add(&cw->events.color_set, listener);
}
+
+EINTERN void
+e_comp_object_color_visible_set_listener_add(Evas_Object *obj, struct wl_listener *listener)
+{
+ API_ENTRY;
+ wl_signal_add(&cw->events.color_visible_set, listener);
+}
+
+EINTERN void
+e_comp_object_resize_listener_add(Evas_Object *obj, struct wl_listener *listener)
+{
+ API_ENTRY;
+ wl_signal_add(&cw->events.resize, listener);
+}
projects / platform / upstream / enlightenment.git / blobdiff