From 93d4d627fa8408a105c05ee22b71d2edc33cd978 Mon Sep 17 00:00:00 2001 From: JengHyun Kang Date: Fri, 9 Dec 2016 16:37:31 +0900 Subject: [PATCH] Cleanup logs Change-Id: If77559a73c2db6c863d17156a57dab03133fa9b9 --- src/Makefile.am | 1 - src/e_mod_keyrouter_combination.c | 1 - src/e_mod_keyrouter_events.c | 51 ++++++++++----------- src/e_mod_keyrouter_list.c | 69 +++++++++++++--------------- src/e_mod_main_wl.c | 76 +++++++++++++++++++++++++------ src/e_mod_main_wl.h | 15 +++++- 6 files changed, 134 insertions(+), 79 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index ec6354c..6a0ff79 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -7,7 +7,6 @@ pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH pkg_LTLIBRARIES = module.la if WAYLAND_ONLY module_la_SOURCES = e_mod_main_wl.c \ - e_mod_main_wl.h \ e_mod_keyrouter_list.c \ e_mod_keyrouter_events.c \ e_mod_keyrouter_conf.c \ diff --git a/src/e_mod_keyrouter_combination.c b/src/e_mod_keyrouter_combination.c index b4d55f3..86a3428 100644 --- a/src/e_mod_keyrouter_combination.c +++ b/src/e_mod_keyrouter_combination.c @@ -13,7 +13,6 @@ */ #define E_COMP_WL -#include "e.h" #include "e_mod_main_wl.h" #include #include diff --git a/src/e_mod_keyrouter_events.c b/src/e_mod_keyrouter_events.c index 33b7491..3663133 100644 --- a/src/e_mod_keyrouter_events.c +++ b/src/e_mod_keyrouter_events.c @@ -1,6 +1,5 @@ #define E_COMP_WL #include "e_mod_main_wl.h" -#include static Eina_Bool _e_keyrouter_send_key_events(int type, Ecore_Event_Key *ev); static Eina_Bool _e_keyrouter_send_key_events_press(int type, Ecore_Event_Key *ev); @@ -37,7 +36,7 @@ _e_keyrouter_event_generate_key(Ecore_Event_Key *ev, int type, struct wl_client Ecore_Event_Key *ev_cpy; int len; - KLDBG("Generate new key event! wc_send: %p(%d)", send_surface, e_keyrouter_util_get_pid(send_surface, NULL)); + KLDBG("Generate new key event! send to wl_surface: %p (pid: %d)", send_surface, e_keyrouter_util_get_pid(send_surface, NULL)); len = sizeof(Ecore_Event_Key) + strlen(ev->key) + strlen(ev->keyname) + ((ev->compose) ? strlen(ev->compose) : 0) + 3; ev_cpy = calloc(1, len); @@ -70,7 +69,7 @@ e_keyrouter_process_key_event(void *event, int type) if (ev->modifiers != 0) { - KLINF("Modifier key delivered to Focus window : Key %s(%d)", ((ECORE_EVENT_KEY_DOWN == type) ? "Down" : "Up"), ev->keycode); + KLDBG("Modifier key delivered to Focus window : Key %s(%d)", ((ECORE_EVENT_KEY_DOWN == type) ? "Down" : "Up"), ev->keycode); goto finish; } @@ -147,7 +146,7 @@ _e_keyrouter_send_key_events_release(int type, Ecore_Event_Key *ev) pid = e_keyrouter_util_get_pid(key_node_data->wc, key_node_data->surface); pname = e_keyrouter_util_process_name_get_from_cmd(e_keyrouter_util_cmd_get_from_pid(pid)); - KLINF("Release Pair : %s(%s:%d)(Focus: %d) => E_Client (%p) WL_Client (%p) (pid: %d) (pname: %s)", + KLINF("Release Pair : %s(%s:%d)(Focus: %d) => wl_surface (%p) wl_client (%p) (pid: %d) (pname: %s)", ((ECORE_EVENT_KEY_DOWN == type) ? "Down" : "Up"), ev->keyname, ev->keycode, key_node_data->focused, key_node_data->surface, key_node_data->wc, pid, pname); @@ -189,7 +188,7 @@ _e_keyrouter_send_key_events_press(int type, Ecore_Event_Key *ev) pid = e_keyrouter_util_get_pid(key_node_data->wc, key_node_data->surface); pname = e_keyrouter_util_process_name_get_from_cmd(e_keyrouter_util_cmd_get_from_pid(pid)); - KLINF("PICTURE OFF : %s(%d) => Surface (%p) WL_Client (%p) (pid: %d) (pname: %s)", + KLINF("PICTURE OFF : %s(%d) => wl_surface (%p) wl_client (%p) (pid: %d) (pname: %s)", ((ECORE_EVENT_KEY_DOWN == type) ? "Down" : "Up"), ev->keycode, key_node_data->surface, key_node_data->wc, pid, pname); E_FREE(pname); } @@ -219,7 +218,7 @@ _e_keyrouter_send_key_events_press(int type, Ecore_Event_Key *ev) pid = e_keyrouter_util_get_pid(key_node_data->wc, key_node_data->surface); pname = e_keyrouter_util_process_name_get_from_cmd(e_keyrouter_util_cmd_get_from_pid(pid)); - KLINF("EXCLUSIVE : %s(%s:%d) => Surface (%p) WL_Client (%p) (pid: %d) (pname: %s)", + KLINF("EXCLUSIVE : %s(%s:%d) => wl_surface (%p) wl_client (%p) (pid: %d) (pname: %s)", ((ECORE_EVENT_KEY_DOWN == type) ? "Down" : "Up"), ev->keyname, ev->keycode, key_node_data->surface, key_node_data->wc, pid, pname); E_FREE(pname); @@ -237,7 +236,7 @@ _e_keyrouter_send_key_events_press(int type, Ecore_Event_Key *ev) pid = e_keyrouter_util_get_pid(key_node_data->wc, key_node_data->surface); pname = e_keyrouter_util_process_name_get_from_cmd(e_keyrouter_util_cmd_get_from_pid(pid)); - KLINF("OVERRIDABLE_EXCLUSIVE : %s(%s:%d) => Surface (%p) WL_Client (%p) (pid: %d) (pname: %s)", + KLINF("OVERRIDABLE_EXCLUSIVE : %s(%s:%d) => wl_surface (%p) wl_client (%p) (pid: %d) (pname: %s)", ((ECORE_EVENT_KEY_DOWN == type) ? "Down" : "Up"), ev->keyname, ev->keycode, key_node_data->surface, key_node_data->wc, pid, pname); E_FREE(pname); @@ -260,7 +259,7 @@ _e_keyrouter_send_key_events_press(int type, Ecore_Event_Key *ev) res = _e_keyrouter_send_key_event(type, key_node_data->surface, NULL, ev, key_node_data->focused, TIZEN_KEYROUTER_MODE_TOPMOST); - KLINF("TOPMOST (TOP_POSITION) : %s (%s:%d) => Surface (%p) (pid: %d) (pname: %s)", + KLINF("TOPMOST (TOP_POSITION) : %s (%s:%d) => wl_surface (%p) (pid: %d) (pname: %s)", ((ECORE_EVENT_KEY_DOWN == type) ? "Down" : "Up"), ev->keyname, ev->keycode, key_node_data->surface, pid, pname); @@ -277,7 +276,7 @@ _e_keyrouter_send_key_events_press(int type, Ecore_Event_Key *ev) res = _e_keyrouter_send_key_event(type, top_key_node_data->surface, NULL, ev, top_key_node_data->focused, TIZEN_KEYROUTER_MODE_TOPMOST); - KLINF("TOPMOST (TOP_POSITION) : %s (%s:%d) => Surface (%p) (pid: %d) (pname: %s)", + KLINF("TOPMOST (TOP_POSITION) : %s (%s:%d) => wl_surface (%p) (pid: %d) (pname: %s)", ((ECORE_EVENT_KEY_DOWN == type) ? "Down" : "Up"), ev->keyname, ev->keycode, top_key_node_data->surface, pid, pname); @@ -293,14 +292,13 @@ _e_keyrouter_send_key_events_press(int type, Ecore_Event_Key *ev) if (krt->HardKeys[keycode].shared_ptr) { need_shared: - //res = _e_keyrouter_send_key_event(type, surface_focus, NULL, ev, EINA_TRUE, TIZEN_KEYROUTER_MODE_SHARED); res = _e_keyrouter_send_key_events_focus(type, surface_focus, ev, &delivered_surface); if (delivered_surface) { res = e_keyrouter_add_surface_destroy_listener(delivered_surface); if (res != TIZEN_KEYROUTER_ERROR_NONE) { - KLWRN("Failed to add surface to destroy listener (res: %d)", res); + KLWRN("Failed to add wl_surface to destroy listener (res: %d)", res); } } EINA_LIST_FOREACH(krt->HardKeys[keycode].shared_ptr, l, key_node_data) @@ -318,7 +316,7 @@ need_shared: _e_keyrouter_send_key_event(type, key_node_data->surface, key_node_data->wc, ev, key_node_data->focused, TIZEN_KEYROUTER_MODE_SHARED); pid = e_keyrouter_util_get_pid(key_node_data->wc, key_node_data->surface); pname = e_keyrouter_util_process_name_get_from_cmd(e_keyrouter_util_cmd_get_from_pid(pid)); - KLINF("SHARED : %s(%s:%d) => Surface (%p) WL_Client (%p) (pid: %d) (pname: %s)", + KLINF("SHARED : %s(%s:%d) => wl_surface (%p) wl_client (%p) (pid: %d) (pname: %s)", ((ECORE_EVENT_KEY_DOWN == type) ? "Down" : "Up"), ev->keyname, ev->keycode, key_node_data->surface, key_node_data->wc, pid, pname); E_FREE(pname); } @@ -354,7 +352,7 @@ _e_keyrouter_send_key_events_focus(int type, struct wl_resource *surface_focus, pname = e_keyrouter_util_process_name_get_from_cmd(e_keyrouter_util_cmd_get_from_pid(pid)); res = _e_keyrouter_send_key_event(type, surface_focus, NULL,ev, EINA_TRUE, TIZEN_KEYROUTER_MODE_SHARED); - KLINF("FOCUS DIRECT : %s(%s:%d) => Surface (%p) (pid: %d) (pname: %s)", + KLINF("FOCUS DIRECT : %s(%s:%d) => wl_surface (%p) (pid: %d) (pname: %s)", ((ECORE_EVENT_KEY_DOWN == type) ? "Down" : "Up"), ev->keyname, ev->keycode, surface_focus, pid, pname); *delivered_surface = surface_focus; E_FREE(pname); @@ -365,6 +363,7 @@ _e_keyrouter_send_key_events_focus(int type, struct wl_resource *surface_focus, for (; ec_top != NULL; ec_top = e_client_below_get(ec_top)) { surface = e_keyrouter_util_get_surface_from_eclient(ec_top); + if(surface == NULL) { // Not a valid surface. @@ -374,7 +373,7 @@ _e_keyrouter_send_key_events_focus(int type, struct wl_resource *surface_focus, // Check if window stack reaches to focus window if (ec_top == ec_focus) { - KLINF("%p is focus client & surface_focus %p. ==> %p", ec_top, surface_focus, surface); + KLINF("%p is focus e_client & wl_surface: focus %p ==> %p", ec_top, surface_focus, surface); below_focus = EINA_TRUE; } @@ -385,7 +384,7 @@ _e_keyrouter_send_key_events_focus(int type, struct wl_resource *surface_focus, pname = e_keyrouter_util_process_name_get_from_cmd(e_keyrouter_util_cmd_get_from_pid(pid)); res = _e_keyrouter_send_key_event(type, surface, NULL, ev, EINA_TRUE, TIZEN_KEYROUTER_MODE_REGISTERED); - KLINF("FORCE DELIVER : %s(%s:%d) => Surface (%p) (pid: %d) (pname: %s)", + KLINF("FORCE DELIVER : %s(%s:%d) => wl_surface (%p) (pid: %d) (pname: %s)", ((ECORE_EVENT_KEY_DOWN == type) ? "Down" : "Up"), ev->keyname, ev->keycode, surface, pid, pname); *delivered_surface = surface; @@ -410,7 +409,7 @@ _e_keyrouter_send_key_events_focus(int type, struct wl_resource *surface_focus, { // Registered None property is set for this surface // No event will be delivered to this surface. - KLINF("Surface(%p) is a none register window.", surface); + KLINF("wl_surface (%p) is a none register window.", surface); continue; } @@ -431,7 +430,7 @@ _e_keyrouter_send_key_events_focus(int type, struct wl_resource *surface_focus, pname = e_keyrouter_util_process_name_get_from_cmd(e_keyrouter_util_cmd_get_from_pid(pid)); res = _e_keyrouter_send_key_event(type, surface, NULL, ev, EINA_TRUE, TIZEN_KEYROUTER_MODE_REGISTERED); - KLINF("REGISTER : %s(%s:%d) => Surface (%p) (pid: %d) (pname: %s)", + KLINF("REGISTER : %s(%s:%d) => wl_surface (%p) (pid: %d) (pname: %s)", ((ECORE_EVENT_KEY_DOWN == type) ? "Down" : "Up"), ev->keyname, ev->keycode, surface, pid, pname); *delivered_surface = surface; krt->isRegisterDelivery = EINA_TRUE; @@ -442,7 +441,7 @@ _e_keyrouter_send_key_events_focus(int type, struct wl_resource *surface_focus, } else { - KLDBG("Key_list is Null for registered surface %p", surface); + KLDBG("Key_list is Null for registered wl_surface %p", surface); } } @@ -457,7 +456,7 @@ _e_keyrouter_send_key_events_focus(int type, struct wl_resource *surface_focus, pname = e_keyrouter_util_process_name_get_from_cmd(e_keyrouter_util_cmd_get_from_pid(pid)); res = _e_keyrouter_send_key_event(type, surface, NULL, ev, EINA_TRUE, TIZEN_KEYROUTER_MODE_SHARED); - KLINF("NOT REGISTER : %s(%s:%d) => Surface (%p) (pid: %d) (pname: %s)", + KLINF("NOT REGISTER : %s(%s:%d) => wl_surface (%p) (pid: %d) (pname: %s)", ((ECORE_EVENT_KEY_DOWN == type) ? "Down" : "Up"), ev->keyname, ev->keycode, surface, pid, pname); *delivered_surface = surface; E_FREE(pname); @@ -474,7 +473,7 @@ _e_keyrouter_send_key_events_focus(int type, struct wl_resource *surface_focus, pname = e_keyrouter_util_process_name_get_from_cmd(e_keyrouter_util_cmd_get_from_pid(pid)); res = _e_keyrouter_send_key_event(type, surface, NULL,ev, EINA_TRUE, TIZEN_KEYROUTER_MODE_SHARED); - KLINF("FOCUS : %s(%s:%d) => Surface (%p) (pid: %d) (pname: %s)", + KLINF("FOCUS : %s(%s:%d) => wl_surface (%p) (pid: %d) (pname: %s)", ((ECORE_EVENT_KEY_DOWN == type) ? "Down" : "Up"), ev->keyname, ev->keycode, surface, pid, pname); *delivered_surface = surface; E_FREE(pname); @@ -484,7 +483,7 @@ _e_keyrouter_send_key_events_focus(int type, struct wl_resource *surface_focus, } } - KLINF("Couldnt Deliver key:(%s:%d) to any window. Focused Surface: %p", ev->keyname, ev->keycode, surface_focus); + KLINF("Couldnt Deliver key:(%s:%d) to any window. Focused wl_surface: %p", ev->keyname, ev->keycode, surface_focus); return res; } @@ -501,7 +500,7 @@ _e_keyrouter_check_top_visible_window(E_Client *ec_focus, int arr_idx) { if (!ec_top->visible && ec_top == ec_focus) { - KLDBG("Top Client(%p) is invisible(%d) but focus client", ec_top, ec_top->visible); + KLDBG("Top e_client (%p) is invisible(%d) but focus client", ec_top, ec_top->visible); return EINA_FALSE; } if (!ec_top->visible) @@ -519,7 +518,7 @@ _e_keyrouter_check_top_visible_window(E_Client *ec_focus, int arr_idx) if (ec_top == wl_resource_get_user_data(key_node_data->surface)) { krt->HardKeys[arr_idx].top_ptr = eina_list_promote_list(krt->HardKeys[arr_idx].top_ptr, l); - KLDBG("Move a client(ec: %p, surface: %p) to first index of list(key: %d)", + 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); return EINA_TRUE; } @@ -528,7 +527,7 @@ _e_keyrouter_check_top_visible_window(E_Client *ec_focus, int arr_idx) if (ec_top == ec_focus) { - KLDBG("The Client(%p) is a focus client", ec_top); + KLDBG("The e_client(%p) is a focus client", ec_top); return EINA_FALSE; } @@ -554,7 +553,7 @@ _e_keyrouter_send_key_event(int type, struct wl_resource *surface, struct wl_cli if (!wc_send) { - KLWRN("surface: %p or wc: %p returns null wayland client", surface, wc); + KLWRN("wl_surface: %p or wl_client: %p returns null wayland client", surface, wc); return EINA_FALSE; } @@ -567,7 +566,7 @@ _e_keyrouter_send_key_event(int type, struct wl_resource *surface, struct wl_cli { focused = EINA_TRUE; ev->data = wc_send; - KLDBG("Send only one key! wc_send: %p(%d)", wc_send, e_keyrouter_util_get_pid(wc_send, NULL)); + KLDBG("Send only one key! wl_client: %p(%d)", wc_send, e_keyrouter_util_get_pid(wc_send, NULL)); } else if (focused == EINA_TRUE) { diff --git a/src/e_mod_keyrouter_list.c b/src/e_mod_keyrouter_list.c index 22f2250..0140902 100644 --- a/src/e_mod_keyrouter_list.c +++ b/src/e_mod_keyrouter_list.c @@ -1,9 +1,7 @@ #define E_COMP_WL #include "e_mod_main_wl.h" -#include static int _e_keyrouter_find_duplicated_client(struct wl_resource *surface, struct wl_client *wc, uint32_t key, uint32_t mode); -static const char *_mode_str_get(uint32_t mode); static Eina_Bool _e_keyrouter_find_key_in_list(struct wl_resource *surface, struct wl_client *wc, int key, int mode); static Eina_List **_e_keyrouter_get_list(int mode, int key); static void _e_keyrouter_add_registered_surface_in_list(struct wl_resource *surface, int key); @@ -53,9 +51,6 @@ 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); - KLINF("Succeed to set keygrab info surface: %p, client: %p key: %d mode: %s", - surface, client, key, _mode_str_get(mode)); - return res; } @@ -102,8 +97,8 @@ _e_keyrouter_find_duplicated_client(struct wl_resource *surface, struct wl_clien { if (key_node_data->surface == surface) { - KLDBG("The key(%d) is already grabbed same mode(%d) on the same surface %p", - key, mode, surface); + KLDBG("The key(%d) is already grabbed same mode(%s) on the same wl_surface %p", + key, e_keyrouter_mode_to_string(mode), surface); return TIZEN_KEYROUTER_ERROR_GRABBED_ALREADY; } } @@ -111,8 +106,8 @@ _e_keyrouter_find_duplicated_client(struct wl_resource *surface, struct wl_clien { if (key_node_data->wc == wc) { - KLDBG("The key(%d) is already grabbed same mode(%d) on the same wl_client %p", - key, mode, wc); + KLDBG("The key(%d) is already grabbed same mode(%s) on the same wl_client %p", + key, e_keyrouter_mode_to_string(mode), wc); return TIZEN_KEYROUTER_ERROR_GRABBED_ALREADY; } } @@ -248,7 +243,7 @@ e_keyrouter_find_and_remove_client_from_list(struct wl_resource *surface, struct *list = eina_list_remove_list(*list, l); E_FREE(key_node_data); } - KLDBG("Remove a %s Mode Grabbed key(%d) by surface(%p)", _mode_str_get(mode), key, surface); + KLDBG("Remove a %s Mode Grabbed key(%d) by surface(%p)", e_keyrouter_mode_to_string(mode), key, surface); } } else if ((wc == key_node_data->wc)) @@ -262,7 +257,7 @@ e_keyrouter_find_and_remove_client_from_list(struct wl_resource *surface, struct *list = eina_list_remove_list(*list, l); E_FREE(key_node_data); } - KLDBG("Remove a %s Mode Grabbed key(%d) by wc(%p)", _mode_str_get(mode), key, wc); + KLDBG("Remove a %s Mode Grabbed key(%d) by wc(%p)", e_keyrouter_mode_to_string(mode), key, wc); } } } @@ -290,14 +285,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); - KLINF("Remove a Exclusive Mode Grabbed key(%d) by surface(%p)", i, surface); + KLDBG("Remove a Exclusive Mode Grabbed key(%d) by wl_surface(%p)", 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); - KLINF("Remove a Exclusive Mode Grabbed key(%d) by wc(%p)", i, wc); + KLDBG("Remove a Exclusive Mode Grabbed key(%d) by wl_client(%p)", i, wc); } } EINA_LIST_FOREACH_SAFE(krt->HardKeys[i].or_excl_ptr, l, l_next, key_node_data) @@ -310,14 +305,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); - KLINF("Remove a Overridable_Exclusive Mode Grabbed key(%d) by surface(%p)", i, surface); + KLDBG("Remove a Overridable_Exclusive Mode Grabbed key(%d) by wl_surface(%p)", 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); - KLINF("Remove a Overridable_Exclusive Mode Grabbed key(%d) by wc(%p)", i, wc); + KLDBG("Remove a Overridable_Exclusive Mode Grabbed key(%d) by wl_client(%p)", i, wc); } } EINA_LIST_FOREACH_SAFE(krt->HardKeys[i].top_ptr, l, l_next, key_node_data) @@ -330,14 +325,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); - KLINF("Remove a Topmost Mode Grabbed key(%d) by surface(%p)", i, surface); + KLDBG("Remove a Topmost Mode Grabbed key(%d) by wl_surface(%p)", 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); - KLINF("Remove a Topmost Mode Grabbed key(%d) by wc(%p)", i, wc); + KLDBG("Remove a Topmost Mode Grabbed key(%d) by wl_client(%p)", i, wc); } } EINA_LIST_FOREACH_SAFE(krt->HardKeys[i].shared_ptr, l, l_next, key_node_data) @@ -350,14 +345,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); - KLINF("Remove a Shared Mode Grabbed key(%d) by surface(%p)", i, surface); + KLDBG("Remove a Shared Mode Grabbed key(%d) by wl_surface(%p)", 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); - KLINF("Remove a Shared Mode Grabbed key(%d) by wc(%p)", i, wc); + KLDBG("Remove a Shared Mode Grabbed key(%d) by wl_client(%p)", i, wc); } } EINA_LIST_FOREACH_SAFE(krt->HardKeys[i].press_ptr, l, l_next, key_node_data) @@ -369,13 +364,13 @@ e_keyrouter_remove_client_from_list(struct wl_resource *surface, struct wl_clien if (surface == key_node_data->surface) { key_node_data->deleted = EINA_TRUE; - KLINF("Remove a Pressed key(%d) by surface(%p)", i, surface); + KLDBG("Remove a Pressed key(%d) by wl_surface(%p)", i, surface); } } else if ((wc == key_node_data->wc)) { key_node_data->deleted = EINA_TRUE; - KLINF("Remove a Pressed key(%d) by wc(%p)", i, wc); + KLDBG("Remove a Pressed key(%d) by wl_client(%p)", i, wc); } } EINA_LIST_FOREACH_SAFE(krt->HardKeys[i].pic_off_ptr, l, l_next, key_node_data) @@ -414,7 +409,7 @@ e_keyrouter_find_key_in_register_list(uint32_t key) { if(*key_data == key) { - KLDBG("Find %d key by register surface %p", key, rwin_info->surface); + KLDBG("Find %d key by register wl_surface: %p", key, rwin_info->surface); return EINA_TRUE; } } @@ -457,19 +452,19 @@ e_keyrouter_find_key_in_list(struct wl_resource *surface, struct wl_client *wc, { if(*key_data == key) { - KLDBG("Find %d key grabbed by (surface: %p, in %s mode", key, surface, "TIZEN_KEYROUTER_MODE_REGISTERED"); + KLDBG("Find %d key grabbed by (wl_surface: %p, in %s mode", key, surface, "TIZEN_KEYROUTER_MODE_REGISTERED"); return TIZEN_KEYROUTER_MODE_REGISTERED; } } } } - KLDBG("%d key is not grabbed by (surface: %p, wl_client: %p)", key, surface, wc); + KLDBG("%d key is not grabbed by (wl_surface: %p, wl_client: %p)", key, surface, wc); return TIZEN_KEYROUTER_MODE_NONE; finish: - KLDBG("Find %d key grabbed by (surface: %p, wl_client: %p) in %s mode", - key, surface, wc, _mode_str_get(mode)); + KLDBG("Find %d key grabbed by (wl_surface: %p, wl_client: %p) in %s mode", + key, surface, wc, e_keyrouter_mode_to_string(mode)); return mode; } @@ -517,7 +512,7 @@ _e_keyrouter_build_register_list(void) if (EINA_TRUE == below_focus && !e_keyrouter_is_registered_window(surface)) { - KLDBG("%p is none registered window, below focus surface", surface); + KLDBG("%p is none registered window, below focus wl_surface", surface); break; } @@ -540,7 +535,7 @@ _e_keyrouter_build_register_list(void) node->deleted = EINA_FALSE; krt->HardKeys[*ddata].registered_ptr = node; - KLDBG("%d key's register surface is %p", *ddata, surface); + KLDBG("%d key's register wl_surface is %p", *ddata, surface); } } @@ -617,13 +612,13 @@ e_keyrouter_unset_keyregister(struct wl_resource *surface, struct wl_client *cli if (!key_list) { - KLDBG("Removing %p surface from register list, as NULL key list", surface); + KLDBG("Removing %p wl_surface from register list, as NULL key list", surface); _e_keyrouter_remove_registered_surface_in_list(surface); } _e_keyrouter_build_register_list(); - KLDBG("Succeed to set keyregister info surface: %p, client: %p key: %d", + KLDBG("Succeed to set keyregister info wl_surface: %p, wl_client: %p key: %d", surface, client, key); return res; @@ -649,7 +644,7 @@ _e_keyrouter_add_registered_surface_in_list(struct wl_resource *surface, int key if (*key_data == key) { - KLDBG("Registered Key(%d) already registered by surface(%p)", key, surface); + KLDBG("Registered Key(%d) already registered by wl_surface(%p)", key, surface); key_finded = EINA_TRUE; break; } @@ -661,7 +656,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; - KLINF("Registered Key(%d) is added to surface (%p)", key, surface); + KLDBG("Registered Key(%d) is added to wl_surface (%p)", key, surface); break; } } @@ -675,7 +670,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); - KLINF("Surface(%p) and key(%d) is added list", surface, key); + KLDBG("wl_surface(%p) and key(%d) is added list", surface, key); } } @@ -700,7 +695,7 @@ _e_keyrouter_remove_registered_surface_in_list(struct wl_resource *surface) } krt->registered_window_list = eina_list_remove_list(krt->registered_window_list, l); E_FREE(data); - KLDBG("Remove a %p surface in register list", surface); + KLDBG("Remove a %p wl_surface in register list", surface); break; } } @@ -720,7 +715,7 @@ e_keyrouter_is_registered_window(struct wl_resource *surface) if (data->surface == surface) { - KLDBG("Surface %p is registered window", surface); + KLDBG("wl_surface %p is registered window", surface); return EINA_TRUE; } } @@ -756,8 +751,8 @@ e_keyrouter_clear_registered_window(void) _e_keyrouter_build_register_list(); } -static const char * -_mode_str_get(uint32_t mode) +const char * +e_keyrouter_mode_to_string(uint32_t mode) { const char *str = NULL; diff --git a/src/e_mod_main_wl.c b/src/e_mod_main_wl.c index eb6ebd2..5f9f421 100644 --- a/src/e_mod_main_wl.c +++ b/src/e_mod_main_wl.c @@ -1,6 +1,5 @@ #define E_COMP_WL #include "e_mod_main_wl.h" -#include #include #include #include @@ -42,6 +41,8 @@ static Eina_Bool _e_keyrouter_util_do_privilege_check(struct wl_client *client, while (0) #endif +int _keyrouter_log_dom = -1; + static int _e_keyrouter_keygrab_set(struct wl_client *client, struct wl_resource *surface, uint32_t key, uint32_t mode) { @@ -155,11 +156,17 @@ _e_keyrouter_cb_keygrab_set(struct wl_client *client, struct wl_resource *resour int res = 0; TRACE_INPUT_BEGIN(_e_keyrouter_cb_keygrab_set); - KLINF("Key grab request (client: %p, surface: %p, pid: %d, key:%d, mode:%d)", client, surface, e_keyrouter_util_get_pid(client, surface), key, mode); res = _e_keyrouter_keygrab_set(client, surface, key, mode); TRACE_INPUT_END(); + + if (res == TIZEN_KEYROUTER_ERROR_NONE) + KLDBG("Success to %d key %s grab request (wl_client: %p, wl_surface: %p, pid: %d)", key, e_keyrouter_mode_to_string(mode), + client, surface, e_keyrouter_util_get_pid(client, surface)); + else + KLINF("Failed to %d key %s grab request (wl_client: %p, wl_surface: %p, pid: %d): res: %d", key, e_keyrouter_mode_to_string(mode), + client, surface, e_keyrouter_util_get_pid(client, surface), res); tizen_keyrouter_send_keygrab_notify(resource, surface, key, mode, res); } @@ -172,11 +179,17 @@ _e_keyrouter_cb_keygrab_unset(struct wl_client *client, struct wl_resource *reso E_Keyrouter_Key_List_NodePtr data = NULL; TRACE_INPUT_BEGIN(_e_keyrouter_cb_keygrab_unset); - KLINF("Key ungrab request (client: %p, surface: %p, pid: %d, key:%d)", client, surface, e_keyrouter_util_get_pid(client, surface), key); res = _e_keyrouter_keygrab_unset(client, surface, key); TRACE_INPUT_END(); + + if (res == TIZEN_KEYROUTER_ERROR_NONE) + KLDBG("Success to %d key ungrab request (wl_client: %p, wl_surface: %p, pid: %d)", key, client, surface, + e_keyrouter_util_get_pid(client, surface)); + else + KLINF("Failed to %d key ungrab request (wl_client: %p, wl_surface: %p, pid: %d): res: %d", key, client, surface, + e_keyrouter_util_get_pid(client, surface), res); tizen_keyrouter_send_keygrab_notify(resource, surface, key, TIZEN_KEYROUTER_MODE_NONE, res); EINA_LIST_FOREACH(krt->HardKeys[key].press_ptr, l, data) { @@ -216,10 +229,13 @@ _e_keyrouter_cb_keygrab_set_list(struct wl_client *client, struct wl_resource *r { E_Keyrouter_Grab_Request *grab_request = NULL; int res = TIZEN_KEYROUTER_ERROR_NONE; + int array_len = 0; TRACE_INPUT_BEGIN(_e_keyrouter_cb_keygrab_set_list); - if (0 != (_e_keyrouter_wl_array_length(grab_list) % 3)) + array_len = _e_keyrouter_wl_array_length(grab_list); + + if (0 != (array_len % 3)) { /* FIX ME: Which way is effectively to notify invalid pair to client */ KLWRN("Invalid keycode and grab mode pair. Check arguments in a list"); @@ -230,11 +246,19 @@ _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, pid: %d, key: %d, mode: %d]", client, surface, e_keyrouter_util_get_pid(client, surface), grab_request->key, grab_request->mode); res = _e_keyrouter_keygrab_set(client, surface, grab_request->key, grab_request->mode); grab_request->err = res; + if (res == TIZEN_KEYROUTER_ERROR_NONE) + KLDBG("Success to %d key %s grab using list(wl_client: %p, wl_surface: %p, pid: %d)", + grab_request->key, e_keyrouter_mode_to_string(grab_request->mode), + client, surface, e_keyrouter_util_get_pid(client, surface)); + else + KLINF("Failed to %d key %s grab using list(wl_client: %p, wl_surface: %p, pid: %d): res: %d", + grab_request->key, e_keyrouter_mode_to_string(grab_request->mode), + client, surface, e_keyrouter_util_get_pid(client, surface), grab_request->err); } + TRACE_INPUT_END(); tizen_keyrouter_send_keygrab_notify_list(resource, surface, grab_list); } @@ -244,10 +268,13 @@ _e_keyrouter_cb_keygrab_unset_list(struct wl_client *client, struct wl_resource { E_Keyrouter_Ungrab_Request *ungrab_request = NULL; int res = TIZEN_KEYROUTER_ERROR_NONE; + int array_len = 0; TRACE_INPUT_BEGIN(_e_keyrouter_cb_keygrab_unset_list); - if (0 != (_e_keyrouter_wl_array_length(ungrab_list) % 2)) + array_len = _e_keyrouter_wl_array_length(ungrab_list); + + if (0 != (array_len % 2)) { /* FIX ME: Which way is effectively to notify invalid pair to client */ KLWRN("Invalid keycode and error pair. Check arguments in a list"); @@ -258,9 +285,14 @@ _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, pid: %d, key: %d, res: %d]", client, surface, e_keyrouter_util_get_pid(client, surface), ungrab_request->key, res); res = _e_keyrouter_keygrab_unset(client, surface, ungrab_request->key); ungrab_request->err = res; + if (res == TIZEN_KEYROUTER_ERROR_NONE) + KLDBG("Success to ungrab using list: %d key (wl_client: %p, wl_surface: %p, pid: %d)", + ungrab_request->key, client, surface, e_keyrouter_util_get_pid(client, surface)); + else + KLINF("Failed to ungrab using list: %d key (wl_client: %p, wl_surface: %p, pid: %d): res: %d", + ungrab_request->key, client, surface, e_keyrouter_util_get_pid(client, surface), ungrab_request->err); } TRACE_INPUT_END(); @@ -287,7 +319,6 @@ static void _e_keyrouter_cb_set_input_config(struct wl_client *client, struct wl_resource *resource, struct wl_resource *surface, uint32_t config_mode, uint32_t value) { Eina_Bool res = EINA_TRUE; - KLINF("Given Surface(%p) for mode %d with value = %d", surface, config_mode, value); if (surface == NULL && config_mode != TIZEN_KEYROUTER_CONFIG_MODE_PICTURE_OFF) { @@ -311,7 +342,7 @@ _e_keyrouter_cb_set_input_config(struct wl_client *client, struct wl_resource *r case KRT_IPD_INPUT_CONFIG: krt->playback_daemon_surface = surface; - KLINF("Registered playback daemon surface: %p",surface); + KLINF("Registered playback daemon wl_surface: %p",surface); break; case TIZEN_KEYROUTER_CONFIG_MODE_INVISIBLE_GET: @@ -336,17 +367,26 @@ _e_keyrouter_cb_set_input_config(struct wl_client *client, struct wl_resource *r break; default: - KLWRN("Wrong mode requested: %d", config_mode); + KLWRN("Invalid mode: %d", config_mode); res= EINA_FALSE; goto send_input_config_notify; } if (value) { - KLDBG("Add a surface(%p) destory listener", surface); + KLDBG("Add a wl_surface(%p) to destory listener", surface); e_keyrouter_add_surface_destroy_listener(surface); } + send_input_config_notify: + if (res == TIZEN_KEYROUTER_ERROR_NONE) + { + KLDBG("Success to set input config: wl_surface (%p) for mode %d with value (%d)", surface, config_mode, value); + } + else + { + KLINF("Failed to set input config (res: %d): wl_surface (%p) for mode %d with value (%d)", res, surface, config_mode, value); + } tizen_keyrouter_send_set_input_config_notify(resource, (int)res); } @@ -361,7 +401,7 @@ IsNoneKeyRegisterWindow(struct wl_resource *surface) { if (surface_ldata == surface) { - KLDBG("Given surface(%p) is in NoneKeyRegisterWindow", surface); + KLDBG("Given wl_surface(%p) is in NoneKeyRegisterWindow", surface); return EINA_TRUE; } } @@ -423,7 +463,7 @@ _e_keyrouter_cb_set_register_none_key(struct wl_client *client, struct wl_resour krt->registered_none_key_window_list = eina_list_remove(krt->registered_none_key_window_list, surface); } - KLDBG("Set Registered None Key called on surface (%p) with data (%d)", surface, krt->register_none_key); + KLDBG("Set Registered None Key called on wl_surface (%p) with data (%d)", surface, krt->register_none_key); tizen_keyrouter_send_set_register_none_key_notify(resource, NULL, krt->register_none_key); } @@ -932,6 +972,14 @@ _e_keyrouter_init(E_Module *m) TRACE_INPUT_BEGIN(_e_keyrouter_init); + _keyrouter_log_dom = eina_log_domain_register("e-keyrouter", EINA_COLOR_RED); + if (_keyrouter_log_dom < 0) + { + KLERR("Failed to set eina_log_domain (%d)\n", _keyrouter_log_dom); + return NULL; + } + eina_log_domain_level_set("e-keyrouter", EINA_LOG_LEVEL_INFO); + if (!krt) { KLERR("Failed to allocate memory for krt !"); @@ -1064,6 +1112,8 @@ e_modapi_shutdown(E_Module *m) E_FREE(krt); /* TODO: free allocated memory */ + eina_log_domain_unregister(_keyrouter_log_dom); + return 1; } diff --git a/src/e_mod_main_wl.h b/src/e_mod_main_wl.h index 36713ac..6ae72e8 100644 --- a/src/e_mod_main_wl.h +++ b/src/e_mod_main_wl.h @@ -1,13 +1,14 @@ #ifndef E_MOD_MAIN_H #define E_MOD_MAIN_H -#include +#include "e.h" #include #ifdef ENABLE_CYNARA #include #include #include #endif +#include #ifdef TRACE_INPUT_BEGIN #undef TRACE_INPUT_BEGIN @@ -33,6 +34,17 @@ #define CHECK_NULL(val) if (!val) return; #define CHECK_NULL_VAL(val) if (!val) return val; +extern int _keyrouter_log_dom; + +#undef ERR +#undef WRN +#undef INF +#undef DBG +#define ERR(...) EINA_LOG_DOM_ERR(_keyrouter_log_dom, __VA_ARGS__) +#define WRN(...) EINA_LOG_DOM_WARN(_keyrouter_log_dom, __VA_ARGS__) +#define INF(...) EINA_LOG_DOM_INFO(_keyrouter_log_dom, __VA_ARGS__) +#define DBG(...) EINA_LOG_DOM_DBG(_keyrouter_log_dom, __VA_ARGS__) + #define KLERR(msg, ARG...) ERR(msg, ##ARG) #define KLWRN(msg, ARG...) WRN(msg, ##ARG) #define KLINF(msg, ARG...) INF(msg, ##ARG) @@ -189,6 +201,7 @@ char *e_keyrouter_util_cmd_get_from_pid(int pid); int e_keyrouter_util_keycode_get_from_string(char *name); char *e_keyrouter_util_keyname_get_from_keycode(int keycode); char *e_keyrouter_util_process_name_get_from_cmd(char *cmd); +const char *e_keyrouter_mode_to_string(uint32_t mode); void e_keyrouter_conf_init(E_Keyrouter_Config_Data *kconfig); void e_keyrouter_conf_deinit(E_Keyrouter_Config_Data *kconfig); -- 2.34.1