e_keyrouter: refactoring code calling a hook and fix typo

Change-Id: I8005f98c28ca118092542a6dc79e0280290f3140

diff --git a/src/bin/inputmgr/e_keyrouter_event.c b/src/bin/inputmgr/e_keyrouter_event.c
index 30a4d8bd8e30b69d099a0e3d8060c6edd504a78e..4ebfec075089aab219e66647c404d57174de9c2c 100644 (file)
--- a/src/bin/inputmgr/e_keyrouter_event.c
+++ b/src/bin/inputmgr/e_keyrouter_event.c
@@ -293,7 +293,7 @@ static void
 _e_keyrouter_send_key_events_release(int type, Ecore_Event_Key *ev, E_Device *dev)
 {
    E_Keyrouter_Key_List_NodePtr key_node_data;
-   Eina_Bool res_hook = EINA_TRUE;
+   Eina_Bool res = EINA_TRUE;
    E_Keyrouter_Event_Data *key_data = NULL;
    Eina_List *press_ptr_list = NULL;
 
@@ -304,39 +304,36 @@ _e_keyrouter_send_key_events_release(int type, Ecore_Event_Key *ev, E_Device *de
      {
         if (key_node_data->focused == EINA_TRUE)
           {
-             res_hook = e_keyrouter_intercept_hook_call(E_KEYROUTER_INTERCEPT_HOOK_DELIVER_FOCUS, type, ev);
-             key_data = (E_Keyrouter_Event_Data *)ev->data;
-
-             if (res_hook)
+             res = e_keyrouter_intercept_hook_call(E_KEYROUTER_INTERCEPT_HOOK_DELIVER_FOCUS, type, ev);
+             if (!res)
                {
-                  if (key_data->ignored)
-                    {
-                       E_FREE(key_node_data);
-                       continue;
-                    }
-                  if (key_data->surface || key_data->client)
-                    {
-                       _e_keyrouter_send_key_event(type, key_data->surface, key_data->client, ev, dev,
-                                                   EINA_FALSE);
-
-                       _e_keyrouter_log_key_event(KEY_EVENT_LOG_TYPE_RELEASE_HOOK, "PRESSED",
-                                                  ev->keycode,
-                                                  key_node_data->focused,
-                                                  key_node_data->status,
-                                                  key_node_data->surface,
-                                                  key_node_data->wc);
+                  E_FREE(key_node_data);
+                  continue;
+               }
 
-                       E_FREE(key_node_data);
+             key_data = (E_Keyrouter_Event_Data *)ev->data;
 
-                       continue;
-                    }
+             if (key_data->ignored)
+               {
+                  E_FREE(key_node_data);
+                  continue;
+               }
+             if (key_data->surface || key_data->client)
+               {
+                  _e_keyrouter_send_key_event(type, key_data->surface, key_data->client, ev, dev,
+                                              EINA_FALSE);
+
+                  _e_keyrouter_log_key_event(KEY_EVENT_LOG_TYPE_RELEASE_HOOK, "PRESSED",
+                                             ev->keycode,
+                                             EINA_FALSE,
+                                             E_KRT_CSTAT_ALIVE,
+                                             key_data->surface,
+                                             key_data->client);
+
+                  E_FREE(key_node_data);
+                  continue;
                }
-          }
 
-        if (!res_hook)
-          {
-             E_FREE(key_node_data);
-             continue;
           }
 
         if (key_node_data->status == E_KRT_CSTAT_ALIVE)
@@ -451,10 +448,10 @@ _e_keyrouter_send_key_events_press(int type, Ecore_Event_Key *ev, E_Device *dev)
 
                        _e_keyrouter_log_key_event(key_event_log_type, "TOPMOST (TOP_POSITION)",
                                                   ev->keycode,
-                                                  key_node_data->focused,
-                                                  key_node_data->status,
-                                                  key_node_data->surface,
-                                                  key_node_data->wc);
+                                                  top_key_node_data->focused,
+                                                  top_key_node_data->status,
+                                                  top_key_node_data->surface,
+                                                  top_key_node_data->wc);
 
                        g_rec_mutex_unlock(&krt->grab_key_mutex);
 
@@ -524,7 +521,7 @@ need_shared:
 }
 
 static Eina_Bool
-_e_keyrouter_send_key_events_focus(int type, struct wl_resource *surface_focus,  Ecore_Event_Key *ev, E_Device *dev, struct wl_resource **delivered_surface)
+_e_keyrouter_send_key_events_focus(int type, struct wl_resource *surface_focus, Ecore_Event_Key *ev, E_Device *dev, struct wl_resource **delivered_surface)
 {
    E_Keyrouter_Event_Data *key_data;
    Eina_Bool res = EINA_TRUE;
@@ -698,7 +695,7 @@ _e_keyrouter_cb_key_up(void *data, int type, void *event)
 
    ev = (Ecore_Event_Key *)event;
 
-   TRACE_INPUT_BEGIN(_e_keyrouter_cb_key_down:KEY_RELEASE(%d), ev->keycode);
+   TRACE_INPUT_BEGIN(_e_keyrouter_cb_key_up:KEY_RELEASE(%d), ev->keycode);
    TRACE_INPUT_END();
 
    return _e_keyrouter_event_process(event, (E_Device *)ev->dev, type);