Replace key enum with xkb key code

Change-Id: I4019ad4907bb5201698b7b5ec0f60ec589230a9c
Signed-off-by: Jihoon Kim <jihoon48.kim@samsung.com>

diff --git a/packaging/mmi-manager.spec b/packaging/mmi-manager.spec
index 241e488..d11a06b 100644 (file)
--- a/packaging/mmi-manager.spec
+++ b/packaging/mmi-manager.spec
@@ -17,6 +17,7 @@ BuildRequires:        pkgconfig(dlog)
 BuildRequires: pkgconfig(rpc-port)
 BuildRequires: pkgconfig(ecore)
 BuildRequires: pkgconfig(json-glib-1.0)
+BuildRequires: pkgconfig(xkbcommon)
 
 #Build dependencies for tests
 BuildRequires: pkgconfig(gmock)

diff --git a/src/iu/intent_understanding_engine.cpp b/src/iu/intent_understanding_engine.cpp
index e6dca32..a76871d 100644 (file)
--- a/src/iu/intent_understanding_engine.cpp
+++ b/src/iu/intent_understanding_engine.cpp
@@ -38,12 +38,12 @@ using namespace std;
 
 static unordered_map<int, string> key_action_map
     = { { MMI_EVENT_KEYEVENT_MIC,   "Mic" },
-        { MMI_EVENT_KEYEVENT_UP,    "Up" },
-        { MMI_EVENT_KEYEVENT_DOWN,  "Down" },
-        { MMI_EVENT_KEYEVENT_LEFT,  "Left" },
-        { MMI_EVENT_KEYEVENT_RIGHT, "Right" },
-        { MMI_EVENT_KEYEVENT_SELECT, "OK" },
-        { MMI_EVENT_KEYEVENT_BACK,  "Back" },
+        { XKB_KEY_Up,       "Up" },
+        { XKB_KEY_Down,     "Down" },
+        { XKB_KEY_Left,     "Left" },
+        { XKB_KEY_Right,    "Right" },
+        { XKB_KEY_Return,   "OK" },
+        { XKB_KEY_XF86Back, "Back" },
       };
 
 static unordered_map<int, string> voice_action_map

diff --git a/src/iu/mmi_iu_event.h b/src/iu/mmi_iu_event.h
index c899add..9b092ad 100644 (file)
--- a/src/iu/mmi_iu_event.h
+++ b/src/iu/mmi_iu_event.h
@@ -24,6 +24,11 @@
 #ifndef __TIZEN_UIX_MMI_IU_EVENT_H__
 #define __TIZEN_UIX_MMI_IU_EVENT_H__
 
+#include <xkbcommon/xkbcommon.h>
+
+/* temporary definition */
+#define MMI_EVENT_KEYEVENT_MIC 0x8080
+
 typedef enum {
     MMI_EVENT_WAKE_UP,
     MMI_EVENT_KEY_DOWN,
@@ -34,16 +39,6 @@ typedef enum {
 } mmi_event_type_e;
 
 typedef enum {
-    MMI_EVENT_KEYEVENT_UP,
-    MMI_EVENT_KEYEVENT_DOWN,
-    MMI_EVENT_KEYEVENT_LEFT,
-    MMI_EVENT_KEYEVENT_RIGHT,
-    MMI_EVENT_KEYEVENT_SELECT,
-    MMI_EVENT_KEYEVENT_BACK,
-    MMI_EVENT_KEYEVENT_MIC
-} mmi_event_key_type_e;
-
-typedef enum {
     MMI_EVENT_GESTURE_SWIPE_UP,
     MMI_EVENT_GESTURE_SWIPE_DOWN,
     MMI_EVENT_GESTURE_SWIPE_LEFT,

diff --git a/src/meson.build b/src/meson.build
index 05f6c94..cd98330 100644 (file)
--- a/src/meson.build
+++ b/src/meson.build
@@ -46,6 +46,7 @@ ecore_dep = dependency('ecore', method : 'pkg-config')
 rpc_port_dep = dependency('rpc-port')
 json_glib_dep = dependency('json-glib-1.0')
 libtzplatform_config_dep = dependency('libtzplatform-config')
+xkbcommon_dep = dependency('xkbcommon')
 
 mmi_manager_deps = [
        ecore_dep,
@@ -55,7 +56,8 @@ mmi_manager_deps = [
        dlog_dep,
        rpc_port_dep,
        json_glib_dep,
-       libtzplatform_config_dep]
+       libtzplatform_config_dep,
+       xkbcommon_dep]
 
 subdir('modules/modality_keyboard')
 subdir('modules/ref_fusion')

diff --git a/tests/iu/mmi_iu_feed_input_event_unittests.cpp b/tests/iu/mmi_iu_feed_input_event_unittests.cpp
index 2a55c64..0c053fd 100644 (file)
--- a/tests/iu/mmi_iu_feed_input_event_unittests.cpp
+++ b/tests/iu/mmi_iu_feed_input_event_unittests.cpp
@@ -136,7 +136,7 @@ TEST_F(IUClientFeedInputEventTest, utc_mmi_iu_feed_intent_key_input_press_up)
 {
     mmi_provider_event_key key_event;
     key_event.type = MMI_EVENT_KEY_DOWN;
-    key_event.keycode = MMI_EVENT_KEYEVENT_UP;
+    key_event.keycode = XKB_KEY_Up;
 
     int ret = feed_input_event_test(MMI_STATE_EXPLORATION, MMI_EVENT_KEY_DOWN, &key_event);
     EXPECT_EQ(ret, MMI_IU_ERROR_NONE);
@@ -148,7 +148,7 @@ TEST_F(IUClientFeedInputEventTest, utc_mmi_iu_feed_intent_key_input_press_down)
 {
     mmi_provider_event_key key_event;
     key_event.type = MMI_EVENT_KEY_DOWN;
-    key_event.keycode = MMI_EVENT_KEYEVENT_DOWN;
+    key_event.keycode = XKB_KEY_Down;
 
     int ret = feed_input_event_test(MMI_STATE_EXPLORATION, MMI_EVENT_KEY_DOWN, &key_event);
     EXPECT_EQ(ret, MMI_IU_ERROR_NONE);
@@ -160,7 +160,7 @@ TEST_F(IUClientFeedInputEventTest, utc_mmi_iu_feed_intent_key_input_press_right)
 {
     mmi_provider_event_key key_event;
     key_event.type = MMI_EVENT_KEY_DOWN;
-    key_event.keycode = MMI_EVENT_KEYEVENT_RIGHT;
+    key_event.keycode = XKB_KEY_Right;
 
     int ret = feed_input_event_test(MMI_STATE_EXPLORATION, MMI_EVENT_KEY_DOWN, &key_event);
     EXPECT_EQ(ret, MMI_IU_ERROR_NONE);
@@ -172,7 +172,7 @@ TEST_F(IUClientFeedInputEventTest, utc_mmi_iu_feed_intent_key_input_press_left)
 {
     mmi_provider_event_key key_event;
     key_event.type = MMI_EVENT_KEY_DOWN;
-    key_event.keycode = MMI_EVENT_KEYEVENT_LEFT;
+    key_event.keycode = XKB_KEY_Left;
 
     int ret = feed_input_event_test(MMI_STATE_EXPLORATION, MMI_EVENT_KEY_DOWN, &key_event);
     EXPECT_EQ(ret, MMI_IU_ERROR_NONE);
@@ -272,7 +272,7 @@ TEST_F(IUClientFeedInputEventTest, utc_mmi_iu_feed_intent_key_press_ok)
 {
     mmi_provider_event_key key_event;
     key_event.type = MMI_EVENT_KEY_DOWN;
-    key_event.keycode = MMI_EVENT_KEYEVENT_SELECT;
+    key_event.keycode = XKB_KEY_Return;
 
     int ret = feed_input_event_test(MMI_STATE_EXECUTION, MMI_EVENT_KEY_DOWN, &key_event);
     EXPECT_EQ(ret, MMI_IU_ERROR_NONE);
@@ -328,7 +328,7 @@ TEST_F(IUClientFeedInputEventTest, utc_mmi_iu_feed_intent_key_back_button)
 {
     mmi_provider_event_key key_event;
     key_event.type = MMI_EVENT_KEY_DOWN;
-    key_event.keycode = MMI_EVENT_KEYEVENT_BACK;
+    key_event.keycode = XKB_KEY_XF86Back;
 
     int ret = feed_input_event_test(MMI_STATE_FEEDBACK, MMI_EVENT_KEY_DOWN, &key_event);
     EXPECT_EQ(ret, MMI_IU_ERROR_NONE);
@@ -395,7 +395,7 @@ TEST_F(IUClientFeedInputEventTest, utc_mmi_iu_feed_intent_key_back_terminate)
 {
     mmi_provider_event_key key_event;
     key_event.type = MMI_EVENT_KEY_DOWN;
-    key_event.keycode = MMI_EVENT_KEYEVENT_BACK;
+    key_event.keycode = XKB_KEY_XF86Back;
 
     int ret = feed_input_event_test(MMI_STATE_TERMINATION, MMI_EVENT_KEY_DOWN, &key_event);
     EXPECT_EQ(ret, MMI_IU_ERROR_NONE);