X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=adaptors%2Fubuntu%2Fkey-mapping-ubuntu.cpp;h=73f3e81a8fd375012a7fd13298af0641fdab8d2d;hb=44da3a20509bf88d148a45c98edb7653dec927f2;hp=2864cfe2591d714221d4c50dc3627fab358a6509;hpb=ea9864a82e0dd4e11c721a26d08ef39047876222;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

diff --git a/adaptors/ubuntu/key-mapping-ubuntu.cpp b/adaptors/ubuntu/key-mapping-ubuntu.cpp
index 2864cfe..73f3e81 100644
--- a/adaptors/ubuntu/key-mapping-ubuntu.cpp
+++ b/adaptors/ubuntu/key-mapping-ubuntu.cpp
@@ -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,56 @@ 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 },
+  { "Control_L",             static_cast<Dali::KEY>( DevelKey::DALI_KEY_CONTROL_LEFT ),  false },
+  { "Control_R",             static_cast<Dali::KEY>( DevelKey::DALI_KEY_CONTROL_RIGHT ), false }
 };
 
 const std::size_t KEY_LOOKUP_COUNT = (sizeof( KeyLookupTable ))/ (sizeof( KeyLookup ));