e_service_softkey: move all definition to internal header

e20 module does not use the e_service_softkey.h file. Therefore,
all definition in e_service_softkey.h move to e_service_softkey_intern.h.

Change-Id: Ib358103b459c4cc710308b848c3e4c58365c5732

diff --git a/src/bin/Makefile.mk b/src/bin/Makefile.mk
index a9ed6748967b6b06d828c06449d7ba0b71f41e44..ce5e1f4172ff5d8587f34a17fa63371aad83e7e1 100644 (file)
--- a/src/bin/Makefile.mk
+++ b/src/bin/Makefile.mk
@@ -103,7 +103,6 @@ src/include/e_comp_wl_viewport.h \
 src/include/e_comp_wl_capture.h \
 src/include/e_service_gesture.h \
 src/include/e_service_quickpanel.h \
-src/include/e_service_softkey.h \
 src/include/e_service_virtual_touch.h \
 src/include/e_policy.h \
 src/include/e_policy_conformant.h \

diff --git a/src/bin/windowmgr/services/e_service_softkey.c b/src/bin/windowmgr/services/e_service_softkey.c
index 2c669a4a1af3af729f8c90d2bb9dc860aa9227e7..46a5a7aa936ca5b1fb6e0b8583c0926ffd7adb5a 100644 (file)
--- a/src/bin/windowmgr/services/e_service_softkey.c
+++ b/src/bin/windowmgr/services/e_service_softkey.c
@@ -31,6 +31,24 @@ do                                            \
      }                                        \
 } while (0)
 
+struct _E_Service_Softkey
+{
+   E_Zone *zone;
+   E_Client *ec;
+   struct wl_resource *wl_res;
+   Evas_Object *handler_obj;
+   E_Policy_Softkey_Expand expand;
+   E_Policy_Softkey_Opacity opacity;
+   Eina_List *intercept_hooks;
+   Eina_Bool show_block;
+
+   Eina_List *events;
+
+   // view listener
+   struct wl_listener show_listener;
+   struct wl_listener hide_listener;
+};
+
 typedef struct _E_Service_Softkey_Pending_Visible_Request
 {
    E_Client *ec;
@@ -47,7 +65,7 @@ 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
+EINTERN 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);
@@ -77,7 +95,7 @@ e_service_softkey_module_func_set(E_Service_Softkey_Funcs *fp)
    return EINA_TRUE;
 }
 
-E_API Eina_Bool
+EINTERN Eina_Bool
 e_service_softkey_module_func_unset(void)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(_e_softkey_service_funcs, EINA_FALSE);
@@ -87,7 +105,7 @@ e_service_softkey_module_func_unset(void)
    return EINA_TRUE;
 }
 
-E_API E_Service_Softkey *
+EINTERN E_Service_Softkey *
 e_service_softkey_add(E_Zone *zone, E_Client *ec)
 {
    ELOGF("SOFTKEY_SRV", "%s (zone:%p)", ec, __func__, zone);
@@ -113,7 +131,7 @@ e_service_softkey_add(E_Zone *zone, E_Client *ec)
    return softkey_service;
 }
 
-E_API void
+EINTERN void
 e_service_softkey_del(E_Service_Softkey *softkey_service)
 {
    ELOGF("SOFTKEY_SRV", "%s (softkey_service:%p)", NULL, __func__, softkey_service);
@@ -135,7 +153,7 @@ e_service_softkey_del(E_Service_Softkey *softkey_service)
 
 }
 
-E_API Eina_Bool
+EINTERN Eina_Bool
 e_service_softkey_wl_resource_set(E_Service_Softkey *softkey_service, struct wl_resource *wl_res)
 {
    ELOGF("SOFTKEY_SRV", "%s (softkey_service:%p, res:%p)", NULL, __func__, softkey_service, wl_res);
@@ -154,7 +172,7 @@ e_service_softkey_wl_resource_set(E_Service_Softkey *softkey_service, struct wl_
    return EINA_TRUE;
 }
 
-E_API struct wl_resource *
+EINTERN struct wl_resource *
 e_service_softkey_wl_resource_get(E_Service_Softkey *softkey_service)
 {
    ELOGF("SOFTKEY_SRV", "%s (softkey_service:%p)", NULL, __func__, softkey_service);
@@ -759,7 +777,7 @@ e_service_softkey_handler_region_set(E_Client *ec, int angle, Eina_Tiler *tiler)
    return EINA_TRUE;
 }
 
-E_API E_Service_Softkey *
+EINTERN E_Service_Softkey *
 e_service_softkey_get(E_Zone *zone)
 {
    if (_e_softkey_service_funcs && _e_softkey_service_funcs->softkey_service_get)

diff --git a/src/bin/windowmgr/services/e_service_softkey_intern.h b/src/bin/windowmgr/services/e_service_softkey_intern.h
index adb280f3ea393bb1ba05f30f82bb76cba7dddd9e..961a3c1f6b15f52bef82005d804b6eca49d2f70c 100644 (file)
--- a/src/bin/windowmgr/services/e_service_softkey_intern.h
+++ b/src/bin/windowmgr/services/e_service_softkey_intern.h
@@ -2,7 +2,41 @@
 #define E_SERVICE_SOFTKEY_INTERN_H
 
 #include "e_intern.h"
-#include "e_service_softkey.h"
+#include "e_policy_softkey_intern.h"
+
+typedef struct _E_Service_Softkey E_Service_Softkey;
+typedef struct _E_Service_Softkey_Funcs E_Service_Softkey_Funcs;
+
+struct _E_Service_Softkey_Funcs
+{
+   E_Service_Softkey*  (*softkey_service_add)(E_Zone *zone, E_Client *ec);
+   void                (*softkey_service_del)(E_Service_Softkey *softkey);
+   Eina_Bool           (*softkey_service_wl_resource_set)(E_Service_Softkey *softkey, struct wl_resource *wl_res);
+   struct wl_resource* (*softkey_service_wl_resource_get)(E_Service_Softkey *softkey);
+   void                (*softkey_service_client_set)(E_Client *ec);
+   void                (*softkey_service_client_unset)(E_Client *ec);
+   void                (*softkey_service_show)(E_Service_Softkey *softkey);
+   void                (*softkey_service_hide)(E_Service_Softkey *softkey);
+   void                (*softkey_service_visible_set)(E_Service_Softkey *softkey, int visible);
+   int                 (*softkey_service_visible_get)(E_Service_Softkey *softkey);
+   void                (*softkey_service_expand_set)(E_Service_Softkey *softkey, E_Policy_Softkey_Expand expand);
+   Eina_Bool           (*softkey_service_expand_get)(E_Service_Softkey *softkey, E_Policy_Softkey_Expand *expand);
+   void                (*softkey_service_opacity_set)(E_Service_Softkey *softkey, E_Policy_Softkey_Opacity opacity);
+   Eina_Bool           (*softkey_service_opacity_get)(E_Service_Softkey *softkey, E_Policy_Softkey_Opacity *opacity);
+   E_Service_Softkey*  (*softkey_service_get)(E_Zone *zone);
+   Eina_Bool           (*softkey_service_handler_region_set)(E_Client *ec, int angle, Eina_Tiler *tiler);
+};
+
+EINTERN Eina_Bool           e_service_softkey_module_func_set(E_Service_Softkey_Funcs *fp);
+EINTERN Eina_Bool           e_service_softkey_module_func_unset(void);
+
+EINTERN E_Service_Softkey  *e_service_softkey_add(E_Zone *zone, E_Client *ec);
+EINTERN void                e_service_softkey_del(E_Service_Softkey *softkey);
+
+EINTERN Eina_Bool           e_service_softkey_wl_resource_set(E_Service_Softkey *softkey, struct wl_resource *wl_res);
+EINTERN struct wl_resource *e_service_softkey_wl_resource_get(E_Service_Softkey *softkey);
+
+EINTERN E_Service_Softkey  *e_service_softkey_get(E_Zone *zone);
 
 EINTERN void              e_service_softkey_client_set(E_Client *ec);
 EINTERN void              e_service_softkey_client_unset(E_Client *ec);

diff --git a/src/include/e_service_softkey.h b/src/include/e_service_softkey.h
deleted file mode 100644 (file)
index ece63d4..0000000
--- a/src/include/e_service_softkey.h
+++ /dev/null
@@ -1,60 +0,0 @@
-#ifndef E_SERVICE_SOFTKEY_H
-#define E_SERVICE_SOFTKEY_H
-
-#include <e_types.h>
-#include <e_policy.h>
-
-typedef struct _E_Service_Softkey E_Service_Softkey;
-typedef struct _E_Service_Softkey_Funcs E_Service_Softkey_Funcs;
-
-struct _E_Service_Softkey
-{
-   E_Zone *zone;
-   E_Client *ec;
-   struct wl_resource *wl_res;
-   Evas_Object *handler_obj;
-   E_Policy_Softkey_Expand expand;
-   E_Policy_Softkey_Opacity opacity;
-   Eina_List *intercept_hooks;
-   Eina_Bool show_block;
-
-   Eina_List *events;
-
-   // view listener
-   struct wl_listener show_listener;
-   struct wl_listener hide_listener;
-};
-
-struct _E_Service_Softkey_Funcs
-{
-   E_Service_Softkey*  (*softkey_service_add)(E_Zone *zone, E_Client *ec);
-   void                (*softkey_service_del)(E_Service_Softkey *softkey);
-   Eina_Bool           (*softkey_service_wl_resource_set)(E_Service_Softkey *softkey, struct wl_resource *wl_res);
-   struct wl_resource* (*softkey_service_wl_resource_get)(E_Service_Softkey *softkey);
-   void                (*softkey_service_client_set)(E_Client *ec);
-   void                (*softkey_service_client_unset)(E_Client *ec);
-   void                (*softkey_service_show)(E_Service_Softkey *softkey);
-   void                (*softkey_service_hide)(E_Service_Softkey *softkey);
-   void                (*softkey_service_visible_set)(E_Service_Softkey *softkey, int visible);
-   int                 (*softkey_service_visible_get)(E_Service_Softkey *softkey);
-   void                (*softkey_service_expand_set)(E_Service_Softkey *softkey, E_Policy_Softkey_Expand expand);
-   Eina_Bool           (*softkey_service_expand_get)(E_Service_Softkey *softkey, E_Policy_Softkey_Expand *expand);
-   void                (*softkey_service_opacity_set)(E_Service_Softkey *softkey, E_Policy_Softkey_Opacity opacity);
-   Eina_Bool           (*softkey_service_opacity_get)(E_Service_Softkey *softkey, E_Policy_Softkey_Opacity *opacity);
-   E_Service_Softkey*  (*softkey_service_get)(E_Zone *zone);
-   Eina_Bool           (*softkey_service_handler_region_set)(E_Client *ec, int angle, Eina_Tiler *tiler);
-};
-
-
-E_API Eina_Bool           e_service_softkey_module_func_set(E_Service_Softkey_Funcs *fp);
-E_API Eina_Bool           e_service_softkey_module_func_unset(void);
-
-E_API E_Service_Softkey  *e_service_softkey_add(E_Zone *zone, E_Client *ec);
-E_API void                e_service_softkey_del(E_Service_Softkey *softkey);
-
-E_API Eina_Bool           e_service_softkey_wl_resource_set(E_Service_Softkey *softkey, struct wl_resource *wl_res);
-E_API struct wl_resource *e_service_softkey_wl_resource_get(E_Service_Softkey *softkey);
-
-E_API E_Service_Softkey  *e_service_softkey_get(E_Zone *zone);
-
-#endif