From 1dbe5e5c3e56ef0e6037ba460a72f85cfee4b9a4 Mon Sep 17 00:00:00 2001 From: SooChan Lim Date: Thu, 27 Mar 2025 09:43:44 +0900 Subject: [PATCH] e_keyrouter: make E_API functions make two functions in e_keyrouter_info be public api for e20 module. Change-Id: I81a10aea3427750c6d03bd214f4a93e3453e3404 --- src/bin/inputmgr/e_keyrouter.c | 12 ++++++------ src/include/e_keyrouter.h | 15 ++++++++------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/bin/inputmgr/e_keyrouter.c b/src/bin/inputmgr/e_keyrouter.c index dc6e47d730..d0ef396fc7 100644 --- a/src/bin/inputmgr/e_keyrouter.c +++ b/src/bin/inputmgr/e_keyrouter.c @@ -355,15 +355,15 @@ _e_keyrouter_query_tizen_key_table(void) return EINA_TRUE; } -static void * -_e_keyrouter_keygrab_list_get(void) +E_API void * +e_keyrouter_keygrab_list_get(void) { EINA_SAFETY_ON_NULL_RETURN_VAL(krt, NULL); return krt->HardKeys; } -static int -_e_keyrouter_max_keycode_get(void) +E_API int +e_keyrouter_max_keycode_get(void) { EINA_SAFETY_ON_NULL_RETURN_VAL(krt, 0); return krt->max_tizen_hwkeys; @@ -409,8 +409,8 @@ e_keyrouter_init(void) e_info_server_hook_set("keyrouter", _e_keyrouter_info_print, NULL); e_info_server_hook_set("keygrab", _e_keyrouter_keygrab_print, NULL); - e_keyrouter.keygrab_list_get = _e_keyrouter_keygrab_list_get; - e_keyrouter.max_keycode_get = _e_keyrouter_max_keycode_get; + e_keyrouter.keygrab_list_get = e_keyrouter_keygrab_list_get; + e_keyrouter.max_keycode_get = e_keyrouter_max_keycode_get; TRACE_INPUT_END(); return EINA_TRUE; diff --git a/src/include/e_keyrouter.h b/src/include/e_keyrouter.h index 39181bd4f5..c26f9685ed 100644 --- a/src/include/e_keyrouter.h +++ b/src/include/e_keyrouter.h @@ -7,7 +7,7 @@ typedef struct _E_Keyrouter_Key_List_Node E_Keyrouter_Key_List_Node; typedef struct _E_Keyrouter_Key_List_Node* E_Keyrouter_Key_List_NodePtr; typedef struct _E_Keyrouter_Grabbed_Key E_Keyrouter_Grabbed_Key; typedef struct _E_Keyrouter_Event_Data E_Keyrouter_Event_Data; -typedef struct _E_Keyrouter_Info E_Keyrouter_Info; +E_DEPRECATED typedef struct _E_Keyrouter_Info E_Keyrouter_Info; typedef struct _E_Keyrouter_Intercept_Hook E_Keyrouter_Intercept_Hook; @@ -62,7 +62,7 @@ struct _E_Keyrouter_Key_List_Node E_Keyrouter_Client_Status status; }; -struct _E_Keyrouter_Info +E_DEPRECATED struct _E_Keyrouter_Info { void *(*keygrab_list_get)(void); int (*max_keycode_get)(void); @@ -74,11 +74,12 @@ E_API E_Keyrouter_Intercept_Hook *e_keyrouter_intercept_hook_add(E_Keyrouter_Int E_API void e_keyrouter_intercept_hook_del(E_Keyrouter_Intercept_Hook *ch); E_API Eina_Bool e_keyrouter_intercept_hook_call(E_Keyrouter_Intercept_Hook_Point hookpoint, int type, Ecore_Event_Key *event); -E_API void e_keyrouter_keygrab_list_lock(); -E_API void e_keyrouter_keygrab_list_unlock(); +E_API void *e_keyrouter_keygrab_list_get(void); +E_API int e_keyrouter_max_keycode_get(void); +E_API void e_keyrouter_keygrab_list_lock(); +E_API void e_keyrouter_keygrab_list_unlock(); E_API char *e_keyrouter_cmd_get_from_pid(int pid); - ////////////////////////////////////////////////////////////////////////// // This is for getting/setting internal value of E_Keyrouter_Key_List_Node E_API E_Keyrouter_Key_List_NodePtr e_keyrouter_key_list_node_create(void); @@ -95,8 +96,8 @@ E_API void e_keyrouter_key_list_node_status_set(E_Keyrou ///////////////////////////////////////////////////////////////// // This is for getting/setting internal value of E_Keyrouter_Info -E_API void *(*e_keyrouter_info_keygrab_list_get(void))(void); -E_API int (*e_keyrouter_info_max_keycode_get(void))(void); +E_DEPRECATED /* use e_keyrouter_keygrab_list_get() function instead */ E_API void *(*e_keyrouter_info_keygrab_list_get(void))(void); +E_DEPRECATED /* use e_keyrouter_max_keycode_get() function instead */ E_API int (*e_keyrouter_info_max_keycode_get(void))(void); /////////////////////////////////////////////////////////////////////// -- 2.34.1