@@ -24,8 +24,7 @@ static constexpr char kKeyMapKey[] = "keymap";
24
24
static constexpr char kKeyCodeKey [] = " keyCode" ;
25
25
static constexpr char kTypeKey [] = " type" ;
26
26
static constexpr char kModifiersKey [] = " modifiers" ;
27
- static constexpr char kKeynameKey [] = " keyname" ;
28
- static constexpr char kKeySymbolKey [] = " keysymbol" ;
27
+ static constexpr char kKeyNameKey [] = " keyName" ;
29
28
static constexpr char kComposeKey [] = " compose" ;
30
29
static constexpr char kTizenKeyMap [] = " tizen" ;
31
30
static constexpr char kKeyUp [] = " keyup" ;
@@ -71,36 +70,31 @@ KeyEventChannel::~KeyEventChannel() {
71
70
}
72
71
73
72
void KeyEventChannel::OnKeyDown (Ecore_Event_Key* keyDownEvent) {
74
- LoggerD (" OnKeyDown##keycode == %d, keyname == %s" , keyDownEvent->keycode ,
73
+ LoggerD (" OnKeyDown keyCode == %d, keyName == %s" , keyDownEvent->keycode ,
75
74
keyDownEvent->keyname );
76
75
rapidjson::Document event (rapidjson::kObjectType );
77
76
auto & allocator = event.GetAllocator ();
78
- rapidjson::Value keyName_code, key_code ;
77
+ rapidjson::Value keyNameValue ;
79
78
event.AddMember (kKeyMapKey , kTizenKeyMap , allocator);
80
79
event.AddMember (kTypeKey , kKeyDown , allocator);
81
80
event.AddMember (kKeyCodeKey , keyDownEvent->keycode , allocator);
82
81
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);
87
84
channel_->Send (event);
88
85
}
89
86
90
87
void KeyEventChannel::OnKeyUp (Ecore_Event_Key* keyUpEvent) {
91
- LoggerD (" OnKeyUp##keycode == %d, keyname == %s" , keyUpEvent->keycode ,
88
+ LoggerD (" OnKeyUp keyCode == %d, keyName == %s" , keyUpEvent->keycode ,
92
89
keyUpEvent->keyname );
93
90
rapidjson::Document event (rapidjson::kObjectType );
94
91
auto & allocator = event.GetAllocator ();
95
- rapidjson::Value keyName_code, key_code ;
92
+ rapidjson::Value keyNameValue ;
96
93
event.AddMember (kKeyMapKey , kTizenKeyMap , allocator);
97
94
event.AddMember (kTypeKey , kKeyUp , allocator);
98
95
event.AddMember (kKeyCodeKey , keyUpEvent->keycode , allocator);
99
96
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);
105
99
channel_->Send (event);
106
100
}
0 commit comments