#include "e_desk_intern.h"
#include "e_zone_intern.h"
#include "e_config_intern.h"
+#include "e_input_thread_client_intern.h"
#define PRI(ec) ((E_Client_Private *)e_object_data_get(E_OBJECT(ec)))
#define API_ENTRY \
EINA_SAFETY_ON_NULL_RETURN(ec); \
- E_Client_Private *priv = PRI(ec)
+ E_Client_Private *priv = PRI(ec); \
+ EINA_SAFETY_ON_NULL_RETURN(priv);
#define API_ENTRY_VAL(ret) \
EINA_SAFETY_ON_NULL_RETURN_VAL(ec, ret); \
- E_Client_Private *priv = PRI(ec)
+ E_Client_Private *priv = PRI(ec); \
+ EINA_SAFETY_ON_NULL_RETURN_VAL(priv, ret);
typedef struct _E_Client_Private E_Client_Private;
} events;
Eina_Bool hide_by_request;
+ Eina_Bool focus_check;
+
+ E_Client *modal;
};
static int _e_client_hooks_delete = 0;
}
static void
+_e_input_thread_client_free(void *data)
+{
+ E_Input_Thread_Request_EClient_Data *ec_data = data;
+ EINA_SAFETY_ON_NULL_RETURN(ec_data);
+
+ INF("[input thread|%s] ec: %p\n", __func__, ec_data->ec);
+ e_input_thread_client_free(e_input_thread_client_get(ec_data->ec));
+}
+
+static void
_e_client_free(E_Client *ec)
{
g_rec_mutex_lock(&e_comp->ec_list_mutex);
+ E_Input_Thread_Request_EClient_Data ec_data;
+ memset(&ec_data, 0, sizeof(E_Input_Thread_Request_EClient_Data));
+
e_comp_object_redirected_set(ec->frame, 0);
e_comp_object_render_update_del(ec->frame);
#else
eina_stringshare_replace(&ec->icccm.class, NULL);
#endif
- eina_stringshare_replace(&ec->icccm.title, NULL);
+ e_client_icccm_title_set(ec, NULL);
eina_stringshare_replace(&ec->icccm.window_role, NULL);
- eina_stringshare_replace(&ec->netwm.name, NULL);
+ e_client_netwm_name_set(ec, NULL);
E_FREE_FUNC(ec->frame, evas_object_del);
e_uuid_store_entry_del(ec->uuid);
+ ec_data.ec = ec;
+ INF("[%s] ec: %p\n", __func__, ec);
+ e_input_thread_safe_call(_e_input_thread_client_free, &ec_data, sizeof(E_Input_Thread_Request_EClient_Data));
+
_e_client_private_finish(ec);
free(ec);
}
static void
+_e_input_thread_client_del(void *data)
+{
+ E_Input_Thread_Request_EClient_Data *ec_data = data;
+ EINA_SAFETY_ON_NULL_RETURN(ec_data);
+
+ INF("[input thread|%s] ec: %p\n", __func__, ec_data->ec);
+ e_input_thread_client_del(e_input_thread_client_get(ec_data->ec));
+}
+
+static void
_e_client_del(E_Client *ec)
{
E_Client *child;
E_Pixmap_Type type;
+ E_Input_Thread_Request_EClient_Data ec_data;
+ memset(&ec_data, 0, sizeof(E_Input_Thread_Request_EClient_Data));
g_rec_mutex_lock(&e_comp->ec_list_mutex);
if (ec->parent)
{
+ if (e_client_modal_child_get(ec->parent) == ec)
+ e_client_modal_child_set(ec->parent, NULL);
ec->parent->transients = eina_list_remove(ec->parent->transients, ec);
ec->parent = NULL;
}
e_comp_visibility_calculation_set(EINA_TRUE);
+ ec_data.ec = ec;
+ INF("[%s] ec: %p\n", __func__, ec);
+ e_input_thread_safe_call(_e_input_thread_client_del, &ec_data, sizeof(E_Input_Thread_Request_EClient_Data));
+
g_rec_mutex_unlock(&e_comp->ec_list_mutex);
}
if (ec->hung)
{
ec->hung = 0;
- evas_object_smart_callback_call(ec->frame, "unhung", NULL);
E_FREE_FUNC(ec->kill_timer, ecore_timer_del);
}
}
if (!ec->hung)
{
ec->hung = 1;
- evas_object_smart_callback_call(ec->frame, "hung", NULL);
/* FIXME: if below dialog is up - hide it now */
}
if (ec->delete_requested)
ec->moving = 1;
ecmove = ec;
- wl_signal_emit_mutable(&PRI(ec)->events.move_begin, NULL);
+ wl_signal_emit(&PRI(ec)->events.move_begin, NULL);
_e_client_hook_call(E_CLIENT_HOOK_MOVE_BEGIN, ec);
if (!ec->moving)
{
ec->moving = 0;
_e_client_action_input_win_del();
- wl_signal_emit_mutable(&PRI(ec)->events.move_end, NULL);
+ wl_signal_emit(&PRI(ec)->events.move_end, NULL);
_e_client_hook_call(E_CLIENT_HOOK_MOVE_END, ec);
if (ec->transformed)
ec->resize_mode = E_POINTER_RESIZE_NONE;
_e_client_action_input_win_del();
- wl_signal_emit_mutable(&PRI(ec)->events.move_resize_end, NULL);
+ wl_signal_emit(&PRI(ec)->events.move_resize_end, NULL);
_e_client_hook_call(E_CLIENT_HOOK_RESIZE_END, ec);
if (ec->transformed)
if (ec->new_client) return;
_e_client_event_hide(ec);
+ e_client_focus_check_set(ec, EINA_TRUE);
EC_CHANGED(ec);
}
}
if (ec->moving || (ecmove == ec))
{
- wl_signal_emit_mutable(&PRI(ec)->events.move_resize_update, NULL);
+ wl_signal_emit(&PRI(ec)->events.move_resize_update, NULL);
_e_client_hook_call(E_CLIENT_HOOK_MOVE_UPDATE, ec);
}
ec->pre_cb.x = x; ec->pre_cb.y = y;
- wl_signal_emit_mutable(&PRI(ec)->events.move, NULL);
+ wl_signal_emit(&PRI(ec)->events.move, NULL);
e_comp_visibility_calculation_set(EINA_TRUE);
}
if (e_client_util_resizing_get(ec) || (ecresize == ec))
{
- wl_signal_emit_mutable(&PRI(ec)->events.move_resize_update, NULL);
+ wl_signal_emit(&PRI(ec)->events.move_resize_update, NULL);
_e_client_hook_call(E_CLIENT_HOOK_RESIZE_UPDATE, ec);
}
ec->pre_cb.w = w; ec->pre_cb.h = h;
_e_client_transform_core_activate_set(ec, EINA_TRUE);
_e_client_event_show(ec);
+
+ e_client_focus_check_set(ec, EINA_TRUE);
EC_CHANGED(ec);
}
}
}
+
_e_client_event_simple(ec, E_EVENT_CLIENT_STACK);
+ e_client_focus_check_set(ec, EINA_TRUE);
+ EC_CHANGED(ec);
+
e_comp_visibility_calculation_set(EINA_TRUE);
}
if (cdata && cdata->aux_hint.changed)
{
- wl_signal_emit_mutable(&PRI(ec)->events.aux_hint_change, NULL);
+ wl_signal_emit(&PRI(ec)->events.aux_hint_change, NULL);
_e_client_hook_call(E_CLIENT_HOOK_AUX_HINT_CHANGE, ec);
EINA_LIST_FOREACH_SAFE(cdata->aux_hint.hints, l, ll, hint)
TRACE_DS_BEGIN(CLIENT:EVAL);
- wl_signal_emit_mutable(&PRI(ec)->events.eval_pre_new_client, NULL);
+ wl_signal_emit(&PRI(ec)->events.eval_pre_new_client, NULL);
if (!_e_client_hook_call(E_CLIENT_HOOK_EVAL_PRE_NEW_CLIENT, ec))
{
TRACE_DS_END();
if ((ec->new_client) && (!e_client_util_ignored_get(ec)))
{
- wl_signal_emit_mutable(&PRI(ec)->events.eval_post_new_client, NULL);
+ wl_signal_emit(&PRI(ec)->events.eval_post_new_client, NULL);
if (!_e_client_hook_call(E_CLIENT_HOOK_EVAL_POST_NEW_CLIENT, ec))
{
TRACE_DS_END();
ec->changes.reset_gravity ||
ec->changes.shape || ec->changes.shape_input || ec->changes.icon ||
ec->changes.internal_state ||
- ec->changes.need_maximize || ec->changes.need_unmaximize;
+ ec->changes.need_maximize || ec->changes.need_unmaximize ||
+ e_client_focus_check_get(ec);
ec->changes.stack = 0;
if (ec->changes.need_maximize)
e_client_transform_core_update(ec);
- wl_signal_emit_mutable(&PRI(ec)->events.eval_end, NULL);
+ wl_signal_emit(&PRI(ec)->events.eval_end, NULL);
_e_client_hook_call(E_CLIENT_HOOK_EVAL_END, ec);
TRACE_DS_END();
else
bordername = e_config->theme_default_border_style;
if (!bordername) bordername = "default";
-
- e_client_border_set(ec, bordername);
}
static Eina_Bool
if (ec->visibility.changed)
_e_client_event_simple(ec, E_EVENT_CLIENT_VISIBILITY_CHANGE);
- wl_signal_emit_mutable(&PRI(ec)->events.eval_visibility, NULL);
+ wl_signal_emit(&PRI(ec)->events.eval_visibility, NULL);
_e_client_hook_call(E_CLIENT_HOOK_EVAL_VISIBILITY, ec);
}
return ec->visibility.obscured;
}
+static void
+_e_input_thread_client_visibility_set(void *data)
+{
+ E_Input_Thread_Request_EClient_Data *ec_data = data;
+ EINA_SAFETY_ON_NULL_RETURN(ec_data);
+
+ INF("[input thread|%s] ec(%p), visibility(%d)\n", __func__, ec_data->ec, ec_data->visibility);
+ e_input_thread_client_visibility_set(e_input_thread_client_get(ec_data->ec), ec_data->visibility);
+}
+
EINTERN void
e_client_visibility_set(E_Client *ec, E_Visibility visibility)
{
+ E_Input_Thread_Request_EClient_Data ec_data;
+ memset(&ec_data, 0, sizeof(E_Input_Thread_Request_EClient_Data));
+
EINA_SAFETY_ON_NULL_RETURN(ec);
if (e_client_visibility_get(ec) == visibility) return;
ec->visibility.obscured = visibility;
+
+ ec_data.ec = ec;
+ ec_data.visibility = ec->visibility.obscured;
+
+ INF("[%s] ec(%p), visibility(%d)\n", __func__, ec, ec->visibility.obscured);
+ e_input_thread_safe_call(_e_input_thread_client_visibility_set, &ec_data, sizeof(E_Input_Thread_Request_EClient_Data));
}
static Eina_Bool
cdata->mapped = set;
}
+EINTERN void
+e_client_modal_child_set(E_Client *ec, E_Client *modal)
+{
+ API_ENTRY;
+
+ E_Client *old_modal = priv->modal;
+ if (old_modal == modal) return;
+
+ ELOGF("E_CLIENT", "SET modal. new(ec:%p, win:0x%08zx), old(ec:%p, win:0x%08zx)", ec,
+ modal, e_client_util_win_get(modal), old_modal, e_client_util_win_get(old_modal));
+
+ // TODO: if ec has a modal window already, then how does we do?
+ priv->modal = modal;
+}
+
+EINTERN E_Client *
+e_client_modal_child_get(E_Client *ec)
+{
+ API_ENTRY_VAL(NULL);
+ return priv->modal;
+}
+
+EINTERN void
+e_client_modal_state_set(E_Client *ec, Eina_Bool modal)
+{
+ if (!ec) return;
+ ec->netwm.state.modal = modal;
+
+ if (ec->parent)
+ {
+ if (ec->netwm.state.modal)
+ e_client_modal_child_set(ec->parent, ec);
+ else
+ e_client_modal_child_set(ec->parent, NULL);
+ }
+}
+
+EINTERN Eina_Bool
+e_client_is_modal_state(E_Client *ec)
+{
+ if (!ec) return EINA_FALSE;
+ return ec->netwm.state.modal;
+}
////////////////////////////////////////////////
EINTERN Eina_Bool
// call hooks to decide what to do - maybe move/resize
if (ec->ignored || (!ec->changed)) continue;
- wl_signal_emit_mutable(&PRI(ec)->events.eval_pre_fetch, NULL);
+ wl_signal_emit(&PRI(ec)->events.eval_pre_fetch, NULL);
if (!_e_client_hook_call(E_CLIENT_HOOK_EVAL_PRE_FETCH, ec)) continue;
/* FETCH is hooked by the compositor to get client hints */
- wl_signal_emit_mutable(&PRI(ec)->events.eval_fetch, NULL);
+ wl_signal_emit(&PRI(ec)->events.eval_fetch, NULL);
if (!_e_client_hook_call(E_CLIENT_HOOK_EVAL_FETCH, ec)) continue;
if (ec->new_client)
}
/* PRE_POST_FETCH calls e_remember apply for new client */
- wl_signal_emit_mutable(&PRI(ec)->events.eval_pre_post_fetch, NULL);
+ wl_signal_emit(&PRI(ec)->events.eval_pre_post_fetch, NULL);
if (!_e_client_hook_call(E_CLIENT_HOOK_EVAL_PRE_POST_FETCH, ec)) continue;
- wl_signal_emit_mutable(&PRI(ec)->events.eval_post_fetch, NULL);
+ wl_signal_emit(&PRI(ec)->events.eval_post_fetch, NULL);
if (!_e_client_hook_call(E_CLIENT_HOOK_EVAL_POST_FETCH, ec)) continue;
- wl_signal_emit_mutable(&PRI(ec)->events.eval_pre_frame_assign, NULL);
+ wl_signal_emit(&PRI(ec)->events.eval_pre_frame_assign, NULL);
if (!_e_client_hook_call(E_CLIENT_HOOK_EVAL_PRE_FRAME_ASSIGN, ec)) continue;
- wl_signal_emit_mutable(&PRI(ec)->events.eval_post_frame_assign, NULL);
+ wl_signal_emit(&PRI(ec)->events.eval_post_frame_assign, NULL);
_e_client_hook_call(E_CLIENT_HOOK_EVAL_POST_FRAME_ASSIGN, ec);
}
// pass 2 - show and hide windows needing hide and eval (main eval)
if (ec->changes.accepts_focus)
*check_focus = EINA_TRUE;
ec->changes.accepts_focus = 0;
+
+ if (e_client_focus_check_get(ec))
+ {
+ *check_focus = EINA_TRUE;
+ e_client_focus_check_set(ec, EINA_FALSE);
+ }
}
if ((ec->changes.visible) && (ec->visible) && (!ec->changed))
return E_LAYER_CLIENT_FULLSCREEN;
}
+static void
+_e_input_thread_client_new(void *data)
+{
+ E_Input_Thread_Request_EClient_Data *ec_data = data;
+ EINA_SAFETY_ON_NULL_RETURN(ec_data);
+
+ INF("[input thread|%s] ec(%p), surface(%p)\n", __func__, ec_data->ec, ec_data->wl_surface);
+ e_input_thread_client_new(ec_data->ec, ec_data->wl_surface);
+}
+
E_API E_Client *
e_client_new(E_Pixmap *cp, int first_map, int internal)
{
e_client_iconified_type_set(ec, E_ICONIFIED_TYPE_NONE);
- wl_signal_emit_mutable(&PRI(ec)->events.new_client, NULL);
+ wl_signal_emit(&PRI(ec)->events.new_client, NULL);
if (!_e_client_hook_call(E_CLIENT_HOOK_NEW_CLIENT, ec))
{
/* delete the above allocated object */
evas_object_event_callback_add(ec->frame, EVAS_CALLBACK_RESTACK, _e_client_cb_evas_restack, ec);
}
- wl_signal_emit_mutable(&PRI(ec)->events.new_client_post, NULL);
+ wl_signal_emit(&PRI(ec)->events.new_client_post, NULL);
#ifdef _F_E_CLIENT_NEW_CLIENT_POST_HOOK_
_e_client_hook_call(E_CLIENT_HOOK_NEW_CLIENT_POST, ec);
ec->visibility.ignore_geometry = e_config->calc_vis_ignore_geometry;
+ E_Input_Thread_Request_EClient_Data ec_new_data;
+ memset(&ec_new_data, 0, sizeof(E_Input_Thread_Request_EClient_Data));
+
+ ec_new_data.ec = ec;
+ ec_new_data.wl_surface = ec->comp_data ? ec->comp_data->wl_surface : NULL;
+ INF("[%s] ec(%p), surface(%p)\n", __func__, ec, ec_new_data.wl_surface);
+ e_input_thread_safe_call(_e_input_thread_client_new, &ec_new_data, sizeof(E_Input_Thread_Request_EClient_Data));
+
return ec;
}
ec->mouse.current.my = y;
ec->mouse.in = 1;
- wl_signal_emit_mutable(&PRI(ec)->events.mouse_in, NULL);
+ wl_signal_emit(&PRI(ec)->events.mouse_in, NULL);
}
EINTERN void
ec->mouse.current.my = y;
ec->mouse.in = 0;
- wl_signal_emit_mutable(&PRI(ec)->events.mouse_out, NULL);
+ wl_signal_emit(&PRI(ec)->events.mouse_out, NULL);
}
EINTERN void
ec->mouse.current.mx = output->x;
ec->mouse.current.my = output->y;
- wl_signal_emit_mutable(&PRI(ec)->events.mouse_down, NULL);
+ wl_signal_emit(&PRI(ec)->events.mouse_down, NULL);
}
EINTERN void
e_client_above_get(const E_Client *ec)
{
#ifdef REFACTOR_DESK_AREA
- E_Client_Data_Get_Above data;
+ API_ENTRY_VAL(NULL);
- E_OBJECT_CHECK_RETURN(ec, NULL);
- E_OBJECT_TYPE_CHECK_RETURN(ec, E_CLIENT_TYPE, NULL);
+ E_Client_Data_Get_Above data;
data.above_ec = NULL;
- wl_signal_emit_mutable(&PRI(ec)->events.get_above, &data);
+ wl_signal_emit(&priv->events.get_above, &data);
return data.above_ec;
#else
e_client_below_get(const E_Client *ec)
{
#ifdef REFACTOR_DESK_AREA
- E_Client_Data_Get_Below data;
+ API_ENTRY_VAL(NULL);
- E_OBJECT_CHECK_RETURN(ec, NULL);
- E_OBJECT_TYPE_CHECK_RETURN(ec, E_CLIENT_TYPE, NULL);
+ E_Client_Data_Get_Below data;
data.below_ec = NULL;
- wl_signal_emit_mutable(&PRI(ec)->events.get_below, &data);
+ wl_signal_emit(&priv->events.get_below, &data);
return data.below_ec;
#else
e_client_visible_above_get(E_Client *ec)
{
#ifdef REFACTOR_DESK_AREA
- E_Client_Data_Get_Visible_Above data;
+ API_ENTRY_VAL(NULL);
- E_OBJECT_CHECK_RETURN(ec, NULL);
- E_OBJECT_TYPE_CHECK_RETURN(ec, E_CLIENT_TYPE, NULL);
+ E_Client_Data_Get_Visible_Above data;
data.above_ec = NULL;
- wl_signal_emit_mutable(&PRI(ec)->events.get_visible_above, &data);
+ wl_signal_emit(&priv->events.get_visible_above, &data);
return data.above_ec;
#else
e_client_visible_below_get(E_Client *ec)
{
#ifdef REFACTOR_DESK_AREA
- E_Client_Data_Get_Visible_Below data;
+ API_ENTRY_VAL(NULL);
- E_OBJECT_CHECK_RETURN(ec, NULL);
- E_OBJECT_TYPE_CHECK_RETURN(ec, E_CLIENT_TYPE, NULL);
+ E_Client_Data_Get_Visible_Below data;
data.below_ec = NULL;
- wl_signal_emit_mutable(&PRI(ec)->events.get_visible_below, &data);
+ wl_signal_emit(&priv->events.get_visible_below, &data);
return data.below_ec;
#else
{
EINA_SAFETY_ON_NULL_RETURN(ec);
- wl_signal_emit_mutable(&PRI(ec)->events.focus_latest_set, NULL);
+ wl_signal_emit(&PRI(ec)->events.focus_latest_set, NULL);
}
E_API void
{
EINA_SAFETY_ON_NULL_RETURN(ec);
- wl_signal_emit_mutable(&PRI(ec)->events.focus_defer_set, NULL);
+ wl_signal_emit(&PRI(ec)->events.focus_defer_set, NULL);
}
EINTERN void
{
// FIXME: Remove focus_unset event of client.
// Instead, make zone focus_unset event and use it.
- wl_signal_emit_mutable(&PRI(focused_ec)->events.focus_unset, NULL);
+ wl_signal_emit(&PRI(focused_ec)->events.focus_unset, NULL);
_e_client_hook_call(E_CLIENT_HOOK_FOCUS_UNSET, focused_ec);
if (e_object_ref_get(E_OBJECT(focused_ec)) > 0)
// FIXME: Remove focus_set event of client.
// Instead, make zone focus_set event and use it.
// set the new current focused_ec
- wl_signal_emit_mutable(&PRI(ec)->events.focus_set, NULL);
+ wl_signal_emit(&PRI(ec)->events.focus_set, NULL);
_e_client_hook_call(E_CLIENT_HOOK_FOCUS_SET, ec);
// send the client_focuse_in event
ec->exp_iconify.by_client = 0;
e_client_iconified_type_set(ec, E_ICONIFIED_TYPE_NONE);
- wl_signal_emit_mutable(&PRI(ec)->events.activate_done, NULL);
+ wl_signal_emit(&PRI(ec)->events.activate_done, NULL);
_e_client_hook_call(E_CLIENT_HOOK_ACTIVATE_DONE, ec);
TRACE_DS_END();
if (!ec->fullscreen)
{
// call the maximize hook of a client
- wl_signal_emit_mutable(&PRI(ec)->events.maximize, &max);
+ wl_signal_emit(&PRI(ec)->events.maximize, &max);
// store the E_Maximize value
ec->maximized = max;
ec->changes.need_unmaximize = 0;
-
- evas_object_smart_callback_call(ec->frame, "maximize_done", NULL);
}
else
{
if (!ec->fullscreen)
{
- evas_object_smart_callback_call(ec->frame, "unmaximize_pre", NULL);
-
// call the unmaximize hook of a client
- wl_signal_emit_mutable(&PRI(ec)->events.unmaximize, &max);
-
- evas_object_smart_callback_call(ec->frame, "unmaximize_done", NULL);
+ wl_signal_emit(&PRI(ec)->events.unmaximize, &max);
}
ec->maximized = E_MAXIMIZE_NONE;
if (ec->fullscreen) return;
// call the fullscreen_pre hook of a client
- wl_signal_emit_mutable(&PRI(ec)->events.fullscreen_pre, NULL);
+ wl_signal_emit(&PRI(ec)->events.fullscreen_pre, NULL);
_e_client_hook_call(E_CLIENT_HOOK_FULLSCREEN_PRE, ec);
if (ec->skip_fullscreen) return;
ec->fullscreen = 1;
// call the fullscreen hook of a client
- wl_signal_emit_mutable(&PRI(ec)->events.fullscreen, &policy);
+ wl_signal_emit(&PRI(ec)->events.fullscreen, &policy);
ec->fullscreen_policy = policy;
E_Fullscreen policy = ec->fullscreen_policy;
// call the unfullscreen hook of a client
- wl_signal_emit_mutable(&PRI(ec)->events.unfullscreen, &policy);
+ wl_signal_emit(&PRI(ec)->events.unfullscreen, &policy);
e_client_layer_set(ec, ec->saved.layer);
TRACE_DS_BEGIN(CLIENT:ICONIFY);
- wl_signal_emit_mutable(&PRI(ec)->events.iconify, NULL);
+ wl_signal_emit(&PRI(ec)->events.iconify, NULL);
_e_client_hook_call(E_CLIENT_HOOK_ICONIFY, ec);
TRACE_DS_END();
TRACE_DS_BEGIN(CLIENT:UNICONIFY);
// call the uniconify hook of a client
- wl_signal_emit_mutable(&PRI(ec)->events.uniconify, NULL);
+ wl_signal_emit(&PRI(ec)->events.uniconify, NULL);
_e_client_hook_call(E_CLIENT_HOOK_UNICONIFY, ec);
TRACE_DS_END();
return priv->hide_by_request;
}
+EINTERN void e_client_focus_check_set(E_Client *ec, Eina_Bool set)
+{
+ API_ENTRY;
+ priv->focus_check = set;
+}
+
+EINTERN Eina_Bool e_client_focus_check_get(E_Client *ec)
+{
+ API_ENTRY_VAL(EINA_FALSE);
+ return priv->focus_check;
+}
+
///////////////////////////////////////
EINTERN void
if (ec->sticky) return;
// call the stick hook of a client
- wl_signal_emit_mutable(&PRI(ec)->events.stick, NULL);
+ wl_signal_emit(&PRI(ec)->events.stick, NULL);
// send the sticky property event of a client
_e_client_event_property(ec, E_CLIENT_PROPERTY_STICKY);
if (!ec->sticky) return;
// call the unstick hook of a client
- wl_signal_emit_mutable(&PRI(ec)->events.unstick, NULL);
+ wl_signal_emit(&PRI(ec)->events.unstick, NULL);
// send the sticky property event of a client
_e_client_event_property(ec, E_CLIENT_PROPERTY_STICKY);
///////////////////////////////////////
-EINTERN Eina_Bool
-e_client_border_set(E_Client *ec, const char *name)
-{
- Eina_Stringshare *pborder;
-
- E_OBJECT_CHECK_RETURN(ec, EINA_FALSE);
- E_OBJECT_TYPE_CHECK_RETURN(ec, E_CLIENT_TYPE, EINA_FALSE);
- if (!e_comp_object_frame_allowed(ec->frame)) return EINA_FALSE;
- if (ec->border.changed)
- CRI("CALLING WHEN border.changed SET!");
-
- if (!e_util_strcmp(ec->border.name, name)) return EINA_TRUE;
- pborder = ec->border.name;
- ec->border.name = eina_stringshare_add(name);
- if (e_comp_object_frame_theme_set(ec->frame, name))
- {
- eina_stringshare_del(pborder);
- return EINA_TRUE;
- }
- eina_stringshare_del(ec->border.name);
- ec->border.name = pborder;
- return EINA_FALSE;
-}
-
///////////////////////////////////////
EINTERN void
_e_client_action_init(ec);
_e_client_action_move_timeout_add();
- wl_signal_emit_mutable(&PRI(ec)->events.move_update, NULL);
+ wl_signal_emit(&PRI(ec)->events.move_update, NULL);
if (!_e_client_hook_call(E_CLIENT_HOOK_MOVE_UPDATE, ec)) return;
evas_object_freeze_events_set(ec->frame, 1);
ec->manage_resize.ah = ec->h - ec->manage_resize.header_h - ec->manage_resize.footer_h;
}
- wl_signal_emit_mutable(&PRI(ec)->events.move_begin, NULL);
+ wl_signal_emit(&PRI(ec)->events.move_begin, NULL);
_e_client_hook_call(E_CLIENT_HOOK_RESIZE_BEGIN, ec);
if (ec->transformed)
_e_client_transform_resize_begin(ec);
{
e_client_frame_recalc(ec);
- wl_signal_emit_mutable(&PRI(ec)->events.redirect, NULL);
+ wl_signal_emit(&PRI(ec)->events.redirect, NULL);
if (!_e_client_hook_call(E_CLIENT_HOOK_REDIRECT, ec)) return;
}
else
{
- wl_signal_emit_mutable(&PRI(ec)->events.unredirect, NULL);
+ wl_signal_emit(&PRI(ec)->events.unredirect, NULL);
if (!_e_client_hook_call(E_CLIENT_HOOK_UNREDIRECT, ec)) return;
}
e_comp_object_redirected_set(ec->frame, set);
if (!e_object_is_del(E_OBJECT(ec)))
{
- wl_signal_emit_mutable(&PRI(ec)->events.transform_change, NULL);
+ wl_signal_emit(&PRI(ec)->events.transform_change, NULL);
_e_client_hook_call(E_CLIENT_HOOK_TRANSFORM_CHANGE, ec);
}
}
if (!e_object_is_del(E_OBJECT(ec)))
{
- wl_signal_emit_mutable(&PRI(ec)->events.transform_change, NULL);
+ wl_signal_emit(&PRI(ec)->events.transform_change, NULL);
_e_client_hook_call(E_CLIENT_HOOK_TRANSFORM_CHANGE, ec);
}
}
if (eina_stringshare_replace(&ec->icccm.window_role, role))
{
- wl_signal_emit_mutable(&PRI(ec)->events.window_role_change, NULL);
+ wl_signal_emit(&PRI(ec)->events.window_role_change, NULL);
_e_client_hook_call(E_CLIENT_HOOK_WINDOW_ROLE_CHANGE, ec);
}
}
}
}
+static void
+_e_input_thread_client_layer_set(void *data)
+{
+ E_Input_Thread_Request_EClient_Data *ec_data = data;
+ EINA_SAFETY_ON_NULL_RETURN(ec_data);
+
+ INF("[input thread|%s] ec(%p), layer(%d)\n", __func__, ec_data->ec, ec_data->layer);
+ e_input_thread_client_layer_set(e_input_thread_client_get(ec_data->ec), ec_data->layer);
+}
+
+EINTERN void
+e_client_input_thread_layer_set(E_Client *ec, E_Layer layer)
+{
+ EINA_SAFETY_ON_NULL_RETURN(ec);
+
+ E_Input_Thread_Request_EClient_Data ec_data;
+ memset(&ec_data, 0, sizeof(E_Input_Thread_Request_EClient_Data));
+
+ ec_data.ec = ec;
+ ec_data.layer = layer;
+
+ INF("[%s] ec(%p), layer(%d)\n", __func__, ec, layer);
+ e_input_thread_safe_call(_e_input_thread_client_layer_set, &ec_data, sizeof(E_Input_Thread_Request_EClient_Data));
+}
+
E_API Eina_Bool
e_client_layer_set(E_Client *ec,
E_Layer layer)
if (ec->layer_pending || ec->layer_block)
{
ec->layer = layer;
+ e_client_input_thread_layer_set(ec, layer);
return EINA_TRUE;
}
}
- wl_signal_emit_mutable(&PRI(ec)->events.set_layer, NULL);
+ wl_signal_emit(&PRI(ec)->events.set_layer, NULL);
return EINA_TRUE;
}
else
evas_object_raise(ec->frame);
- wl_signal_emit_mutable(&PRI(ec)->events.raise, NULL);
+ wl_signal_emit(&PRI(ec)->events.raise, NULL);
}
static void
{
e_desk_area_ec_lower(eda, ec);
- wl_signal_emit_mutable(&PRI(ec)->events.lower, NULL);
+ wl_signal_emit(&PRI(ec)->events.lower, NULL);
return;
}
}
else
evas_object_lower(ec->frame);
- wl_signal_emit_mutable(&PRI(ec)->events.lower, NULL);
+ wl_signal_emit(&PRI(ec)->events.lower, NULL);
}
E_API void
evas_object_stack_above(ec->frame, above->frame);
- wl_signal_emit_mutable(&PRI(ec)->events.stack_above, NULL);
+ wl_signal_emit(&PRI(ec)->events.stack_above, NULL);
}
E_API void
evas_object_stack_below(ec->frame, below->frame);
- wl_signal_emit_mutable(&PRI(ec)->events.stack_below, NULL);
+ wl_signal_emit(&PRI(ec)->events.stack_below, NULL);
}
E_API int
{
EINA_SAFETY_ON_NULL_RETURN(ec);
- wl_signal_emit_mutable(&PRI(ec)->events.stack_transient_for_done, NULL);
+ wl_signal_emit(&PRI(ec)->events.stack_transient_for_done, NULL);
}
#ifdef REFACTOR_DESK_AREA
{
EINA_SAFETY_ON_NULL_RETURN(ec);
- wl_signal_emit_mutable(&PRI(ec)->events.subsurface_stack_update, ec);
+ wl_signal_emit(&PRI(ec)->events.subsurface_stack_update, ec);
}
#endif
}
static void
+_e_input_thread_client_icccm_name_set(void *data)
+{
+ E_Input_Thread_Request_EClient_Data *ec_data = data;
+ EINA_SAFETY_ON_NULL_RETURN(ec_data);
+
+ INF("[input thread|%s] ec(%p), name(%s)\n", __func__, ec_data->ec, ec_data->icccm_name);
+ e_input_thread_client_icccm_name_set(e_input_thread_client_get(ec_data->ec), ec_data->icccm_name);
+}
+
+EINTERN void
+e_client_icccm_name_set(E_Client *ec, const char *name)
+{
+ E_Input_Thread_Request_EClient_Data ec_data;
+ memset(&ec_data, 0, sizeof(E_Input_Thread_Request_EClient_Data));
+
+ EINA_SAFETY_ON_NULL_RETURN(ec);
+
+ if (eina_stringshare_replace(&ec->icccm.name, name))
+ {
+ ec->changes.title = EINA_TRUE;
+
+ ec_data.ec = ec;
+ ec_data.wl_surface = ec->comp_data ? ec->comp_data->wl_surface : NULL;
+ ec_data.is_video = EINA_FALSE;
+
+ if (name)
+ strncpy(ec_data.icccm_name, name, sizeof(ec_data.icccm_name)-1);
+
+ INF("[%s] ec(%p), surface(%p), name(%s)\n", __func__, ec, ec_data.wl_surface, name);
+ e_input_thread_safe_call(_e_input_thread_client_icccm_name_set, &ec_data, sizeof(E_Input_Thread_Request_EClient_Data));
+ }
+}
+
+E_API Eina_Stringshare *
+e_client_icccm_name_get(E_Client *ec)
+{
+ EINA_SAFETY_ON_NULL_RETURN_VAL(ec, NULL);
+
+ return ec->icccm.name;
+}
+
+static void
+_e_input_thread_client_netwm_name_set(void *data)
+{
+ E_Input_Thread_Request_EClient_Data *ec_data = data;
+ EINA_SAFETY_ON_NULL_RETURN(ec_data);
+
+ INF("[input thread|%s] ec(%p), name(%p)\n", __func__, ec_data->ec, ec_data->netwm_name);
+ e_input_thread_client_netwm_name_set(e_input_thread_client_get(ec_data->ec), ec_data->netwm_name);
+}
+
+EINTERN void
+e_client_netwm_name_set(E_Client *ec, const char *name)
+{
+ E_Input_Thread_Request_EClient_Data ec_data = { NULL, NULL, EINA_FALSE, EINA_FALSE };
+ memset(&ec_data, 0, sizeof(E_Input_Thread_Request_EClient_Data));
+
+ EINA_SAFETY_ON_NULL_RETURN(ec);
+
+ eina_stringshare_replace(&ec->netwm.name, name);
+
+ ec_data.ec = ec;
+ ec_data.wl_surface = ec->comp_data ? ec->comp_data->wl_surface : NULL;
+
+ if (name)
+ strncpy(ec_data.netwm_name, name, sizeof(ec_data.netwm_name)-1);
+
+ INF("[%s] ec(%p), surface(%p), name(%s)\n", __func__, ec, ec_data.wl_surface, ec_data.netwm_name);
+ e_input_thread_safe_call(_e_input_thread_client_netwm_name_set, &ec_data, sizeof(E_Input_Thread_Request_EClient_Data));
+}
+
+E_API Eina_Stringshare *
+e_client_netwm_name_get(E_Client *ec)
+{
+ EINA_SAFETY_ON_NULL_RETURN_VAL(ec, NULL);
+
+ return ec->netwm.name;
+}
+
+static void
+_e_input_thread_client_icccm_title_set(void *data)
+{
+ E_Input_Thread_Request_EClient_Data *ec_data = data;
+ EINA_SAFETY_ON_NULL_RETURN(ec_data);
+
+ INF("[input thread|%s] ec(%p), title(%s)\n", __func__, ec_data->ec, ec_data->icccm_title);
+ e_input_thread_client_icccm_title_set(e_input_thread_client_get(ec_data->ec), ec_data->icccm_title);
+}
+
+EINTERN void
+e_client_icccm_title_set(E_Client *ec, const char *title)
+{
+ E_Input_Thread_Request_EClient_Data ec_data;
+ memset(&ec_data, 0, sizeof(E_Input_Thread_Request_EClient_Data));
+
+ EINA_SAFETY_ON_NULL_RETURN(ec);
+
+ if (eina_stringshare_replace(&ec->icccm.title, title))
+ {
+ ec->changes.title = EINA_TRUE;
+
+ ec_data.ec = ec;
+ ec_data.wl_surface = ec->comp_data ? ec->comp_data->wl_surface : NULL;
+ if (title)
+ strncpy(ec_data.icccm_title, title, sizeof(ec_data.icccm_title)-1);
+
+ INF("[%s] ec(%p), surface(%p)\n", __func__, ec, ec_data.wl_surface);
+ e_input_thread_safe_call(_e_input_thread_client_icccm_title_set, &ec_data, sizeof(E_Input_Thread_Request_EClient_Data));
+ }
+}
+
+E_API Eina_Stringshare *
+e_client_icccm_title_get(E_Client *ec)
+{
+ EINA_SAFETY_ON_NULL_RETURN_VAL(ec, NULL);
+
+ return ec->icccm.title;
+}
+
+static void
_e_client_shell_map(E_Client *ec)
{
EINA_SAFETY_ON_NULL_RETURN(ec);
ec->comp_data->mapped = 0;
}
}
+
+static void
+_e_input_thread_client_video_mode_set(void *data)
+{
+ E_Input_Thread_Request_EClient_Data *ec_data = data;
+ EINA_SAFETY_ON_NULL_RETURN(ec_data);
+
+ INF("[input thread|%s] ec(%p), is_video(%d)\n", __func__, ec_data->ec, ec_data->is_video);
+ e_input_thread_client_video_set(e_input_thread_client_get(ec_data->ec), ec_data->is_video);
+}
+
+EINTERN void
+e_client_video_mode_set(E_Client *ec, Eina_Bool is_video)
+{
+ E_Input_Thread_Request_EClient_Data ec_data;
+ memset(&ec_data, 0, sizeof(E_Input_Thread_Request_EClient_Data));
+
+ EINA_SAFETY_ON_NULL_RETURN(ec);
+ EINA_SAFETY_ON_NULL_RETURN(ec->hwc_window);
+
+ ec->hwc_window->is_video = is_video;
+
+ ec_data.ec = ec;
+ ec_data.is_video = is_video;
+
+ INF("[%s] ec(%p), is_video(%d)\n", __func__, ec, is_video);
+ e_input_thread_safe_call(_e_input_thread_client_video_mode_set, &ec_data, sizeof(E_Input_Thread_Request_EClient_Data));
+}
projects / platform / upstream / enlightenment.git / blobdiff