e_keyrouter: Modify keyname type of _E_Keyrouter_Grabbed_Key

- Change from char * to Eina_Stringshare *

Change-Id: I08faabe4d6d5f415a1839c00bc3e86c53c77b6c1

diff --git a/src/bin/inputmgr/e_keyrouter.c b/src/bin/inputmgr/e_keyrouter.c
index 6034cc3c55621cf83e0055f16ac312146c228c17..b49f1421a81e80b841b2d0a743453cedd9fb8618 100644 (file)
--- a/src/bin/inputmgr/e_keyrouter.c
+++ b/src/bin/inputmgr/e_keyrouter.c
@@ -440,7 +440,7 @@ e_keyrouter_query_tizen_key_table(void)
         KLINF("(keycode:%d,%s)(no_priv:%d)(repeat:%d)",
               data->keycode, data->name, data->no_privcheck, data->repeat);
 
-        e_keyrouter_hardkeys_keycode_set(krt->HardKeys, data->keycode, (char *)eina_stringshare_add(data->name),
+        e_keyrouter_hardkeys_keycode_set(krt->HardKeys, data->keycode, eina_stringshare_add(data->name),
               data->no_privcheck ? EINA_TRUE : EINA_FALSE, data->repeat ? EINA_TRUE : EINA_FALSE);
         if (!data->repeat)
           {

diff --git a/src/bin/inputmgr/e_keyrouter_hardkeys.c b/src/bin/inputmgr/e_keyrouter_hardkeys.c
index f2eb41f20ef16f714253bb9d7e00d3f91d32baf6..8cff82a0fed3bd8185737dc4f16f99e5f0d58ee3 100644 (file)
--- a/src/bin/inputmgr/e_keyrouter_hardkeys.c
+++ b/src/bin/inputmgr/e_keyrouter_hardkeys.c
@@ -195,7 +195,7 @@ e_keyrouter_hardkeys_remove_keynode_with_client(E_Keyrouter_Grabbed_Key *hardkey
    e_keyrouter_hardkeys_list_set(hardkeys, keycode, mode, hardkey_list);
 }
 
-EINTERN char *
+EINTERN const char *
 e_keyrouter_hardkeys_keyname_get(E_Keyrouter_Grabbed_Key *hardkeys,
         uint32_t keycode)
 {
@@ -255,7 +255,7 @@ e_keyrouter_hardkeys_list_set(E_Keyrouter_Grabbed_Key *hardkeys, uint32_t keycod
 
 EINTERN void
 e_keyrouter_hardkeys_keycode_set(E_Keyrouter_Grabbed_Key *hardkeys, uint32_t keycode,
-        char *keyname, Eina_Bool no_privcheck, Eina_Bool repeat)
+        Eina_Stringshare *keyname, Eina_Bool no_privcheck, Eina_Bool repeat)
 {
    EINA_SAFETY_ON_NULL_RETURN(hardkeys);
 

diff --git a/src/bin/inputmgr/e_keyrouter_hardkeys_intern.h b/src/bin/inputmgr/e_keyrouter_hardkeys_intern.h
index 0804b3230f2496c8e52a45486fa7b5245eb5f608..91f591a072e1acd1a308402e834b430d3093dd1f 100644 (file)
--- a/src/bin/inputmgr/e_keyrouter_hardkeys_intern.h
+++ b/src/bin/inputmgr/e_keyrouter_hardkeys_intern.h
@@ -14,12 +14,12 @@ EINTERN void       e_keyrouter_hardkeys_remove_keynode_with_surface(E_Keyrouter_
 EINTERN void       e_keyrouter_hardkeys_remove_keynode_with_client(E_Keyrouter_Grabbed_Key *hardkeys, uint32_t keycode, uint32_t mode, void *client);
 
 EINTERN Eina_List  *e_keyrouter_hardkeys_list_get(E_Keyrouter_Grabbed_Key *hardkeys, uint32_t keycode, uint32_t mode);
-EINTERN char       *e_keyrouter_hardkeys_keyname_get(E_Keyrouter_Grabbed_Key *hardkeys, uint32_t keycode);
+EINTERN const char *e_keyrouter_hardkeys_keyname_get(E_Keyrouter_Grabbed_Key *hardkeys, uint32_t keycode);
 EINTERN Eina_Bool  e_keyrouter_hardkeys_no_privcheck_get(E_Keyrouter_Grabbed_Key *hardkeys, uint32_t keycode);
 EINTERN Eina_Bool  e_keyrouter_hardkeys_repeat_get(E_Keyrouter_Grabbed_Key *hardkeys, uint32_t keycode);
 
 EINTERN void      e_keyrouter_hardkeys_list_set(E_Keyrouter_Grabbed_Key *hardkeys, uint32_t keycode, uint32_t mode, Eina_List *list);
-EINTERN void       e_keyrouter_hardkeys_keycode_set(E_Keyrouter_Grabbed_Key *hardkeys, uint32_t keycode, char *keyname, Eina_Bool no_privcheck, Eina_Bool repeat);
+EINTERN void       e_keyrouter_hardkeys_keycode_set(E_Keyrouter_Grabbed_Key *hardkeys, uint32_t keycode, Eina_Stringshare *keyname, Eina_Bool no_privcheck, Eina_Bool repeat);
 
 EINTERN Eina_Bool  e_keyrouter_harkeys_is_key_grabbed_by_client(E_Keyrouter_Grabbed_Key *hardkeys, uint32_t keycode, struct wl_client *client, uint32_t mode);
 EINTERN Eina_Bool  e_keyrouter_harkeys_is_key_grabbed_by_surface(E_Keyrouter_Grabbed_Key *hardkeys, uint32_t keycode, struct wl_resource *surface, uint32_t mode);

diff --git a/src/include/e_keyrouter.h b/src/include/e_keyrouter.h
index c5d2a1545fc781ec1e40aa3ccd81ca3a6dfa8995..82c21b29eb98d1c3513e782cab0ebd7cff8a40d9 100644 (file)
--- a/src/include/e_keyrouter.h
+++ b/src/include/e_keyrouter.h
@@ -30,7 +30,7 @@ typedef Eina_Bool (*E_Keyrouter_Intercept_Hook_Cb) (void *data, int type, Ecore_
 struct _E_Keyrouter_Grabbed_Key
 {
    int keycode;
-   char* keyname;
+   Eina_Stringshare *keyname;
    Eina_Bool no_privcheck;
    Eina_Bool repeat;