From 44da3a20509bf88d148a45c98edb7653dec927f2 Mon Sep 17 00:00:00 2001 From: Richard Huang Date: Wed, 29 Nov 2017 14:22:38 +0000 Subject: [PATCH] [4.0] Add DALI_KEY_CONTROL_LEFT and DALI_KEY_CONTROL_RIGHT to get Control key events - 'Control_L' key name is DALI_KEY_CONTROL_LEFT in DALi. 'Control_L' keyCode is 37 by ecore_x_keysym_keycode_get(). - 'Control_R' key name is DALI_KEY_CONTROL_RIGHT in DALi. 'Control_R' keyCode is 105 by ecore_x_keysym_keycode_get(). Change-Id: Ifc77436620fa7967cc540b9f681be632366368e5 (cherry picked from commit a6ad815172445dfbe27443a89f7cc614979fd5b1) --- adaptors/devel-api/adaptor-framework/key-devel.h | 12 +++- adaptors/ecore/wayland/key-mapping-ecore-wl.cpp | 92 ++++++++++++------------ adaptors/tv/key-mapping-tv.cpp | 92 ++++++++++++------------ adaptors/ubuntu/key-mapping-ubuntu.cpp | 90 +++++++++++------------ adaptors/wayland/input/key-mapping-wl.cpp | 92 ++++++++++++------------ adaptors/x11/key-mapping-x.cpp | 92 ++++++++++++------------ 6 files changed, 249 insertions(+), 221 deletions(-) diff --git a/adaptors/devel-api/adaptor-framework/key-devel.h b/adaptors/devel-api/adaptor-framework/key-devel.h index 6b86dc4..2b8a477 100644 --- a/adaptors/devel-api/adaptor-framework/key-devel.h +++ b/adaptors/devel-api/adaptor-framework/key-devel.h @@ -79,7 +79,17 @@ enum Key /** * @brief Delete key. */ - DALI_KEY_DELETE = 119 + DALI_KEY_DELETE = 119, + + /** + * @brief Control Left key. + */ + DALI_KEY_CONTROL_LEFT = 37, + + /** + * @brief Control Right key. + */ + DALI_KEY_CONTROL_RIGHT = 105 }; diff --git a/adaptors/ecore/wayland/key-mapping-ecore-wl.cpp b/adaptors/ecore/wayland/key-mapping-ecore-wl.cpp index 071ab90..9b1f447 100644 --- a/adaptors/ecore/wayland/key-mapping-ecore-wl.cpp +++ b/adaptors/ecore/wayland/key-mapping-ecore-wl.cpp @@ -36,54 +36,58 @@ 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 }, - { "Delete", static_cast( DevelKey::DALI_KEY_DELETE ), false } + { "BackSpace", DALI_KEY_BACKSPACE, false }, + { "Left", DALI_KEY_CURSOR_LEFT, false }, + { "Right", DALI_KEY_CURSOR_RIGHT, false }, + { "left", DALI_KEY_CURSOR_LEFT, false }, // To be removed after the key name is fixed in the platform + { "right", DALI_KEY_CURSOR_RIGHT, false }, // To be removed after the key name is fixed in the platform + { "Shift_L", DALI_KEY_SHIFT_LEFT, false }, + { "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 } }; 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 a1d5f69..88da0fc 100644 --- a/adaptors/tv/key-mapping-tv.cpp +++ b/adaptors/tv/key-mapping-tv.cpp @@ -36,54 +36,58 @@ 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 }, - { "Delete", static_cast( DevelKey::DALI_KEY_DELETE ), false } + { "BackSpace", DALI_KEY_BACKSPACE, false }, + { "Left", DALI_KEY_CURSOR_LEFT, false }, + { "Right", DALI_KEY_CURSOR_RIGHT, false }, + { "left", DALI_KEY_CURSOR_LEFT, false }, // To be removed after the key name is fixed in the platform + { "right", DALI_KEY_CURSOR_RIGHT, false }, // To be removed after the key name is fixed in the platform + { "Shift_L", DALI_KEY_SHIFT_LEFT, false }, + { "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 } }; 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 071ab90..73f3e81 100644 --- a/adaptors/ubuntu/key-mapping-ubuntu.cpp +++ b/adaptors/ubuntu/key-mapping-ubuntu.cpp @@ -36,54 +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 }, - { "Delete", static_cast( DevelKey::DALI_KEY_DELETE ), 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( 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 } }; 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 88279dc..4152e83 100644 --- a/adaptors/wayland/input/key-mapping-wl.cpp +++ b/adaptors/wayland/input/key-mapping-wl.cpp @@ -36,54 +36,58 @@ 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 }, - { "Delete", static_cast( DevelKey::DALI_KEY_DELETE ), false } + { "BackSpace", DALI_KEY_BACKSPACE, false }, + { "Left", DALI_KEY_CURSOR_LEFT, false }, + { "Right", DALI_KEY_CURSOR_RIGHT, false }, + { "left", DALI_KEY_CURSOR_LEFT, false }, // To be removed after the key name is fixed in the platform + { "right", DALI_KEY_CURSOR_RIGHT, false }, // To be removed after the key name is fixed in the platform + { "Shift_L", DALI_KEY_SHIFT_LEFT, false }, + { "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 } }; 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 071ab90..f280088 100644 --- a/adaptors/x11/key-mapping-x.cpp +++ b/adaptors/x11/key-mapping-x.cpp @@ -36,54 +36,58 @@ 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 }, - { "Delete", static_cast( DevelKey::DALI_KEY_DELETE ), false } + { "BackSpace", DALI_KEY_BACKSPACE, false }, + { "Left", DALI_KEY_CURSOR_LEFT, false }, + { "Right", DALI_KEY_CURSOR_RIGHT, false }, + { "left", DALI_KEY_CURSOR_LEFT, false }, // To be removed after the key name is fixed in the platform + { "right", DALI_KEY_CURSOR_RIGHT, false }, // To be removed after the key name is fixed in the platform + { "Shift_L", DALI_KEY_SHIFT_LEFT, false }, + { "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 } }; const std::size_t KEY_LOOKUP_COUNT = (sizeof( KeyLookupTable ))/ (sizeof( KeyLookup )); -- 2.7.4