@@ -24,8 +24,7 @@ static constexpr char kKeyMapKey[] = "keymap";
2424static constexpr char kKeyCodeKey [] = " keyCode" ;
2525static constexpr char kTypeKey [] = " type" ;
2626static constexpr char kModifiersKey [] = " modifiers" ;
27- static constexpr char kKeynameKey [] = " keyname" ;
28- static constexpr char kKeySymbolKey [] = " keysymbol" ;
27+ static constexpr char kKeyNameKey [] = " keyName" ;
2928static constexpr char kComposeKey [] = " compose" ;
3029static constexpr char kTizenKeyMap [] = " tizen" ;
3130static constexpr char kKeyUp [] = " keyup" ;
@@ -71,36 +70,31 @@ KeyEventChannel::~KeyEventChannel() {
7170}
7271
7372void KeyEventChannel::OnKeyDown (Ecore_Event_Key* keyDownEvent) {
74- LoggerD (" OnKeyDown##keycode == %d, keyname == %s" , keyDownEvent->keycode ,
73+ LoggerD (" OnKeyDown keyCode == %d, keyName == %s" , keyDownEvent->keycode ,
7574 keyDownEvent->keyname );
7675 rapidjson::Document event (rapidjson::kObjectType );
7776 auto & allocator = event.GetAllocator ();
78- rapidjson::Value keyName_code, key_code ;
77+ rapidjson::Value keyNameValue ;
7978 event.AddMember (kKeyMapKey , kTizenKeyMap , allocator);
8079 event.AddMember (kTypeKey , kKeyDown , allocator);
8180 event.AddMember (kKeyCodeKey , keyDownEvent->keycode , allocator);
8281 event.AddMember (kModifiersKey , keyDownEvent->modifiers , allocator);
83- keyName_code.SetString (keyDownEvent->keyname , allocator);
84- event.AddMember (kKeynameKey , keyName_code, allocator);
85- key_code.SetString (keyDownEvent->keyname , allocator);
86- event.AddMember (kKeySymbolKey , key_code, allocator);
82+ keyNameValue.SetString (keyDownEvent->keyname , allocator);
83+ event.AddMember (kKeyNameKey , keyNameValue, allocator);
8784 channel_->Send (event);
8885}
8986
9087void KeyEventChannel::OnKeyUp (Ecore_Event_Key* keyUpEvent) {
91- LoggerD (" OnKeyUp##keycode == %d, keyname == %s" , keyUpEvent->keycode ,
88+ LoggerD (" OnKeyUp keyCode == %d, keyName == %s" , keyUpEvent->keycode ,
9289 keyUpEvent->keyname );
9390 rapidjson::Document event (rapidjson::kObjectType );
9491 auto & allocator = event.GetAllocator ();
95- rapidjson::Value keyName_code, key_code ;
92+ rapidjson::Value keyNameValue ;
9693 event.AddMember (kKeyMapKey , kTizenKeyMap , allocator);
9794 event.AddMember (kTypeKey , kKeyUp , allocator);
9895 event.AddMember (kKeyCodeKey , keyUpEvent->keycode , allocator);
9996 event.AddMember (kModifiersKey , keyUpEvent->modifiers , allocator);
100- keyName_code.SetString (keyUpEvent->keyname , allocator);
101- event.AddMember (kKeynameKey , keyName_code, allocator);
102- key_code.SetString (keyUpEvent->keyname , allocator);
103- event.AddMember (kKeySymbolKey , key_code, allocator);
104-
97+ keyNameValue.SetString (keyUpEvent->keyname , allocator);
98+ event.AddMember (kKeyNameKey , keyNameValue, allocator);
10599 channel_->Send (event);
106100}
0 commit comments