From: SooChan Lim Date: Sun, 19 Jan 2025 04:01:40 +0000 (+0900) Subject: e_service_softkey: move all definition to internal header X-Git-Tag: accepted/tizen/unified/20250123.133210~4 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=18da4f0d1e28954fbb7d5e86a39efe6eb39c95d6;p=platform%2Fupstream%2Fenlightenment.git 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 a9ed674896..ce5e1f4172 100644 --- 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 2c669a4a1a..46a5a7aa93 100644 --- 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 adb280f3ea..961a3c1f6b 100644 --- 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 index ece63d49f6..0000000000 --- a/src/include/e_service_softkey.h +++ /dev/null @@ -1,60 +0,0 @@ -#ifndef E_SERVICE_SOFTKEY_H -#define E_SERVICE_SOFTKEY_H - -#include -#include - -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