Skip to content

Commit 075d0a7

Browse files
swift-kimGitHub Enterprise
authored andcommitted
Use camel case key for key event messages (#15)
* Use camel case key for key event messages * Update DEPS file
1 parent 2e3a159 commit 075d0a7

File tree

2 files changed

+10
-16
lines changed

2 files changed

+10
-16
lines changed

DEPS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ allowed_hosts = [
106106

107107
deps = {
108108
'src': 'https://github.com/flutter/buildroot.git' + '@' + 'a6c0959d1ac8cdfe6f9ff87892bc4905a73699fe',
109-
'src/third_party/tizen_tools' :'git@github.sec.samsung.net:f-project/tizen_tools.git' + '@' + 'f2d2461da1c0a3192019c475c7210456cb8ec715',
109+
'src/third_party/tizen_tools' :'git@github.sec.samsung.net:f-project/tizen_tools.git' + '@' + 'dcd6fbaaa68da4225ab1482e60e6e6ee157664b6',
110110

111111
# Fuchsia compatibility
112112
#

shell/platform/tizen/key_event_channel.cc

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ static constexpr char kKeyMapKey[] = "keymap";
2424
static constexpr char kKeyCodeKey[] = "keyCode";
2525
static constexpr char kTypeKey[] = "type";
2626
static constexpr char kModifiersKey[] = "modifiers";
27-
static constexpr char kKeynameKey[] = "keyname";
28-
static constexpr char kKeySymbolKey[] = "keysymbol";
27+
static constexpr char kKeyNameKey[] = "keyName";
2928
static constexpr char kComposeKey[] = "compose";
3029
static constexpr char kTizenKeyMap[] = "tizen";
3130
static constexpr char kKeyUp[] = "keyup";
@@ -71,36 +70,31 @@ KeyEventChannel::~KeyEventChannel() {
7170
}
7271

7372
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,
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

9087
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,
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

Comments
 (0)