From: SooChan Lim Date: Wed, 4 Jun 2025 12:43:01 +0000 (+0900) Subject: e_tizen_ws_shell_manager: remove tizen_ws_shell_extension X-Git-Tag: accepted/tizen/unified/20250613.040658~4 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F07%2F325607%2F1;p=platform%2Fupstream%2Fenlightenment.git e_tizen_ws_shell_manager: remove tizen_ws_shell_extension Tizen_WS_Shell_Extension is deprecated. and it is not used anymore. Change-Id: Ifc787ff241c1dcbcedb3962df678f3ee64511f88 --- diff --git a/src/bin/server/e_tizen_ws_shell_manager.c b/src/bin/server/e_tizen_ws_shell_manager.c index ff1129c029..2187b9c732 100644 --- a/src/bin/server/e_tizen_ws_shell_manager.c +++ b/src/bin/server/e_tizen_ws_shell_manager.c @@ -76,12 +76,6 @@ typedef struct _E_Tizen_Ws_Shell_Region struct wl_listener destroy_listener; } E_Tizen_Ws_Shell_Region; -typedef struct _E_Tizen_Ws_Shell_Extension -{ - char *name; - E_Tizen_Ws_Shell_Ext_Hook_Cb cb; -} E_Tizen_Ws_Shell_Extension; - struct _E_Tizen_Ws_Shell_Manager { struct wl_global *global; @@ -92,9 +86,6 @@ struct _E_Tizen_Ws_Shell_Manager Eina_List *tzsh_clients; /* list of E_Tizen_Ws_Shell_Client */ E_Tizen_Ws_Shell_Srv *srvs[TZSH_SRV_ROLE_MAX]; /* list of registered E_Tizen_Ws_Shell_Srv */ - - /* tizen_ws_shell_interface ver_2 */ - Eina_List *tzsh_extensions; /* list of E_Tizen_Ws_Shell_Extension */ }; typedef struct _E_Tzsh_QP_Event @@ -520,22 +511,6 @@ _e_tizen_ws_shell_client_del(E_Tizen_Ws_Shell_Client *tzsh_client) E_FREE(tzsh_client); } -static E_Tizen_Ws_Shell_Extension* -_e_tizen_ws_shell_extension_get(const char *name) -{ - E_Tizen_Ws_Shell_Extension *tzsh_ext; - Eina_List *l; - - EINA_LIST_FOREACH(g_tizen_ws_shell_mgr->tzsh_extensions, l, tzsh_ext) - { - if (strcmp(tzsh_ext->name, name)) continue; - - return tzsh_ext; - } - - return NULL; -} - // -------------------------------------------------------- // tizen_ws_shell_interface::service // -------------------------------------------------------- @@ -1109,57 +1084,6 @@ _tzsh_iface_cb_srv_create(struct wl_client *client, struct wl_resource *res_tzsh e_client_service_role_set(ec, role); // set service role to e_client } -// -------------------------------------------------------- -// tizen_ws_shell common -// -------------------------------------------------------- -EINTERN Eina_Bool -e_tizen_ws_shell_extension_add(const char *name, E_Tizen_Ws_Shell_Ext_Hook_Cb cb) -{ - E_Tizen_Ws_Shell_Extension *tzsh_ext; - - if (_e_tizen_ws_shell_extension_get(name)) - { - ERR("Already exists the %s extension\n", name); - return EINA_FALSE; - } - - tzsh_ext = E_NEW(E_Tizen_Ws_Shell_Extension, 1); - EINA_SAFETY_ON_NULL_RETURN_VAL(tzsh_ext, EINA_FALSE); - - tzsh_ext->name = strndup(name, 512); - tzsh_ext->cb = cb; - - g_tizen_ws_shell_mgr->tzsh_extensions = eina_list_append(g_tizen_ws_shell_mgr->tzsh_extensions, tzsh_ext); - ELOGF("TZSH", - "EXTENSION_ADD | name:%s | cb:%p", - NULL, - name, cb); - - return EINA_TRUE; -} - -EINTERN void -e_tizen_ws_shell_extension_del(const char *name) -{ - E_Tizen_Ws_Shell_Extension *tzsh_ext; - - tzsh_ext = _e_tizen_ws_shell_extension_get(name); - if (!tzsh_ext) - { - ERR("Cannot find the %s extension\n", name); - return; - } - - g_tizen_ws_shell_mgr->tzsh_extensions = eina_list_remove(g_tizen_ws_shell_mgr->tzsh_extensions, tzsh_ext); - memset(tzsh_ext, 0x0, sizeof(E_Tizen_Ws_Shell_Extension)); - E_FREE(tzsh_ext); - - ELOGF("TZSH", - "EXTENSION_DEL | name:%s", - NULL, - name); -} - // -------------------------------------------------------- // tizen_ws_shell_interface::region // -------------------------------------------------------- @@ -1853,41 +1777,8 @@ _tzsh_iface_cb_qp_get(struct wl_client *client, struct wl_resource *res_tzsh, ui static void _tzsh_iface_cb_extension_get(struct wl_client *client, struct wl_resource *res_tzsh, uint32_t id, const char *name) { - E_Tizen_Ws_Shell *tzsh; - E_Tizen_Ws_Shell_Extension *tzsh_ext; - struct wl_resource *res_ext; - - tzsh = wl_resource_get_user_data(res_tzsh); - if (!tzsh) - { - wl_resource_post_error - (res_tzsh, - WL_DISPLAY_ERROR_INVALID_OBJECT, - "Invalid res_tzsh's user data"); - return; - } - - tzsh_ext = _e_tizen_ws_shell_extension_get(name); - if (!tzsh_ext) - { - ERR("Could not find tzsh_extension(%s)", name); - wl_resource_post_error - (res_tzsh, - WL_DISPLAY_ERROR_INVALID_OBJECT, - "unregistered ext:%s", name); - } - else - { - res_ext = tzsh_ext->cb(client, res_tzsh, id); - if (!res_ext) - { - ERR("Could not create extension(%s) resource", name); - wl_resource_post_error - (res_tzsh, - WL_DISPLAY_ERROR_INVALID_OBJECT, - "Unknown error:%s", name); - } - } + // This request is deprecated. + wl_client_post_implementation_error(client, "Error Not Supported"); } // -------------------------------------------------------- @@ -2554,7 +2445,6 @@ e_tizen_ws_shell_shutdown(void) { E_Tizen_Ws_Shell *tzsh; E_Tizen_Ws_Shell_Srv *tzsh_srv; - E_Tizen_Ws_Shell_Extension *tzsh_extension; int i; if (!g_tizen_ws_shell_mgr) return; @@ -2570,11 +2460,6 @@ e_tizen_ws_shell_shutdown(void) EINA_LIST_FREE(g_tizen_ws_shell_mgr->tzshs, tzsh) wl_resource_destroy(tzsh->res_tzsh); - EINA_LIST_FREE(g_tizen_ws_shell_mgr->tzsh_extensions, tzsh_extension) - { - free(tzsh_extension->name); - } - wl_global_destroy(g_tizen_ws_shell_mgr->global); E_FREE(g_tizen_ws_shell_mgr); diff --git a/src/bin/server/e_tizen_ws_shell_manager_intern.h b/src/bin/server/e_tizen_ws_shell_manager_intern.h index f5aa5e875a..118055d912 100644 --- a/src/bin/server/e_tizen_ws_shell_manager_intern.h +++ b/src/bin/server/e_tizen_ws_shell_manager_intern.h @@ -11,8 +11,6 @@ typedef struct _E_Tizen_Ws_Shell_Manager E_Tizen_Ws_Shell_Manager; typedef struct _E_Tizen_Ws_Shell_Srv E_Tizen_Ws_Shell_Srv; typedef struct _E_Tizen_Ws_Shell E_Tizen_Ws_Shell; -typedef struct wl_resource* (*E_Tizen_Ws_Shell_Ext_Hook_Cb)(struct wl_client* client, struct wl_resource* res, uint32_t id); - typedef enum _Tzsh_Srv_Role { TZSH_SRV_ROLE_UNKNOWN = -1, @@ -50,9 +48,6 @@ struct _E_Tizen_Ws_Shell_Srv EINTERN E_Tizen_Ws_Shell_Manager *e_tizen_ws_shell_manager_init(struct wl_display *display); EINTERN void e_tizen_ws_shell_shutdown(void); -EINTERN Eina_Bool e_tizen_ws_shell_extension_add(const char* name, E_Tizen_Ws_Shell_Ext_Hook_Cb cb); -EINTERN void e_tizen_ws_shell_extension_del(const char* name); - EINTERN void e_tizen_ws_shell_qp_state_scrollable_update(E_Client *ec, Eina_Bool scrollable, E_Quickpanel_Type type); EINTERN Eina_Bool e_tizen_ws_shell_shared_widget_launch_prepare_send(E_Client *callee_ec, uint32_t state, uint32_t serial);