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 \
*/\r
\r
#define E_COMP_WL\r
-#include "e.h"\r
#include "e_mod_main_wl.h"\r
#include <dbus/dbus-glib.h>\r
#include <dbus/dbus.h>\r
#define E_COMP_WL
#include "e_mod_main_wl.h"
-#include <string.h>
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);
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);
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;
}
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);
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);
}
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);
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);
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);
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);
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)
_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);
}
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);
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.
// 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;
}
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;
{
// 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;
}
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;
}
else
{
- KLDBG("Key_list is Null for registered surface %p", surface);
+ KLDBG("Key_list is Null for registered wl_surface %p", surface);
}
}
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);
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);
}
}
- 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;
}
{
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)
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;
}
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;
}
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;
}
{
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)
{
#define E_COMP_WL
#include "e_mod_main_wl.h"
-#include <string.h>
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);
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;
}
{
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;
}
}
{
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;
}
}
*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))
*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);
}
}
}
{
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)
{
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)
{
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)
{
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)
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)
{
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;
}
}
{
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;
}
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;
}
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);
}
}
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;
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;
}
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;
}
}
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);
}
}
}
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;
}
}
if (data->surface == surface)
{
- KLDBG("Surface %p is registered window", surface);
+ KLDBG("wl_surface %p is registered window", surface);
return EINA_TRUE;
}
}
_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;
#define E_COMP_WL
#include "e_mod_main_wl.h"
-#include <string.h>
#include <device/power.h>
#include <device/callback.h>
#include <device/display.h>
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)
{
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);
}
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)
{
{
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");
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);
}
{
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");
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();
_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)
{
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:
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);
}
{
if (surface_ldata == surface)
{
- KLDBG("Given surface(%p) is in NoneKeyRegisterWindow", surface);
+ KLDBG("Given wl_surface(%p) is in NoneKeyRegisterWindow", surface);
return EINA_TRUE;
}
}
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);
}
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 !");
E_FREE(krt);
/* TODO: free allocated memory */
+ eina_log_domain_unregister(_keyrouter_log_dom);
+
return 1;
}
#ifndef E_MOD_MAIN_H
#define E_MOD_MAIN_H
-#include <e.h>
+#include "e.h"
#include <tizen-extension-server-protocol.h>
#ifdef ENABLE_CYNARA
#include <cynara-session.h>
#include <cynara-client.h>
#include <cynara-creds-socket.h>
#endif
+#include <string.h>
#ifdef TRACE_INPUT_BEGIN
#undef TRACE_INPUT_BEGIN
#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)
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);
projects / platform / core / uifw / e-mod-tizen-keyrouter.git / commitdiff