e_service_softkey: refactoring internal naming

Rename to softkey_service from softkey

Change-Id: I9ff6d19fe0e5c2bad8a811eba17a8f48454d82b3

diff --git a/src/bin/services/e_service_softkey.c b/src/bin/services/e_service_softkey.c
old mode 100755 (executable)
new mode 100644 (file)
index e3d312b..cfdd77f
--- a/src/bin/services/e_service_softkey.c
+++ b/src/bin/services/e_service_softkey.c
@@ -5,25 +5,25 @@
 #include "services/e_service_region.h"
 #include "e_policy_wl.h"
 
-#define SOFTKEY_SHOW(softkey)                 \
+#define SOFTKEY_SERVICE_SHOW(softkey_service)                 \
 do                                            \
 {                                             \
-   if (softkey->ec && !softkey->ec->visible)  \
+   if (softkey_service->ec && !softkey_service->ec->visible)  \
      {                                        \
-        softkey->show_block = EINA_FALSE;     \
-        softkey->ec->visible = EINA_TRUE;     \
-        evas_object_show(softkey->ec->frame); \
+        softkey_service->show_block = EINA_FALSE;     \
+        softkey_service->ec->visible = EINA_TRUE;     \
+        evas_object_show(softkey_service->ec->frame); \
      }                                        \
 } while (0)
 
-#define SOFTKEY_HIDE(softkey)                 \
+#define SOFTKEY_SERVICE_HIDE(softkey_service)                 \
 do                                            \
 {                                             \
-   if (softkey->ec && softkey->ec->visible)   \
+   if (softkey_service->ec && softkey_service->ec->visible)   \
      {                                        \
-        softkey->show_block = EINA_TRUE;      \
-        softkey->ec->visible = EINA_FALSE;    \
-        evas_object_hide(softkey->ec->frame); \
+        softkey_service->show_block = EINA_TRUE;      \
+        softkey_service->ec->visible = EINA_FALSE;    \
+        evas_object_hide(softkey_service->ec->frame); \
      }                                        \
 } while (0)
 
@@ -39,36 +39,36 @@ typedef struct _E_Service_Softkey_Pending_Request
    Ecore_Event_Handler *ec_remove_handler;
 } E_Service_Softkey_Pending_Request;
 
-static Eina_List *_e_softkey_list;
-static E_Service_Softkey_Funcs *_e_softkey_funcs = NULL;
-static E_Service_Softkey_Pending_Request _e_softkey_pending_req;
+static Eina_List *_e_softkey_service_list;
+static E_Service_Softkey_Funcs *_e_softkey_service_funcs = NULL;
+static E_Service_Softkey_Pending_Request _e_softkey_service_pending_req;
 
 E_API Eina_Bool
 e_service_softkey_module_func_set(E_Service_Softkey_Funcs *fp)
 {
    EINA_SAFETY_ON_FALSE_RETURN_VAL(e_config->use_softkey_service, EINA_FALSE);
-   EINA_SAFETY_ON_FALSE_RETURN_VAL((_e_softkey_funcs == NULL), EINA_FALSE);
+   EINA_SAFETY_ON_FALSE_RETURN_VAL((_e_softkey_service_funcs == NULL), EINA_FALSE);
    EINA_SAFETY_ON_NULL_RETURN_VAL(fp, EINA_FALSE);
 
-   _e_softkey_funcs = E_NEW(E_Service_Softkey_Funcs, 1);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(_e_softkey_funcs, EINA_FALSE);
-
-   _e_softkey_funcs->softkey_service_add = fp->softkey_service_add;
-   _e_softkey_funcs->softkey_service_del = fp->softkey_service_del;
-   _e_softkey_funcs->softkey_service_wl_resource_set = fp->softkey_service_wl_resource_set;
-   _e_softkey_funcs->softkey_service_wl_resource_get = fp->softkey_service_wl_resource_get;
-   _e_softkey_funcs->softkey_service_client_set = fp->softkey_service_client_set;
-   _e_softkey_funcs->softkey_service_client_unset = fp->softkey_service_client_unset;
-   _e_softkey_funcs->softkey_service_show = fp->softkey_service_show;
-   _e_softkey_funcs->softkey_service_hide = fp->softkey_service_hide;
-   _e_softkey_funcs->softkey_service_visible_set = fp->softkey_service_visible_set;
-   _e_softkey_funcs->softkey_service_visible_get = fp->softkey_service_visible_get;
-   _e_softkey_funcs->softkey_service_expand_set = fp->softkey_service_expand_set;
-   _e_softkey_funcs->softkey_service_expand_get = fp->softkey_service_expand_get;
-   _e_softkey_funcs->softkey_service_opacity_set = fp->softkey_service_opacity_set;
-   _e_softkey_funcs->softkey_service_opacity_get = fp->softkey_service_opacity_get;
-   _e_softkey_funcs->softkey_service_get = fp->softkey_service_get;
-   _e_softkey_funcs->softkey_service_handler_region_set = fp->softkey_service_handler_region_set;
+   _e_softkey_service_funcs = E_NEW(E_Service_Softkey_Funcs, 1);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(_e_softkey_service_funcs, EINA_FALSE);
+
+   _e_softkey_service_funcs->softkey_service_add = fp->softkey_service_add;
+   _e_softkey_service_funcs->softkey_service_del = fp->softkey_service_del;
+   _e_softkey_service_funcs->softkey_service_wl_resource_set = fp->softkey_service_wl_resource_set;
+   _e_softkey_service_funcs->softkey_service_wl_resource_get = fp->softkey_service_wl_resource_get;
+   _e_softkey_service_funcs->softkey_service_client_set = fp->softkey_service_client_set;
+   _e_softkey_service_funcs->softkey_service_client_unset = fp->softkey_service_client_unset;
+   _e_softkey_service_funcs->softkey_service_show = fp->softkey_service_show;
+   _e_softkey_service_funcs->softkey_service_hide = fp->softkey_service_hide;
+   _e_softkey_service_funcs->softkey_service_visible_set = fp->softkey_service_visible_set;
+   _e_softkey_service_funcs->softkey_service_visible_get = fp->softkey_service_visible_get;
+   _e_softkey_service_funcs->softkey_service_expand_set = fp->softkey_service_expand_set;
+   _e_softkey_service_funcs->softkey_service_expand_get = fp->softkey_service_expand_get;
+   _e_softkey_service_funcs->softkey_service_opacity_set = fp->softkey_service_opacity_set;
+   _e_softkey_service_funcs->softkey_service_opacity_get = fp->softkey_service_opacity_get;
+   _e_softkey_service_funcs->softkey_service_get = fp->softkey_service_get;
+   _e_softkey_service_funcs->softkey_service_handler_region_set = fp->softkey_service_handler_region_set;
 
    return EINA_TRUE;
 }
@@ -76,9 +76,9 @@ e_service_softkey_module_func_set(E_Service_Softkey_Funcs *fp)
 E_API Eina_Bool
 e_service_softkey_module_func_unset(void)
 {
-   EINA_SAFETY_ON_NULL_RETURN_VAL(_e_softkey_funcs, EINA_FALSE);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(_e_softkey_service_funcs, EINA_FALSE);
 
-   E_FREE(_e_softkey_funcs);
+   E_FREE(_e_softkey_service_funcs);
 
    return EINA_TRUE;
 }
@@ -88,97 +88,97 @@ e_service_softkey_add(E_Zone *zone, E_Client *ec)
 {
    ELOGF("SOFTKEY_SRV", "%s (zone:%p)", ec, __func__, zone);
 
-   if (_e_softkey_funcs && _e_softkey_funcs->softkey_service_add)
+   if (_e_softkey_service_funcs && _e_softkey_service_funcs->softkey_service_add)
      {
-        return _e_softkey_funcs->softkey_service_add(zone, ec);
+        return _e_softkey_service_funcs->softkey_service_add(zone, ec);
      }
 
    if (!zone || !ec) return NULL;
 
-   E_Service_Softkey *softkey;
+   E_Service_Softkey *softkey_service;
 
    ELOGF("SOFTKEY_SRV", "Softkey service window add. zone:%p (id:%d)", ec, zone, zone->id);
-   softkey = E_NEW(E_Service_Softkey, 1);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(softkey, NULL);
+   softkey_service = E_NEW(E_Service_Softkey, 1);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(softkey_service, NULL);
 
-   _e_softkey_list = eina_list_append(_e_softkey_list, softkey);
+   _e_softkey_service_list = eina_list_append(_e_softkey_service_list, softkey_service);
 
-   softkey->zone = zone;
-   softkey->ec = ec;
+   softkey_service->zone = zone;
+   softkey_service->ec = ec;
 
-   return softkey;
+   return softkey_service;
 }
 
 E_API void
-e_service_softkey_del(E_Service_Softkey *softkey)
+e_service_softkey_del(E_Service_Softkey *softkey_service)
 {
-   ELOGF("SOFTKEY_SRV", "%s (softkey:%p)", NULL, __func__, softkey);
+   ELOGF("SOFTKEY_SRV", "%s (softkey_service:%p)", NULL, __func__, softkey_service);
 
-   if (_e_softkey_funcs && _e_softkey_funcs->softkey_service_del)
+   if (_e_softkey_service_funcs && _e_softkey_service_funcs->softkey_service_del)
      {
-        _e_softkey_funcs->softkey_service_del(softkey);
+        _e_softkey_service_funcs->softkey_service_del(softkey_service);
         return;
      }
 
-   if (!softkey) return;
+   if (!softkey_service) return;
 
-   _e_softkey_list = eina_list_remove(_e_softkey_list , softkey);
+   _e_softkey_service_list = eina_list_remove(_e_softkey_service_list , softkey_service);
 
-   E_FREE_FUNC(softkey->handler_obj, evas_object_del);
-   E_FREE_LIST(softkey->intercept_hooks, e_comp_object_intercept_hook_del);
+   E_FREE_FUNC(softkey_service->handler_obj, evas_object_del);
+   E_FREE_LIST(softkey_service->intercept_hooks, e_comp_object_intercept_hook_del);
 
-   E_FREE(softkey);
+   E_FREE(softkey_service);
 
 }
 
 E_API Eina_Bool
-e_service_softkey_wl_resource_set(E_Service_Softkey *softkey, struct wl_resource *wl_res)
+e_service_softkey_wl_resource_set(E_Service_Softkey *softkey_service, struct wl_resource *wl_res)
 {
-   ELOGF("SOFTKEY_SRV", "%s (softkey:%p, res:%p)", NULL, __func__, softkey, wl_res);
+   ELOGF("SOFTKEY_SRV", "%s (softkey_service:%p, res:%p)", NULL, __func__, softkey_service, wl_res);
 
-   if (_e_softkey_funcs && _e_softkey_funcs->softkey_service_wl_resource_set)
+   if (_e_softkey_service_funcs && _e_softkey_service_funcs->softkey_service_wl_resource_set)
      {
-        return _e_softkey_funcs->softkey_service_wl_resource_set(softkey, wl_res);
+        return _e_softkey_service_funcs->softkey_service_wl_resource_set(softkey_service, wl_res);
      }
 
-   if (!softkey)
+   if (!softkey_service)
      return EINA_FALSE;
 
-   ELOGF("SOFTKEY_SRV", "SET Softkey service (softkey:%p, res:%p)", softkey->ec, softkey, wl_res);
-   softkey->wl_res = wl_res;
+   ELOGF("SOFTKEY_SRV", "SET Softkey service (softkey_service:%p, res:%p)", softkey_service->ec, softkey_service, wl_res);
+   softkey_service->wl_res = wl_res;
 
    return EINA_TRUE;
 }
 
 E_API struct wl_resource *
-e_service_softkey_wl_resource_get(E_Service_Softkey *softkey)
+e_service_softkey_wl_resource_get(E_Service_Softkey *softkey_service)
 {
-   ELOGF("SOFTKEY_SRV", "%s (softkey:%p)", NULL, __func__, softkey);
+   ELOGF("SOFTKEY_SRV", "%s (softkey_service:%p)", NULL, __func__, softkey_service);
 
-   if (_e_softkey_funcs && _e_softkey_funcs->softkey_service_wl_resource_get)
+   if (_e_softkey_service_funcs && _e_softkey_service_funcs->softkey_service_wl_resource_get)
      {
-        return _e_softkey_funcs->softkey_service_wl_resource_get(softkey);
+        return _e_softkey_service_funcs->softkey_service_wl_resource_get(softkey_service);
      }
 
-   if (!softkey)
+   if (!softkey_service)
      return NULL;
 
-   return softkey->wl_res;
+   return softkey_service->wl_res;
 }
 
 static Eina_Bool
 _softkey_intercept_hook_show(void *data, E_Client *ec)
 {
-   E_Service_Softkey *softkey;
+   E_Service_Softkey *softkey_service;
 
-   softkey = data;
-   if (EINA_UNLIKELY(!softkey))
+   softkey_service = data;
+   if (EINA_UNLIKELY(!softkey_service))
      goto end;
 
-   if (softkey->ec != ec)
+   if (softkey_service->ec != ec)
      goto end;
 
-   if (softkey->show_block)
+   if (softkey_service->show_block)
      {
         ec->visible = EINA_FALSE;
         return EINA_FALSE;
@@ -294,11 +294,11 @@ e_service_softkey_client_set(E_Client *ec)
 {
    ELOGF("SOFTKEY_SRV", "%s", ec, __func__);
 
-   E_Service_Softkey *softkey;
+   E_Service_Softkey *softkey_service;
 
-   if (_e_softkey_funcs && _e_softkey_funcs->softkey_service_client_set)
+   if (_e_softkey_service_funcs && _e_softkey_service_funcs->softkey_service_client_set)
      {
-        _e_softkey_funcs->softkey_service_client_set(ec);
+        _e_softkey_service_funcs->softkey_service_client_set(ec);
         return;
      }
 
@@ -312,24 +312,24 @@ e_service_softkey_client_set(E_Client *ec)
 
    ELOGF("SOFTKEY_SRV", "SET Softkey service", ec);
 
-   softkey = e_service_softkey_get(ec->zone);
-   if (!softkey)
-     softkey = e_service_softkey_add(ec->zone, ec);
+   softkey_service = e_service_softkey_get(ec->zone);
+   if (!softkey_service)
+     softkey_service = e_service_softkey_add(ec->zone, ec);
    else
      {
-        if (softkey->ec != ec)
+        if (softkey_service->ec != ec)
           {
-             e_service_softkey_del(softkey);
-             softkey = e_service_softkey_add(ec->zone, ec);
+             e_service_softkey_del(softkey_service);
+             softkey_service = e_service_softkey_add(ec->zone, ec);
           }
      }
 
-   if (!softkey)
+   if (!softkey_service)
      return;
 
-   ELOGF("SOFTKEY", "Set Client | softkey %p", ec, softkey);
+   ELOGF("SOFTKEY", "Set Client | softkey_service %p", ec, softkey_service);
 
-   softkey->ec = ec;
+   softkey_service->ec = ec;
    e_client_window_role_set(ec, "softkey");
 
    // set softkey layer
@@ -347,10 +347,10 @@ e_service_softkey_client_set(E_Client *ec)
    // disable effect
    e_policy_animatable_lock(ec, E_POLICY_ANIMATABLE_NEVER, EINA_TRUE);
 
-   E_COMP_OBJECT_INTERCEPT_HOOK_APPEND(softkey->intercept_hooks, E_COMP_OBJECT_INTERCEPT_HOOK_SHOW_HELPER, _softkey_intercept_hook_show, softkey);
+   E_COMP_OBJECT_INTERCEPT_HOOK_APPEND(softkey_service->intercept_hooks, E_COMP_OBJECT_INTERCEPT_HOOK_SHOW_HELPER, _softkey_intercept_hook_show, softkey_service);
 
-   evas_object_event_callback_add(ec->frame, EVAS_CALLBACK_SHOW, _e_service_softkey_client_evas_cb_show, softkey);
-   evas_object_event_callback_add(ec->frame, EVAS_CALLBACK_HIDE, _e_service_softkey_client_evas_cb_hide, softkey);
+   evas_object_event_callback_add(ec->frame, EVAS_CALLBACK_SHOW, _e_service_softkey_client_evas_cb_show, softkey_service);
+   evas_object_event_callback_add(ec->frame, EVAS_CALLBACK_HIDE, _e_service_softkey_client_evas_cb_hide, softkey_service);
 }
 
 EINTERN void
@@ -358,120 +358,120 @@ e_service_softkey_client_unset(E_Client *ec)
 {
    ELOGF("SOFTKEY_SRV", "%s", ec, __func__);
 
-   E_Service_Softkey *softkey;
+   E_Service_Softkey *softkey_service;
 
-   if (_e_softkey_funcs && _e_softkey_funcs->softkey_service_client_unset)
+   if (_e_softkey_service_funcs && _e_softkey_service_funcs->softkey_service_client_unset)
      {
-        _e_softkey_funcs->softkey_service_client_unset(ec);
+        _e_softkey_service_funcs->softkey_service_client_unset(ec);
         return;
      }
 
-   softkey = e_service_softkey_get(ec->zone);
-   if (!softkey) return;
+   softkey_service = e_service_softkey_get(ec->zone);
+   if (!softkey_service) return;
 
-   evas_object_event_callback_del(softkey->ec->frame, EVAS_CALLBACK_SHOW, _e_service_softkey_client_evas_cb_show);
-   evas_object_event_callback_del(softkey->ec->frame, EVAS_CALLBACK_HIDE, _e_service_softkey_client_evas_cb_hide);
+   evas_object_event_callback_del(softkey_service->ec->frame, EVAS_CALLBACK_SHOW, _e_service_softkey_client_evas_cb_show);
+   evas_object_event_callback_del(softkey_service->ec->frame, EVAS_CALLBACK_HIDE, _e_service_softkey_client_evas_cb_hide);
 
-   e_service_softkey_del(softkey);
+   e_service_softkey_del(softkey_service);
 }
 
 EINTERN void
-e_service_softkey_show(E_Service_Softkey *softkey)
+e_service_softkey_show(E_Service_Softkey *softkey_service)
 {
-   if (_e_softkey_funcs && _e_softkey_funcs->softkey_service_show)
+   if (_e_softkey_service_funcs && _e_softkey_service_funcs->softkey_service_show)
      {
-        _e_softkey_funcs->softkey_service_show(softkey);
+        _e_softkey_service_funcs->softkey_service_show(softkey_service);
         return;
      }
 
-   if (!softkey) return;
-   if (!softkey->ec) return;
+   if (!softkey_service) return;
+   if (!softkey_service->ec) return;
 
-   SOFTKEY_SHOW(softkey);
+   SOFTKEY_SERVICE_SHOW(softkey_service);
 }
 
 EINTERN void
-e_service_softkey_hide(E_Service_Softkey *softkey)
+e_service_softkey_hide(E_Service_Softkey *softkey_service)
 {
-   if (_e_softkey_funcs && _e_softkey_funcs->softkey_service_hide)
+   if (_e_softkey_service_funcs && _e_softkey_service_funcs->softkey_service_hide)
      {
-        _e_softkey_funcs->softkey_service_hide(softkey);
+        _e_softkey_service_funcs->softkey_service_hide(softkey_service);
         return;
      }
 
-   if (!softkey) return;
-   if (!softkey->ec) return;
+   if (!softkey_service) return;
+   if (!softkey_service->ec) return;
 
-   SOFTKEY_HIDE(softkey);
+   SOFTKEY_SERVICE_HIDE(softkey_service);
 }
 
 
 EINTERN void
-e_service_softkey_visible_set(E_Service_Softkey *softkey, int visible)
+e_service_softkey_visible_set(E_Service_Softkey *softkey_service, int visible)
 {
-   if (_e_softkey_funcs && _e_softkey_funcs->softkey_service_visible_set)
+   if (_e_softkey_service_funcs && _e_softkey_service_funcs->softkey_service_visible_set)
      {
-        _e_softkey_funcs->softkey_service_visible_set(softkey, visible);
+        _e_softkey_service_funcs->softkey_service_visible_set(softkey_service, visible);
         return;
      }
 
-   if (!softkey) return;
-   if (!softkey->wl_res)
+   if (!softkey_service) return;
+   if (!softkey_service->wl_res)
      {
         ELOGF("SOFTKEY_SRV", "Error. No wl_resource of Softkey Service", NULL);
         return;
      }
 
-   tws_service_softkey_send_visible_change_request(softkey->wl_res, visible);
+   tws_service_softkey_send_visible_change_request(softkey_service->wl_res, visible);
 }
 
 
 EINTERN int
-e_service_softkey_visible_get(E_Service_Softkey *softkey)
+e_service_softkey_visible_get(E_Service_Softkey *softkey_service)
 {
    int visible;
 
-   if (_e_softkey_funcs && _e_softkey_funcs->softkey_service_visible_get)
+   if (_e_softkey_service_funcs && _e_softkey_service_funcs->softkey_service_visible_get)
      {
-        return _e_softkey_funcs->softkey_service_visible_get(softkey);
+        return _e_softkey_service_funcs->softkey_service_visible_get(softkey_service);
      }
 
-   if (!softkey) return 0;
-   if (!softkey->ec) return 0;
+   if (!softkey_service) return 0;
+   if (!softkey_service->ec) return 0;
 
-   visible = evas_object_visible_get(softkey->ec->frame);
+   visible = evas_object_visible_get(softkey_service->ec->frame);
    return visible;
 }
 
 EINTERN void
-e_service_softkey_expand_set(E_Service_Softkey *softkey, E_Policy_Softkey_Expand expand)
+e_service_softkey_expand_set(E_Service_Softkey *softkey_service, E_Policy_Softkey_Expand expand)
 {
-   if (_e_softkey_funcs && _e_softkey_funcs->softkey_service_expand_set)
+   if (_e_softkey_service_funcs && _e_softkey_service_funcs->softkey_service_expand_set)
      {
-        _e_softkey_funcs->softkey_service_expand_set(softkey, expand);
+        _e_softkey_service_funcs->softkey_service_expand_set(softkey_service, expand);
         return;
      }
 
-   if (!softkey) return;
-   if (!softkey->wl_res)
+   if (!softkey_service) return;
+   if (!softkey_service->wl_res)
      {
         ELOGF("SOFTKEY_SRV", "Error. No wl_resource of Softkey Service", NULL);
         return;
      }
 
-   tws_service_softkey_send_expand_change_request(softkey->wl_res, expand);
-   softkey->expand = expand;
+   tws_service_softkey_send_expand_change_request(softkey_service->wl_res, expand);
+   softkey_service->expand = expand;
 }
 
 EINTERN Eina_Bool
-e_service_softkey_expand_get(E_Service_Softkey *softkey, E_Policy_Softkey_Expand *expand)
+e_service_softkey_expand_get(E_Service_Softkey *softkey_service, E_Policy_Softkey_Expand *expand)
 {
-   if (_e_softkey_funcs && _e_softkey_funcs->softkey_service_expand_get)
+   if (_e_softkey_service_funcs && _e_softkey_service_funcs->softkey_service_expand_get)
      {
-        return _e_softkey_funcs->softkey_service_expand_get(softkey, expand);
+        return _e_softkey_service_funcs->softkey_service_expand_get(softkey_service, expand);
      }
 
-   if (!softkey)
+   if (!softkey_service)
      {
         if (expand)
           *expand = E_POLICY_SOFTKEY_EXPAND_OFF;
@@ -481,41 +481,41 @@ e_service_softkey_expand_get(E_Service_Softkey *softkey, E_Policy_Softkey_Expand
    else
      {
         if (expand)
-          *expand = softkey->expand;
+          *expand = softkey_service->expand;
 
         return EINA_TRUE;
      }
 }
 
 EINTERN void
-e_service_softkey_opacity_set(E_Service_Softkey *softkey, E_Policy_Softkey_Opacity opacity)
+e_service_softkey_opacity_set(E_Service_Softkey *softkey_service, E_Policy_Softkey_Opacity opacity)
 {
-   if (_e_softkey_funcs && _e_softkey_funcs->softkey_service_opacity_set)
+   if (_e_softkey_service_funcs && _e_softkey_service_funcs->softkey_service_opacity_set)
      {
-        _e_softkey_funcs->softkey_service_opacity_set(softkey, opacity);
+        _e_softkey_service_funcs->softkey_service_opacity_set(softkey_service, opacity);
         return;
      }
 
-   if (!softkey) return;
-   if (!softkey->wl_res)
+   if (!softkey_service) return;
+   if (!softkey_service->wl_res)
      {
         ELOGF("SOFTKEY_SRV", "Error. No wl_resource of Softkey Service", NULL);
         return;
      }
 
-   tws_service_softkey_send_opacity_change_request(softkey->wl_res, opacity);
-   softkey->opacity = opacity;
+   tws_service_softkey_send_opacity_change_request(softkey_service->wl_res, opacity);
+   softkey_service->opacity = opacity;
 }
 
 EINTERN Eina_Bool
-e_service_softkey_opacity_get(E_Service_Softkey *softkey, E_Policy_Softkey_Opacity *opacity)
+e_service_softkey_opacity_get(E_Service_Softkey *softkey_service, E_Policy_Softkey_Opacity *opacity)
 {
-   if (_e_softkey_funcs && _e_softkey_funcs->softkey_service_opacity_get)
+   if (_e_softkey_service_funcs && _e_softkey_service_funcs->softkey_service_opacity_get)
      {
-        return _e_softkey_funcs->softkey_service_opacity_get(softkey, opacity);
+        return _e_softkey_service_funcs->softkey_service_opacity_get(softkey_service, opacity);
      }
 
-   if (!softkey)
+   if (!softkey_service)
      {
         if (opacity)
           *opacity = E_POLICY_SOFTKEY_OPACITY_OPAQUE;
@@ -525,7 +525,7 @@ e_service_softkey_opacity_get(E_Service_Softkey *softkey, E_Policy_Softkey_Opaci
    else
      {
         if (opacity)
-          *opacity = softkey->opacity;
+          *opacity = softkey_service->opacity;
 
         return EINA_TRUE;
      }
@@ -545,11 +545,11 @@ _e_service_softkey_cb_hide_request_client_remove(void *data EINA_UNUSED, int typ
    ec = ev->ec;
    if (!ec) return ECORE_CALLBACK_PASS_ON;
 
-   EINA_LIST_FOREACH_SAFE(_e_softkey_pending_req.visible, l, ll, vis_req)
+   EINA_LIST_FOREACH_SAFE(_e_softkey_service_pending_req.visible, l, ll, vis_req)
      {
         if (vis_req->ec == ec)
           {
-             _e_softkey_pending_req.visible = eina_list_remove(_e_softkey_pending_req.visible, vis_req);
+             _e_softkey_service_pending_req.visible = eina_list_remove(_e_softkey_service_pending_req.visible, vis_req);
              E_FREE(vis_req);
           }
      }
@@ -560,8 +560,8 @@ _e_service_softkey_cb_hide_request_client_remove(void *data EINA_UNUSED, int typ
 EINTERN void
 e_service_softkey_client_remove_handler_add(void)
 {
-   if (!_e_softkey_pending_req.ec_remove_handler)
-     _e_softkey_pending_req.ec_remove_handler =
+   if (!_e_softkey_service_pending_req.ec_remove_handler)
+     _e_softkey_service_pending_req.ec_remove_handler =
         ecore_event_handler_add(E_EVENT_CLIENT_REMOVE,
                                 _e_service_softkey_cb_hide_request_client_remove,
                                 NULL);
@@ -570,30 +570,30 @@ e_service_softkey_client_remove_handler_add(void)
 EINTERN void
 e_service_softkey_client_remove_handler_del(void)
 {
-   E_FREE_FUNC(_e_softkey_pending_req.ec_remove_handler, ecore_event_handler_del);
+   E_FREE_FUNC(_e_softkey_service_pending_req.ec_remove_handler, ecore_event_handler_del);
 }
 
 EINTERN void
-e_service_softkey_restore_visible_request(E_Service_Softkey *softkey_srv)
+e_service_softkey_restore_visible_request(E_Service_Softkey *softkey_service)
 {
    E_Service_Softkey_Pending_Visible_Request *vis_req;
    Eina_List *l, *ll;
    Eina_Bool restored = EINA_FALSE;
 
-   EINA_SAFETY_ON_NULL_RETURN(softkey_srv);
+   EINA_SAFETY_ON_NULL_RETURN(softkey_service);
 
-   EINA_LIST_REVERSE_FOREACH_SAFE(_e_softkey_pending_req.visible, l, ll, vis_req)
+   EINA_LIST_REVERSE_FOREACH_SAFE(_e_softkey_service_pending_req.visible, l, ll, vis_req)
      {
-        if (vis_req->ec->zone == softkey_srv->zone)
+        if (vis_req->ec->zone == softkey_service->zone)
           {
              if (!restored)
                {
-                  ELOGF("SOFTKEY_SRV", "restore visible request (zone:%p, softkey:%p, vis:%d)",
-                        vis_req->ec, softkey_srv->zone, softkey_srv, vis_req->visible);
-                  e_service_softkey_visible_set(softkey_srv, vis_req->visible);
+                  ELOGF("SOFTKEY_SRV", "restore visible request (zone:%p, softkey_service:%p, vis:%d)",
+                        vis_req->ec, softkey_service->zone, softkey_service, vis_req->visible);
+                  e_service_softkey_visible_set(softkey_service, vis_req->visible);
                   restored = EINA_TRUE;
                }
-             _e_softkey_pending_req.visible = eina_list_remove(_e_softkey_pending_req.visible, vis_req);
+             _e_softkey_service_pending_req.visible = eina_list_remove(_e_softkey_service_pending_req.visible, vis_req);
              E_FREE(vis_req);
           }
      }
@@ -606,11 +606,11 @@ e_service_softkey_store_visible_request(E_Client *ec, Eina_Bool visible)
    Eina_List *l, *ll;
    EINA_SAFETY_ON_NULL_RETURN(ec);
 
-   EINA_LIST_FOREACH_SAFE(_e_softkey_pending_req.visible, l, ll, vis_req)
+   EINA_LIST_FOREACH_SAFE(_e_softkey_service_pending_req.visible, l, ll, vis_req)
      {
         if (vis_req->ec == ec)
           {
-             _e_softkey_pending_req.visible = eina_list_remove(_e_softkey_pending_req.visible, vis_req);
+             _e_softkey_service_pending_req.visible = eina_list_remove(_e_softkey_service_pending_req.visible, vis_req);
              E_FREE(vis_req);
              break;
           }
@@ -622,7 +622,7 @@ e_service_softkey_store_visible_request(E_Client *ec, Eina_Bool visible)
    vis_req->ec = ec;
    vis_req->visible = visible;
 
-   _e_softkey_pending_req.visible = eina_list_append(_e_softkey_pending_req.visible, vis_req);
+   _e_softkey_service_pending_req.visible = eina_list_append(_e_softkey_service_pending_req.visible, vis_req);
 }
 
 static void
@@ -695,9 +695,9 @@ _e_service_softkey_handler_region_set(E_Service_Softkey *softkey_service, E_Poli
 EINTERN Eina_Bool
 e_service_softkey_handler_region_set(E_Client *ec, int angle, Eina_Tiler *tiler)
 {
-   if (_e_softkey_funcs && _e_softkey_funcs->softkey_service_handler_region_set)
+   if (_e_softkey_service_funcs && _e_softkey_service_funcs->softkey_service_handler_region_set)
      {
-        return _e_softkey_funcs->softkey_service_handler_region_set(ec, angle, tiler);
+        return _e_softkey_service_funcs->softkey_service_handler_region_set(ec, angle, tiler);
      }
 
    E_Service_Softkey *softkey_service = NULL;
@@ -726,19 +726,19 @@ e_service_softkey_handler_region_set(E_Client *ec, int angle, Eina_Tiler *tiler)
 E_API E_Service_Softkey *
 e_service_softkey_get(E_Zone *zone)
 {
-   if (_e_softkey_funcs && _e_softkey_funcs->softkey_service_get)
+   if (_e_softkey_service_funcs && _e_softkey_service_funcs->softkey_service_get)
      {
-        return _e_softkey_funcs->softkey_service_get(zone);
+        return _e_softkey_service_funcs->softkey_service_get(zone);
      }
 
    Eina_List *l;
-   E_Service_Softkey *softkey = NULL;
+   E_Service_Softkey *softkey_service = NULL;
 
-   EINA_LIST_FOREACH(_e_softkey_list, l, softkey)
+   EINA_LIST_FOREACH(_e_softkey_service_list, l, softkey_service)
      {
-        if (softkey->zone == zone)
-          return softkey;
+        if (softkey_service->zone == zone)
+          return softkey_service;
      }
 
-   return softkey;
+   return softkey_service;
 }