From f16fe1f8144a594dd4d239e0c1d540535dbf44c4 Mon Sep 17 00:00:00 2001 From: "minho.sun" Date: Tue, 16 Jan 2018 20:57:04 +0900 Subject: [PATCH] Add DALI_KEY_RETURN to get control key event Add DALI_KEY_RETURN. - keyName : "Return" - keyCode : 36 Change-Id: I6f321ac38011e16280a27c919a4d1482a83ca5c4 Signed-off-by: minho.sun --- adaptors/devel-api/adaptor-framework/key-devel.h | 7 ++++++- adaptors/ecore/wayland/key-mapping-ecore-wl.cpp | 3 ++- adaptors/tv/key-mapping-tv.cpp | 3 ++- adaptors/ubuntu/key-mapping-ubuntu.cpp | 3 ++- adaptors/wayland/input/key-mapping-wl.cpp | 3 ++- adaptors/x11/key-mapping-x.cpp | 3 ++- 6 files changed, 16 insertions(+), 6 deletions(-) diff --git a/adaptors/devel-api/adaptor-framework/key-devel.h b/adaptors/devel-api/adaptor-framework/key-devel.h index 2b8a477..617dffd 100644 --- a/adaptors/devel-api/adaptor-framework/key-devel.h +++ b/adaptors/devel-api/adaptor-framework/key-devel.h @@ -89,7 +89,12 @@ enum Key /** * @brief Control Right key. */ - DALI_KEY_CONTROL_RIGHT = 105 + DALI_KEY_CONTROL_RIGHT = 105, + + /** + * @brief Control Return key. + */ + DALI_KEY_RETURN = 36 }; diff --git a/adaptors/ecore/wayland/key-mapping-ecore-wl.cpp b/adaptors/ecore/wayland/key-mapping-ecore-wl.cpp index 9b1f447..001adfe 100644 --- a/adaptors/ecore/wayland/key-mapping-ecore-wl.cpp +++ b/adaptors/ecore/wayland/key-mapping-ecore-wl.cpp @@ -87,7 +87,8 @@ KeyLookup KeyLookupTable[]= { "Shift_R", DALI_KEY_SHIFT_RIGHT, false }, { "Delete", static_cast( DevelKey::DALI_KEY_DELETE ), false }, { "Control_L", static_cast( DevelKey::DALI_KEY_CONTROL_LEFT ), false }, - { "Control_R", static_cast( DevelKey::DALI_KEY_CONTROL_RIGHT ), false } + { "Control_R", static_cast( DevelKey::DALI_KEY_CONTROL_RIGHT ), false }, + { "Return", static_cast( DevelKey::DALI_KEY_RETURN ), false } }; const std::size_t KEY_LOOKUP_COUNT = (sizeof( KeyLookupTable ))/ (sizeof( KeyLookup )); diff --git a/adaptors/tv/key-mapping-tv.cpp b/adaptors/tv/key-mapping-tv.cpp index 88da0fc..07794e8 100644 --- a/adaptors/tv/key-mapping-tv.cpp +++ b/adaptors/tv/key-mapping-tv.cpp @@ -87,7 +87,8 @@ KeyLookup KeyLookupTable[]= { "Shift_R", DALI_KEY_SHIFT_RIGHT, false }, { "Delete", static_cast( DevelKey::DALI_KEY_DELETE ), false }, { "Control_L", static_cast( DevelKey::DALI_KEY_CONTROL_LEFT ), false }, - { "Control_R", static_cast( DevelKey::DALI_KEY_CONTROL_RIGHT ), false } + { "Control_R", static_cast( DevelKey::DALI_KEY_CONTROL_RIGHT ), false }, + { "Return", static_cast( DevelKey::DALI_KEY_RETURN ), false } }; const std::size_t KEY_LOOKUP_COUNT = (sizeof( KeyLookupTable ))/ (sizeof( KeyLookup )); diff --git a/adaptors/ubuntu/key-mapping-ubuntu.cpp b/adaptors/ubuntu/key-mapping-ubuntu.cpp index 73f3e81..73f033a 100644 --- a/adaptors/ubuntu/key-mapping-ubuntu.cpp +++ b/adaptors/ubuntu/key-mapping-ubuntu.cpp @@ -85,7 +85,8 @@ KeyLookup KeyLookupTable[]= { "Shift_R", DALI_KEY_SHIFT_RIGHT, false }, { "Delete", static_cast( DevelKey::DALI_KEY_DELETE ), false }, { "Control_L", static_cast( DevelKey::DALI_KEY_CONTROL_LEFT ), false }, - { "Control_R", static_cast( DevelKey::DALI_KEY_CONTROL_RIGHT ), false } + { "Control_R", static_cast( DevelKey::DALI_KEY_CONTROL_RIGHT ), false }, + { "Return", static_cast( DevelKey::DALI_KEY_RETURN ), false } }; const std::size_t KEY_LOOKUP_COUNT = (sizeof( KeyLookupTable ))/ (sizeof( KeyLookup )); diff --git a/adaptors/wayland/input/key-mapping-wl.cpp b/adaptors/wayland/input/key-mapping-wl.cpp index 4152e83..e9724bb 100644 --- a/adaptors/wayland/input/key-mapping-wl.cpp +++ b/adaptors/wayland/input/key-mapping-wl.cpp @@ -87,7 +87,8 @@ KeyLookup KeyLookupTable[]= { "Shift_R", DALI_KEY_SHIFT_RIGHT, false }, { "Delete", static_cast( DevelKey::DALI_KEY_DELETE ), false }, { "Control_L", static_cast( DevelKey::DALI_KEY_CONTROL_LEFT ), false }, - { "Control_R", static_cast( DevelKey::DALI_KEY_CONTROL_RIGHT ), false } + { "Control_R", static_cast( DevelKey::DALI_KEY_CONTROL_RIGHT ), false }, + { "Return", static_cast( DevelKey::DALI_KEY_RETURN ), false } }; const std::size_t KEY_LOOKUP_COUNT = (sizeof( KeyLookupTable ))/ (sizeof( KeyLookup )); diff --git a/adaptors/x11/key-mapping-x.cpp b/adaptors/x11/key-mapping-x.cpp index f280088..dd7f8f2 100644 --- a/adaptors/x11/key-mapping-x.cpp +++ b/adaptors/x11/key-mapping-x.cpp @@ -87,7 +87,8 @@ KeyLookup KeyLookupTable[]= { "Shift_R", DALI_KEY_SHIFT_RIGHT, false }, { "Delete", static_cast( DevelKey::DALI_KEY_DELETE ), false }, { "Control_L", static_cast( DevelKey::DALI_KEY_CONTROL_LEFT ), false }, - { "Control_R", static_cast( DevelKey::DALI_KEY_CONTROL_RIGHT ), false } + { "Control_R", static_cast( DevelKey::DALI_KEY_CONTROL_RIGHT ), false }, + { "Return", static_cast( DevelKey::DALI_KEY_RETURN ), false } }; const std::size_t KEY_LOOKUP_COUNT = (sizeof( KeyLookupTable ))/ (sizeof( KeyLookup )); -- 2.7.4