From: SooChan Lim <sc1.lim@samsung.com>
Date: Sun, 8 Jun 2025 01:59:04 +0000 (+0900)
Subject: e_client: check if client_private is null
X-Git-Tag: accepted/tizen/unified/20250612.024607~74
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f0aa038e0981bd7434d9b8f7002acd48e87c320a;p=platform%2Fupstream%2Fenlightenment.git

e_client: check if client_private is null

Change-Id: I876ae50e0108d718698caefd2d86470aa2781a3c
---

diff --git a/src/bin/core/e_client.c b/src/bin/core/e_client.c
index 06a3c7cc9c..8e11050102 100644
--- a/src/bin/core/e_client.c
+++ b/src/bin/core/e_client.c
@@ -1169,6 +1169,8 @@ e_client_resize_handle(E_Client *ec)
    int trans_x = 0, trans_y = 0;
    int trans_w = 0, trans_h = 0;
 
+   API_ENTRY;
+
    x = ec->x;
    y = ec->y;
    w = ec->w;
@@ -1282,7 +1284,7 @@ e_client_resize_handle(E_Client *ec)
 
    if (e_config->interactive_resize)
      {
-        e_view_client_geometry_set(PRI(ec)->view_client, new_x, new_y, new_w, new_h);
+        e_view_client_geometry_set(priv->view_client, new_x, new_y, new_w, new_h);
      }
    else
      {
@@ -1355,10 +1357,12 @@ _e_client_adjust_geometry_by_resize_ppu(E_Client *ec)
 EINTERN int
 e_client_resize_end(E_Client *ec)
 {
+   API_ENTRY_VAL(0);
+
    ec->resize_mode = E_POINTER_RESIZE_NONE;
    _e_client_action_input_win_del();
 
-   wl_signal_emit(&PRI(ec)->events.resize_end, NULL);
+   wl_signal_emit(&priv->events.resize_end, NULL);
    e_client_hook_call(E_CLIENT_HOOK_RESIZE_END, ec);
 
    e_comp_client_override_del(ec);
@@ -1831,15 +1835,16 @@ _e_client_cb_view_restack(struct wl_listener *listener, void *data)
 EINTERN void
 e_client_aux_hint_eval(E_Client *ec)
 {
-   if (!ec) return;
-
-   E_Comp_Wl_Client_Data *cdata = e_client_cdata_get(ec);
+   E_Comp_Wl_Client_Data *cdata;
    Eina_List *l, *ll;
    E_Comp_Wl_Aux_Hint *hint;
 
+   API_ENTRY;
+
+   cdata = e_client_cdata_get(ec);
    if (cdata && cdata->aux_hint.changed)
      {
-        wl_signal_emit(&PRI(ec)->events.aux_hint_change, NULL);
+        wl_signal_emit(&priv->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)
@@ -1865,6 +1870,8 @@ e_client_eval(E_Client *ec)
    unsigned int prop = 0;
    int tx, ty;
 
+   API_ENTRY;
+
    if (e_object_is_del(E_OBJECT(ec)))
      {
         CRI("e_client_eval(%p) with deleted border! - %d\n", ec, ec->new_client);
@@ -1874,7 +1881,7 @@ e_client_eval(E_Client *ec)
 
    TRACE_DS_BEGIN(CLIENT:EVAL);
 
-   wl_signal_emit(&PRI(ec)->events.eval_pre_new_client, NULL);
+   wl_signal_emit(&priv->events.eval_pre_new_client, NULL);
    if (!e_client_hook_call(E_CLIENT_HOOK_EVAL_PRE_NEW_CLIENT, ec))
      {
         TRACE_DS_END();
@@ -1883,7 +1890,7 @@ e_client_eval(E_Client *ec)
 
    if ((ec->new_client) && (!e_client_util_ignored_get(ec)))
      {
-        wl_signal_emit(&PRI(ec)->events.eval_post_new_client, NULL);
+        wl_signal_emit(&priv->events.eval_post_new_client, NULL);
         if (!e_client_hook_call(E_CLIENT_HOOK_EVAL_POST_NEW_CLIENT, ec))
           {
              TRACE_DS_END();
@@ -1894,7 +1901,7 @@ e_client_eval(E_Client *ec)
    if (ec->changes.size)
      {
         ec->changes.size = 0;
-        e_view_client_size_set(PRI(ec)->view_client, ec->w, ec->h);
+        e_view_client_size_set(priv->view_client, ec->w, ec->h);
 
         prop |= E_CLIENT_PROPERTY_SIZE;
      }
@@ -1903,7 +1910,7 @@ e_client_eval(E_Client *ec)
         ec->changes.tz_position = 0;
         ec->changes.pos = 0;
 
-        e_view_position_set(e_view_client_view_get(PRI(ec)->view_client), ec->x, ec->y);
+        e_view_position_set(e_view_client_view_get(priv->view_client), ec->x, ec->y);
         prop |= E_CLIENT_PROPERTY_POS;
      }
 
@@ -1950,8 +1957,8 @@ e_client_eval(E_Client *ec)
                }
           }
 
-        e_view_client_show(PRI(ec)->view_client);
-        if (e_view_client_visible_get(PRI(ec)->view_client))
+        e_view_client_show(priv->view_client);
+        if (e_view_client_visible_get(priv->view_client))
           {
              ec->changes.visible = 0;
              e_client_event_show(ec);
@@ -2019,7 +2026,7 @@ e_client_eval(E_Client *ec)
 
    e_client_transform_core_update(ec);
 
-   wl_signal_emit(&PRI(ec)->events.eval_end, NULL);
+   wl_signal_emit(&priv->events.eval_end, NULL);
    e_client_hook_call(E_CLIENT_HOOK_EVAL_END, ec);
 
    TRACE_DS_END();
@@ -2100,11 +2107,11 @@ e_client_type_update(E_Client *ec)
 EINTERN void
 e_client_parent_set(E_Client *ec, E_Client *parent_ec)
 {
-   EINA_SAFETY_ON_NULL_RETURN(ec);
+   API_ENTRY;
 
    ec->parent = parent_ec;
 
-   wl_signal_emit(&PRI(ec)->events.parent_set, parent_ec);
+   wl_signal_emit(&priv->events.parent_set, parent_ec);
 }
 
 static void
@@ -2260,10 +2267,11 @@ _e_client_transform_core_check_change(E_Client *ec)
    int w = 0;
    int h = 0;
    Eina_Bool check = EINA_FALSE;
-   if (!ec) return EINA_FALSE;
+
+   API_ENTRY_VAL(EINA_FALSE);
 
    if (ec->frame)
-     e_view_client_geometry_get(PRI(ec)->view_client, NULL, NULL, &w, &h);
+     e_view_client_geometry_get(priv->view_client, NULL, NULL, &w, &h);
 
    // check client position or size change
    if (ec->x != ec->transform_core.backup.client_x ||
@@ -2647,25 +2655,25 @@ e_client_mapped_set(E_Client *ec, Eina_Bool set)
 EINTERN void
 e_client_map_prepare(E_Client *ec)
 {
-   EINA_SAFETY_ON_NULL_RETURN(ec);
+   API_ENTRY;
 
-   wl_signal_emit(&PRI(ec)->events.map_prepare, NULL);
+   wl_signal_emit(&priv->events.map_prepare, NULL);
 }
 
 EINTERN void
 e_client_map_post(E_Client *ec)
 {
-   EINA_SAFETY_ON_NULL_RETURN(ec);
+   API_ENTRY;
 
-   wl_signal_emit(&PRI(ec)->events.map_post, NULL);
+   wl_signal_emit(&priv->events.map_post, NULL);
 }
 
 EINTERN void
 e_client_shell_remove(E_Client *ec)
 {
-   EINA_SAFETY_ON_NULL_RETURN(ec);
+   API_ENTRY;
 
-   wl_signal_emit(&PRI(ec)->events.shell_remove, NULL);
+   wl_signal_emit(&priv->events.shell_remove, NULL);
 }
 
 EINTERN void
@@ -2895,7 +2903,6 @@ e_client_new(E_Pixmap *cp, int first_map, int internal)
         return NULL;
      }
 
-
    uuid_generate(ec->uuid);
 
    ec->focus_policy_override = E_FOCUS_LAST;
@@ -3085,6 +3092,7 @@ e_client_mouse_in(E_Client *ec, int x, int y)
 {
    E_Desk *desk;
 
+   API_ENTRY;
    if (comp_grabbed) return;
    if (e_object_is_del(E_OBJECT(ec))) return;
    desk = e_comp_desk_find_by_ec(ec);
@@ -3093,7 +3101,7 @@ e_client_mouse_in(E_Client *ec, int x, int y)
    ec->mouse.current.my = y;
    ec->mouse.in = 1;
 
-   wl_signal_emit(&PRI(ec)->events.mouse_in, NULL);
+   wl_signal_emit(&priv->events.mouse_in, NULL);
 }
 
 EINTERN void
@@ -3101,6 +3109,7 @@ e_client_mouse_out(E_Client *ec, int x, int y)
 {
    E_Desk *desk;
 
+   API_ENTRY;
    if (comp_grabbed) return;
    if (ec->fullscreen) return;
    if (e_object_is_del(E_OBJECT(ec))) return;
@@ -3111,7 +3120,7 @@ e_client_mouse_out(E_Client *ec, int x, int y)
    ec->mouse.current.my = y;
    ec->mouse.in = 0;
 
-   wl_signal_emit(&PRI(ec)->events.mouse_out, NULL);
+   wl_signal_emit(&priv->events.mouse_out, NULL);
 }
 
 EINTERN void
@@ -3126,7 +3135,7 @@ e_client_mouse_wheel(E_Client *ec, Evas_Point *output, E_Event_Mouse_Wheel *ev)
 EINTERN void
 e_client_mouse_down(E_Client *ec, int button, Evas_Point *output, E_Event_Mouse_Button *ev)
 {
-   EINA_SAFETY_ON_NULL_RETURN(ec);
+   API_ENTRY;
 
    if (action_client || ec->iconic || e_client_util_ignored_get(ec)) return;
    if ((button >= 1) && (button <= 3))
@@ -3166,7 +3175,7 @@ e_client_mouse_down(E_Client *ec, int button, Evas_Point *output, E_Event_Mouse_
    ec->mouse.current.mx = output->x;
    ec->mouse.current.my = output->y;
 
-   wl_signal_emit(&PRI(ec)->events.mouse_down, NULL);
+   wl_signal_emit(&priv->events.mouse_down, NULL);
 }
 
 EINTERN void
@@ -3254,7 +3263,7 @@ e_client_res_change_geometry_restore(E_Client *ec)
       } saved;
    } pre_res_change;
 
-   E_OBJECT_CHECK(ec);
+   API_ENTRY;
    E_OBJECT_TYPE_CHECK(ec, E_CLIENT_TYPE);
    if (!ec->pre_res_change.valid) return;
    if (ec->new_client) return;
@@ -3310,7 +3319,7 @@ e_client_res_change_geometry_restore(E_Client *ec)
           x = zx + zw - w;
         if ((y + h) > (zy + zh))
           y = zy + zh - h;
-        e_view_client_geometry_set(PRI(ec)->view_client, x, y, w, h);
+        e_view_client_geometry_set(priv->view_client, x, y, w, h);
      }
    memcpy(&ec->pre_res_change, &pre_res_change, sizeof(pre_res_change));
 }
@@ -3428,7 +3437,7 @@ e_client_geometry_get(E_Client *ec, int *x, int *y, int *w, int *h)
    int gw = 0;
    int gh = 0;
 
-   E_OBJECT_CHECK(ec);
+   API_ENTRY;
    E_OBJECT_TYPE_CHECK(ec, E_CLIENT_TYPE);
 
    if (e_client_transform_core_enable_get(ec))
@@ -3442,7 +3451,7 @@ e_client_geometry_get(E_Client *ec, int *x, int *y, int *w, int *h)
      {
         if (ec->frame)
           {
-             e_view_client_geometry_get(PRI(ec)->view_client, &gx, &gy, &gw, &gh);
+             e_view_client_geometry_get(priv->view_client, &gx, &gy, &gw, &gh);
              if (gw == 0 && gh == 0)
                {
                   /* In this case, there is no image buffer in e_comp_object, thus it
@@ -3620,17 +3629,17 @@ e_client_intercept_hook_del(E_Client_Intercept_Hook *ch)
 E_API void
 e_client_focus_latest_set(E_Client *ec)
 {
-   EINA_SAFETY_ON_NULL_RETURN(ec);
+   API_ENTRY;
 
-   wl_signal_emit(&PRI(ec)->events.focus_latest_set, NULL);
+   wl_signal_emit(&priv->events.focus_latest_set, NULL);
 }
 
 E_API void
 e_client_focus_defer_set(E_Client *ec)
 {
-   EINA_SAFETY_ON_NULL_RETURN(ec);
+   API_ENTRY;
 
-   wl_signal_emit(&PRI(ec)->events.focus_defer_set, NULL);
+   wl_signal_emit(&priv->events.focus_defer_set, NULL);
 }
 
 EINTERN void
@@ -3638,7 +3647,7 @@ e_client_focused_set(E_Client *ec)
 {
    E_Zone *zone;
 
-   EINA_SAFETY_ON_NULL_RETURN(ec);
+   API_ENTRY;
 
    zone = e_comp_zone_find_by_ec(ec);
    if (!zone)
@@ -3653,7 +3662,7 @@ e_client_focused_set(E_Client *ec)
    // 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(&PRI(ec)->events.focus_set, NULL);
+   wl_signal_emit(&priv->events.focus_set, NULL);
    e_client_hook_call(E_CLIENT_HOOK_FOCUS_SET, ec);
 
    // send the client_focuse_in event
@@ -3667,7 +3676,7 @@ e_client_focused_unset(E_Client *ec)
 {
    E_Zone *zone;
 
-   EINA_SAFETY_ON_NULL_RETURN(ec);
+   API_ENTRY;
    if (e_object_is_del(E_OBJECT(ec))) return;
 
    zone = e_comp_zone_find_by_ec(ec);
@@ -3682,7 +3691,7 @@ e_client_focused_unset(E_Client *ec)
 
    // FIXME: Remove focus_unset event of client.
    //        Instead, make zone focus_unset event and use it.
-   wl_signal_emit(&PRI(ec)->events.focus_unset, NULL);
+   wl_signal_emit(&priv->events.focus_unset, NULL);
    e_client_hook_call(E_CLIENT_HOOK_FOCUS_UNSET, ec);
 
    if (e_object_ref_get(E_OBJECT(ec)) > 0)
@@ -3697,7 +3706,7 @@ e_client_focused_unset(E_Client *ec)
 EINTERN void
 e_client_activate(E_Client *ec)
 {
-   E_OBJECT_CHECK(ec);
+   API_ENTRY;
    E_OBJECT_TYPE_CHECK(ec, E_CLIENT_TYPE);
 
    TRACE_DS_BEGIN(CLIENT:ACTIVATE);
@@ -3716,7 +3725,7 @@ e_client_activate(E_Client *ec)
    ec->exp_iconify.by_client = 0;
    e_client_iconified_type_set(ec, E_ICONIFIED_TYPE_NONE);
 
-   wl_signal_emit(&PRI(ec)->events.activate_done, NULL);
+   wl_signal_emit(&priv->events.activate_done, NULL);
    e_client_hook_call(E_CLIENT_HOOK_ACTIVATE_DONE, ec);
 
    TRACE_DS_END();
@@ -3819,7 +3828,7 @@ e_client_maximize_pre_get(E_Client *ec)
 E_API void
 e_client_maximize(E_Client *ec, E_Maximize max)
 {
-   E_OBJECT_CHECK(ec);
+   API_ENTRY;
    E_OBJECT_TYPE_CHECK(ec, E_CLIENT_TYPE);
 
    if (!(max & E_MAXIMIZE_DIRECTION)) max |= E_MAXIMIZE_BOTH;
@@ -3848,7 +3857,7 @@ e_client_maximize(E_Client *ec, E_Maximize max)
    if (!ec->fullscreen)
      {
         // call the maximize hook of a client
-        wl_signal_emit(&PRI(ec)->events.maximize, &max);
+        wl_signal_emit(&priv->events.maximize, &max);
 
         // store the E_Maximize value
         ec->maximized = max;
@@ -3862,13 +3871,13 @@ e_client_maximize(E_Client *ec, E_Maximize max)
      }
 
    // call the maximize_done signal of a client
-   wl_signal_emit(&PRI(ec)->events.maximize_done, &max);
+   wl_signal_emit(&priv->events.maximize_done, &max);
 }
 
 E_API void
 e_client_unmaximize(E_Client *ec, E_Maximize max)
 {
-   E_OBJECT_CHECK(ec);
+   API_ENTRY;
    E_OBJECT_TYPE_CHECK(ec, E_CLIENT_TYPE);
 
    if (!(max & E_MAXIMIZE_DIRECTION))
@@ -3897,14 +3906,14 @@ e_client_unmaximize(E_Client *ec, E_Maximize max)
    if (!ec->fullscreen)
      {
         // call the unmaximize hook of a client
-        wl_signal_emit(&PRI(ec)->events.unmaximize, &max);
+        wl_signal_emit(&priv->events.unmaximize, &max);
      }
 
    ec->maximized = E_MAXIMIZE_NONE;
    ec->changes.need_unmaximize = 0;
 
    // call the unmaximize_done signal of a client
-   wl_signal_emit(&PRI(ec)->events.unmaximize_done, &max);
+   wl_signal_emit(&priv->events.unmaximize_done, &max);
 }
 
 static void
@@ -3981,13 +3990,13 @@ end:
 EINTERN void
 e_client_fullscreen(E_Client *ec, E_Fullscreen policy)
 {
-   E_OBJECT_CHECK(ec);
+   API_ENTRY;
    E_OBJECT_TYPE_CHECK(ec, E_CLIENT_TYPE);
 
    if (ec->fullscreen) return;
 
    // call the fullscreen_pre hook of a client
-   wl_signal_emit(&PRI(ec)->events.fullscreen_pre, NULL);
+   wl_signal_emit(&priv->events.fullscreen_pre, NULL);
    e_client_hook_call(E_CLIENT_HOOK_FULLSCREEN_PRE, ec);
 
    if (ec->skip_fullscreen) return;
@@ -4003,7 +4012,7 @@ e_client_fullscreen(E_Client *ec, E_Fullscreen policy)
    ec->fullscreen = 1;
 
    // call the fullscreen hook of a client
-   wl_signal_emit(&PRI(ec)->events.fullscreen, &policy);
+   wl_signal_emit(&priv->events.fullscreen, &policy);
 
    ec->fullscreen_policy = policy;
 
@@ -4013,7 +4022,7 @@ e_client_fullscreen(E_Client *ec, E_Fullscreen policy)
 EINTERN void
 e_client_unfullscreen(E_Client *ec)
 {
-   E_OBJECT_CHECK(ec);
+   API_ENTRY;
    E_OBJECT_TYPE_CHECK(ec, E_CLIENT_TYPE);
 
    ec->need_fullscreen = 0;
@@ -4025,7 +4034,7 @@ e_client_unfullscreen(E_Client *ec)
    E_Fullscreen policy = ec->fullscreen_policy;
 
    // call the unfullscreen hook of a client
-   wl_signal_emit(&PRI(ec)->events.unfullscreen, &policy);
+   wl_signal_emit(&priv->events.unfullscreen, &policy);
 
    e_client_layer_set(ec, ec->saved.layer);
 
@@ -4051,7 +4060,7 @@ e_client_is_parent_iconify_by_client(E_Client *ec)
 E_API void
 e_client_iconify(E_Client *ec)
 {
-   E_OBJECT_CHECK(ec);
+   API_ENTRY;
    E_OBJECT_TYPE_CHECK(ec, E_CLIENT_TYPE);
 
    E_Comp_Wl_Client_Data *cdata = e_client_cdata_get(ec);
@@ -4079,7 +4088,7 @@ e_client_iconify(E_Client *ec)
 
    TRACE_DS_BEGIN(CLIENT:ICONIFY);
 
-   wl_signal_emit(&PRI(ec)->events.iconify, NULL);
+   wl_signal_emit(&priv->events.iconify, NULL);
    e_client_hook_call(E_CLIENT_HOOK_ICONIFY, ec);
 
    TRACE_DS_END();
@@ -4090,7 +4099,7 @@ e_client_uniconify(E_Client *ec)
 {
    E_Comp_Wl_Client_Data *cdata;
 
-   E_OBJECT_CHECK(ec);
+   API_ENTRY;
    E_OBJECT_TYPE_CHECK(ec, E_CLIENT_TYPE);
 
    cdata = e_client_cdata_get(ec);
@@ -4105,7 +4114,7 @@ e_client_uniconify(E_Client *ec)
    TRACE_DS_BEGIN(CLIENT:UNICONIFY);
 
     // call the uniconify hook of a client
-   wl_signal_emit(&PRI(ec)->events.uniconify, NULL);
+   wl_signal_emit(&priv->events.uniconify, NULL);
    e_client_hook_call(E_CLIENT_HOOK_UNICONIFY, ec);
 
    TRACE_DS_END();
@@ -4178,12 +4187,12 @@ EINTERN Eina_Bool e_client_focus_check_get(E_Client *ec)
 EINTERN void
 e_client_stick(E_Client *ec)
 {
-   E_OBJECT_CHECK(ec);
+   API_ENTRY;
    E_OBJECT_TYPE_CHECK(ec, E_CLIENT_TYPE);
    if (ec->sticky) return;
 
    // call the stick hook of a client
-   wl_signal_emit(&PRI(ec)->events.stick, NULL);
+   wl_signal_emit(&priv->events.stick, NULL);
 
    // send the sticky property event of a client
    _e_client_event_property(ec, E_CLIENT_PROPERTY_STICKY);
@@ -4192,13 +4201,13 @@ e_client_stick(E_Client *ec)
 EINTERN void
 e_client_unstick(E_Client *ec)
 {
-   E_OBJECT_CHECK(ec);
+   API_ENTRY;
    E_OBJECT_TYPE_CHECK(ec, E_CLIENT_TYPE);
 
    if (!ec->sticky) return;
 
    // call the unstick hook of a client
-   wl_signal_emit(&PRI(ec)->events.unstick, NULL);
+   wl_signal_emit(&priv->events.unstick, NULL);
 
   // send the sticky property event of a client
    _e_client_event_property(ec, E_CLIENT_PROPERTY_STICKY);
@@ -4240,7 +4249,7 @@ e_client_comp_hidden_set(E_Client *ec, Eina_Bool hidden)
 EINTERN void
 e_client_act_move_keyboard(E_Client *ec)
 {
-   EINA_SAFETY_ON_NULL_RETURN(ec);
+   API_ENTRY;
 
    if (!_e_client_move_begin(ec))
      return;
@@ -4248,9 +4257,9 @@ e_client_act_move_keyboard(E_Client *ec)
    _e_client_action_init(ec);
    _e_client_action_move_timeout_add();
 
-   wl_signal_emit(&PRI(ec)->events.move_update, NULL);
+   wl_signal_emit(&priv->events.move_update, NULL);
    if (!e_client_hook_call(E_CLIENT_HOOK_MOVE_UPDATE, ec)) return;
-   e_view_freeze_events_set(e_view_client_view_get(PRI(ec)->view_client), true);
+   e_view_freeze_events_set(e_view_client_view_get(priv->view_client), true);
 
    if (!action_handler_mouse)
      action_handler_mouse = ecore_event_handler_add(ECORE_EVENT_MOUSE_BUTTON_DOWN, _e_client_move_mouse_down, NULL);
@@ -4259,7 +4268,7 @@ e_client_act_move_keyboard(E_Client *ec)
 EINTERN void
 e_client_act_resize_keyboard(E_Client *ec)
 {
-   EINA_SAFETY_ON_NULL_RETURN(ec);
+   API_ENTRY;
 
    ec->resize_mode = E_POINTER_RESIZE_TL;
    ec->keyboard_resizing = 1;
@@ -4271,7 +4280,7 @@ e_client_act_resize_keyboard(E_Client *ec)
 
    _e_client_action_init(ec);
    _e_client_action_resize_timeout_add();
-   e_view_freeze_events_set(e_view_client_view_get(PRI(ec)->view_client), true);
+   e_view_freeze_events_set(e_view_client_view_get(priv->view_client), true);
 
    if (!action_handler_mouse)
      action_handler_mouse = ecore_event_handler_add(ECORE_EVENT_MOUSE_BUTTON_DOWN, _e_client_resize_mouse_down, NULL);
@@ -4371,7 +4380,7 @@ e_client_act_resize_end(E_Client *ec, E_Event_Mouse_Button *ev EINA_UNUSED)
 EINTERN void
 e_client_act_kill_begin(E_Client *ec)
 {
-   E_OBJECT_CHECK(ec);
+   API_ENTRY;
    E_OBJECT_TYPE_CHECK(ec, E_CLIENT_TYPE);
    if (ec->internal) return;
    if (ec->lock_close) return;
@@ -4382,7 +4391,7 @@ e_client_act_kill_begin(E_Client *ec)
                                          _e_client_cb_kill_timer, ec);
      }
    else
-     wl_signal_emit(&PRI(ec)->events.kill_request, ec);
+     wl_signal_emit(&priv->events.kill_request, ec);
 }
 
 E_API void
@@ -4394,6 +4403,8 @@ e_client_cursor_map_apply(E_Client *ec, int rotation, int x, int y)
 EINTERN Eina_Bool
 e_client_resize_begin(E_Client *ec)
 {
+   API_ENTRY_VAL(EINA_FALSE);
+
    if ((ec->fullscreen) || (ec->lock_user_size))
      goto error;
    if (!_e_client_action_input_win_new()) goto error;
@@ -4405,7 +4416,7 @@ e_client_resize_begin(E_Client *ec)
         ec->manage_resize.ah = ec->h - ec->manage_resize.header_h - ec->manage_resize.footer_h;
      }
 
-   wl_signal_emit(&PRI(ec)->events.resize_begin, NULL);
+   wl_signal_emit(&priv->events.resize_begin, NULL);
    e_client_hook_call(E_CLIENT_HOOK_RESIZE_BEGIN, ec);
 
    if (!e_client_util_resizing_get(ec))
@@ -4549,17 +4560,18 @@ e_client_redirected_set(E_Client *ec, Eina_Bool set)
 {
    E_View_Client *view_client;
 
-   EINA_SAFETY_ON_NULL_RETURN(ec);
+   API_ENTRY;
+
    set = !!set;
    if (ec->redirected == set) return;
    if (set)
      {
-        wl_signal_emit(&PRI(ec)->events.redirect, NULL);
+        wl_signal_emit(&priv->events.redirect, NULL);
         if (!e_client_hook_call(E_CLIENT_HOOK_REDIRECT, ec)) return;
      }
    else
      {
-        wl_signal_emit(&PRI(ec)->events.unredirect, NULL);
+        wl_signal_emit(&priv->events.unredirect, NULL);
         if (!e_client_hook_call(E_CLIENT_HOOK_UNREDIRECT, ec)) return;
      }
 
@@ -4658,7 +4670,7 @@ e_client_transform_core_update(E_Client *ec)
 {
    E_View_Client *view_client;
 
-   if (!ec) return;
+   API_ENTRY;
    if (ec->new_client) return;
    if (!_e_client_transform_core_check_change(ec)) return;
 
@@ -4796,7 +4808,7 @@ e_client_transform_core_update(E_Client *ec)
 
         if (!e_object_is_del(E_OBJECT(ec)))
           {
-             wl_signal_emit(&PRI(ec)->events.transform_change, NULL);
+             wl_signal_emit(&priv->events.transform_change, NULL);
              e_client_hook_call(E_CLIENT_HOOK_TRANSFORM_CHANGE, ec);
           }
      }
@@ -4817,7 +4829,7 @@ e_client_transform_core_update(E_Client *ec)
 
              if (!e_object_is_del(E_OBJECT(ec)))
                {
-                  wl_signal_emit(&PRI(ec)->events.transform_change, NULL);
+                  wl_signal_emit(&priv->events.transform_change, NULL);
                   e_client_hook_call(E_CLIENT_HOOK_TRANSFORM_CHANGE, ec);
                }
           }
@@ -4919,11 +4931,11 @@ e_client_pixmap_replace(E_Client *ec, E_Pixmap *newcp)
 E_API void
 e_client_window_role_set(E_Client *ec, const char *role)
 {
-   EINA_SAFETY_ON_NULL_RETURN(ec);
+   API_ENTRY;
 
    if (eina_stringshare_replace(&ec->icccm.window_role, role))
      {
-        wl_signal_emit(&PRI(ec)->events.window_role_change, NULL);
+        wl_signal_emit(&priv->events.window_role_change, NULL);
         e_client_hook_call(E_CLIENT_HOOK_WINDOW_ROLE_CHANGE, ec);
      }
 }
@@ -5183,7 +5195,9 @@ e_client_base_output_resolution_desk_useful_geometry_get(E_Client *ec, int *x, i
 E_API E_View_Client *
 e_client_view_get(E_Client *ec)
 {
-   return PRI(ec)->view_client;
+   API_ENTRY_VAL(NULL);
+
+   return priv->view_client;
 }
 
 /* change the base_output_resolution of the bind_ec by checking the base_output_resolution of provider_ec's appinfo */
@@ -5332,18 +5346,19 @@ e_client_pending_geometry_last_geometry_get(E_Client *ec, int *x, int *y, int *w
 E_API void
 e_client_frame_focus_set(E_Client *ec, Eina_Bool focus)
 {
-   if (!ec) return;
-   e_view_client_focus_set(PRI(ec)->view_client, focus);
+   API_ENTRY;
+
+   e_view_client_focus_set(priv->view_client, focus);
 }
 
 E_API void
 e_client_frame_geometry_set(E_Client *ec, int x, int y, int w, int h)
 {
-   if (!ec) return;
+   API_ENTRY;
 
    if (ec->internal)
      {
-        e_view_client_geometry_set(PRI(ec)->view_client, x, y, w, h);
+        e_view_client_geometry_set(priv->view_client, x, y, w, h);
      }
    else
      {
@@ -5356,10 +5371,10 @@ e_client_frame_geometry_set(E_Client *ec, int x, int y, int w, int h)
                }
 
              e_client_pos_set(ec, x, y);
-             e_view_client_size_set(PRI(ec)->view_client, w, h);
+             e_view_client_size_set(priv->view_client, w, h);
           }
         else
-          e_view_client_geometry_set(PRI(ec)->view_client, x, y, w, h);
+          e_view_client_geometry_set(priv->view_client, x, y, w, h);
      }
 }
 
@@ -5522,7 +5537,7 @@ e_client_layer_set(E_Client *ec,
 {
    E_Client_Data_Layer data = {0,};
 
-   E_OBJECT_CHECK_RETURN(ec, EINA_FALSE);
+   API_ENTRY_VAL(EINA_FALSE);
    E_OBJECT_TYPE_CHECK_RETURN(ec, E_CLIENT_TYPE, EINA_FALSE);
    if (!ec->frame) return EINA_FALSE;
 
@@ -5531,7 +5546,7 @@ e_client_layer_set(E_Client *ec,
 
    data.layer = layer;
    data.result = EINA_FALSE;
-   wl_signal_emit(&PRI(ec)->events.set_layer, &data);
+   wl_signal_emit(&priv->events.set_layer, &data);
 
    return data.result;
 }
@@ -5541,11 +5556,11 @@ e_client_layer_get(E_Client *ec)
 {
    E_Client_Data_Layer data = {0,};
 
-   E_OBJECT_CHECK_RETURN(ec, E_LAYER_BOTTOM);
+   API_ENTRY_VAL(E_LAYER_BOTTOM);
    E_OBJECT_TYPE_CHECK_RETURN(ec, E_CLIENT_TYPE, E_LAYER_BOTTOM);
    if (!ec->frame) return E_LAYER_BOTTOM;
 
-   wl_signal_emit(&PRI(ec)->events.get_layer, &data);
+   wl_signal_emit(&priv->events.get_layer, &data);
 
    return data.layer;
 }
@@ -5591,14 +5606,14 @@ _raise_belong_to_parent(E_Client *ec)
 E_API void
 e_client_raise(E_Client *ec)
 {
-   if (!ec) return;
+   API_ENTRY;
 
    if (ec->parent && e_client_is_belong_to_parent(ec))
      _raise_belong_to_parent(ec);
    else
-     e_view_raise_to_top(e_view_client_view_get(PRI(ec)->view_client));
+     e_view_raise_to_top(e_view_client_view_get(priv->view_client));
 
-   wl_signal_emit(&PRI(ec)->events.raise, NULL);
+   wl_signal_emit(&priv->events.raise, NULL);
 }
 
 static void
@@ -5702,58 +5717,64 @@ _lower_belong_to_parent(E_Client *ec)
 E_API void
 e_client_lower(E_Client *ec)
 {
-   if (!ec) return;
+   API_ENTRY;
 
    if (ec->parent && e_client_is_belong_to_parent(ec))
      _lower_belong_to_parent(ec);
    else
-     e_view_lower_to_bottom(e_view_client_view_get(PRI(ec)->view_client));
+     e_view_lower_to_bottom(e_view_client_view_get(priv->view_client));
 
-   wl_signal_emit(&PRI(ec)->events.lower, NULL);
+   wl_signal_emit(&priv->events.lower, NULL);
 }
 
 E_API void
 e_client_stack_above(E_Client *ec, E_Client *above)
 {
    E_View *ec_view, *above_view;
+   E_Client_Private *above_priv;
 
-   if (!ec) return;
+   API_ENTRY;
+   above_priv = PRI(above);
+   if (!above_priv) return;
    if (!ec->frame) return;
    if (!above) return;
    if (!above->frame) return;
    if (ec == above) return;
 
-   ec_view = e_view_client_view_get(PRI(ec)->view_client);
-   above_view = e_view_client_view_get(PRI(above)->view_client);
+   ec_view = e_view_client_view_get(priv->view_client);
+   above_view = e_view_client_view_get(above_priv->view_client);
 
    if (e_view_parent_get(ec_view) != e_view_parent_get(above_view))
      e_view_reparent(ec_view, e_view_parent_get(above_view));
 
    e_view_place_above(ec_view , above_view);
 
-   wl_signal_emit(&PRI(ec)->events.stack_above, NULL);
+   wl_signal_emit(&priv->events.stack_above, NULL);
 }
 
 E_API void
 e_client_stack_below(E_Client *ec, E_Client *below)
 {
    E_View *ec_view, *below_view;
+   E_Client_Private *below_priv;
 
-   if (!ec) return;
+   API_ENTRY;
+   below_priv = PRI(below);
+   if (!below_priv) return;
    if (!ec->frame) return;
    if (!below) return;
    if (!below->frame) return;
    if (ec == below) return;
 
-   ec_view = e_view_client_view_get(PRI(ec)->view_client);
-   below_view = e_view_client_view_get(PRI(below)->view_client);
+   ec_view = e_view_client_view_get(priv->view_client);
+   below_view = e_view_client_view_get(below_priv->view_client);
 
    if (e_view_parent_get(ec_view) != e_view_parent_get(below_view))
      e_view_reparent(ec_view, e_view_parent_get(below_view));
 
    e_view_place_below(ec_view, below_view);
 
-   wl_signal_emit(&PRI(ec)->events.stack_below, NULL);
+   wl_signal_emit(&priv->events.stack_below, NULL);
 }
 
 E_API int
@@ -5769,7 +5790,7 @@ e_client_show_pending_set(E_Client *ec)
 E_API int
 e_client_show_pending_unset(E_Client *ec)
 {
-   if (!ec) return 0;
+   API_ENTRY_VAL(0);
    if (ec->show_pending.count <= 0) return 0;
 
    ec->show_pending.count--;
@@ -5780,7 +5801,7 @@ e_client_show_pending_unset(E_Client *ec)
         if (ec->frame)
           {
              ELOGF("E_CLIENT", "e_view_client_show by unset show_pending", ec);
-             e_view_client_show(PRI(ec)->view_client);
+             e_view_client_show(priv->view_client);
              EC_CHANGED(ec);
           }
      }
@@ -5859,9 +5880,9 @@ e_client_map_set(E_Client *ec, E_Map *em)
 E_API E_Map *
 e_client_map_get(E_Client *ec)
 {
-   EINA_SAFETY_ON_NULL_RETURN_VAL(ec, NULL);
+   API_ENTRY_VAL(NULL);
 
-   return e_view_client_map_get(PRI(ec)->view_client);
+   return e_view_client_map_get(priv->view_client);
 }
 
 EINTERN Eina_Bool
@@ -6020,17 +6041,17 @@ e_client_uniconify_event_send(E_Client *ec)
 EINTERN void
 e_client_stack_transient_for_done_notify(E_Client *ec)
 {
-   EINA_SAFETY_ON_NULL_RETURN(ec);
+   API_ENTRY;
 
-   wl_signal_emit(&PRI(ec)->events.stack_transient_for_done, NULL);
+   wl_signal_emit(&priv->events.stack_transient_for_done, NULL);
 }
 
 EINTERN void
 e_client_subsurface_stack_update(E_Client *ec)
 {
-   EINA_SAFETY_ON_NULL_RETURN(ec);
+   API_ENTRY;
 
-   wl_signal_emit(&PRI(ec)->events.subsurface_stack_update, ec);
+   wl_signal_emit(&priv->events.subsurface_stack_update, ec);
 }
 
 EINTERN void
@@ -6693,7 +6714,7 @@ e_client_map(E_Client *ec)
 {
    E_Comp_Wl_Data *comp_wl;
 
-   EINA_SAFETY_ON_NULL_RETURN(ec);
+   API_ENTRY;
    EINA_SAFETY_ON_NULL_RETURN(ec->comp_data);
 
    if (ec->comp_data->mapped)
@@ -6712,7 +6733,7 @@ e_client_map(E_Client *ec)
               ec, ec->internal, (ec == comp_wl->drag_client));
         ec->visible = EINA_TRUE;
         ec->ignored = 0;
-        e_view_client_show(PRI(ec)->view_client);
+        e_view_client_show(priv->view_client);
         ec->comp_data->mapped = 1;
      }
 }
@@ -6757,7 +6778,7 @@ e_client_unmap(E_Client *ec)
         ELOGF("E_CLIENT", "Unmap. internal:%d, sub:%p, drag:%d",
               ec, ec->internal, ec->comp_data->sub.data, (ec == comp_wl->drag_client));
         ec->visible = EINA_FALSE;
-        e_view_client_hide(PRI(ec)->view_client);
+        e_view_client_hide(priv->view_client);
         ec->comp_data->mapped = 0;
      }
 }