- To clarify the meaning of the key symbol, changed the variable name to 'logicalKey'
Change-Id: Ia892910ed1c8556aa0af39b00c0abb5f6c10e039
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
if ( mIMFContext )
{
Integration::KeyEvent integKeyEvent( keyEvent );
- std::string key = integKeyEvent.key;
+ std::string key = integKeyEvent.logicalKey;
std::string compose = keyEvent.GetCompose();
std::string deviceName = keyEvent.GetDeviceName();
if( mIMFContext )
{
Integration::KeyEvent integKeyEvent( keyEvent );
- std::string key = integKeyEvent.key;
+ std::string key = integKeyEvent.logicalKey;
std::string compose = keyEvent.GetCompose();
std::string deviceName = keyEvent.GetDeviceName();
if ( mIMFContext )
{
Integration::KeyEvent integKeyEvent( keyEvent );
- std::string key = integKeyEvent.key;
+ std::string key = integKeyEvent.logicalKey;
std::string compose = keyEvent.GetCompose();
if( mIMFContext )
{
Integration::KeyEvent integKeyEvent( keyEvent );
- std::string key = integKeyEvent.key;
+ std::string key = integKeyEvent.logicalKey;
std::string compose = keyEvent.GetCompose();
DALI_LOG_INFO( gWindowBaseLogFilter, Debug::General, "WindowBaseEcoreWl::OnKeyDown\n" );
std::string keyName( keyEvent->keyname );
- std::string key( "" );
+ std::string logicalKey( "" );
std::string keyString( "" );
std::string compose( "" );
// Ensure key symbol is not NULL as keys like SHIFT have a null string.
if( keyEvent->key )
{
- key = keyEvent->key;
+ logicalKey = keyEvent->key;
}
int keyCode = KeyLookup::GetDaliKeyCode( keyEvent->keyname );
GetDeviceClass( ecore_device_class_get( keyEvent->dev ), deviceClass );
GetDeviceSubclass( ecore_device_subclass_get( keyEvent->dev ), deviceSubclass );
- Integration::KeyEvent keyEvent( keyName, key, keyString, keyCode, modifier, time, Integration::KeyEvent::Down, compose, deviceName, deviceClass, deviceSubclass );
+ Integration::KeyEvent keyEvent( keyName, logicalKey, keyString, keyCode, modifier, time, Integration::KeyEvent::Down, compose, deviceName, deviceClass, deviceSubclass );
mKeyEventSignal.Emit( keyEvent );
}
DALI_LOG_INFO( gWindowBaseLogFilter, Debug::General, "WindowBaseEcoreWl::OnKeyUp\n" );
std::string keyName( keyEvent->keyname );
- std::string key( "" );
+ std::string logicalKey( "" );
std::string keyString( "" );
std::string compose( "" );
// Ensure key symbol is not NULL as keys like SHIFT have a null string.
if( keyEvent->key )
{
- key = keyEvent->key;
+ logicalKey = keyEvent->key;
}
int keyCode = KeyLookup::GetDaliKeyCode( keyEvent->keyname );
GetDeviceClass( ecore_device_class_get( keyEvent->dev ), deviceClass );
GetDeviceSubclass( ecore_device_subclass_get( keyEvent->dev ), deviceSubclass );
- Integration::KeyEvent keyEvent( keyName, key, keyString, keyCode, modifier, time, Integration::KeyEvent::Up, compose, deviceName, deviceClass, deviceSubclass );
+ Integration::KeyEvent keyEvent( keyName, logicalKey, keyString, keyCode, modifier, time, Integration::KeyEvent::Up, compose, deviceName, deviceClass, deviceSubclass );
mKeyEventSignal.Emit( keyEvent );
}
DALI_LOG_INFO( gWindowBaseLogFilter, Debug::General, "WindowBaseEcoreWl::OnKeyDown\n" );
std::string keyName( keyEvent->keyname );
- std::string key( "" );
+ std::string logicalKey( "" );
std::string keyString( "" );
std::string compose( "" );
// Ensure key symbol is not NULL as keys like SHIFT have a null string.
if( keyEvent->key )
{
- key = keyEvent->key;
+ logicalKey = keyEvent->key;
}
int keyCode = KeyLookup::GetDaliKeyCode( keyEvent->keyname );
GetDeviceClass( ecore_device_class_get( keyEvent->dev ), deviceClass );
GetDeviceSubclass( ecore_device_subclass_get( keyEvent->dev ), deviceSubclass );
- Integration::KeyEvent keyEvent( keyName, key, keyString, keyCode, modifier, time, Integration::KeyEvent::Down, compose, deviceName, deviceClass, deviceSubclass );
+ Integration::KeyEvent keyEvent( keyName, logicalKey, keyString, keyCode, modifier, time, Integration::KeyEvent::Down, compose, deviceName, deviceClass, deviceSubclass );
mKeyEventSignal.Emit( keyEvent );
}
DALI_LOG_INFO( gWindowBaseLogFilter, Debug::General, "WindowBaseEcoreWl::OnKeyUp\n" );
std::string keyName( keyEvent->keyname );
- std::string key( "" );
+ std::string logicalKey( "" );
std::string keyString( "" );
std::string compose( "" );
// Ensure key symbol is not NULL as keys like SHIFT have a null string.
if( keyEvent->key )
{
- key = keyEvent->key;
+ logicalKey = keyEvent->key;
}
int keyCode = KeyLookup::GetDaliKeyCode( keyEvent->keyname );
GetDeviceClass( ecore_device_class_get( keyEvent->dev ), deviceClass );
GetDeviceSubclass( ecore_device_subclass_get( keyEvent->dev ), deviceSubclass );
- Integration::KeyEvent keyEvent( keyName, key, keyString, keyCode, modifier, time, Integration::KeyEvent::Up, compose, deviceName, deviceClass, deviceSubclass );
+ Integration::KeyEvent keyEvent( keyName, logicalKey, keyString, keyCode, modifier, time, Integration::KeyEvent::Up, compose, deviceName, deviceClass, deviceSubclass );
mKeyEventSignal.Emit( keyEvent );
}
DALI_LOG_INFO( gWindowBaseLogFilter, Debug::General, "WindowBaseEcoreX::OnKeyDown\n" );
std::string keyName( keyEvent->keyname );
- std::string key( "" );
+ std::string logicalKey( "" );
std::string keyString( "" );
std::string compose( "" );
// Ensure key symbol is not NULL as keys like SHIFT have a null string.
if( keyEvent->key )
{
- key = keyEvent->key;
+ logicalKey = keyEvent->key;
}
int keyCode = ecore_x_keysym_keycode_get( keyEvent->keyname );
keyString = keyEvent->string;
}
- Integration::KeyEvent keyEvent( keyName, key, keyString, keyCode, modifier, time, Integration::KeyEvent::Down, compose, DEFAULT_DEVICE_NAME, DEFAULT_DEVICE_CLASS, DEFAULT_DEVICE_SUBCLASS );
+ Integration::KeyEvent keyEvent( keyName, logicalKey, keyString, keyCode, modifier, time, Integration::KeyEvent::Down, compose, DEFAULT_DEVICE_NAME, DEFAULT_DEVICE_CLASS, DEFAULT_DEVICE_SUBCLASS );
mKeyEventSignal.Emit( keyEvent );
}
DALI_LOG_INFO( gWindowBaseLogFilter, Debug::General, " WindowBaseEcoreX::OnKeyUp\n" );
std::string keyName( keyEvent->keyname );
- std::string key( "" );
+ std::string logicalKey( "" );
std::string keyString( "" );
std::string compose( "" );
// Ensure key symbol is not NULL as keys like SHIFT have a null string.
if( keyEvent->key )
{
- key = keyEvent->key;
+ logicalKey = keyEvent->key;
}
int keyCode = ecore_x_keysym_keycode_get( keyEvent->keyname );
keyString = keyEvent->string;
}
- Integration::KeyEvent keyEvent( keyName, key, keyString, keyCode, modifier, time, Integration::KeyEvent::Up, compose, DEFAULT_DEVICE_NAME, DEFAULT_DEVICE_CLASS, DEFAULT_DEVICE_SUBCLASS );
+ Integration::KeyEvent keyEvent( keyName, logicalKey, keyString, keyCode, modifier, time, Integration::KeyEvent::Up, compose, DEFAULT_DEVICE_NAME, DEFAULT_DEVICE_CLASS, DEFAULT_DEVICE_SUBCLASS );
mKeyEventSignal.Emit( keyEvent );
}