e_keyrouter: Rename e_keyrouter_hardkeys_-_available

- Change function names to be more clear.

Rename e_keyrouter_hardkeys_-_available to e_keyrouter_harkeys_is_key_grabbed_by_-

Change-Id: I8b22ac7e0a7cbe491f5d329f2f9df622f3992718

diff --git a/src/bin/inputmgr/e_keyrouter_hardkeys.c b/src/bin/inputmgr/e_keyrouter_hardkeys.c
index 31978108256ee3483570a1cc370af8cbf7c70d60..f2eb41f20ef16f714253bb9d7e00d3f91d32baf6 100644 (file)
--- a/src/bin/inputmgr/e_keyrouter_hardkeys.c
+++ b/src/bin/inputmgr/e_keyrouter_hardkeys.c
@@ -266,7 +266,7 @@ e_keyrouter_hardkeys_keycode_set(E_Keyrouter_Grabbed_Key *hardkeys, uint32_t key
 }
 
 EINTERN Eina_Bool
-e_keyrouter_hardkeys_client_available(E_Keyrouter_Grabbed_Key *hardkeys, uint32_t keycode,
+e_keyrouter_harkeys_is_key_grabbed_by_client(E_Keyrouter_Grabbed_Key *hardkeys, uint32_t keycode,
         struct wl_client *client, uint32_t mode)
 {
    E_Keyrouter_Key_List_Node *keynode;
@@ -287,7 +287,8 @@ e_keyrouter_hardkeys_client_available(E_Keyrouter_Grabbed_Key *hardkeys, uint32_
 }
 
 EINTERN Eina_Bool
-e_keyrouter_hardkeys_surface_available(E_Keyrouter_Grabbed_Key *hardkeys, uint32_t keycode, struct wl_resource *surface, uint32_t mode)
+e_keyrouter_harkeys_is_key_grabbed_by_surface(E_Keyrouter_Grabbed_Key *hardkeys, uint32_t keycode,
+        struct wl_resource *surface, uint32_t mode)
 {
    E_Keyrouter_Key_List_Node *keynode;
    Eina_List *l, *hardkey_list;

diff --git a/src/bin/inputmgr/e_keyrouter_hardkeys_intern.h b/src/bin/inputmgr/e_keyrouter_hardkeys_intern.h
index 59b0de84fd2449420cca7b162a61b50999973c32..0804b3230f2496c8e52a45486fa7b5245eb5f608 100644 (file)
--- a/src/bin/inputmgr/e_keyrouter_hardkeys_intern.h
+++ b/src/bin/inputmgr/e_keyrouter_hardkeys_intern.h
@@ -21,8 +21,8 @@ EINTERN Eina_Bool  e_keyrouter_hardkeys_repeat_get(E_Keyrouter_Grabbed_Key *hard
 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 Eina_Bool e_keyrouter_hardkeys_client_available(E_Keyrouter_Grabbed_Key *hardkeys, uint32_t keycode, struct wl_client *client, uint32_t mode);
-EINTERN Eina_Bool e_keyrouter_hardkeys_surface_available(E_Keyrouter_Grabbed_Key *hardkeys, uint32_t keycode, struct wl_resource *surface, uint32_t mode);
+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);
 
 #endif
 

diff --git a/src/bin/inputmgr/e_keyrouter_list.c b/src/bin/inputmgr/e_keyrouter_list.c
index 3920c88f117dc8e17627139aaa312591800c802e..7bbe5ef0b049f0e4f36048eb8a9d3a28b0a4a8f4 100644 (file)
--- a/src/bin/inputmgr/e_keyrouter_list.c
+++ b/src/bin/inputmgr/e_keyrouter_list.c
@@ -19,7 +19,7 @@ _e_keyrouter_find_duplicated_client(struct wl_resource *surface, struct wl_clien
 
    if (surface)
      {
-        if (e_keyrouter_hardkeys_surface_available(krt->HardKeys, key, surface, mode))
+        if (e_keyrouter_harkeys_is_key_grabbed_by_surface(krt->HardKeys, key, surface, mode))
           {
              KLDBG("The key(%d) is already grabbed same mode(%s) on the same wl_surface %p",
                    key, e_keyrouter_util_mode_to_string(mode), surface);
@@ -29,7 +29,7 @@ _e_keyrouter_find_duplicated_client(struct wl_resource *surface, struct wl_clien
      }
    else
      {
-        if (e_keyrouter_hardkeys_client_available(krt->HardKeys, key, wc, mode))
+        if (e_keyrouter_harkeys_is_key_grabbed_by_client(krt->HardKeys, key, wc, mode))
           {
              KLDBG("The key(%d) is already grabbed same mode(%s) on the same wl_client %p",
                    key, e_keyrouter_util_mode_to_string(mode), wc);
@@ -153,22 +153,22 @@ e_keyrouter_find_keygrab_mode(struct wl_resource *surface, struct wl_client *cli
 
    if (!surface)
      {
-        if (e_keyrouter_hardkeys_client_available(krt->HardKeys, key, client, TIZEN_KEYROUTER_MODE_EXCLUSIVE))
+        if (e_keyrouter_harkeys_is_key_grabbed_by_client(krt->HardKeys, key, client, TIZEN_KEYROUTER_MODE_EXCLUSIVE))
           {
              mode = TIZEN_KEYROUTER_MODE_EXCLUSIVE;
              goto finish;
           }
-        if (e_keyrouter_hardkeys_client_available(krt->HardKeys, key, client, TIZEN_KEYROUTER_MODE_OVERRIDABLE_EXCLUSIVE))
+        if (e_keyrouter_harkeys_is_key_grabbed_by_client(krt->HardKeys, key, client, TIZEN_KEYROUTER_MODE_OVERRIDABLE_EXCLUSIVE))
           {
              mode = TIZEN_KEYROUTER_MODE_OVERRIDABLE_EXCLUSIVE;
              goto finish;
           }
-        if (e_keyrouter_hardkeys_client_available(krt->HardKeys, key, client, TIZEN_KEYROUTER_MODE_TOPMOST))
+        if (e_keyrouter_harkeys_is_key_grabbed_by_client(krt->HardKeys, key, client, TIZEN_KEYROUTER_MODE_TOPMOST))
           {
              mode = TIZEN_KEYROUTER_MODE_TOPMOST;
              goto finish;
           }
-        if (e_keyrouter_hardkeys_client_available(krt->HardKeys, key, client, TIZEN_KEYROUTER_MODE_SHARED))
+        if (e_keyrouter_harkeys_is_key_grabbed_by_client(krt->HardKeys, key, client, TIZEN_KEYROUTER_MODE_SHARED))
           {
              mode = TIZEN_KEYROUTER_MODE_SHARED;
              goto finish;
@@ -176,22 +176,22 @@ e_keyrouter_find_keygrab_mode(struct wl_resource *surface, struct wl_client *cli
      }
    else
      {
-        if (e_keyrouter_hardkeys_surface_available(krt->HardKeys, key, surface, TIZEN_KEYROUTER_MODE_EXCLUSIVE))
+        if (e_keyrouter_harkeys_is_key_grabbed_by_surface(krt->HardKeys, key, surface, TIZEN_KEYROUTER_MODE_EXCLUSIVE))
           {
              mode = TIZEN_KEYROUTER_MODE_EXCLUSIVE;
              goto finish;
           }
-        if (e_keyrouter_hardkeys_surface_available(krt->HardKeys, key, surface, TIZEN_KEYROUTER_MODE_OVERRIDABLE_EXCLUSIVE))
+        if (e_keyrouter_harkeys_is_key_grabbed_by_surface(krt->HardKeys, key, surface, TIZEN_KEYROUTER_MODE_OVERRIDABLE_EXCLUSIVE))
           {
              mode = TIZEN_KEYROUTER_MODE_OVERRIDABLE_EXCLUSIVE;
              goto finish;
           }
-        if (e_keyrouter_hardkeys_surface_available(krt->HardKeys, key, surface, TIZEN_KEYROUTER_MODE_TOPMOST))
+        if (e_keyrouter_harkeys_is_key_grabbed_by_surface(krt->HardKeys, key, surface, TIZEN_KEYROUTER_MODE_TOPMOST))
           {
              mode = TIZEN_KEYROUTER_MODE_TOPMOST;
              goto finish;
           }
-        if (e_keyrouter_hardkeys_surface_available(krt->HardKeys, key, surface, TIZEN_KEYROUTER_MODE_SHARED))
+        if (e_keyrouter_harkeys_is_key_grabbed_by_surface(krt->HardKeys, key, surface, TIZEN_KEYROUTER_MODE_SHARED))
           {
              mode = TIZEN_KEYROUTER_MODE_SHARED;
              goto finish;