Modify log levels and remove unnecessary logs

Change-Id: I719a3fa7d43ce97922e00ac820bf1e8db4787590

diff --git a/src/e_mod_keyrouter_events.c b/src/e_mod_keyrouter_events.c
index a23cbeb..797d52a 100644 (file)
--- a/src/e_mod_keyrouter_events.c
+++ b/src/e_mod_keyrouter_events.c
@@ -41,11 +41,11 @@ e_keyrouter_process_key_event(void *event, int type)
 
    if (!ev) return res;
 
-   KLDBG("type=%s\n", (type == ECORE_EVENT_KEY_DOWN) ? "ECORE_EVENT_KEY_DOWN" : "ECORE_EVENT_KEY_UP");
+   KLDBG("[%s] keyname: %s, key: %s, keycode: %d\n", (type == ECORE_EVENT_KEY_DOWN) ? "KEY_PRESS" : "KEY_RELEASE", ev->keyname, ev->key, ev->keycode);
 
    if (krt->max_tizen_hwkeys < ev->keycode)
      {
-        KLDBG("The key(%d) is too larger to process keyrouting: Invalid keycode\n", ev->keycode);
+        KLWRN("The key(%d) is too larger to process keyrouting: Invalid keycode\n", ev->keycode);
         return res;
      }
 
@@ -64,10 +64,7 @@ e_keyrouter_process_key_event(void *event, int type)
    //KLDBG("The key(%d) is going to be sent to the proper wl client(s) !\n", ev->keycode);
 
   if (_e_keyrouter_send_key_events(type, ev))
-    {
-       res = EINA_FALSE;
-       KLDBG("Key event(s) has/have been sent to wl client(s) !\n");
-    }
+    res = EINA_FALSE;
 
    return res;
 }
@@ -99,8 +96,8 @@ _e_keyrouter_send_key_events_release(int type, Ecore_Event_Key *ev)
         if (key_node_data)
           {
              _e_keyrouter_send_key_event(type, key_node_data->surface, key_node_data->wc, ev);
-             KLDBG("Release Pair : Key %s(%d) ===> E_Client (%p) WL_Client (%p)\n",
-                      ((ECORE_EVENT_KEY_DOWN == type) ? "Down" : "Up"), ev->keycode, key_node_data->surface, key_node_data->wc);
+             KLINF("Release Pair : Key %s(%s:%d) ===> E_Client (%p) WL_Client (%p)\n",
+                      ((ECORE_EVENT_KEY_DOWN == type) ? "Down" : "Up"), ev->keyname, ev->keycode, key_node_data->surface, key_node_data->wc);
              E_FREE(key_node_data);
           }
      }
@@ -124,8 +121,8 @@ _e_keyrouter_send_key_events_press(int type, Ecore_Event_Key *ev)
         if (key_node_data)
           {
              _e_keyrouter_send_key_event(type, key_node_data->surface, key_node_data->wc, ev);
-             KLDBG("EXCLUSIVE Mode : Key %s(%d) ===> Surface (%p) WL_Client (%p)\n",
-                      ((ECORE_EVENT_KEY_DOWN == type) ? "Down" : "Up"), ev->keycode, key_node_data->surface, key_node_data->wc);
+             KLINF("EXCLUSIVE Mode : Key %s(%s:%d) ===> Surface (%p) WL_Client (%p)\n",
+                      ((ECORE_EVENT_KEY_DOWN == type) ? "Down" : "Up"), ev->keyname, ev->keycode, key_node_data->surface, key_node_data->wc);
 
              return EINA_TRUE;
           }
@@ -136,8 +133,8 @@ _e_keyrouter_send_key_events_press(int type, Ecore_Event_Key *ev)
         if (key_node_data)
           {
              _e_keyrouter_send_key_event(type, key_node_data->surface, key_node_data->wc, ev);
-             KLDBG("OVERRIDABLE_EXCLUSIVE Mode : Key %s(%d) ===> Surface (%p) WL_Client (%p)\n",
-                     ((ECORE_EVENT_KEY_DOWN == type) ? "Down" : "Up"), ev->keycode, key_node_data->surface, key_node_data->wc);
+             KLINF("OVERRIDABLE_EXCLUSIVE Mode : Key %s(%s:%d) ===> Surface (%p) WL_Client (%p)\n",
+                     ((ECORE_EVENT_KEY_DOWN == type) ? "Down" : "Up"), ev->keyname, ev->keycode, key_node_data->surface, key_node_data->wc);
 
              return EINA_TRUE;
           }
@@ -156,8 +153,8 @@ _e_keyrouter_send_key_events_press(int type, Ecore_Event_Key *ev)
                   if ((EINA_FALSE == krt->isWindowStackChanged) && (surface_focus == key_node_data->surface))
                     {
                        _e_keyrouter_send_key_event(type, key_node_data->surface, NULL, ev);
-                       KLDBG("TOPMOST (TOP_POSITION) Mode : Key %s (%d) ===> Surface (%p)\n",
-                                ((ECORE_EVENT_KEY_DOWN == type) ? "Down" : "Up"), ev->keycode, key_node_data->surface);
+                       KLINF("TOPMOST (TOP_POSITION) Mode : Key %s (%s:%d) ===> Surface (%p)\n",
+                                ((ECORE_EVENT_KEY_DOWN == type) ? "Down" : "Up"), ev->keyname, ev->keycode, key_node_data->surface);
 
                        return EINA_TRUE;
                     }
@@ -166,8 +163,8 @@ _e_keyrouter_send_key_events_press(int type, Ecore_Event_Key *ev)
                   if (_e_keyrouter_check_top_visible_window(ec_focus, keycode))
                     {
                        _e_keyrouter_send_key_event(type, key_node_data->surface, NULL, ev);
-                       KLDBG("TOPMOST (TOP_POSITION) Mode : Key %s (%d) ===> Surface (%p)\n",
-                             ((ECORE_EVENT_KEY_DOWN == type) ? "Down" : "Up"), ev->keycode,key_node_data->surface);
+                       KLINF("TOPMOST (TOP_POSITION) Mode : Key %s (%s:%d) ===> Surface (%p)\n",
+                             ((ECORE_EVENT_KEY_DOWN == type) ? "Down" : "Up"), ev->keyname, ev->keycode,key_node_data->surface);
 
                        return EINA_TRUE;
                     }
@@ -179,8 +176,8 @@ _e_keyrouter_send_key_events_press(int type, Ecore_Event_Key *ev)
    if (krt->HardKeys[keycode].shared_ptr)
      {
         _e_keyrouter_send_key_event(type, surface_focus, NULL, ev);
-        KLDBG("SHARED [Focus client] : Key %s (%d) ===> Surface (%p)\n",
-                 ((ECORE_EVENT_KEY_DOWN == type) ? "Down" : "Up "), ev->keycode, surface_focus);
+        KLINF("SHARED [Focus client] : Key %s (%s:%d) ===> Surface (%p)\n",
+                 ((ECORE_EVENT_KEY_DOWN == type) ? "Down" : "Up "), ev->keyname, ev->keycode, surface_focus);
 
         EINA_LIST_FOREACH(krt->HardKeys[keycode].shared_ptr, l, key_node_data)
           {
@@ -191,8 +188,8 @@ _e_keyrouter_send_key_events_press(int type, Ecore_Event_Key *ev)
                        if (key_node_data->surface != surface_focus)
                          {
                             _e_keyrouter_send_key_event(type, key_node_data->surface, key_node_data->wc, ev);
-                            KLDBG("SHARED Mode : Key %s(%d) ===> Surface (%p) WL_Client (%p)\n",
-                                     ((ECORE_EVENT_KEY_DOWN == type) ? "Down" : "Up"), ev->keycode, key_node_data->surface, key_node_data->wc);
+                            KLINF("SHARED Mode : Key %s(%s:%d) ===> Surface (%p) WL_Client (%p)\n",
+                                     ((ECORE_EVENT_KEY_DOWN == type) ? "Down" : "Up"), ev->keyname, ev->keycode, key_node_data->surface, key_node_data->wc);
                          }
                     }
                   else
@@ -200,8 +197,8 @@ _e_keyrouter_send_key_events_press(int type, Ecore_Event_Key *ev)
                        if ((surface_focus) && (key_node_data->wc != wl_resource_get_client(surface_focus)))
                          {
                             _e_keyrouter_send_key_event(type, key_node_data->surface, key_node_data->wc, ev);
-                            KLDBG("SHARED Mode : Key %s(%d) ===> Surface (%p) WL_Client (%p)\n",
-                                     ((ECORE_EVENT_KEY_DOWN == type) ? "Down" : "Up"), ev->keycode, key_node_data->surface, key_node_data->wc);
+                            KLINF("SHARED Mode : Key %s(%s:%d) ===> Surface (%p) WL_Client (%p)\n",
+                                     ((ECORE_EVENT_KEY_DOWN == type) ? "Down" : "Up"), ev->keyname, ev->keycode, key_node_data->surface, key_node_data->wc);
                          }
                     }
                }
@@ -230,8 +227,8 @@ _e_keyrouter_send_key_events_register(int type, Ecore_Event_Key *ev)
      }
 
    _e_keyrouter_send_key_event(type, krt->HardKeys[keycode].registered_ptr->surface, NULL, ev);
-   KLDBG("REGISTER Mode : Key %s(%d) ===> Surface (%p)\n",
-            ((ECORE_EVENT_KEY_DOWN == type) ? "Down" : "Up"), ev->keycode, krt->HardKeys[keycode].registered_ptr->surface);
+   KLINF("REGISTER Mode : Key %s(%s:%d) ===> Surface (%p)\n",
+            ((ECORE_EVENT_KEY_DOWN == type) ? "Down" : "Up"), ev->keyname, ev->keycode, krt->HardKeys[keycode].registered_ptr->surface);
 
    return EINA_TRUE;
 }
@@ -244,7 +241,6 @@ _e_keyrouter_check_top_visible_window(E_Client *ec_focus, int arr_idx)
    E_Keyrouter_Key_List_NodePtr key_node_data = NULL;
 
    ec_top = e_client_top_get();
-   KLDBG("Top Client: %p\n", ec_top);
 
    while (ec_top)
      {
@@ -277,7 +273,6 @@ _e_keyrouter_check_top_visible_window(E_Client *ec_focus, int arr_idx)
           }
 
         ec_top = e_client_below_get(ec_top);
-        KLDBG("Next client: %p\n", ec_top);
      }
    return EINA_FALSE;
 }
@@ -304,7 +299,7 @@ _e_keyrouter_send_key_event(int type, struct wl_resource *surface, struct wl_cli
 
    if (!wc_send)
      {
-        KLDBG("surface: %p or wc: %p returns null wayland client\n", surface, wc);
+        KLWRN("surface: %p or wc: %p returns null wayland client\n", surface, wc);
         return;
      }
 

diff --git a/src/e_mod_keyrouter_list.c b/src/e_mod_keyrouter_list.c
index 3c812c6..684c4e4 100644 (file)
--- a/src/e_mod_keyrouter_list.c
+++ b/src/e_mod_keyrouter_list.c
@@ -52,7 +52,7 @@ e_keyrouter_set_keygrab_in_list(struct wl_resource *surface, struct wl_client *c
 
    EINA_SAFETY_ON_FALSE_RETURN_VAL(res == TIZEN_KEYROUTER_ERROR_NONE, res);
 
-   KLDBG("Succeed to set keygrab info surface: %p, client: %p key: %d mode: %s\n",
+   KLINF("Succeed to set keygrab info surface: %p, client: %p key: %d mode: %s\n",
          surface, client, key, _mode_str_get(mode));
 
    return res;
@@ -87,7 +87,7 @@ _e_keyrouter_find_duplicated_client(struct wl_resource *surface, struct wl_clien
          break;
 
       default:
-         KLDBG("Unknown key(%d) and grab mode(%d)\n", key, mode);
+         KLWRN("Unknown key(%d) and grab mode(%d)\n", key, mode);
          return TIZEN_KEYROUTER_ERROR_INVALID_MODE;
      }
 
@@ -155,91 +155,37 @@ e_keyrouter_prepend_to_keylist(struct wl_resource *surface, struct wl_client *wc
 
    if (!new_keyptr)
      {
-        KLDBG("Failled to allocate memory for new_keyptr\n");
+        KLERR("Failled to allocate memory for new_keyptr\n");
         return TIZEN_KEYROUTER_ERROR_NO_SYSTEM_RESOURCES;
      }
 
    new_keyptr->surface = surface;
    new_keyptr->wc = wc;
 
-   if (surface)
-     {
-        KLDBG("Now it's going to add a key(%d) mode(%d) for surface(%p), wc(NULL)\n", key, mode, surface);
-     }
-   else
-     {
-        KLDBG("Now it's going to add a key(%d) mode(%d) for surface(NULL), wc(%p)\n", key, mode, wc);
-     }
-
    switch(mode)
      {
       case TIZEN_KEYROUTER_MODE_EXCLUSIVE:
          krt->HardKeys[key].excl_ptr = eina_list_prepend(krt->HardKeys[key].excl_ptr, new_keyptr);
-
-         if (surface)
-           {
-              KLDBG("Succeed to set keygrab information (surface:%p, wl_client:NULL, key:%d, mode:EXCLUSIVE)\n", surface, key);
-           }
-         else
-           {
-              KLDBG("Succeed to set keygrab information (surface:NULL, wl_client:%p, key:%d, mode:EXCLUSIVE)\n", wc, key);
-           }
          break;
 
       case TIZEN_KEYROUTER_MODE_OVERRIDABLE_EXCLUSIVE:
          krt->HardKeys[key].or_excl_ptr= eina_list_prepend(krt->HardKeys[key].or_excl_ptr, new_keyptr);
-
-         if (surface)
-           {
-              KLDBG("TIZEN_KEYROUTER_MODE_OVERRIDABLE_EXCLUSIVE, key=%d, surface(%p), wl_client(NULL) has been set !\n", key, surface);
-           }
-         else
-           {
-              KLDBG("TIZEN_KEYROUTER_MODE_OVERRIDABLE_EXCLUSIVE, key=%d, surface(NULL), wl_client(%p) has been set !\n", key, wc);
-           }
          break;
 
       case TIZEN_KEYROUTER_MODE_TOPMOST:
          krt->HardKeys[key].top_ptr = eina_list_prepend(krt->HardKeys[key].top_ptr, new_keyptr);
-
-         if (surface)
-           {
-              KLDBG("TIZEN_KEYROUTER_MODE_TOPMOST, key=%d, surface(%p), wl_client(NULL) has been set !\n", key, surface);
-           }
-         else
-           {
-              KLDBG("TIZEN_KEYROUTER_MODE_TOPMOST, key=%d, surface(NULL), wl_client(%p) has been set !\n", key, wc);
-           }
          break;
 
       case TIZEN_KEYROUTER_MODE_SHARED:
          krt->HardKeys[key].shared_ptr= eina_list_prepend(krt->HardKeys[key].shared_ptr, new_keyptr);
-
-         if (surface)
-           {
-              KLDBG("TIZEN_KEYROUTER_MODE_SHARED, key=%d, surface(%p), wl_client(NULL) has been set !\n", key, surface);
-           }
-         else
-           {
-              KLDBG("TIZEN_KEYROUTER_MODE_SHARED, key=%d, surface(NULL), wl_client(%p) has been set !\n", key, wc);
-           }
          break;
 
       case TIZEN_KEYROUTER_MODE_PRESSED:
          krt->HardKeys[key].press_ptr = eina_list_prepend(krt->HardKeys[key].press_ptr, new_keyptr);
-
-         if (surface)
-           {
-              KLDBG("TIZEN_KEYROUTER_MODE_PRESSED, key=%d, surface(%p), wl_client(NULL) has been set !\n", key, surface);
-           }
-         else
-           {
-              KLDBG("TIZEN_KEYROUTER_MODE_PRESSED, key=%d, surface(NULL), wl_client(%p) has been set !\n", key, wc);
-           }
          break;
 
       default:
-         KLDBG("Unknown key(%d) and grab mode(%d)\n", key, mode);
+         KLWRN("Unknown key(%d) and grab mode(%d)\n", key, mode);
          E_FREE(new_keyptr);
          return TIZEN_KEYROUTER_ERROR_INVALID_MODE;
      }
@@ -248,7 +194,6 @@ e_keyrouter_prepend_to_keylist(struct wl_resource *surface, struct wl_client *wc
      {
         if (surface)
           {
-             KLDBG("Add a surface(%p) destory listener\n", surface);
              e_keyrouter_add_surface_destroy_listener(surface);
              /* TODO: if failed add surface_destory_listener, remove keygrabs */
           }
@@ -260,7 +205,6 @@ e_keyrouter_prepend_to_keylist(struct wl_resource *surface, struct wl_client *wc
         else if (wc)
 #endif
           {
-             KLDBG("Add a client(%p) destory listener\n", wc);
              e_keyrouter_add_client_destroy_listener(wc);
              /* TODO: if failed add client_destory_listener, remove keygrabs */
           }
@@ -325,14 +269,14 @@ e_keyrouter_remove_client_from_list(struct wl_resource *surface, struct wl_clien
                     {
                        krt->HardKeys[i].excl_ptr = eina_list_remove_list(krt->HardKeys[i].excl_ptr, l);
                        E_FREE(key_node_data);
-                       KLDBG("Remove a Exclusive Mode Grabbed key(%d) by surface(%p)\n", i, surface);
+                       KLINF("Remove a Exclusive Mode Grabbed key(%d) by surface(%p)\n", i, surface);
                     }
                }
              else if ((wc == key_node_data->wc))
                {
                   krt->HardKeys[i].excl_ptr = eina_list_remove_list(krt->HardKeys[i].excl_ptr, l);
                   E_FREE(key_node_data);
-                  KLDBG("Remove a Exclusive Mode Grabbed key(%d) by wc(%p)\n", i, wc);
+                  KLINF("Remove a Exclusive Mode Grabbed key(%d) by wc(%p)\n", i, wc);
                }
           }
         EINA_LIST_FOREACH_SAFE(krt->HardKeys[i].or_excl_ptr, l, l_next, key_node_data)
@@ -345,14 +289,14 @@ e_keyrouter_remove_client_from_list(struct wl_resource *surface, struct wl_clien
                     {
                        krt->HardKeys[i].or_excl_ptr = eina_list_remove_list(krt->HardKeys[i].or_excl_ptr, l);
                        E_FREE(key_node_data);
-                       KLDBG("Remove a Overridable_Exclusive Mode Grabbed key(%d) by surface(%p)\n", i, surface);
+                       KLINF("Remove a Overridable_Exclusive Mode Grabbed key(%d) by surface(%p)\n", i, surface);
                     }
                }
              else if ((wc == key_node_data->wc))
                {
                   krt->HardKeys[i].or_excl_ptr = eina_list_remove_list(krt->HardKeys[i].or_excl_ptr, l);
                   E_FREE(key_node_data);
-                  KLDBG("Remove a Overridable_Exclusive Mode Grabbed key(%d) by wc(%p)\n", i, wc);
+                  KLINF("Remove a Overridable_Exclusive Mode Grabbed key(%d) by wc(%p)\n", i, wc);
                }
           }
         EINA_LIST_FOREACH_SAFE(krt->HardKeys[i].top_ptr, l, l_next, key_node_data)
@@ -365,14 +309,14 @@ e_keyrouter_remove_client_from_list(struct wl_resource *surface, struct wl_clien
                     {
                        krt->HardKeys[i].top_ptr = eina_list_remove_list(krt->HardKeys[i].top_ptr, l);
                        E_FREE(key_node_data);
-                       KLDBG("Remove a Topmost Mode Grabbed key(%d) by surface(%p)\n", i, surface);
+                       KLINF("Remove a Topmost Mode Grabbed key(%d) by surface(%p)\n", i, surface);
                     }
                }
              else if ((wc == key_node_data->wc))
                {
                   krt->HardKeys[i].top_ptr = eina_list_remove_list(krt->HardKeys[i].top_ptr, l);
                   E_FREE(key_node_data);
-                  KLDBG("Remove a Topmost Mode Grabbed key(%d) by wc(%p)\n", i, wc);
+                  KLINF("Remove a Topmost Mode Grabbed key(%d) by wc(%p)\n", i, wc);
                }
           }
         EINA_LIST_FOREACH_SAFE(krt->HardKeys[i].shared_ptr, l, l_next, key_node_data)
@@ -385,14 +329,14 @@ e_keyrouter_remove_client_from_list(struct wl_resource *surface, struct wl_clien
                     {
                        krt->HardKeys[i].shared_ptr = eina_list_remove_list(krt->HardKeys[i].shared_ptr, l);
                        E_FREE(key_node_data);
-                       KLDBG("Remove a Shared Mode Grabbed key(%d) by surface(%p)\n", i, surface);
+                       KLINF("Remove a Shared Mode Grabbed key(%d) by surface(%p)\n", i, surface);
                     }
                }
              else if ((wc == key_node_data->wc))
                {
                   krt->HardKeys[i].shared_ptr = eina_list_remove_list(krt->HardKeys[i].shared_ptr, l);
                   E_FREE(key_node_data);
-                  KLDBG("Remove a Shared Mode Grabbed key(%d) by wc(%p)\n", i, wc);
+                  KLINF("Remove a Shared Mode Grabbed key(%d) by wc(%p)\n", i, wc);
                }
           }
      }
@@ -422,8 +366,6 @@ e_keyrouter_find_key_in_list(struct wl_resource *surface, struct wl_client *wc,
    found = _e_keyrouter_find_key_in_list(surface, wc, key, mode);
    if (found) goto finish;
 
-   KLDBG("%d key is not grabbed by (surface: %p, wl_client: %p)\n",
-            key, surface, wc);
    return TIZEN_KEYROUTER_MODE_NONE;
 
 finish:
@@ -469,11 +411,8 @@ _e_keyrouter_build_register_list(void)
    while (ec_top)
      {
         surface = e_keyrouter_util_get_surface_from_eclient(ec_top);
-        KLDBG("client: %p, surface: %p\n", ec_top, surface);
-
         if (ec_top == ec_focus)
           {
-             KLDBG("%p is focus client.\n", ec_top);
              below_focus = EINA_TRUE;
           }
 
@@ -530,11 +469,8 @@ e_keyrouter_set_keyregister(struct wl_client *client, struct wl_resource *surfac
 
    _e_keyrouter_add_registered_surface_in_list(surface, key);
 
-   KLDBG("surface :%p is newly request register about key: %d\n", surface, key);
-
    if (surface)
      {
-        KLDBG("Add a surface(%p) destory listener\n", surface);
         e_keyrouter_add_surface_destroy_listener(surface);
         /* TODO: if failed add surface_destory_listener, remove keygrabs */
      }
@@ -561,17 +497,14 @@ e_keyrouter_unset_keyregister(struct wl_resource *surface, struct wl_client *cli
 
         if (data->surface == surface)
           {
-             KLDBG("Find %p surface in list\n", surface);
              EINA_LIST_FOREACH_SAFE(data->keys, ll, ll_next, ddata)
                {
                   if (!ddata) continue;
 
                   if (*ddata == key)
                     {
-                       KLDBG("Find %d key in list\n", key);
                        data->keys = eina_list_remove_list(data->keys, ll);
                        E_FREE(ddata);
-                       KLDBG("Unset %d key in %p surface's list\n", key, surface);
                     }
                }
           }
@@ -617,7 +550,7 @@ _e_keyrouter_add_registered_surface_in_list(struct wl_resource *surface, int key
              rwin_info->keys = eina_list_append(rwin_info->keys, key_added);
              surface_finded = EINA_TRUE;
 
-             KLDBG("Registered Key(%d) is added to surface (%p)\n", key, surface);
+             KLINF("Registered Key(%d) is added to surface (%p)\n", key, surface);
              break;
           }
      }
@@ -631,7 +564,7 @@ _e_keyrouter_add_registered_surface_in_list(struct wl_resource *surface, int key
         rwin_added->keys = eina_list_append(rwin_added->keys, key_added);
         krt->registered_window_list = eina_list_append(krt->registered_window_list, rwin_added);
 
-        KLDBG("Surface(%p) and key(%d) is added list\n", surface, key);
+        KLINF("Surface(%p) and key(%d) is added list\n", surface, key);
      }
 }
 
@@ -689,7 +622,6 @@ e_keyrouter_clear_registered_window(void)
 {
    if (!krt->registered_window_list)
      {
-        KLDBG("Do not build register list, no register surface\n");
         return;
      }
    _e_keyrouter_clean_register_list();

diff --git a/src/e_mod_main_wl.c b/src/e_mod_main_wl.c
index d9bd97f..c75649c 100644 (file)
--- a/src/e_mod_main_wl.c
+++ b/src/e_mod_main_wl.c
@@ -54,20 +54,16 @@ _e_keyrouter_keygrab_set(struct wl_client *client, struct wl_resource *surface,
         /* Regarding topmost mode, a client must request to grab a key with a valid surface. */
         if (mode == TIZEN_KEYROUTER_MODE_TOPMOST)
           {
-             KLDBG("Invalid surface for TOPMOST grab mode ! (key=%d, mode=%d)\n", key, mode);
+             KLWRN("Invalid surface for TOPMOST grab mode ! (key=%d, mode=%d)\n", key, mode);
 
              return TIZEN_KEYROUTER_ERROR_INVALID_SURFACE;
           }
-        else
-          {
-             KLDBG("Null surface will be permitted for EXCLUSIVE, OR_EXCLUSIVE and SHARED !\n");
-          }
      }
 
    /* Check the given key range */
    if (krt->max_tizen_hwkeys < key)
      {
-        KLDBG("Invalid range of key ! (keycode:%d)\n", key);
+        KLWRN("Invalid range of key ! (keycode:%d)\n", key);
         return TIZEN_KEYROUTER_ERROR_INVALID_KEY;
      }
 
@@ -75,22 +71,20 @@ _e_keyrouter_keygrab_set(struct wl_client *client, struct wl_resource *surface,
     * Only key listed in Tizen key layout file can be grabbed. */
    if (0 == krt->HardKeys[key].keycode)
      {
-        KLDBG("Invalid key ! Disabled to grab ! (keycode:%d)\n", key);
+        KLWRN("Invalid key ! Disabled to grab ! (keycode:%d)\n", key);
         return TIZEN_KEYROUTER_ERROR_INVALID_KEY;
      }
 
    /* Check whether the mode is valid or not */
    if (TIZEN_KEYROUTER_MODE_REGISTERED < mode)
      {
-        KLDBG("Invalid range of mode ! (mode:%d)\n", mode);
+        KLWRN("Invalid range of mode ! (mode:%d)\n", mode);
         return  TIZEN_KEYROUTER_ERROR_INVALID_MODE;
      }
 
    /* Check whether the request key can be grabbed or not */
    res = e_keyrouter_set_keygrab_in_list(surface, client, key, mode);
 
-   KLDBG("Result of grab check for a key (key:%d, mode:%d, res:%d)\n", key, mode, res);
-
    return res;
 }
 
@@ -146,7 +140,7 @@ _e_keyrouter_cb_keygrab_set(struct wl_client *client, struct wl_resource *resour
 {
    int res = 0;
 
-   KLDBG("Key grab request (key:%d, mode:%d)\n", key, mode);
+   KLINF("Key grab request (client: %p, surface: %p, key:%d, mode:%d)\n", client, surface, key, mode);
 
    res = _e_keyrouter_keygrab_set(client, surface, key, mode);
 
@@ -159,7 +153,7 @@ _e_keyrouter_cb_keygrab_unset(struct wl_client *client, struct wl_resource *reso
 {
    int res = 0;
 
-   KLDBG("Key ungrab request (key:%d)\n", key);
+   KLINF("Key ungrab request (client: %p, surface: %p, key:%d)\n", client, surface, key);
 
    res = _e_keyrouter_keygrab_unset(client, surface, key);
 
@@ -194,7 +188,7 @@ _e_keyrouter_cb_keygrab_set_list(struct wl_client *client, struct wl_resource *r
    if (0 != (_e_keyrouter_wl_array_length(grab_list) % 2))
      {
         /* FIX ME: Which way is effectively to notify invalid pair to client */
-        KLDBG("Invalid keycode and grab mode pair. Check arguments in a list\n");
+        KLWRN("Invalid keycode and grab mode pair. Check arguments in a list\n");
         grab_result = wl_array_add(&grab_result_list, sizeof(E_Keyrouter_Grab_Result));
         grab_result->request_data.key = 0;
         grab_result->request_data.mode = 0;
@@ -204,8 +198,8 @@ _e_keyrouter_cb_keygrab_set_list(struct wl_client *client, struct wl_resource *r
 
    wl_array_for_each(grab_request, grab_list)
      {
+        KLINF("Grab request using list  (client: %p, surface: %p, key: %d, mode: %d]\n", client, surface, grab_request->key, grab_request->mode);
         res = _e_keyrouter_keygrab_set(client, surface, grab_request->key, grab_request->mode);
-        KLDBG("Grab request using list  [key: %d, mode: %d, res: %d]\n", grab_request->key, grab_request->mode, res);
         grab_result = wl_array_add(&grab_result_list, sizeof(E_Keyrouter_Grab_Result));
         if (grab_result)
           {
@@ -232,8 +226,8 @@ _e_keyrouter_cb_keygrab_unset_list(struct wl_client *client, struct wl_resource
 
    wl_array_for_each(ungrab_request, ungrab_list)
      {
+        KLINF("Ungrab request using list  (client: %p, surface: %p, key: %d, res: %d]\n", client, surface, *ungrab_request, res);
         res = _e_keyrouter_keygrab_unset(client, surface, *ungrab_request);
-        KLDBG("Ungrab request using list  [key: %d, res: %d]\n", *ungrab_request, res);
         grab_result = wl_array_add(&grab_result_list, sizeof(E_Keyrouter_Grab_Result));
         if (grab_result)
           {
@@ -262,7 +256,6 @@ e_keyrouter_add_client_destroy_listener(struct wl_client *client)
           {
              if (wc_data == client)
                {
-                  KLDBG("client(%p)'s destroy listener is already added, wc_data(%p)\n", client, wc_data);
                   return TIZEN_KEYROUTER_ERROR_NONE;
                }
           }
@@ -272,7 +265,7 @@ e_keyrouter_add_client_destroy_listener(struct wl_client *client)
 
    if (!destroy_listener)
      {
-        KLDBG("Failed to allocate memory for wl_client destroy listener !\n");
+        KLERR("Failed to allocate memory for wl_client destroy listener !\n");
         return TIZEN_KEYROUTER_ERROR_NO_SYSTEM_RESOURCES;
      }
 
@@ -280,8 +273,6 @@ e_keyrouter_add_client_destroy_listener(struct wl_client *client)
    wl_client_add_destroy_listener(client, destroy_listener);
    krt->grab_client_list = eina_list_append(krt->grab_client_list, client);
 
-   KLDBG("Add a wl_client(%p) destroy listener(%p)\n", client, destroy_listener);
-
    return TIZEN_KEYROUTER_ERROR_NONE;
 }
 
@@ -299,7 +290,6 @@ e_keyrouter_add_surface_destroy_listener(struct wl_resource *surface)
           {
              if (surface_data == surface)
                {
-                  KLDBG("surface(%p)'s destroy listener is already added, wc_data(%p)\n", surface, surface_data);
                   return TIZEN_KEYROUTER_ERROR_NONE;
                }
           }
@@ -309,7 +299,7 @@ e_keyrouter_add_surface_destroy_listener(struct wl_resource *surface)
 
    if (!destroy_listener)
      {
-        KLDBG("Failed to allocate memory for wl_surface destroy listener !\n");
+        KLERR("Failed to allocate memory for wl_surface destroy listener !\n");
         return TIZEN_KEYROUTER_ERROR_NO_SYSTEM_RESOURCES;
      }
 
@@ -317,8 +307,6 @@ e_keyrouter_add_surface_destroy_listener(struct wl_resource *surface)
    wl_resource_add_destroy_listener(surface, destroy_listener);
    krt->grab_surface_list = eina_list_append(krt->grab_surface_list, surface);
 
-   KLDBG("Add a surface(%p) destroy listener(%p)\n", surface, destroy_listener);
-
    return TIZEN_KEYROUTER_ERROR_NONE;
 }
 
@@ -351,14 +339,12 @@ _e_keyrouter_cb_bind(struct wl_client *client, void *data, uint32_t version, uin
 
    if (!resource)
      {
-        KLDBG("Failed to create resource ! (version :%d, id:%d)\n", version, id);
+        KLERR("Failed to create resource ! (version :%d, id:%d)\n", version, id);
         wl_client_post_no_memory(client);
         return;
      }
 
    wl_resource_set_implementation(resource, &_e_keyrouter_implementation, krt_instance, _e_keyrouter_cb_destory);
-
-   KLDBG("wl_resource_set_implementation(..., _e_keyrouter_implementation, ...)\n");
 }
 
 static Eina_Bool
@@ -387,13 +373,13 @@ _e_keyrouter_init(E_Module *m)
 
    if (!krt)
      {
-        KLDBG("Failed to allocate memory for krt !\n");
+        KLERR("Failed to allocate memory for krt !\n");
         return NULL;
      }
 
    if (!e_comp)
      {
-        KLDBG("Failed to initialize keyrouter module ! (e_comp == NULL)\n");
+        KLERR("Failed to initialize keyrouter module ! (e_comp == NULL)\n");
         goto err;
      }
 
@@ -417,7 +403,7 @@ _e_keyrouter_init(E_Module *m)
    krt->global = wl_global_create(e_comp_wl->wl.disp, &tizen_keyrouter_interface, 1, krt, _e_keyrouter_cb_bind);
    if (!krt->global)
      {
-        KLDBG("Failed to create global !\n");
+        KLERR("Failed to create global !\n");
         goto err;
      }
 
@@ -501,7 +487,7 @@ _e_keyrouter_query_tizen_key_table(void)
 
         if (0 > data->keycode || krt->max_tizen_hwkeys < data->keycode)
           {
-             KLDBG("[ERR] Given keycode(%d) is invalid. It must be bigger than zero, smaller than the maximum value(%d) or equal to it.\n", data->keycode, kconf->max_keycode);
+             KLWRN("Given keycode(%d) is invalid. It must be bigger than zero, smaller than the maximum value(%d) or equal to it.\n", data->keycode, kconf->max_keycode);
              continue;
           }
 
@@ -621,10 +607,10 @@ _e_keyrouter_util_cynara_log(const char *func_name, int err)
    ret = cynara_strerror(err, buf, CYNARA_BUFSIZE);
    if (ret != CYNARA_API_SUCCESS)
      {
-        KLDBG("Failed to cynara_strerror: %d (error log about %s: %d)\n", ret, func_name, err);
+        KLWRN("Failed to cynara_strerror: %d (error log about %s: %d)\n", ret, func_name, err);
         return;
      }
-   KLDBG("%s is failed: %s\n", func_name, buf);
+   KLWRN("%s is failed: %s\n", func_name, buf);
 }
 
 static Eina_Bool

diff --git a/src/e_mod_main_wl.h b/src/e_mod_main_wl.h
index 2ec73f8..c0bc197 100644 (file)
--- a/src/e_mod_main_wl.h
+++ b/src/e_mod_main_wl.h
@@ -16,6 +16,9 @@
 #define CHECK_NULL(val) if (!val) return;
 #define CHECK_NULL_VAL(val) if (!val) return val;
 
+#define KLERR(msg, ARG...) ERR("[tizen_keyrouter][%s:%d] "msg, __FUNCTION__, __LINE__, ##ARG)
+#define KLWRN(msg, ARG...) WRN("[tizen_keyrouter][%s:%d] "msg, __FUNCTION__, __LINE__, ##ARG)
+#define KLINF(msg, ARG...) INF("[tizen_keyrouter][%s:%d] "msg, __FUNCTION__, __LINE__, ##ARG)
 #define KLDBG(msg, ARG...) DBG("[tizen_keyrouter][%s:%d] "msg, __FUNCTION__, __LINE__, ##ARG)
 
 typedef struct _E_Keyrouter E_Keyrouter;