e_keyrouter: Apply setter methods for E_Keyrouter_Grabbed_Key

TO-BE
- Apply setter methods to set values based on HardKeys and keycode.

Change-Id: I949a20a41e6babbe4c0d083323bb3cc6111177f8

diff --git a/src/bin/inputmgr/e_keyrouter.c b/src/bin/inputmgr/e_keyrouter.c
index 1bfbe63c26b5e18d97fb4704d47329d2918bf151..a1047c8fa99312eedb3cecb3a823d16c4482e22c 100644 (file)
--- a/src/bin/inputmgr/e_keyrouter.c
+++ b/src/bin/inputmgr/e_keyrouter.c
@@ -454,10 +454,10 @@ 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);
 
-        krt->HardKeys[data->keycode].keycode = data->keycode;
-        krt->HardKeys[data->keycode].keyname = (char *)eina_stringshare_add(data->name);
-        krt->HardKeys[data->keycode].no_privcheck = data->no_privcheck ? EINA_TRUE : EINA_FALSE;
-        krt->HardKeys[data->keycode].repeat = data->repeat ? EINA_TRUE : EINA_FALSE;
+        e_keyrouter_hardkeys_keycode_set(krt->HardKeys, data->keycode);
+        e_keyrouter_hardkeys_keyname_set(krt->HardKeys, data->keycode, (char *)eina_stringshare_add(data->name));
+        e_keyrouter_hardkeys_no_privcheck_set(krt->HardKeys, data->keycode, data->no_privcheck ? EINA_TRUE : EINA_FALSE);
+        e_keyrouter_hardkeys_repeat_set(krt->HardKeys, data->keycode, data->repeat ? EINA_TRUE : EINA_FALSE);
 
         if (!data->repeat)
           {

diff --git a/src/bin/inputmgr/e_keyrouter_events.c b/src/bin/inputmgr/e_keyrouter_events.c
index ccc957f9866c0419fd148f809ded5fa1748a88a7..e513f83b53829c9ab19ba3aabf9ceab2554bc96c 100644 (file)
--- a/src/bin/inputmgr/e_keyrouter_events.c
+++ b/src/bin/inputmgr/e_keyrouter_events.c
@@ -345,7 +345,7 @@ _e_keyrouter_send_key_events_release(int type, Ecore_Event_Key *ev, E_Device *de
 
         E_FREE(key_node_data);
      }
-   *hardkey_list = NULL;
+   e_keyrouter_hardkeys_list_set(krt->HardKeys, ev->keycode, TIZEN_KEYROUTER_MODE_PRESSED, NULL);
    g_rec_mutex_unlock(&krt->grab_key_mutex);
 }
 
@@ -636,7 +636,8 @@ _e_keyrouter_check_top_visible_window(E_Client *ec_focus, int arr_idx)
                {
                   if (ec_top == e_client_from_surface_resource(key_node_data->surface))
                     {
-                       krt->HardKeys[arr_idx].top_ptr = eina_list_promote_list(top_ptr_list, l);
+                       top_ptr_list = eina_list_promote_list(top_ptr_list, l);
+                       e_keyrouter_hardkeys_list_set(krt->HardKeys, arr_idx, TIZEN_KEYROUTER_MODE_TOPMOST, top_ptr_list);
                        KLDBG("Move a client(e_client: %p, wl_surface: %p) to first index of list(key: %d)",
                                 ec_top, key_node_data->surface, arr_idx);
                        g_rec_mutex_unlock(&krt->grab_key_mutex);