Add DALI_KEY_DELETE to get Delete key event 55/161055/3
authorSeoyeon Kim <seoyeon2.kim@samsung.com>
Mon, 20 Nov 2017 07:28:55 +0000 (16:28 +0900)
committerSeoyeon Kim <seoyeon2.kim@samsung.com>
Thu, 23 Nov 2017 01:40:33 +0000 (10:40 +0900)
- 'Delete' key name is DALI_KEY_DELETE key code in DALi.
  'Delete' keyCode is 119 by ecore_x_keysym_keycode_get().

Change-Id: I56bca075e607fe6e942b7e9a7ed87b7b6ee57aa2
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
adaptors/common/key-impl.h
adaptors/devel-api/adaptor-framework/key-devel.h [new file with mode: 0644]
adaptors/devel-api/file.list
adaptors/ecore/wayland/key-mapping-ecore-wl.cpp
adaptors/tv/key-mapping-tv.cpp
adaptors/ubuntu/key-mapping-ubuntu.cpp
adaptors/wayland/input/key-mapping-wl.cpp
adaptors/x11/key-mapping-x.cpp

index 25400f3..2bbe379 100644 (file)
@@ -21,6 +21,7 @@
 // INTERNAL INCLUDES
 #include <key.h>
 #include <key-extension-plugin.h>
+#include <key-devel.h>
 
 namespace Dali
 {
diff --git a/adaptors/devel-api/adaptor-framework/key-devel.h b/adaptors/devel-api/adaptor-framework/key-devel.h
new file mode 100644 (file)
index 0000000..6b86dc4
--- /dev/null
@@ -0,0 +1,90 @@
+#ifndef DALI_KEY_DEVEL_H
+#define DALI_KEY_DEVEL_H
+
+/*
+ * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// INTERNAL INCLUDES
+#ifdef DALI_ADAPTOR_COMPILATION
+#include <key.h>
+#else
+#include <dali/public-api/adaptor-framework/key.h>
+#endif
+
+namespace Dali
+{
+
+namespace DevelKey
+{
+
+enum Key
+{
+  DALI_KEY_INVALID = Dali::DALI_KEY_INVALID,
+  DALI_KEY_ESCAPE = Dali::DALI_KEY_ESCAPE,
+  DALI_KEY_BACKSPACE = Dali::DALI_KEY_BACKSPACE,
+  DALI_KEY_SHIFT_LEFT = Dali::DALI_KEY_SHIFT_LEFT,
+  DALI_KEY_SHIFT_RIGHT = Dali::DALI_KEY_SHIFT_RIGHT,
+  DALI_KEY_CURSOR_UP = Dali::DALI_KEY_CURSOR_UP,
+  DALI_KEY_CURSOR_LEFT = Dali::DALI_KEY_CURSOR_LEFT,
+  DALI_KEY_CURSOR_RIGHT = Dali::DALI_KEY_CURSOR_RIGHT,
+  DALI_KEY_CURSOR_DOWN = Dali::DALI_KEY_CURSOR_DOWN,
+  DALI_KEY_BACK = Dali::DALI_KEY_BACK,
+  DALI_KEY_CAMERA = Dali::DALI_KEY_CAMERA,
+  DALI_KEY_CONFIG = Dali::DALI_KEY_CONFIG,
+  DALI_KEY_POWER = Dali::DALI_KEY_POWER,
+  DALI_KEY_PAUSE = Dali::DALI_KEY_PAUSE,
+  DALI_KEY_CANCEL = Dali::DALI_KEY_CANCEL,
+  DALI_KEY_PLAY_CD = Dali::DALI_KEY_PLAY_CD,
+  DALI_KEY_STOP_CD = Dali::DALI_KEY_STOP_CD,
+  DALI_KEY_PAUSE_CD = Dali::DALI_KEY_PAUSE_CD,
+  DALI_KEY_NEXT_SONG = Dali::DALI_KEY_NEXT_SONG,
+  DALI_KEY_PREVIOUS_SONG = Dali::DALI_KEY_PREVIOUS_SONG,
+  DALI_KEY_REWIND = Dali::DALI_KEY_REWIND,
+  DALI_KEY_FASTFORWARD = Dali::DALI_KEY_FASTFORWARD,
+  DALI_KEY_MEDIA = Dali::DALI_KEY_MEDIA,
+  DALI_KEY_PLAY_PAUSE = Dali::DALI_KEY_PLAY_PAUSE,
+  DALI_KEY_MUTE = Dali::DALI_KEY_MUTE,
+  DALI_KEY_MENU = Dali::DALI_KEY_MENU,
+  DALI_KEY_HOME = Dali::DALI_KEY_HOME,
+  DALI_KEY_HOMEPAGE = Dali::DALI_KEY_HOMEPAGE,
+  DALI_KEY_WEBPAGE = Dali::DALI_KEY_WEBPAGE,
+  DALI_KEY_MAIL = Dali::DALI_KEY_MAIL,
+  DALI_KEY_SCREENSAVER = Dali::DALI_KEY_SCREENSAVER,
+  DALI_KEY_BRIGHTNESS_UP = Dali::DALI_KEY_BRIGHTNESS_UP,
+  DALI_KEY_BRIGHTNESS_DOWN = Dali::DALI_KEY_BRIGHTNESS_DOWN,
+  DALI_KEY_SOFT_KBD = Dali::DALI_KEY_SOFT_KBD,
+  DALI_KEY_QUICK_PANEL = Dali::DALI_KEY_QUICK_PANEL,
+  DALI_KEY_TASK_SWITCH = Dali::DALI_KEY_TASK_SWITCH,
+  DALI_KEY_APPS = Dali::DALI_KEY_APPS,
+  DALI_KEY_SEARCH = Dali::DALI_KEY_SEARCH,
+  DALI_KEY_VOICE = Dali::DALI_KEY_VOICE,
+  DALI_KEY_LANGUAGE = Dali::DALI_KEY_LANGUAGE,
+  DALI_KEY_VOLUME_UP = Dali::DALI_KEY_VOLUME_UP,
+  DALI_KEY_VOLUME_DOWN = Dali::DALI_KEY_VOLUME_DOWN,
+
+  /**
+   * @brief Delete key.
+   */
+  DALI_KEY_DELETE = 119
+
+};
+
+} // namespace DevelKey
+
+} // namespace Dali
+
+#endif // DALI_KEY_DEVEL_H
index 4a074a5..4eca888 100644 (file)
@@ -62,6 +62,7 @@ devel_api_adaptor_framework_header_files = \
   $(adaptor_devel_api_dir)/adaptor-framework/tilt-sensor.h \
   $(adaptor_devel_api_dir)/adaptor-framework/video-player.h \
   $(adaptor_devel_api_dir)/adaptor-framework/video-player-plugin.h \
+  $(adaptor_devel_api_dir)/adaptor-framework/key-devel.h \
   $(adaptor_devel_api_dir)/adaptor-framework/key-extension-plugin.h \
   $(adaptor_devel_api_dir)/adaptor-framework/virtual-keyboard.h \
   $(adaptor_devel_api_dir)/adaptor-framework/physical-keyboard.h
index 6603b27..071ab90 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2017 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,56 +36,57 @@ KeyLookup KeyLookupTable[]=
   // more than one key name can be assigned to a single dali-key code
   // e.g. "Menu" and "XF86Menu" are both assigned to  DALI_KEY_MENU
 
-  { "Escape",                DALI_KEY_ESCAPE,          false },
-  { "Menu",                  DALI_KEY_MENU,            false },
+  { "Escape",                DALI_KEY_ESCAPE,                                     false },
+  { "Menu",                  DALI_KEY_MENU,                                       false },
 
   // Now literal strings are used as key names instead of defined symbols in utilX,
   // since these definition in utilX.h is deprecated
-  { "XF86Camera",            DALI_KEY_CAMERA,          false },
-  { "XF86Camera_Full",       DALI_KEY_CONFIG,          false },
-  { "XF86PowerOff",          DALI_KEY_POWER,           true  },
-  { "XF86Standby",           DALI_KEY_PAUSE,           false },
-  { "Cancel",                DALI_KEY_CANCEL,          false },
-  { "XF86AudioPlay",         DALI_KEY_PLAY_CD,         false },
-  { "XF86AudioStop",         DALI_KEY_STOP_CD,         false },
-  { "XF86AudioPause",        DALI_KEY_PAUSE_CD,        false },
-  { "XF86AudioNext",         DALI_KEY_NEXT_SONG,       false },
-  { "XF86AudioPrev",         DALI_KEY_PREVIOUS_SONG,   false },
-  { "XF86AudioRewind",       DALI_KEY_REWIND,          false },
-  { "XF86AudioForward",      DALI_KEY_FASTFORWARD,     false },
-  { "XF86AudioMedia",        DALI_KEY_MEDIA,           false },
-  { "XF86AudioPlayPause",    DALI_KEY_PLAY_PAUSE,      false },
-  { "XF86AudioMute",         DALI_KEY_MUTE,            false },
-  { "XF86Menu",              DALI_KEY_MENU,            true  },
-  { "XF86Home",              DALI_KEY_HOME,            true  },
-  { "XF86Back",              DALI_KEY_BACK,            true  },
-  { "XF86Send",              DALI_KEY_MENU,            true  },
-  { "XF86Phone",             DALI_KEY_HOME,            true  },
-  { "XF86Stop",              DALI_KEY_BACK,            true  },
-  { "XF86HomePage",          DALI_KEY_HOMEPAGE,        false },
-  { "XF86WWW",               DALI_KEY_WEBPAGE,         false },
-  { "XF86Mail",              DALI_KEY_MAIL,            false },
-  { "XF86ScreenSaver",       DALI_KEY_SCREENSAVER,     false },
-  { "XF86MonBrightnessUp",   DALI_KEY_BRIGHTNESS_UP,   false },
-  { "XF86MonBrightnessDown", DALI_KEY_BRIGHTNESS_DOWN, false },
-  { "XF86SoftKBD",           DALI_KEY_SOFT_KBD,        false },
-  { "XF86QuickPanel",        DALI_KEY_QUICK_PANEL,     false },
-  { "XF86TaskPane",          DALI_KEY_TASK_SWITCH,     false },
-  { "XF86Apps",              DALI_KEY_APPS,            false },
-  { "XF86Search",            DALI_KEY_SEARCH,          false },
-  { "XF86Voice",             DALI_KEY_VOICE,           false },
-  { "Hangul",                DALI_KEY_LANGUAGE,        false },
-  { "XF86AudioRaiseVolume",  DALI_KEY_VOLUME_UP,       true  },
-  { "XF86AudioLowerVolume",  DALI_KEY_VOLUME_DOWN,     true  },
+  { "XF86Camera",            DALI_KEY_CAMERA,                                     false },
+  { "XF86Camera_Full",       DALI_KEY_CONFIG,                                     false },
+  { "XF86PowerOff",          DALI_KEY_POWER,                                      true  },
+  { "XF86Standby",           DALI_KEY_PAUSE,                                      false },
+  { "Cancel",                DALI_KEY_CANCEL,                                     false },
+  { "XF86AudioPlay",         DALI_KEY_PLAY_CD,                                    false },
+  { "XF86AudioStop",         DALI_KEY_STOP_CD,                                    false },
+  { "XF86AudioPause",        DALI_KEY_PAUSE_CD,                                   false },
+  { "XF86AudioNext",         DALI_KEY_NEXT_SONG,                                  false },
+  { "XF86AudioPrev",         DALI_KEY_PREVIOUS_SONG,                              false },
+  { "XF86AudioRewind",       DALI_KEY_REWIND,                                     false },
+  { "XF86AudioForward",      DALI_KEY_FASTFORWARD,                                false },
+  { "XF86AudioMedia",        DALI_KEY_MEDIA,                                      false },
+  { "XF86AudioPlayPause",    DALI_KEY_PLAY_PAUSE,                                 false },
+  { "XF86AudioMute",         DALI_KEY_MUTE,                                       false },
+  { "XF86Menu",              DALI_KEY_MENU,                                       true  },
+  { "XF86Home",              DALI_KEY_HOME,                                       true  },
+  { "XF86Back",              DALI_KEY_BACK,                                       true  },
+  { "XF86Send",              DALI_KEY_MENU,                                       true  },
+  { "XF86Phone",             DALI_KEY_HOME,                                       true  },
+  { "XF86Stop",              DALI_KEY_BACK,                                       true  },
+  { "XF86HomePage",          DALI_KEY_HOMEPAGE,                                   false },
+  { "XF86WWW",               DALI_KEY_WEBPAGE,                                    false },
+  { "XF86Mail",              DALI_KEY_MAIL,                                       false },
+  { "XF86ScreenSaver",       DALI_KEY_SCREENSAVER,                                false },
+  { "XF86MonBrightnessUp",   DALI_KEY_BRIGHTNESS_UP,                              false },
+  { "XF86MonBrightnessDown", DALI_KEY_BRIGHTNESS_DOWN,                            false },
+  { "XF86SoftKBD",           DALI_KEY_SOFT_KBD,                                   false },
+  { "XF86QuickPanel",        DALI_KEY_QUICK_PANEL,                                false },
+  { "XF86TaskPane",          DALI_KEY_TASK_SWITCH,                                false },
+  { "XF86Apps",              DALI_KEY_APPS,                                       false },
+  { "XF86Search",            DALI_KEY_SEARCH,                                     false },
+  { "XF86Voice",             DALI_KEY_VOICE,                                      false },
+  { "Hangul",                DALI_KEY_LANGUAGE,                                   false },
+  { "XF86AudioRaiseVolume",  DALI_KEY_VOLUME_UP,                                  true  },
+  { "XF86AudioLowerVolume",  DALI_KEY_VOLUME_DOWN,                                true  },
 
-  { "BackSpace",             DALI_KEY_BACKSPACE,       false },
-  { "Left",                  DALI_KEY_CURSOR_LEFT,     false },
-  { "Right",                 DALI_KEY_CURSOR_RIGHT,    false },
-  { "Shift_L",               DALI_KEY_SHIFT_LEFT,      false },
-  { "Shift_R",               DALI_KEY_SHIFT_RIGHT,     false }
+  { "BackSpace",             DALI_KEY_BACKSPACE,                                  false },
+  { "Left",                  DALI_KEY_CURSOR_LEFT,                                false },
+  { "Right",                 DALI_KEY_CURSOR_RIGHT,                               false },
+  { "Shift_L",               DALI_KEY_SHIFT_LEFT,                                 false },
+  { "Shift_R",               DALI_KEY_SHIFT_RIGHT,                                false },
+  { "Delete",                static_cast<Dali::KEY>( DevelKey::DALI_KEY_DELETE ), false }
 };
 
-const std::size_t KEY_LOOKUP_COUNT = (sizeof( KeyLookupTable))/ (sizeof(KeyLookup));
+const std::size_t KEY_LOOKUP_COUNT = (sizeof( KeyLookupTable ))/ (sizeof( KeyLookup ));
 
 } // namespace KeyLookup
 
index 1009157..a1d5f69 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2017 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,56 +36,57 @@ KeyLookup KeyLookupTable[]=
   // more than one key name can be assigned to a single dali-key code
   // e.g. "Menu" and "XF86Menu" are both assigned to  DALI_KEY_MENU
 
-  { "Escape",                DALI_KEY_ESCAPE,          false },
-  { "Menu",                  DALI_KEY_MENU,            false },
+  { "Escape",                DALI_KEY_ESCAPE,                                     false },
+  { "Menu",                  DALI_KEY_MENU,                                       false },
 
   // Now literal strings are used as key names instead of defined symbols in utilX,
   // since these definition in utilX.h is deprecated
-  { "XF86Camera",            DALI_KEY_CAMERA,          false },
-  { "XF86Camera_Full",       DALI_KEY_CONFIG,          false },
-  { "XF86PowerOff",          DALI_KEY_POWER,           true  },
-  { "XF86Standby",           DALI_KEY_PAUSE,           false },
-  { "Cancel",                DALI_KEY_CANCEL,          false },
-  { "XF86AudioPlay",         DALI_KEY_PLAY_CD,         false },
-  { "XF86AudioStop",         DALI_KEY_STOP_CD,         false },
-  { "XF86AudioPause",        DALI_KEY_PAUSE_CD,        false },
-  { "XF86AudioNext",         DALI_KEY_NEXT_SONG,       false },
-  { "XF86AudioPrev",         DALI_KEY_PREVIOUS_SONG,   false },
-  { "XF86AudioRewind",       DALI_KEY_REWIND,          false },
-  { "XF86AudioForward",      DALI_KEY_FASTFORWARD,     false },
-  { "XF86AudioMedia",        DALI_KEY_MEDIA,           false },
-  { "XF86AudioPlayPause",    DALI_KEY_PLAY_PAUSE,      false },
-  { "XF86AudioMute",         DALI_KEY_MUTE,            false },
-  { "XF86Menu",              DALI_KEY_MENU,            true  },
-  { "XF86Home",              DALI_KEY_HOME,            true  },
-  { "XF86Back",              DALI_KEY_BACK,            true  },
-  { "XF86Send",              DALI_KEY_MENU,            true  },
-  { "XF86Phone",             DALI_KEY_HOME,            true  },
-  { "XF86Stop",              DALI_KEY_BACK,            true  },
-  { "XF86HomePage",          DALI_KEY_HOMEPAGE,        false },
-  { "XF86WWW",               DALI_KEY_WEBPAGE,         false },
-  { "XF86Mail",              DALI_KEY_MAIL,            false },
-  { "XF86ScreenSaver",       DALI_KEY_SCREENSAVER,     false },
-  { "XF86MonBrightnessUp",   DALI_KEY_BRIGHTNESS_UP,   false },
-  { "XF86MonBrightnessDown", DALI_KEY_BRIGHTNESS_DOWN, false },
-  { "XF86SoftKBD",           DALI_KEY_SOFT_KBD,        false },
-  { "XF86QuickPanel",        DALI_KEY_QUICK_PANEL,     false },
-  { "XF86TaskPane",          DALI_KEY_TASK_SWITCH,     false },
-  { "XF86Apps",              DALI_KEY_APPS,            false },
-  { "XF86Search",            DALI_KEY_SEARCH,          false },
-  { "XF86Voice",             DALI_KEY_VOICE,           false },
-  { "Hangul",                DALI_KEY_LANGUAGE,        false },
-  { "XF86AudioRaiseVolume",  DALI_KEY_VOLUME_UP,       true  },
-  { "XF86AudioLowerVolume",  DALI_KEY_VOLUME_DOWN,     true  },
+  { "XF86Camera",            DALI_KEY_CAMERA,                                     false },
+  { "XF86Camera_Full",       DALI_KEY_CONFIG,                                     false },
+  { "XF86PowerOff",          DALI_KEY_POWER,                                      true  },
+  { "XF86Standby",           DALI_KEY_PAUSE,                                      false },
+  { "Cancel",                DALI_KEY_CANCEL,                                     false },
+  { "XF86AudioPlay",         DALI_KEY_PLAY_CD,                                    false },
+  { "XF86AudioStop",         DALI_KEY_STOP_CD,                                    false },
+  { "XF86AudioPause",        DALI_KEY_PAUSE_CD,                                   false },
+  { "XF86AudioNext",         DALI_KEY_NEXT_SONG,                                  false },
+  { "XF86AudioPrev",         DALI_KEY_PREVIOUS_SONG,                              false },
+  { "XF86AudioRewind",       DALI_KEY_REWIND,                                     false },
+  { "XF86AudioForward",      DALI_KEY_FASTFORWARD,                                false },
+  { "XF86AudioMedia",        DALI_KEY_MEDIA,                                      false },
+  { "XF86AudioPlayPause",    DALI_KEY_PLAY_PAUSE,                                 false },
+  { "XF86AudioMute",         DALI_KEY_MUTE,                                       false },
+  { "XF86Menu",              DALI_KEY_MENU,                                       true  },
+  { "XF86Home",              DALI_KEY_HOME,                                       true  },
+  { "XF86Back",              DALI_KEY_BACK,                                       true  },
+  { "XF86Send",              DALI_KEY_MENU,                                       true  },
+  { "XF86Phone",             DALI_KEY_HOME,                                       true  },
+  { "XF86Stop",              DALI_KEY_BACK,                                       true  },
+  { "XF86HomePage",          DALI_KEY_HOMEPAGE,                                   false },
+  { "XF86WWW",               DALI_KEY_WEBPAGE,                                    false },
+  { "XF86Mail",              DALI_KEY_MAIL,                                       false },
+  { "XF86ScreenSaver",       DALI_KEY_SCREENSAVER,                                false },
+  { "XF86MonBrightnessUp",   DALI_KEY_BRIGHTNESS_UP,                              false },
+  { "XF86MonBrightnessDown", DALI_KEY_BRIGHTNESS_DOWN,                            false },
+  { "XF86SoftKBD",           DALI_KEY_SOFT_KBD,                                   false },
+  { "XF86QuickPanel",        DALI_KEY_QUICK_PANEL,                                false },
+  { "XF86TaskPane",          DALI_KEY_TASK_SWITCH,                                false },
+  { "XF86Apps",              DALI_KEY_APPS,                                       false },
+  { "XF86Search",            DALI_KEY_SEARCH,                                     false },
+  { "XF86Voice",             DALI_KEY_VOICE,                                      false },
+  { "Hangul",                DALI_KEY_LANGUAGE,                                   false },
+  { "XF86AudioRaiseVolume",  DALI_KEY_VOLUME_UP,                                  true  },
+  { "XF86AudioLowerVolume",  DALI_KEY_VOLUME_DOWN,                                true  },
 
-  { "BackSpace",             DALI_KEY_BACKSPACE,       false },
-  { "Left",                  DALI_KEY_CURSOR_LEFT,     false },
-  { "Right",                 DALI_KEY_CURSOR_RIGHT,    false },
-  { "Shift_L",               DALI_KEY_SHIFT_LEFT,      false },
-  { "Shift_R",               DALI_KEY_SHIFT_RIGHT,     false }
+  { "BackSpace",             DALI_KEY_BACKSPACE,                                  false },
+  { "Left",                  DALI_KEY_CURSOR_LEFT,                                false },
+  { "Right",                 DALI_KEY_CURSOR_RIGHT,                               false },
+  { "Shift_L",               DALI_KEY_SHIFT_LEFT,                                 false },
+  { "Shift_R",               DALI_KEY_SHIFT_RIGHT,                                false },
+  { "Delete",                static_cast<Dali::KEY>( DevelKey::DALI_KEY_DELETE ), false }
 };
 
-const std::size_t KEY_LOOKUP_COUNT = (sizeof( KeyLookupTable))/ (sizeof(KeyLookup));
+const std::size_t KEY_LOOKUP_COUNT = (sizeof( KeyLookupTable ))/ (sizeof( KeyLookup ));
 
 } // namespace KeyLookup
 
index 2864cfe..071ab90 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2017 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,53 +36,54 @@ KeyLookup KeyLookupTable[]=
   // more than one key name can be assigned to a single dali-key code
   // e.g. "Menu" and "XF86Menu" are both assigned to  DALI_KEY_MENU
 
-  { "Escape",                DALI_KEY_ESCAPE,          false },
-  { "Menu",                  DALI_KEY_MENU,            false },
+  { "Escape",                DALI_KEY_ESCAPE,                                     false },
+  { "Menu",                  DALI_KEY_MENU,                                       false },
 
   // Now literal strings are used as key names instead of defined symbols in utilX,
   // since these definition in utilX.h is deprecated
-  { "XF86Camera",            DALI_KEY_CAMERA,          false },
-  { "XF86Camera_Full",       DALI_KEY_CONFIG,          false },
-  { "XF86PowerOff",          DALI_KEY_POWER,           true  },
-  { "XF86Standby",           DALI_KEY_PAUSE,           false },
-  { "Cancel",                DALI_KEY_CANCEL,          false },
-  { "XF86AudioPlay",         DALI_KEY_PLAY_CD,         false },
-  { "XF86AudioStop",         DALI_KEY_STOP_CD,         false },
-  { "XF86AudioPause",        DALI_KEY_PAUSE_CD,        false },
-  { "XF86AudioNext",         DALI_KEY_NEXT_SONG,       false },
-  { "XF86AudioPrev",         DALI_KEY_PREVIOUS_SONG,   false },
-  { "XF86AudioRewind",       DALI_KEY_REWIND,          false },
-  { "XF86AudioForward",      DALI_KEY_FASTFORWARD,     false },
-  { "XF86AudioMedia",        DALI_KEY_MEDIA,           false },
-  { "XF86AudioPlayPause",    DALI_KEY_PLAY_PAUSE,      false },
-  { "XF86AudioMute",         DALI_KEY_MUTE,            false },
-  { "XF86Menu",              DALI_KEY_MENU,            true  },
-  { "XF86Home",              DALI_KEY_HOME,            true  },
-  { "XF86Back",              DALI_KEY_BACK,            true  },
-  { "XF86Send",              DALI_KEY_MENU,            true  },
-  { "XF86Phone",             DALI_KEY_HOME,            true  },
-  { "XF86Stop",              DALI_KEY_BACK,            true  },
-  { "XF86HomePage",          DALI_KEY_HOMEPAGE,        false },
-  { "XF86WWW",               DALI_KEY_WEBPAGE,         false },
-  { "XF86Mail",              DALI_KEY_MAIL,            false },
-  { "XF86ScreenSaver",       DALI_KEY_SCREENSAVER,     false },
-  { "XF86MonBrightnessUp",   DALI_KEY_BRIGHTNESS_UP,   false },
-  { "XF86MonBrightnessDown", DALI_KEY_BRIGHTNESS_DOWN, false },
-  { "XF86SoftKBD",           DALI_KEY_SOFT_KBD,        false },
-  { "XF86QuickPanel",        DALI_KEY_QUICK_PANEL,     false },
-  { "XF86TaskPane",          DALI_KEY_TASK_SWITCH,     false },
-  { "XF86Apps",              DALI_KEY_APPS,            false },
-  { "XF86Search",            DALI_KEY_SEARCH,          false },
-  { "XF86Voice",             DALI_KEY_VOICE,           false },
-  { "Hangul",                DALI_KEY_LANGUAGE,        false },
-  { "XF86AudioRaiseVolume",  DALI_KEY_VOLUME_UP,       true  },
-  { "XF86AudioLowerVolume",  DALI_KEY_VOLUME_DOWN,     true  },
+  { "XF86Camera",            DALI_KEY_CAMERA,                                     false },
+  { "XF86Camera_Full",       DALI_KEY_CONFIG,                                     false },
+  { "XF86PowerOff",          DALI_KEY_POWER,                                      true  },
+  { "XF86Standby",           DALI_KEY_PAUSE,                                      false },
+  { "Cancel",                DALI_KEY_CANCEL,                                     false },
+  { "XF86AudioPlay",         DALI_KEY_PLAY_CD,                                    false },
+  { "XF86AudioStop",         DALI_KEY_STOP_CD,                                    false },
+  { "XF86AudioPause",        DALI_KEY_PAUSE_CD,                                   false },
+  { "XF86AudioNext",         DALI_KEY_NEXT_SONG,                                  false },
+  { "XF86AudioPrev",         DALI_KEY_PREVIOUS_SONG,                              false },
+  { "XF86AudioRewind",       DALI_KEY_REWIND,                                     false },
+  { "XF86AudioForward",      DALI_KEY_FASTFORWARD,                                false },
+  { "XF86AudioMedia",        DALI_KEY_MEDIA,                                      false },
+  { "XF86AudioPlayPause",    DALI_KEY_PLAY_PAUSE,                                 false },
+  { "XF86AudioMute",         DALI_KEY_MUTE,                                       false },
+  { "XF86Menu",              DALI_KEY_MENU,                                       true  },
+  { "XF86Home",              DALI_KEY_HOME,                                       true  },
+  { "XF86Back",              DALI_KEY_BACK,                                       true  },
+  { "XF86Send",              DALI_KEY_MENU,                                       true  },
+  { "XF86Phone",             DALI_KEY_HOME,                                       true  },
+  { "XF86Stop",              DALI_KEY_BACK,                                       true  },
+  { "XF86HomePage",          DALI_KEY_HOMEPAGE,                                   false },
+  { "XF86WWW",               DALI_KEY_WEBPAGE,                                    false },
+  { "XF86Mail",              DALI_KEY_MAIL,                                       false },
+  { "XF86ScreenSaver",       DALI_KEY_SCREENSAVER,                                false },
+  { "XF86MonBrightnessUp",   DALI_KEY_BRIGHTNESS_UP,                              false },
+  { "XF86MonBrightnessDown", DALI_KEY_BRIGHTNESS_DOWN,                            false },
+  { "XF86SoftKBD",           DALI_KEY_SOFT_KBD,                                   false },
+  { "XF86QuickPanel",        DALI_KEY_QUICK_PANEL,                                false },
+  { "XF86TaskPane",          DALI_KEY_TASK_SWITCH,                                false },
+  { "XF86Apps",              DALI_KEY_APPS,                                       false },
+  { "XF86Search",            DALI_KEY_SEARCH,                                     false },
+  { "XF86Voice",             DALI_KEY_VOICE,                                      false },
+  { "Hangul",                DALI_KEY_LANGUAGE,                                   false },
+  { "XF86AudioRaiseVolume",  DALI_KEY_VOLUME_UP,                                  true  },
+  { "XF86AudioLowerVolume",  DALI_KEY_VOLUME_DOWN,                                true  },
 
-  { "BackSpace",             DALI_KEY_BACKSPACE,       false },
-  { "Left",                  DALI_KEY_CURSOR_LEFT,     false },
-  { "Right",                 DALI_KEY_CURSOR_RIGHT,    false },
-  { "Shift_L",               DALI_KEY_SHIFT_LEFT,      false },
-  { "Shift_R",               DALI_KEY_SHIFT_RIGHT,     false }
+  { "BackSpace",             DALI_KEY_BACKSPACE,                                  false },
+  { "Left",                  DALI_KEY_CURSOR_LEFT,                                false },
+  { "Right",                 DALI_KEY_CURSOR_RIGHT,                               false },
+  { "Shift_L",               DALI_KEY_SHIFT_LEFT,                                 false },
+  { "Shift_R",               DALI_KEY_SHIFT_RIGHT,                                false },
+  { "Delete",                static_cast<Dali::KEY>( DevelKey::DALI_KEY_DELETE ), false }
 };
 
 const std::size_t KEY_LOOKUP_COUNT = (sizeof( KeyLookupTable ))/ (sizeof( KeyLookup ));
index bcf581d..88279dc 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2017 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,56 +36,57 @@ KeyLookup KeyLookupTable[]=
   // more than one key name can be assigned to a single dali-key code
   // e.g. "Menu" and "XF86Menu" are both assigned to  DALI_KEY_MENU
 
-  { "Escape",                DALI_KEY_ESCAPE,          false },
-  { "Menu",                  DALI_KEY_MENU,            false },
+  { "Escape",                DALI_KEY_ESCAPE,                                     false },
+  { "Menu",                  DALI_KEY_MENU,                                       false },
 
   // Now literal strings are used as key names instead of defined symbols in utilX,
   // since these definition in utilX.h is deprecated
-  { "XF86Camera",            DALI_KEY_CAMERA,          false },
-  { "XF86Camera_Full",       DALI_KEY_CONFIG,          false },
-  { "XF86PowerOff",          DALI_KEY_POWER,           true  },
-  { "XF86Standby",           DALI_KEY_PAUSE,           false },
-  { "Cancel",                DALI_KEY_CANCEL,          false },
-  { "XF86AudioPlay",         DALI_KEY_PLAY_CD,         false },
-  { "XF86AudioStop",         DALI_KEY_STOP_CD,         false },
-  { "XF86AudioPause",        DALI_KEY_PAUSE_CD,        false },
-  { "XF86AudioNext",         DALI_KEY_NEXT_SONG,       false },
-  { "XF86AudioPrev",         DALI_KEY_PREVIOUS_SONG,   false },
-  { "XF86AudioRewind",       DALI_KEY_REWIND,          false },
-  { "XF86AudioForward",      DALI_KEY_FASTFORWARD,     false },
-  { "XF86AudioMedia",        DALI_KEY_MEDIA,           false },
-  { "XF86AudioPlayPause",    DALI_KEY_PLAY_PAUSE,      false },
-  { "XF86AudioMute",         DALI_KEY_MUTE,            false },
-  { "XF86Menu",              DALI_KEY_MENU,            true  },
-  { "XF86Home",              DALI_KEY_HOME,            true  },
-  { "XF86Back",              DALI_KEY_BACK,            true  },
-  { "XF86Send",              DALI_KEY_MENU,            true  },
-  { "XF86Phone",             DALI_KEY_HOME,            true  },
-  { "XF86Stop",              DALI_KEY_BACK,            true  },
-  { "XF86HomePage",          DALI_KEY_HOMEPAGE,        false },
-  { "XF86WWW",               DALI_KEY_WEBPAGE,         false },
-  { "XF86Mail",              DALI_KEY_MAIL,            false },
-  { "XF86ScreenSaver",       DALI_KEY_SCREENSAVER,     false },
-  { "XF86MonBrightnessUp",   DALI_KEY_BRIGHTNESS_UP,   false },
-  { "XF86MonBrightnessDown", DALI_KEY_BRIGHTNESS_DOWN, false },
-  { "XF86SoftKBD",           DALI_KEY_SOFT_KBD,        false },
-  { "XF86QuickPanel",        DALI_KEY_QUICK_PANEL,     false },
-  { "XF86TaskPane",          DALI_KEY_TASK_SWITCH,     false },
-  { "XF86Apps",              DALI_KEY_APPS,            false },
-  { "XF86Search",            DALI_KEY_SEARCH,          false },
-  { "XF86Voice",             DALI_KEY_VOICE,           false },
-  { "Hangul",                DALI_KEY_LANGUAGE,        false },
-  { "XF86AudioRaiseVolume",  DALI_KEY_VOLUME_UP,       true  },
-  { "XF86AudioLowerVolume",  DALI_KEY_VOLUME_DOWN,     true  },
+  { "XF86Camera",            DALI_KEY_CAMERA,                                     false },
+  { "XF86Camera_Full",       DALI_KEY_CONFIG,                                     false },
+  { "XF86PowerOff",          DALI_KEY_POWER,                                      true  },
+  { "XF86Standby",           DALI_KEY_PAUSE,                                      false },
+  { "Cancel",                DALI_KEY_CANCEL,                                     false },
+  { "XF86AudioPlay",         DALI_KEY_PLAY_CD,                                    false },
+  { "XF86AudioStop",         DALI_KEY_STOP_CD,                                    false },
+  { "XF86AudioPause",        DALI_KEY_PAUSE_CD,                                   false },
+  { "XF86AudioNext",         DALI_KEY_NEXT_SONG,                                  false },
+  { "XF86AudioPrev",         DALI_KEY_PREVIOUS_SONG,                              false },
+  { "XF86AudioRewind",       DALI_KEY_REWIND,                                     false },
+  { "XF86AudioForward",      DALI_KEY_FASTFORWARD,                                false },
+  { "XF86AudioMedia",        DALI_KEY_MEDIA,                                      false },
+  { "XF86AudioPlayPause",    DALI_KEY_PLAY_PAUSE,                                 false },
+  { "XF86AudioMute",         DALI_KEY_MUTE,                                       false },
+  { "XF86Menu",              DALI_KEY_MENU,                                       true  },
+  { "XF86Home",              DALI_KEY_HOME,                                       true  },
+  { "XF86Back",              DALI_KEY_BACK,                                       true  },
+  { "XF86Send",              DALI_KEY_MENU,                                       true  },
+  { "XF86Phone",             DALI_KEY_HOME,                                       true  },
+  { "XF86Stop",              DALI_KEY_BACK,                                       true  },
+  { "XF86HomePage",          DALI_KEY_HOMEPAGE,                                   false },
+  { "XF86WWW",               DALI_KEY_WEBPAGE,                                    false },
+  { "XF86Mail",              DALI_KEY_MAIL,                                       false },
+  { "XF86ScreenSaver",       DALI_KEY_SCREENSAVER,                                false },
+  { "XF86MonBrightnessUp",   DALI_KEY_BRIGHTNESS_UP,                              false },
+  { "XF86MonBrightnessDown", DALI_KEY_BRIGHTNESS_DOWN,                            false },
+  { "XF86SoftKBD",           DALI_KEY_SOFT_KBD,                                   false },
+  { "XF86QuickPanel",        DALI_KEY_QUICK_PANEL,                                false },
+  { "XF86TaskPane",          DALI_KEY_TASK_SWITCH,                                false },
+  { "XF86Apps",              DALI_KEY_APPS,                                       false },
+  { "XF86Search",            DALI_KEY_SEARCH,                                     false },
+  { "XF86Voice",             DALI_KEY_VOICE,                                      false },
+  { "Hangul",                DALI_KEY_LANGUAGE,                                   false },
+  { "XF86AudioRaiseVolume",  DALI_KEY_VOLUME_UP,                                  true  },
+  { "XF86AudioLowerVolume",  DALI_KEY_VOLUME_DOWN,                                true  },
 
-  { "BackSpace",             DALI_KEY_BACKSPACE,       false },
-  { "Left",                  DALI_KEY_CURSOR_LEFT,     false },
-  { "Right",                 DALI_KEY_CURSOR_RIGHT,    false },
-  { "Shift_L",               DALI_KEY_SHIFT_LEFT,      false },
-  { "Shift_R",               DALI_KEY_SHIFT_RIGHT,     false }
+  { "BackSpace",             DALI_KEY_BACKSPACE,                                  false },
+  { "Left",                  DALI_KEY_CURSOR_LEFT,                                false },
+  { "Right",                 DALI_KEY_CURSOR_RIGHT,                               false },
+  { "Shift_L",               DALI_KEY_SHIFT_LEFT,                                 false },
+  { "Shift_R",               DALI_KEY_SHIFT_RIGHT,                                false },
+  { "Delete",                static_cast<Dali::KEY>( DevelKey::DALI_KEY_DELETE ), false }
 };
 
-const std::size_t KEY_LOOKUP_COUNT = (sizeof( KeyLookupTable))/ (sizeof(KeyLookup));
+const std::size_t KEY_LOOKUP_COUNT = (sizeof( KeyLookupTable ))/ (sizeof( KeyLookup ));
 
 } // namespace KeyLookup
 
index 6603b27..071ab90 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2017 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,56 +36,57 @@ KeyLookup KeyLookupTable[]=
   // more than one key name can be assigned to a single dali-key code
   // e.g. "Menu" and "XF86Menu" are both assigned to  DALI_KEY_MENU
 
-  { "Escape",                DALI_KEY_ESCAPE,          false },
-  { "Menu",                  DALI_KEY_MENU,            false },
+  { "Escape",                DALI_KEY_ESCAPE,                                     false },
+  { "Menu",                  DALI_KEY_MENU,                                       false },
 
   // Now literal strings are used as key names instead of defined symbols in utilX,
   // since these definition in utilX.h is deprecated
-  { "XF86Camera",            DALI_KEY_CAMERA,          false },
-  { "XF86Camera_Full",       DALI_KEY_CONFIG,          false },
-  { "XF86PowerOff",          DALI_KEY_POWER,           true  },
-  { "XF86Standby",           DALI_KEY_PAUSE,           false },
-  { "Cancel",                DALI_KEY_CANCEL,          false },
-  { "XF86AudioPlay",         DALI_KEY_PLAY_CD,         false },
-  { "XF86AudioStop",         DALI_KEY_STOP_CD,         false },
-  { "XF86AudioPause",        DALI_KEY_PAUSE_CD,        false },
-  { "XF86AudioNext",         DALI_KEY_NEXT_SONG,       false },
-  { "XF86AudioPrev",         DALI_KEY_PREVIOUS_SONG,   false },
-  { "XF86AudioRewind",       DALI_KEY_REWIND,          false },
-  { "XF86AudioForward",      DALI_KEY_FASTFORWARD,     false },
-  { "XF86AudioMedia",        DALI_KEY_MEDIA,           false },
-  { "XF86AudioPlayPause",    DALI_KEY_PLAY_PAUSE,      false },
-  { "XF86AudioMute",         DALI_KEY_MUTE,            false },
-  { "XF86Menu",              DALI_KEY_MENU,            true  },
-  { "XF86Home",              DALI_KEY_HOME,            true  },
-  { "XF86Back",              DALI_KEY_BACK,            true  },
-  { "XF86Send",              DALI_KEY_MENU,            true  },
-  { "XF86Phone",             DALI_KEY_HOME,            true  },
-  { "XF86Stop",              DALI_KEY_BACK,            true  },
-  { "XF86HomePage",          DALI_KEY_HOMEPAGE,        false },
-  { "XF86WWW",               DALI_KEY_WEBPAGE,         false },
-  { "XF86Mail",              DALI_KEY_MAIL,            false },
-  { "XF86ScreenSaver",       DALI_KEY_SCREENSAVER,     false },
-  { "XF86MonBrightnessUp",   DALI_KEY_BRIGHTNESS_UP,   false },
-  { "XF86MonBrightnessDown", DALI_KEY_BRIGHTNESS_DOWN, false },
-  { "XF86SoftKBD",           DALI_KEY_SOFT_KBD,        false },
-  { "XF86QuickPanel",        DALI_KEY_QUICK_PANEL,     false },
-  { "XF86TaskPane",          DALI_KEY_TASK_SWITCH,     false },
-  { "XF86Apps",              DALI_KEY_APPS,            false },
-  { "XF86Search",            DALI_KEY_SEARCH,          false },
-  { "XF86Voice",             DALI_KEY_VOICE,           false },
-  { "Hangul",                DALI_KEY_LANGUAGE,        false },
-  { "XF86AudioRaiseVolume",  DALI_KEY_VOLUME_UP,       true  },
-  { "XF86AudioLowerVolume",  DALI_KEY_VOLUME_DOWN,     true  },
+  { "XF86Camera",            DALI_KEY_CAMERA,                                     false },
+  { "XF86Camera_Full",       DALI_KEY_CONFIG,                                     false },
+  { "XF86PowerOff",          DALI_KEY_POWER,                                      true  },
+  { "XF86Standby",           DALI_KEY_PAUSE,                                      false },
+  { "Cancel",                DALI_KEY_CANCEL,                                     false },
+  { "XF86AudioPlay",         DALI_KEY_PLAY_CD,                                    false },
+  { "XF86AudioStop",         DALI_KEY_STOP_CD,                                    false },
+  { "XF86AudioPause",        DALI_KEY_PAUSE_CD,                                   false },
+  { "XF86AudioNext",         DALI_KEY_NEXT_SONG,                                  false },
+  { "XF86AudioPrev",         DALI_KEY_PREVIOUS_SONG,                              false },
+  { "XF86AudioRewind",       DALI_KEY_REWIND,                                     false },
+  { "XF86AudioForward",      DALI_KEY_FASTFORWARD,                                false },
+  { "XF86AudioMedia",        DALI_KEY_MEDIA,                                      false },
+  { "XF86AudioPlayPause",    DALI_KEY_PLAY_PAUSE,                                 false },
+  { "XF86AudioMute",         DALI_KEY_MUTE,                                       false },
+  { "XF86Menu",              DALI_KEY_MENU,                                       true  },
+  { "XF86Home",              DALI_KEY_HOME,                                       true  },
+  { "XF86Back",              DALI_KEY_BACK,                                       true  },
+  { "XF86Send",              DALI_KEY_MENU,                                       true  },
+  { "XF86Phone",             DALI_KEY_HOME,                                       true  },
+  { "XF86Stop",              DALI_KEY_BACK,                                       true  },
+  { "XF86HomePage",          DALI_KEY_HOMEPAGE,                                   false },
+  { "XF86WWW",               DALI_KEY_WEBPAGE,                                    false },
+  { "XF86Mail",              DALI_KEY_MAIL,                                       false },
+  { "XF86ScreenSaver",       DALI_KEY_SCREENSAVER,                                false },
+  { "XF86MonBrightnessUp",   DALI_KEY_BRIGHTNESS_UP,                              false },
+  { "XF86MonBrightnessDown", DALI_KEY_BRIGHTNESS_DOWN,                            false },
+  { "XF86SoftKBD",           DALI_KEY_SOFT_KBD,                                   false },
+  { "XF86QuickPanel",        DALI_KEY_QUICK_PANEL,                                false },
+  { "XF86TaskPane",          DALI_KEY_TASK_SWITCH,                                false },
+  { "XF86Apps",              DALI_KEY_APPS,                                       false },
+  { "XF86Search",            DALI_KEY_SEARCH,                                     false },
+  { "XF86Voice",             DALI_KEY_VOICE,                                      false },
+  { "Hangul",                DALI_KEY_LANGUAGE,                                   false },
+  { "XF86AudioRaiseVolume",  DALI_KEY_VOLUME_UP,                                  true  },
+  { "XF86AudioLowerVolume",  DALI_KEY_VOLUME_DOWN,                                true  },
 
-  { "BackSpace",             DALI_KEY_BACKSPACE,       false },
-  { "Left",                  DALI_KEY_CURSOR_LEFT,     false },
-  { "Right",                 DALI_KEY_CURSOR_RIGHT,    false },
-  { "Shift_L",               DALI_KEY_SHIFT_LEFT,      false },
-  { "Shift_R",               DALI_KEY_SHIFT_RIGHT,     false }
+  { "BackSpace",             DALI_KEY_BACKSPACE,                                  false },
+  { "Left",                  DALI_KEY_CURSOR_LEFT,                                false },
+  { "Right",                 DALI_KEY_CURSOR_RIGHT,                               false },
+  { "Shift_L",               DALI_KEY_SHIFT_LEFT,                                 false },
+  { "Shift_R",               DALI_KEY_SHIFT_RIGHT,                                false },
+  { "Delete",                static_cast<Dali::KEY>( DevelKey::DALI_KEY_DELETE ), false }
 };
 
-const std::size_t KEY_LOOKUP_COUNT = (sizeof( KeyLookupTable))/ (sizeof(KeyLookup));
+const std::size_t KEY_LOOKUP_COUNT = (sizeof( KeyLookupTable ))/ (sizeof( KeyLookup ));
 
 } // namespace KeyLookup