e_client: make E_API to be EINTERN

Change-Id: I3766c5008e6abde2861788c11d8f1a07e7d4c7c8

diff --git a/src/bin/e_client.c b/src/bin/e_client.c
index cfb2feb..1c766b8 100644 (file)
--- a/src/bin/e_client.c
+++ b/src/bin/e_client.c
@@ -3352,7 +3352,7 @@ _e_client_transient_for_group_make(E_Client *ec, Eina_List **list)
      }
 }
 
-E_API E_Client *
+EINTERN E_Client *
 e_client_transient_child_top_get(E_Client *ec, Eina_Bool consider_focus)
 {
    E_Client *top_ec = NULL;
@@ -4603,7 +4603,7 @@ E_API Eina_Bool e_client_is_internal(E_Client *ec)
    return ec->internal;
 }
 
-E_API Eina_Bool
+EINTERN Eina_Bool
 e_client_desk_window_profile_available_check(E_Client *ec, const char *profile)
 {
    int i;
@@ -4624,7 +4624,7 @@ e_client_desk_window_profile_available_check(E_Client *ec, const char *profile)
    return EINA_FALSE;
 }
 
-E_API void
+EINTERN void
 e_client_desk_window_profile_wait_desk_set(E_Client *ec, E_Desk *desk)
 {
    E_OBJECT_CHECK(ec);
@@ -4759,33 +4759,33 @@ e_client_desk_set(E_Client *ec, E_Desk *desk)
      }
 }
 
-E_API void
+EINTERN void
 e_client_desk_iconify_skip_set(E_Client *ec, Eina_Bool skip)
 {
    if (!ec) return;
    ec->user_skip_winlist = skip;
 }
 
-E_API Eina_Bool
+EINTERN Eina_Bool
 e_client_desk_iconify_skip_get(E_Client *ec)
 {
    if (!ec) return EINA_FALSE;
    return ec->user_skip_winlist;
 }
 
-E_API Eina_Bool
+EINTERN Eina_Bool
 e_client_comp_grabbed_get(void)
 {
    return comp_grabbed;
 }
 
-E_API E_Client *
+EINTERN E_Client *
 e_client_action_get(void)
 {
    return action_client;
 }
 
-E_API E_Client *
+EINTERN E_Client *
 e_client_warping_get(void)
 {
    return warp_client;
@@ -4794,7 +4794,7 @@ e_client_warping_get(void)
 
 //////////////////////////////////////////////////////////
 
-E_API void
+EINTERN void
 e_client_mouse_in(E_Client *ec, int x, int y)
 {
    if (comp_grabbed) return;
@@ -4808,7 +4808,7 @@ e_client_mouse_in(E_Client *ec, int x, int y)
      e_focus_event_mouse_in(ec);
 }
 
-E_API void
+EINTERN void
 e_client_mouse_out(E_Client *ec, int x, int y)
 {
    if (comp_grabbed) return;
@@ -4823,7 +4823,7 @@ e_client_mouse_out(E_Client *ec, int x, int y)
      e_focus_event_mouse_out(ec);
 }
 
-E_API void
+EINTERN void
 e_client_mouse_wheel(E_Client *ec, Evas_Point *output, E_Binding_Event_Wheel *ev)
 {
    EINA_SAFETY_ON_NULL_RETURN(ec);
@@ -4832,7 +4832,7 @@ e_client_mouse_wheel(E_Client *ec, Evas_Point *output, E_Binding_Event_Wheel *ev
    ec->mouse.current.my = output->y;
 }
 
-E_API void
+EINTERN void
 e_client_mouse_down(E_Client *ec, int button, Evas_Point *output, E_Binding_Event_Mouse_Button *ev)
 {
    EINA_SAFETY_ON_NULL_RETURN(ec);
@@ -4875,7 +4875,7 @@ e_client_mouse_down(E_Client *ec, int button, Evas_Point *output, E_Binding_Even
    ec->mouse.current.my = output->y;
 }
 
-E_API void
+EINTERN void
 e_client_mouse_up(E_Client *ec, int button, Evas_Point *output, E_Binding_Event_Mouse_Button* ev)
 {
    EINA_SAFETY_ON_NULL_RETURN(ec);
@@ -4915,7 +4915,7 @@ e_client_mouse_up(E_Client *ec, int button, Evas_Point *output, E_Binding_Event_
    ec->drag.start = 0;
 }
 
-E_API void
+EINTERN void
 e_client_stay_within_canvas_margin(E_Client *ec)
 {
    int new_x = ec->x;
@@ -4930,7 +4930,7 @@ e_client_stay_within_canvas_margin(E_Client *ec)
      }
 }
 
-E_API void
+EINTERN void
 e_client_mouse_move(E_Client *ec, Evas_Point *output)
 {
    EINA_SAFETY_ON_NULL_RETURN(ec);
@@ -4995,7 +4995,7 @@ e_client_mouse_move(E_Client *ec, Evas_Point *output)
 }
 ///////////////////////////////////////////////////////
 
-E_API void
+EINTERN void
 e_client_res_change_geometry_save(E_Client *ec)
 {
    E_OBJECT_CHECK(ec);
@@ -5013,7 +5013,7 @@ e_client_res_change_geometry_save(E_Client *ec)
    ec->pre_res_change.saved.h = ec->saved.h;
 }
 
-E_API void
+EINTERN void
 e_client_res_change_geometry_restore(E_Client *ec)
 {
    struct
@@ -5085,7 +5085,7 @@ e_client_res_change_geometry_restore(E_Client *ec)
    memcpy(&ec->pre_res_change, &pre_res_change, sizeof(pre_res_change));
 }
 
-E_API void
+EINTERN void
 e_client_zone_set(E_Client *ec, E_Zone *zone)
 {
    E_Event_Client_Zone_Set *ev;
@@ -5150,7 +5150,7 @@ e_client_zone_set(E_Client *ec, E_Zone *zone)
    ec->pre_res_change.valid = 0;
 }
 
-E_API void
+EINTERN void
 e_client_pos_set(E_Client *ec, int x, int y)
 {
    if (!ec) return;
@@ -5158,7 +5158,7 @@ e_client_pos_set(E_Client *ec, int x, int y)
    ec->y = y;
 }
 
-E_API void
+EINTERN void
 e_client_pos_get(E_Client *ec, int *x, int *y)
 {
    int ex = 0;
@@ -5391,7 +5391,7 @@ e_client_top_get(void)
    return NULL;
 }
 
-E_API unsigned int
+EINTERN unsigned int
 e_clients_count(void)
 {
    return eina_list_count(e_comp->clients);
@@ -5402,7 +5402,7 @@ e_clients_count(void)
  * Set a callback which will be called just prior to updating the
  * move coordinates for a border
  */
-E_API void
+EINTERN void
 e_client_move_intercept_cb_set(E_Client *ec, E_Client_Move_Intercept_Cb cb)
 {
    ec->move_intercept_cb = cb;
@@ -5540,7 +5540,7 @@ e_client_focus_defer_set(E_Client *ec)
    defer_focus_stack = eina_list_prepend(defer_focus_stack, ec);
 }
 
-E_API void
+EINTERN void
 e_client_focus_defer_unset(E_Client *ec)
 {
    EINA_SAFETY_ON_NULL_RETURN(ec);
@@ -5561,26 +5561,26 @@ e_client_focus_defer_clear(void)
    defer_focus_stack = eina_list_free(defer_focus_stack);
 }
 
-E_API Eina_Bool
+EINTERN Eina_Bool
 e_client_focus_track_enabled(void)
 {
    return !focus_track_frozen;
 }
 
-E_API void
+EINTERN void
 e_client_focus_track_freeze(void)
 {
    focus_track_frozen++;
 }
 
-E_API void
+EINTERN void
 e_client_focus_track_thaw(void)
 {
    if (focus_track_frozen)
      focus_track_frozen--;
 }
 
-E_API void
+EINTERN void
 e_client_refocus(void)
 {
    E_Client *ec;
@@ -5624,7 +5624,7 @@ e_client_refocus(void)
  * the last focused window should get focus).
  *
  */
-E_API void
+EINTERN void
 e_client_focus_set_with_pointer(E_Client *ec)
 {
    E_OBJECT_CHECK(ec);
@@ -5758,7 +5758,7 @@ e_client_focused_set(E_Client *ec)
    TRACE_DS_END();
 }
 
-E_API void
+EINTERN void
 e_client_activate(E_Client *ec, Eina_Bool just_do_it)
 {
    E_OBJECT_CHECK(ec);
@@ -5853,13 +5853,13 @@ e_client_focused_get(void)
    return focused;
 }
 
-E_API Eina_List *
+EINTERN Eina_List *
 e_client_focus_stack_get(void)
 {
    return focus_stack;
 }
 
-YOLO E_API void
+YOLO EINTERN void
 e_client_focus_stack_set(Eina_List *l)
 {
    focus_stack = l;
@@ -5873,7 +5873,7 @@ e_client_focus_stack_clear(void)
    focus_stack = eina_list_free(focus_stack);
 }
 
-E_API Eina_List *
+EINTERN Eina_List *
 e_client_lost_windows_get(E_Zone *zone)
 {
    Eina_List *list = NULL;
@@ -5902,7 +5902,7 @@ e_client_lost_windows_get(E_Zone *zone)
 
 ///////////////////////////////////////
 
-E_API void
+EINTERN void
 e_client_shade(E_Client *ec, E_Direction dir)
 {
    E_OBJECT_CHECK(ec);
@@ -5919,7 +5919,7 @@ e_client_shade(E_Client *ec, E_Direction dir)
    evas_object_smart_callback_call(ec->frame, "shaded", (uintptr_t*)dir);
 }
 
-E_API void
+EINTERN void
 e_client_unshade(E_Client *ec, E_Direction dir)
 {
    E_OBJECT_CHECK(ec);
@@ -6154,7 +6154,7 @@ e_client_unmaximize(E_Client *ec, E_Maximize max)
    ec->changes.need_unmaximize = 0;
 }
 
-E_API void
+EINTERN void
 e_client_fullscreen(E_Client *ec, E_Fullscreen policy)
 {
    int x, y, w, h;
@@ -6228,7 +6228,7 @@ e_client_fullscreen(E_Client *ec, E_Fullscreen policy)
    _e_client_event_simple(ec, E_EVENT_CLIENT_FULLSCREEN);
 }
 
-E_API void
+EINTERN void
 e_client_unfullscreen(E_Client *ec)
 {
    E_OBJECT_CHECK(ec);
@@ -6445,7 +6445,7 @@ e_client_iconified_type_set(E_Client *ec, E_Iconified_Type type)
    ec->exp_iconify.type = type;
 }
 
-E_API E_Iconified_Type
+EINTERN E_Iconified_Type
 e_client_iconified_type_get(E_Client *ec)
 {
    if (!ec) return E_ICONIFIED_TYPE_NONE;
@@ -6473,7 +6473,7 @@ E_API Eina_Bool e_client_is_iconified_by_client(E_Client *ec)
 
 ///////////////////////////////////////
 
-E_API void
+EINTERN void
 e_client_urgent_set(E_Client *ec, Eina_Bool urgent)
 {
    E_OBJECT_CHECK(ec);
@@ -6498,7 +6498,7 @@ e_client_urgent_set(E_Client *ec, Eina_Bool urgent)
 
 ///////////////////////////////////////
 
-E_API void
+EINTERN void
 e_client_stick(E_Client *ec)
 {
    E_Desk *desk;
@@ -6529,7 +6529,7 @@ e_client_stick(E_Client *ec)
    _e_client_event_property(ec, E_CLIENT_PROPERTY_STICKY);
 }
 
-E_API void
+EINTERN void
 e_client_unstick(E_Client *ec)
 {
    E_Desk *desk;
@@ -6561,7 +6561,7 @@ e_client_unstick(E_Client *ec)
    e_client_desk_set(ec, e_desk_current_get(ec->zone));
 }
 
-E_API void
+EINTERN void
 e_client_pinned_set(E_Client *ec, Eina_Bool set)
 {
    E_Layer layer;
@@ -6579,7 +6579,7 @@ e_client_pinned_set(E_Client *ec, Eina_Bool set)
 
 ///////////////////////////////////////
 
-E_API Eina_Bool
+EINTERN Eina_Bool
 e_client_border_set(E_Client *ec, const char *name)
 {
    Eina_Stringshare *pborder;
@@ -6609,7 +6609,7 @@ e_client_border_set(E_Client *ec, const char *name)
 
 ///////////////////////////////////////
 
-E_API void
+EINTERN void
 e_client_comp_hidden_set(E_Client *ec, Eina_Bool hidden)
 {
    E_OBJECT_CHECK(ec);
@@ -6624,7 +6624,7 @@ e_client_comp_hidden_set(E_Client *ec, Eina_Bool hidden)
 
 ///////////////////////////////////////
 
-E_API void
+EINTERN void
 e_client_act_move_keyboard(E_Client *ec)
 {
    EINA_SAFETY_ON_NULL_RETURN(ec);
@@ -6642,7 +6642,7 @@ e_client_act_move_keyboard(E_Client *ec)
      action_handler_mouse = ecore_event_handler_add(ECORE_EVENT_MOUSE_BUTTON_DOWN, _e_client_move_mouse_down, NULL);
 }
 
-E_API void
+EINTERN void
 e_client_act_resize_keyboard(E_Client *ec)
 {
    EINA_SAFETY_ON_NULL_RETURN(ec);
@@ -6664,7 +6664,7 @@ e_client_act_resize_keyboard(E_Client *ec)
      action_handler_mouse = ecore_event_handler_add(ECORE_EVENT_MOUSE_BUTTON_DOWN, _e_client_resize_mouse_down, NULL);
 }
 
-E_API void
+EINTERN void
 e_client_act_move_begin(E_Client *ec, E_Binding_Event_Mouse_Button *ev)
 {
    E_OBJECT_CHECK(ec);
@@ -6685,7 +6685,7 @@ e_client_act_move_begin(E_Client *ec, E_Binding_Event_Mouse_Button *ev)
    e_zone_edge_disable();
 }
 
-E_API void
+EINTERN void
 e_client_act_move_end(E_Client *ec, E_Binding_Event_Mouse_Button *ev EINA_UNUSED)
 {
    E_OBJECT_CHECK(ec);
@@ -6698,7 +6698,7 @@ e_client_act_move_end(E_Client *ec, E_Binding_Event_Mouse_Button *ev EINA_UNUSED
    _e_client_action_finish();
 }
 
-E_API void
+EINTERN void
 e_client_act_resize_begin(E_Client *ec, E_Binding_Event_Mouse_Button *ev, E_Pointer_Mode resize_mode)
 {
    E_OBJECT_CHECK(ec);
@@ -6746,7 +6746,7 @@ e_client_act_resize_begin(E_Client *ec, E_Binding_Event_Mouse_Button *ev, E_Poin
    _e_client_action_init(ec);
 }
 
-E_API void
+EINTERN void
 e_client_act_resize_end(E_Client *ec, E_Binding_Event_Mouse_Button *ev EINA_UNUSED)
 {
    E_OBJECT_CHECK(ec);
@@ -6762,7 +6762,7 @@ e_client_act_resize_end(E_Client *ec, E_Binding_Event_Mouse_Button *ev EINA_UNUS
    _e_client_action_finish();
 }
 
-E_API void
+EINTERN void
 e_client_act_menu_begin(E_Client *ec, E_Binding_Event_Mouse_Button *ev, int key)
 {
    E_OBJECT_CHECK(ec);
@@ -6770,7 +6770,7 @@ e_client_act_menu_begin(E_Client *ec, E_Binding_Event_Mouse_Button *ev, int key)
    if (!ec->zone) return;
 }
 
-E_API void
+EINTERN void
 e_client_act_close_begin(E_Client *ec)
 {
    E_OBJECT_CHECK(ec);
@@ -6788,7 +6788,7 @@ e_client_act_close_begin(E_Client *ec)
      }
 }
 
-E_API void
+EINTERN void
 e_client_act_kill_begin(E_Client *ec)
 {
    E_OBJECT_CHECK(ec);
@@ -6808,7 +6808,7 @@ e_client_act_kill_begin(E_Client *ec)
 
 ////////////////////////////////////////////
 
-E_API void
+EINTERN void
 e_client_ping(E_Client *ec)
 {
    E_OBJECT_CHECK(ec);
@@ -6834,7 +6834,7 @@ e_client_cursor_map_apply(E_Client *ec, int rotation, int x, int y)
    // TODO: remove(deprecate) this e_client_cursor_map_apply.
 }
 
-E_API void
+EINTERN void
 e_client_move_cancel(void)
 {
    if (!ecmove) return;
@@ -6856,7 +6856,7 @@ e_client_move_cancel(void)
      _e_client_move_end(ecmove);
 }
 
-E_API void
+EINTERN void
 e_client_resize_cancel(void)
 {
    if (!ecresize) return;
@@ -6878,7 +6878,7 @@ e_client_resize_cancel(void)
      _e_client_resize_end(ecresize);
 }
 
-E_API Eina_Bool
+EINTERN Eina_Bool
 e_client_resize_begin(E_Client *ec)
 {
    if ((ec->shaded) || (ec->shading) ||
@@ -6919,7 +6919,7 @@ error:
 
 ////////////////////////////////////////////
 
-E_API void
+EINTERN void
 e_client_frame_recalc(E_Client *ec)
 {
    EINA_SAFETY_ON_NULL_RETURN(ec);
@@ -6929,7 +6929,7 @@ e_client_frame_recalc(E_Client *ec)
 
 ////////////////////////////////////////////
 
-E_API void
+EINTERN void
 e_client_signal_move_begin(E_Client *ec, const char *sig, const char *src EINA_UNUSED)
 {
    E_OBJECT_CHECK(ec);
@@ -6942,7 +6942,7 @@ e_client_signal_move_begin(E_Client *ec, const char *sig, const char *src EINA_U
    e_zone_edge_disable();
 }
 
-E_API void
+EINTERN void
 e_client_signal_move_end(E_Client *ec, const char *sig EINA_UNUSED, const char *src EINA_UNUSED)
 {
    E_OBJECT_CHECK(ec);
@@ -6954,7 +6954,7 @@ e_client_signal_move_end(E_Client *ec, const char *sig EINA_UNUSED, const char *
    e_zone_flip_coords_handle(ec->zone, -1, -1);
 }
 
-E_API void
+EINTERN void
 e_client_signal_resize_begin(E_Client *ec, const char *dir, const char *sig, const char *src EINA_UNUSED)
 {
    int resize_mode = E_POINTER_RESIZE_BR;
@@ -7001,7 +7001,7 @@ e_client_signal_resize_begin(E_Client *ec, const char *dir, const char *sig, con
      return;
 }
 
-E_API void
+EINTERN void
 e_client_signal_resize_end(E_Client *ec, const char *dir EINA_UNUSED, const char *sig EINA_UNUSED, const char *src EINA_UNUSED)
 {
    E_OBJECT_CHECK(ec);
@@ -7015,7 +7015,7 @@ e_client_signal_resize_end(E_Client *ec, const char *dir EINA_UNUSED, const char
 
 ////////////////////////////////////////////
 
-E_API void
+EINTERN void
 e_client_resize_limit(E_Client *ec, int *w, int *h)
 {
    double a;
@@ -7112,7 +7112,7 @@ e_client_resize_limit(E_Client *ec, int *w, int *h)
 
 
 
-E_API E_Client *
+EINTERN E_Client *
 e_client_under_pointer_get(E_Desk *desk, E_Client *exclude)
 {
    int x, y;
@@ -7181,7 +7181,7 @@ e_client_input_rect_under_pointer_get(E_Desk *desk, E_Client *exclude)
 
 ////////////////////////////////////////////
 
-E_API int
+EINTERN int
 e_client_pointer_warp_to_center_now(E_Client *ec)
 {
    if (warp_client == ec)
@@ -7198,7 +7198,7 @@ e_client_pointer_warp_to_center_now(E_Client *ec)
    return 1;
 }
 
-E_API int
+EINTERN int
 e_client_pointer_warp_to_center(E_Client *ec)
 {
    int x, y;
@@ -7268,7 +7268,7 @@ e_client_redirected_set(E_Client *ec, Eina_Bool set)
 
 ////////////////////////////////////////////
 
-E_API Eina_Bool
+EINTERN Eina_Bool
 e_client_is_stacking(const E_Client *ec)
 {
    return e_comp->layers[e_comp_canvas_layer_map(ec->layer)].obj == ec->frame;
@@ -7276,7 +7276,7 @@ e_client_is_stacking(const E_Client *ec)
 
 ////////////////////////////////////////////
 
-E_API void
+EINTERN void
 e_client_layout_cb_set(E_Client_Layout_Cb cb)
 {
    if (_e_client_layout_cb && cb)
@@ -7295,7 +7295,7 @@ e_client_transform_update(E_Client *ec)
 
 ////////////////////////////////////////////
 
-E_API void
+EINTERN void
 e_client_transform_apply(E_Client *ec, double angle, double zoom, int cx, int cy)
 {
    E_Map *map;
@@ -7360,7 +7360,7 @@ e_client_transform_apply(E_Client *ec, double angle, double zoom, int cx, int cy
 
 ////////////////////////////////////////////
 
-E_API void
+EINTERN void
 e_client_transform_clear(E_Client *ec)
 {
    E_Comp_Wl_Client_Data *cdata = e_client_cdata_get(ec);
@@ -7621,7 +7621,7 @@ e_client_transform_core_input_inv_transform(E_Client *ec, int x, int y, int *out
    e_util_transform_vertex_pos_round_get(&result_vertex, out_x, out_y, NULL, NULL);
 }
 
-E_API void
+EINTERN void
 e_client_transform_core_input_inv_rect_transform(E_Client *ec, int x, int y, int *out_x, int *out_y)
 {
    int gw = 0, gh = 0;
@@ -7648,7 +7648,7 @@ e_client_transform_core_direct_render_set(E_Client *ec, Eina_Bool set)
    e_client_transform_core_update(ec);
 }
 
-E_API E_Pixmap *
+EINTERN E_Pixmap *
 e_client_pixmap_change(E_Client *ec, E_Pixmap *newcp)
 {
    E_Pixmap_Type oldtype, newtype;
@@ -7687,7 +7687,7 @@ e_client_window_role_set(E_Client *ec, const char *role)
      _e_client_hook_call(E_CLIENT_HOOK_WINDOW_ROLE_CHANGE, ec);
 }
 
-E_API Eina_Bool
+EINTERN Eina_Bool
 e_client_key_send(E_Client *ec, int keycode, Eina_Bool pressed, Ecore_Device *dev, unsigned int time)
 {
    Eina_Bool res;
@@ -7697,7 +7697,7 @@ e_client_key_send(E_Client *ec, int keycode, Eina_Bool pressed, Ecore_Device *de
    return res;
 }
 
-E_API Eina_Bool
+EINTERN Eina_Bool
 e_client_key_cancel(E_Client *ec, int keycode, Ecore_Device *dev, unsigned int time)
 {
    Eina_Bool res;
@@ -7707,7 +7707,7 @@ e_client_key_cancel(E_Client *ec, int keycode, Ecore_Device *dev, unsigned int t
    return res;
 }
 
-E_API Eina_Bool
+EINTERN Eina_Bool
 e_client_touch_send(E_Client *ec, int idx, int x, int y, Eina_Bool pressed, Ecore_Device *dev, double radius_x, double radius_y, double pressure, double angle, unsigned int time)
 {
    Eina_Bool res;
@@ -7717,7 +7717,7 @@ e_client_touch_send(E_Client *ec, int idx, int x, int y, Eina_Bool pressed, Ecor
    return res;
 }
 
-E_API Eina_Bool
+EINTERN Eina_Bool
 e_client_touch_update_send(E_Client *ec, int idx, int x, int y, Ecore_Device *dev, double radius_x, double radius_y, double pressure, double angle, unsigned int time)
 {
    Eina_Bool res;
@@ -7727,7 +7727,7 @@ e_client_touch_update_send(E_Client *ec, int idx, int x, int y, Ecore_Device *de
    return res;
 }
 
-E_API Eina_Bool
+EINTERN Eina_Bool
 e_client_touch_cancel_send(E_Client *ec)
 {
    Eina_Bool res;
@@ -7737,7 +7737,7 @@ e_client_touch_cancel_send(E_Client *ec)
    return res;
 }
 
-E_API Eina_Bool
+EINTERN Eina_Bool
 e_client_mouse_button_send(E_Client *ec, int buttons, Eina_Bool pressed, Ecore_Device *dev, unsigned int time)
 {
    Eina_Bool res;
@@ -7747,7 +7747,7 @@ e_client_mouse_button_send(E_Client *ec, int buttons, Eina_Bool pressed, Ecore_D
    return res;
 }
 
-E_API Eina_Bool
+EINTERN Eina_Bool
 e_client_mouse_move_send(E_Client *ec, int x, int y, Ecore_Device *dev, unsigned int time)
 {
    Eina_Bool res;
@@ -7757,7 +7757,7 @@ e_client_mouse_move_send(E_Client *ec, int x, int y, Ecore_Device *dev, unsigned
    return res;
 }
 
-E_API Eina_Bool
+EINTERN Eina_Bool
 e_client_mouse_wheel_send(E_Client *ec, int direction, int z, Ecore_Device *dev, unsigned int time)
 {
    Eina_Bool res;
@@ -7767,7 +7767,7 @@ e_client_mouse_wheel_send(E_Client *ec, int direction, int z, Ecore_Device *dev,
    return res;
 }
 
-E_API Eina_Bool
+EINTERN Eina_Bool
 e_client_mouse_in_send(E_Client *ec, int x, int y, Ecore_Device *dev, unsigned int time)
 {
    Eina_Bool res;
@@ -7777,7 +7777,7 @@ e_client_mouse_in_send(E_Client *ec, int x, int y, Ecore_Device *dev, unsigned i
    return res;
 }
 
-E_API Eina_Bool
+EINTERN Eina_Bool
 e_client_mouse_out_send(E_Client *ec, Ecore_Device *dev, unsigned int time)
 {
    Eina_Bool res;
@@ -7816,7 +7816,7 @@ e_client_visibility_force_obscured_set(E_Client *ec, Eina_Bool set)
    e_client_visibility_calculate();
 }
 
-E_API E_Capture_Save_State
+EINTERN E_Capture_Save_State
 e_client_image_save(E_Client *ec, const char *dir, const char *name, E_Capture_Client_Save_End_Cb func_end, void *data, Eina_Bool skip_child)
 {
    return e_comp_wl_capture_client_image_save(ec, dir, name, func_end, data, skip_child);
@@ -8138,7 +8138,7 @@ e_client_frame_focus_set(E_Client *ec, Eina_Bool focus)
    evas_object_focus_set(ec->frame, focus);
 }
 
-E_API void
+EINTERN void
 e_client_frame_geometry_set(E_Client *ec, int x, int y, int w, int h)
 {
    if (!ec) return;
@@ -8752,7 +8752,7 @@ e_client_cdata_get(E_Client *ec)
    return ec->comp_data;
 }
 
-E_API Eina_Bool
+EINTERN Eina_Bool
 e_client_map_set(E_Client *ec, E_Map *em)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(ec, EINA_FALSE);
@@ -8768,7 +8768,7 @@ e_client_map_get(const E_Client *ec)
    return e_map_get_from_comp_object(ec->frame);
 }
 
-E_API Eina_Bool
+EINTERN Eina_Bool
 e_client_map_enable_set(E_Client *ec, Eina_Bool enable)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(ec, EINA_FALSE);
@@ -8786,14 +8786,14 @@ e_client_belong_to_parent_set(E_Client *ec, Eina_Bool set)
    ec->belong_to_parent = set;
 }
 
-E_API Eina_Bool
+EINTERN Eina_Bool
 e_client_is_belong_to_parent(E_Client *ec)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(ec, EINA_FALSE);
    return ec->belong_to_parent;
 }
 
-E_API void
+EINTERN void
 e_client_transient_policy_set(E_Client *ec, E_Transient policy)
 {
    if (!ec) return;
@@ -8807,7 +8807,7 @@ e_client_transient_policy_get(E_Client *ec)
    return ec->transient_policy;
 }
 
-E_API void
+EINTERN void
 e_client_resize_object_create_cb_set(E_Client_Resize_Object_Create_Cb cb)
 {
    if (_e_client_resize_object_create_cb && cb)
@@ -8815,7 +8815,7 @@ e_client_resize_object_create_cb_set(E_Client_Resize_Object_Create_Cb cb)
    _e_client_resize_object_create_cb = cb;
 }
 
-E_API void
+EINTERN void
 e_client_resize_unit_size_set(E_Client *ec, unsigned int unit_size)
 {
    if (!ec) return;
@@ -8845,7 +8845,7 @@ e_client_layout_apply(E_Client *ec, Eina_Bool apply)
    ec->apply_layout = apply;
 }
 
-E_API Eina_Bool
+EINTERN Eina_Bool
 e_client_is_layout_apply(E_Client *ec)
 {
    if (!ec) return EINA_FALSE;

diff --git a/src/bin/e_client.h b/src/bin/e_client.h
index f442a9f..0521345 100644 (file)
--- a/src/bin/e_client.h
+++ b/src/bin/e_client.h
@@ -1102,22 +1102,22 @@ E_API E_Client *e_client_new(E_Pixmap *cp, int first_map, int internal);
 E_API Eina_Bool e_client_is_internal(E_Client *ec);
 E_API void e_client_unignore(E_Client *ec);
 E_API void e_client_desk_set(E_Client *ec, E_Desk *desk);
-E_API void e_client_desk_iconify_skip_set(E_Client *ec, Eina_Bool skip);
-E_API Eina_Bool e_client_desk_iconify_skip_get(E_Client *ec);
-E_API Eina_Bool e_client_comp_grabbed_get(void);
-E_API E_Client *e_client_action_get(void);
-E_API E_Client *e_client_warping_get(void);
-E_API void e_client_mouse_in(E_Client *ec, int x, int y);
-E_API void e_client_mouse_out(E_Client *ec, int x, int y);
-E_API void e_client_mouse_wheel(E_Client *ec, Evas_Point *output, E_Binding_Event_Wheel *ev);
-E_API void e_client_mouse_down(E_Client *ec, int button, Evas_Point *output, E_Binding_Event_Mouse_Button *ev);
-E_API void e_client_mouse_up(E_Client *ec, int button, Evas_Point *output, E_Binding_Event_Mouse_Button* ev);
-E_API void e_client_mouse_move(E_Client *ec, Evas_Point *output);
-E_API void e_client_res_change_geometry_save(E_Client *bd);
-E_API void e_client_res_change_geometry_restore(E_Client *ec);
-E_API void e_client_zone_set(E_Client *ec, E_Zone *zone);
-E_API void e_client_pos_set(E_Client *ec, int x, int y);
-E_API void e_client_pos_get(E_Client *ec, int *x, int *y);
+EINTERN void e_client_desk_iconify_skip_set(E_Client *ec, Eina_Bool skip);
+EINTERN Eina_Bool e_client_desk_iconify_skip_get(E_Client *ec);
+EINTERN Eina_Bool e_client_comp_grabbed_get(void);
+EINTERN E_Client *e_client_action_get(void);
+EINTERN E_Client *e_client_warping_get(void);
+EINTERN void e_client_mouse_in(E_Client *ec, int x, int y);
+EINTERN void e_client_mouse_out(E_Client *ec, int x, int y);
+EINTERN void e_client_mouse_wheel(E_Client *ec, Evas_Point *output, E_Binding_Event_Wheel *ev);
+EINTERN void e_client_mouse_down(E_Client *ec, int button, Evas_Point *output, E_Binding_Event_Mouse_Button *ev);
+EINTERN void e_client_mouse_up(E_Client *ec, int button, Evas_Point *output, E_Binding_Event_Mouse_Button* ev);
+EINTERN void e_client_mouse_move(E_Client *ec, Evas_Point *output);
+EINTERN void e_client_res_change_geometry_save(E_Client *bd);
+EINTERN void e_client_res_change_geometry_restore(E_Client *ec);
+EINTERN void e_client_zone_set(E_Client *ec, E_Zone *zone);
+EINTERN void e_client_pos_set(E_Client *ec, int x, int y);
+EINTERN void e_client_pos_get(E_Client *ec, int *x, int *y);
 E_API void e_client_size_set(E_Client *ec, int w, int h);
 E_API void e_client_size_get(E_Client *ec, int *w, int *h);
 E_API void e_client_geometry_get(E_Client *ec, int *x, int *y, int *w, int *h);
@@ -1125,8 +1125,8 @@ E_API E_Client *e_client_above_get(const E_Client *ec);
 E_API E_Client *e_client_below_get(const E_Client *ec);
 E_API E_Client *e_client_bottom_get(void);
 E_API E_Client *e_client_top_get(void);
-E_API unsigned int e_clients_count(void);
-E_API void e_client_move_intercept_cb_set(E_Client *ec, E_Client_Move_Intercept_Cb cb);
+EINTERN unsigned int e_clients_count(void);
+EINTERN void e_client_move_intercept_cb_set(E_Client *ec, E_Client_Move_Intercept_Cb cb);
 E_API E_Client_Hook *e_client_hook_add(E_Client_Hook_Point hookpoint, E_Client_Hook_Cb func, const void *data);
 E_API void e_client_hook_del(E_Client_Hook *ch);
 E_API E_Client_Intercept_Hook *e_client_intercept_hook_add(E_Client_Intercept_Hook_Point hookpoint, E_Client_Intercept_Hook_Cb func, const void *data);
@@ -1136,69 +1136,68 @@ EINTERN void e_client_focus_stack_lower(E_Client *ec);
 E_API void e_client_focus_latest_set(E_Client *ec);
 EINTERN void e_client_focus_stack_append_current_focused(E_Client *ec);
 E_API void e_client_focus_defer_set(E_Client *ec);
-E_API void e_client_focus_defer_unset(E_Client *ec);
+EINTERN void e_client_focus_defer_unset(E_Client *ec);
 EINTERN void e_client_focus_defer_clear(void);
-E_API Eina_Bool e_client_focus_track_enabled(void);
-E_API void e_client_focus_track_freeze(void);
-E_API void e_client_focus_track_thaw(void);
-E_API void e_client_refocus(void);
-E_API void e_client_focus_set_with_pointer(E_Client *ec);
-E_API void e_client_activate(E_Client *ec, Eina_Bool just_do_it);
+EINTERN Eina_Bool e_client_focus_track_enabled(void);
+EINTERN void e_client_focus_track_freeze(void);
+EINTERN void e_client_focus_track_thaw(void);
+EINTERN void e_client_refocus(void);
+EINTERN void e_client_focus_set_with_pointer(E_Client *ec);
+EINTERN void e_client_activate(E_Client *ec, Eina_Bool just_do_it);
 E_API E_Client *e_client_focused_get(void);
-E_API Eina_List *e_client_focus_stack_get(void);
+EINTERN Eina_List *e_client_focus_stack_get(void);
 EINTERN void e_client_focus_stack_clear(void);
-E_API Eina_List *e_client_lost_windows_get(E_Zone *zone);
-E_API void e_client_shade(E_Client *ec, E_Direction dir);
-E_API void e_client_unshade(E_Client *ec, E_Direction dir);
+EINTERN Eina_List *e_client_lost_windows_get(E_Zone *zone);
+EINTERN void e_client_shade(E_Client *ec, E_Direction dir);
+EINTERN void e_client_unshade(E_Client *ec, E_Direction dir);
 EINTERN void e_client_maximized_geometry_set(E_Client *ec, int x, int y, int w, int h);
 EINTERN void e_client_maximized_geometry_get(E_Client *ec, int *x, int *y, int *w, int *h);
 EINTERN void e_client_maximize_update(E_Client *ec);
 E_API void e_client_maximize(E_Client *ec, E_Maximize max);
 E_API void e_client_unmaximize(E_Client *ec, E_Maximize max);
-E_API void e_client_fullscreen(E_Client *ec, E_Fullscreen policy);
-E_API void e_client_unfullscreen(E_Client *ec);
+EINTERN void e_client_fullscreen(E_Client *ec, E_Fullscreen policy);
+EINTERN void e_client_unfullscreen(E_Client *ec);
 E_API void e_client_iconify(E_Client *ec);
 E_API void e_client_uniconify(E_Client *ec);
 E_API void e_client_iconified_type_set(E_Client *ec, E_Iconified_Type type);
-E_API E_Iconified_Type e_client_iconified_type_get(E_Client *ec);
+EINTERN E_Iconified_Type e_client_iconified_type_get(E_Client *ec);
 E_API Eina_Bool e_client_is_iconified_by_client(E_Client *ec);
-E_API void e_client_urgent_set(E_Client *ec, Eina_Bool urgent);
-E_API void e_client_stick(E_Client *ec);
-E_API void e_client_unstick(E_Client *ec);
-E_API void e_client_pinned_set(E_Client *ec, Eina_Bool set);
-E_API void e_client_comp_hidden_set(E_Client *ec, Eina_Bool hidden);
-E_API Eina_Bool e_client_border_set(E_Client *ec, const char *name);
-E_API void e_client_act_move_keyboard(E_Client *ec);
-E_API void e_client_act_resize_keyboard(E_Client *ec);
-E_API void e_client_act_move_begin(E_Client *ec, E_Binding_Event_Mouse_Button *ev);
-E_API void e_client_act_move_end(E_Client *ec, E_Binding_Event_Mouse_Button *ev EINA_UNUSED);
-E_API void e_client_act_resize_begin(E_Client *ec, E_Binding_Event_Mouse_Button *ev, E_Pointer_Mode resize_mode);
-E_API void e_client_act_resize_end(E_Client *ec, E_Binding_Event_Mouse_Button *ev EINA_UNUSED);
-E_API void e_client_act_menu_begin(E_Client *ec, E_Binding_Event_Mouse_Button *ev, int key);
-E_API void e_client_act_close_begin(E_Client *ec);
-E_API void e_client_act_kill_begin(E_Client *ec);
-E_API Evas_Object *e_client_icon_add(E_Client *ec, Evas *evas);
-E_API void e_client_ping(E_Client *cw);
-E_API void e_client_move_cancel(void);
-E_API void e_client_resize_cancel(void);
-E_API Eina_Bool e_client_resize_begin(E_Client *ec);
-E_API void e_client_frame_recalc(E_Client *ec);
-E_API void e_client_signal_move_begin(E_Client *ec, const char *sig, const char *src EINA_UNUSED);
-E_API void e_client_signal_move_end(E_Client *ec, const char *sig EINA_UNUSED, const char *src EINA_UNUSED);
-E_API void e_client_signal_resize_begin(E_Client *ec, const char *dir, const char *sig, const char *src EINA_UNUSED);
-E_API void e_client_signal_resize_end(E_Client *ec, const char *dir EINA_UNUSED, const char *sig EINA_UNUSED, const char *src EINA_UNUSED);
-E_API void e_client_resize_limit(E_Client *ec, int *w, int *h);
-E_API E_Client *e_client_under_pointer_get(E_Desk *desk, E_Client *exclude);
+EINTERN void e_client_urgent_set(E_Client *ec, Eina_Bool urgent);
+EINTERN void e_client_stick(E_Client *ec);
+EINTERN void e_client_unstick(E_Client *ec);
+EINTERN void e_client_pinned_set(E_Client *ec, Eina_Bool set);
+EINTERN void e_client_comp_hidden_set(E_Client *ec, Eina_Bool hidden);
+EINTERN Eina_Bool e_client_border_set(E_Client *ec, const char *name);
+EINTERN void e_client_act_move_keyboard(E_Client *ec);
+EINTERN void e_client_act_resize_keyboard(E_Client *ec);
+EINTERN void e_client_act_move_begin(E_Client *ec, E_Binding_Event_Mouse_Button *ev);
+EINTERN void e_client_act_move_end(E_Client *ec, E_Binding_Event_Mouse_Button *ev EINA_UNUSED);
+EINTERN void e_client_act_resize_begin(E_Client *ec, E_Binding_Event_Mouse_Button *ev, E_Pointer_Mode resize_mode);
+EINTERN void e_client_act_resize_end(E_Client *ec, E_Binding_Event_Mouse_Button *ev EINA_UNUSED);
+EINTERN void e_client_act_menu_begin(E_Client *ec, E_Binding_Event_Mouse_Button *ev, int key);
+EINTERN void e_client_act_close_begin(E_Client *ec);
+EINTERN void e_client_act_kill_begin(E_Client *ec);
+EINTERN void e_client_ping(E_Client *cw);
+EINTERN void e_client_move_cancel(void);
+EINTERN void e_client_resize_cancel(void);
+EINTERN Eina_Bool e_client_resize_begin(E_Client *ec);
+EINTERN void e_client_frame_recalc(E_Client *ec);
+EINTERN void e_client_signal_move_begin(E_Client *ec, const char *sig, const char *src EINA_UNUSED);
+EINTERN void e_client_signal_move_end(E_Client *ec, const char *sig EINA_UNUSED, const char *src EINA_UNUSED);
+EINTERN void e_client_signal_resize_begin(E_Client *ec, const char *dir, const char *sig, const char *src EINA_UNUSED);
+EINTERN void e_client_signal_resize_end(E_Client *ec, const char *dir EINA_UNUSED, const char *sig EINA_UNUSED, const char *src EINA_UNUSED);
+EINTERN void e_client_resize_limit(E_Client *ec, int *w, int *h);
+EINTERN E_Client *e_client_under_pointer_get(E_Desk *desk, E_Client *exclude);
 E_API E_Client *e_client_under_position_get(E_Desk *desk, int x, int y, E_Client *exclude);
 EINTERN E_Client *e_client_input_rect_under_pointer_get(E_Desk *desk, E_Client *exclude);
-E_API int e_client_pointer_warp_to_center_now(E_Client *ec);
-E_API int e_client_pointer_warp_to_center(E_Client *ec);
+EINTERN int e_client_pointer_warp_to_center_now(E_Client *ec);
+EINTERN int e_client_pointer_warp_to_center(E_Client *ec);
 E_API void e_client_redirected_set(E_Client *ec, Eina_Bool set);
-E_API Eina_Bool e_client_is_stacking(const E_Client *ec);
-E_API Eina_Bool e_client_desk_window_profile_available_check(E_Client *ec, const char *profile);
-E_API void      e_client_desk_window_profile_wait_desk_set(E_Client *ec, E_Desk *desk);
-E_API void      e_client_layout_cb_set(E_Client_Layout_Cb cb);
-E_API E_Client *e_client_transient_child_top_get(E_Client *ec, Eina_Bool consider_focus);
+EINTERN Eina_Bool e_client_is_stacking(const E_Client *ec);
+EINTERN Eina_Bool e_client_desk_window_profile_available_check(E_Client *ec, const char *profile);
+EINTERN void      e_client_desk_window_profile_wait_desk_set(E_Client *ec, E_Desk *desk);
+EINTERN void      e_client_layout_cb_set(E_Client_Layout_Cb cb);
+EINTERN E_Client *e_client_transient_child_top_get(E_Client *ec, Eina_Bool consider_focus);
 E_API void      e_client_visibility_calculate(void);
 E_API void      e_client_visibility_skip_set(E_Client *ec, Eina_Bool skip);
 E_API void      e_client_post_raise_lower_set(E_Client *ec, Eina_Bool raise_set, Eina_Bool lower_set);
@@ -1207,11 +1206,11 @@ EINTERN Eina_Bool e_client_mapped_get(E_Client *ec);
 EINTERN void      e_client_mapped_set(E_Client *ec, Eina_Bool set);
 
 E_API void e_client_transform_update(E_Client *ec);
-E_API void e_client_transform_apply(E_Client *ec, double degree, double zoom, int cx, int cy);
-E_API void e_client_transform_clear(E_Client *ec);
+EINTERN void e_client_transform_apply(E_Client *ec, double degree, double zoom, int cx, int cy);
+EINTERN void e_client_transform_clear(E_Client *ec);
 E_API void e_client_cursor_map_apply(E_Client *ec, int rotation, int x, int y);
 
-YOLO E_API void e_client_focus_stack_set(Eina_List *l);
+YOLO EINTERN void e_client_focus_stack_set(Eina_List *l);
 
 E_API Eina_Bool         e_client_transform_core_enable_get(E_Client *ec);
 E_API void              e_client_transform_core_add(E_Client *ec, E_Util_Transform *transform);
@@ -1221,22 +1220,22 @@ E_API int               e_client_transform_core_transform_count_get(E_Client *ec
 E_API E_Util_Transform *e_client_transform_core_transform_get(E_Client *ec, int index);
 E_API void              e_client_transform_core_input_transform(E_Client *ec, int x, int y, int *out_x, int *out_y);
 E_API void              e_client_transform_core_input_inv_transform(E_Client *ec, int x, int y, int *out_x, int *out_y);
-E_API void              e_client_transform_core_input_inv_rect_transform(E_Client *ec, int x, int y, int *out_x, int *out_y);
+EINTERN void              e_client_transform_core_input_inv_rect_transform(E_Client *ec, int x, int y, int *out_x, int *out_y);
 E_API void              e_client_transform_core_direct_render_set(E_Client *ec, Eina_Bool set);
 
-E_API E_Pixmap *e_client_pixmap_change(E_Client *ec, E_Pixmap *newcp);
+EINTERN E_Pixmap *e_client_pixmap_change(E_Client *ec, E_Pixmap *newcp);
 E_API void e_client_window_role_set(E_Client *ec, const char *role);
 
-E_API Eina_Bool e_client_key_send(E_Client *ec, int keycode, Eina_Bool pressed, Ecore_Device *dev, unsigned int time);
-E_API Eina_Bool e_client_key_cancel(E_Client *ec, int keycode, Ecore_Device *dev, unsigned int time);
-E_API Eina_Bool e_client_touch_send(E_Client *ec, int idx, int x, int y, Eina_Bool pressed, Ecore_Device *dev, double radius_x, double radius_y, double pressure, double angle, unsigned int time);
-E_API Eina_Bool e_client_touch_update_send(E_Client *ec, int idx, int x, int y, Ecore_Device *dev, double radius_x, double radius_y, double pressure, double angle, unsigned int time);
-E_API Eina_Bool e_client_touch_cancel_send(E_Client *ec);
-E_API Eina_Bool e_client_mouse_button_send(E_Client *ec, int buttons, Eina_Bool pressed, Ecore_Device *dev, unsigned int time);
-E_API Eina_Bool e_client_mouse_move_send(E_Client *ec, int x, int y, Ecore_Device *dev, unsigned int time);
-E_API Eina_Bool e_client_mouse_wheel_send(E_Client *ec, int direction, int z, Ecore_Device *dev, unsigned int time);
-E_API Eina_Bool e_client_mouse_in_send(E_Client *ec, int x, int y, Ecore_Device *dev, unsigned int time);
-E_API Eina_Bool e_client_mouse_out_send(E_Client *ec, Ecore_Device *dev, unsigned int time);
+EINTERN Eina_Bool e_client_key_send(E_Client *ec, int keycode, Eina_Bool pressed, Ecore_Device *dev, unsigned int time);
+EINTERN Eina_Bool e_client_key_cancel(E_Client *ec, int keycode, Ecore_Device *dev, unsigned int time);
+EINTERN Eina_Bool e_client_touch_send(E_Client *ec, int idx, int x, int y, Eina_Bool pressed, Ecore_Device *dev, double radius_x, double radius_y, double pressure, double angle, unsigned int time);
+EINTERN Eina_Bool e_client_touch_update_send(E_Client *ec, int idx, int x, int y, Ecore_Device *dev, double radius_x, double radius_y, double pressure, double angle, unsigned int time);
+EINTERN Eina_Bool e_client_touch_cancel_send(E_Client *ec);
+EINTERN Eina_Bool e_client_mouse_button_send(E_Client *ec, int buttons, Eina_Bool pressed, Ecore_Device *dev, unsigned int time);
+EINTERN Eina_Bool e_client_mouse_move_send(E_Client *ec, int x, int y, Ecore_Device *dev, unsigned int time);
+EINTERN Eina_Bool e_client_mouse_wheel_send(E_Client *ec, int direction, int z, Ecore_Device *dev, unsigned int time);
+EINTERN Eina_Bool e_client_mouse_in_send(E_Client *ec, int x, int y, Ecore_Device *dev, unsigned int time);
+EINTERN Eina_Bool e_client_mouse_out_send(E_Client *ec, Ecore_Device *dev, unsigned int time);
 
 E_API Eina_Bool e_client_video_client_has(E_Client *ec);
 E_API Eina_Bool e_client_normal_client_has(E_Client *ec);
@@ -1245,9 +1244,9 @@ E_API Eina_Bool e_client_cursor_hide(E_Client *ec);
 
 E_API void e_client_visibility_force_obscured_set(E_Client *ec, Eina_Bool set);
 
-E_API void e_client_stay_within_canvas_margin(E_Client *ec);
+EINTERN void e_client_stay_within_canvas_margin(E_Client *ec);
 
-E_API E_Capture_Save_State e_client_image_save(E_Client *ec, const char *dir, const char *name, E_Capture_Client_Save_End_Cb func_end, void *data, Eina_Bool skip_child);
+EINTERN E_Capture_Save_State e_client_image_save(E_Client *ec, const char *dir, const char *name, E_Capture_Client_Save_End_Cb func_end, void *data, Eina_Bool skip_child);
 
 E_API void      e_client_base_output_resolution_transform_adjust(E_Client *ec);
 E_API Eina_Bool e_client_base_output_resolution_update(E_Client *ec);
@@ -1263,7 +1262,7 @@ EINTERN Eina_Bool e_client_pending_geometry_has(E_Client *ec);
 EINTERN void      e_client_pending_geometry_last_geometry_get(E_Client *ec, int *x, int *y, int *w, int *h);
 
 E_API void e_client_frame_focus_set(E_Client *ec, Eina_Bool focus);
-E_API void e_client_frame_geometry_set(E_Client *ec, int x, int y, int w, int h);
+EINTERN void e_client_frame_geometry_set(E_Client *ec, int x, int y, int w, int h);
 
 E_API Eina_Bool e_client_layer_set(E_Client *ec, E_Layer layer);
 /* client layer shall be placed on range between E_LAYER_CLIENT_DESKTOP and E_LAYER_CLIENT_CURSOR
@@ -1297,25 +1296,25 @@ EINTERN E_Comp_Wl_Client_Data   *e_client_cdata_new(E_Client *ec);
 EINTERN void                     e_client_cdata_free(E_Client *ec);
 EINTERN E_Comp_Wl_Client_Data   *e_client_cdata_get(E_Client *ec);
 
-E_API Eina_Bool        e_client_map_set(E_Client *ec, E_Map *em);
+EINTERN Eina_Bool        e_client_map_set(E_Client *ec, E_Map *em);
 // get E_Map from e_client. it must be freed after used.
 E_API E_Map           *e_client_map_get(const E_Client *ec);
-E_API Eina_Bool        e_client_map_enable_set(E_Client *ec, Eina_Bool enabled);
+EINTERN Eina_Bool        e_client_map_enable_set(E_Client *ec, Eina_Bool enabled);
 
 EINTERN void e_client_belong_to_parent_set(E_Client *ec, Eina_Bool set);
-E_API Eina_Bool e_client_is_belong_to_parent(E_Client *ec);
+EINTERN Eina_Bool e_client_is_belong_to_parent(E_Client *ec);
 
-E_API void e_client_transient_policy_set(E_Client *ec, E_Transient policy);
+EINTERN void e_client_transient_policy_set(E_Client *ec, E_Transient policy);
 E_API E_Transient e_client_transient_policy_get(E_Client *ec);
 
-E_API void e_client_resize_object_create_cb_set(E_Client_Resize_Object_Create_Cb cb);
-E_API void e_client_resize_unit_size_set(E_Client *ec, unsigned int unit_size);
+EINTERN void e_client_resize_object_create_cb_set(E_Client_Resize_Object_Create_Cb cb);
+EINTERN void e_client_resize_unit_size_set(E_Client *ec, unsigned int unit_size);
 
 EINTERN void e_client_desk_zoom_enable_set(E_Client *ec, Eina_Bool enable);
 EINTERN Eina_Bool e_client_desk_zoom_enable_get(E_Client *ec);
 
 EINTERN void e_client_layout_apply(E_Client *ec, Eina_Bool apply);
-E_API Eina_Bool e_client_is_layout_apply(E_Client *ec);
+EINTERN Eina_Bool e_client_is_layout_apply(E_Client *ec);
 
 EINTERN Eina_Bool e_client_fps_get(E_Client *ec, double *fps);
 EINTERN void e_client_fps_update(E_Client *ec);