add keycode for H/W Back and B/T Keyboard

Change-Id: I036dd92b4f14b7dc4b2e1800e3f7a67a144130f7

diff --git a/inc/FUiKeyTypes.h b/inc/FUiKeyTypes.h
index 0aace50..e29f74c 100644 (file)
--- a/inc/FUiKeyTypes.h
+++ b/inc/FUiKeyTypes.h
@@ -20,6 +20,7 @@
 *
 * This header file contains the declarations of the key enumeration.
 */
+#include <climits>
 #ifndef _FUI_KEY_TYPES_H_
 #define _FUI_KEY_TYPES_H_
 
@@ -195,7 +196,28 @@ enum KeyCode
        KEY_OEM_18,                     /**< The OEM 18 key */
        KEY_OEM_19,                     /**< The OEM 19 key */
        KEY_OEM_20,                     /**< The OEM 20 key */
-       KEY_HARDWARE_MAX        /**< The placeholder key */
+
+       KEY_BACK,               /**< The back key @b Since: @b 2.2 */
+       KEY_HOME,                                       /**< The home key @b Since: @b 2.2 */
+       KEY_WEB_PAGE,                           /**< The web page key @b Since: @b 2.2 */
+       KEY_MAIL,                                       /**< The mail key @b Since: @b 2.2 */
+       KEY_SCREEN_SAVER,                       /**< The screen saver key @b Since: @b 2.2 */
+       KEY_BRIGHTNESS_DOWN,            /**< The brightness down key @b Since: @b 2.2 */
+       KEY_BRIGHTNESS_UP,              /**< The brightness up key @b Since: @b 2.2 */
+       KEY_MUTE,                                       /**< The mute key @b Since: @b 2.2 */
+       KEY_VOLUME_DOWN,                        /**< The volume down key @b Since: @b 2.2 */
+       KEY_VOLUME_UP,                  /**< The volume up key @b Since: @b 2.2 */
+       KEY_PLAY_PAUSE,                 /**< The play pause key @b Since: @b 2.2 */
+       KEY_NEXT_SONG,                  /**< The next song key @b Since: @b 2.2 */
+       KEY_PREVIOUS_SONG,              /**< The previous song key @b Since: @b 2.2 */
+       KEY_APPS,                                       /**< The apps key @b Since: @b 2.2 */
+       KEY_MENU,                                       /**< The menu key @b Since: @b 2.2 */
+       KEY_SOFT_KEYBOARD,              /**< The soft keyboard key @b Since: @b 2.2 */
+       KEY_SEARCH,                             /**< The search key @b Since: @b 2.2 */
+       KEY_VOICE,                                      /**< The voice key @b Since: @b 2.2 */
+       KEY_QUICKPANEL,                 /**< The quickpanel key @b Since: @b 2.2 */
+       KEY_CLIPBOARD,                          /**< The clipboard key @b Since: @b 2.2 */
+       KEY_HARDWARE_MAX = INT_MAX
 };
 
 /**

diff --git a/src/ui/FUi_EflUiEventManager.cpp b/src/ui/FUi_EflUiEventManager.cpp
index b950e60..ff17881 100644 (file)
--- a/src/ui/FUi_EflUiEventManager.cpp
+++ b/src/ui/FUi_EflUiEventManager.cpp
@@ -24,6 +24,33 @@
 #ifdef KEY_CAMERA
 #undef KEY_CAMERA
 #endif
+#if defined KEY_BACK
+#undef KEY_BACK
+#endif
+#if defined KEY_HOME
+#undef KEY_HOME
+#endif
+#if defined KEY_MAIL
+#undef KEY_MAIL
+#endif
+#if defined KEY_MUTE
+#undef KEY_MUTE
+#endif
+#if defined KEY_APPS
+#undef KEY_APPS
+#endif
+#if defined KEY_MENU
+#undef KEY_MENU
+#endif
+#if defined KEY_SEARCH
+#undef KEY_SEARCH
+#endif
+#if defined KEY_VOICE
+#undef KEY_VOICE
+#endif
+#if defined KEY_QUICKPANEL
+#undef KEY_QUICKPANEL
+#endif
 #include <X11/Xlib.h>
 #include <Evas.h>
 #include <FBaseColIEnumeratorT.h>
@@ -232,17 +259,35 @@ const _EvasConvertKeys keyTable[] =
        { _KEY_LEFT, "Left" },
        { _KEY_DOWN, "Down" },
        { _KEY_RIGHT, "Right" },
+       { _KEY_CONTEXT_MENU, "Menu" },
+       { _KEY_CONTEXT_MENU, "XF86Send" },
+
        { _KEY_COMMA, "less" }, /*virtual keypad <*/
        { _KEY_9, "parenleft" }, /*virtual keypad (*/
        { _KEY_0, "parenright" }, /*virtual keypad )*/
-       { _KEY_CONTEXT_MENU, "Menu" },
-       { _KEY_CONTEXT_MENU, "XF86Send" },
+
+       { _KEY_BACK, "XF86Stop" },
+       { _KEY_HOME, "XF86Phone" },
+       { _KEY_WEB_PAGE, "XF86WWW" },
+       { _KEY_MAIL, "XF86Mail" },
+       { _KEY_SCREEN_SAVER, "XF86ScreenSaver" },
+       { _KEY_BRIGHTNESS_DOWN, "XF86MonBrightnessDown" },
+       { _KEY_BRIGHTNESS_UP, "XF86MonBrightnessUp" },
+       { _KEY_MUTE, "XF86AudioMute" },
+       { _KEY_VOLUME_DOWN, "XF86AudioLowerVolume" },
+       { _KEY_VOLUME_UP, "XF86AudioRaiseVolume" },
+       { _KEY_PLAY_PAUSE, "XF86AudioPlay" },
+       { _KEY_NEXT_SONG, "XF86AudioNext" },
+       { _KEY_PREVIOUS_SONG, "XF86AudioPrev" },
+       { _KEY_APPS, "XF86Launch0" },
+       { _KEY_MENU, "XF86Send" },
+       { _KEY_SOFT_KEYBOARD, "XF86MenuKB" },
+       { _KEY_SEARCH, "XF86Search" },
+       { _KEY_VOICE, "XF86Launch2" },
+       { _KEY_QUICKPANEL, "XF86Tools" }
        //{ _KEY_SIDE_UP, "XF86AudioRaiseVolume" },
        //{ _KEY_SIDE_DOWN, "XF86AudioLowerVolume" },
        //{ _KEY_POWER_HOLD, "XF86PowerOff" },
-       { _KEY_CLEAR, "XF86Stop" }
-
-
 };
 
 class _KeyEvent

diff --git a/src/ui/FUi_SystemUtilImpl.cpp b/src/ui/FUi_SystemUtilImpl.cpp
index b4185b7..321fd15 100644 (file)
--- a/src/ui/FUi_SystemUtilImpl.cpp
+++ b/src/ui/FUi_SystemUtilImpl.cpp
@@ -23,6 +23,33 @@
 #ifdef KEY_CAMERA
 #undef KEY_CAMERA
 #endif
+#if defined KEY_BACK
+#undef KEY_BACK
+#endif
+#if defined KEY_HOME
+#undef KEY_HOME
+#endif
+#if defined KEY_MAIL
+#undef KEY_MAIL
+#endif
+#if defined KEY_MUTE
+#undef KEY_MUTE
+#endif
+#if defined KEY_APPS
+#undef KEY_APPS
+#endif
+#if defined KEY_MENU
+#undef KEY_MENU
+#endif
+#if defined KEY_SEARCH
+#undef KEY_SEARCH
+#endif
+#if defined KEY_VOICE
+#undef KEY_VOICE
+#endif
+#if defined KEY_QUICKPANEL
+#undef KEY_QUICKPANEL
+#endif
 #include <unique_ptr.h>
 #include <Ecore_X.h>
 #include <FBaseSysLog.h>
@@ -151,10 +178,29 @@ const ConvertKeys KeyCodeMap[] = {
        { _KEY_RIGHT, "Right" },
        { _KEY_CONTEXT_MENU, "Menu" },
 
+       { _KEY_BACK, "XF86Stop" },
+       { _KEY_HOME, "XF86Phone" },
+       { _KEY_WEB_PAGE, "XF86WWW" },
+       { _KEY_MAIL, "XF86Mail" },
+       { _KEY_SCREEN_SAVER, "XF86ScreenSaver" },
+       { _KEY_BRIGHTNESS_DOWN, "XF86MonBrightnessDown" },
+       { _KEY_BRIGHTNESS_UP, "XF86MonBrightnessUp" },
+       { _KEY_MUTE, "XF86AudioMute" },
+       { _KEY_VOLUME_DOWN, "XF86AudioLowerVolume" },
+       { _KEY_VOLUME_UP, "XF86AudioRaiseVolume" },
+       { _KEY_PLAY_PAUSE, "XF86AudioPlay" },
+       { _KEY_NEXT_SONG, "XF86AudioNext" },
+       { _KEY_PREVIOUS_SONG, "XF86AudioPrev" },
+       { _KEY_APPS, "XF86Launch0" },
+       { _KEY_MENU, "XF86Send" },
+       { _KEY_SOFT_KEYBOARD, "XF86MenuKB" },
+       { _KEY_SEARCH, "XF86Search" },
+       { _KEY_VOICE, "XF86Launch2" },
+       { _KEY_QUICKPANEL, "XF86Tools" },
+
        //{ _KEY_SIDE_UP, "XF86AudioRaiseVolume" },
        //{ _KEY_SIDE_DOWN, "XF86AudioLowerVolume" },
        //{ _KEY_POWER_HOLD, "XF86PowerOff" },
-       { _KEY_CLEAR, "XF86Stop" }
 };
 
 struct _DisplayDeleter

diff --git a/src/ui/FUi_UiKeyEvent.cpp b/src/ui/FUi_UiKeyEvent.cpp
index 9c629cc..4dfbe01 100644 (file)
--- a/src/ui/FUi_UiKeyEvent.cpp
+++ b/src/ui/FUi_UiKeyEvent.cpp
@@ -205,7 +205,7 @@ _UiKeyEvent::IsEventEnabled(const _Control& control) const
        }
 
        if (( GetKeyInfo()->GetKeyCode() == _KEY_CONTEXT_MENU )
-                       || ( GetKeyInfo()->GetKeyCode() == _KEY_CLEAR ))
+                       || ( GetKeyInfo()->GetKeyCode() == _KEY_BACK ))
        {
        }
        else

diff --git a/src/ui/FUi_UiTouchEvent.cpp b/src/ui/FUi_UiTouchEvent.cpp
index f7fe361..bfeb1a7 100644 (file)
--- a/src/ui/FUi_UiTouchEvent.cpp
+++ b/src/ui/FUi_UiTouchEvent.cpp
@@ -548,7 +548,7 @@ _UiTouchEvent::FireListener(const _ITouchEventListener* pListener, const _Contro
                        SysLog(NID_UI, "Event Consumed : isFiltered is True : pControl %x", pControl);
                        //_UiPrintControl(*pControl, false);
                }
-               SysLog(NID_UI, "Event Consumed : isFiltered is True : pTarget %x", pTarget);
+               //SysLog(NID_UI, "Event Consumed : isFiltered is True : pTarget %x", pTarget);
        }
 
        return r;

diff --git a/src/ui/controls/FUiCtrl_Form.cpp b/src/ui/controls/FUiCtrl_Form.cpp
index 6339ead..cbdfe0b 100644 (file)
--- a/src/ui/controls/FUiCtrl_Form.cpp
+++ b/src/ui/controls/FUiCtrl_Form.cpp
@@ -2552,7 +2552,7 @@ _Form::OnKeyPressed(const _Control& source, const _KeyInfo& keyInfo)
 bool
 _Form::OnKeyReleased(const _Control& source, const _KeyInfo& keyInfo)
 {
-       if (keyInfo.GetKeyCode() == _KEY_ESC || keyInfo.GetKeyCode() == _KEY_CLEAR)
+       if (keyInfo.GetKeyCode() == _KEY_ESC || keyInfo.GetKeyCode() == _KEY_BACK)
        {
 //             _Toolbar* pToolbar = GetFooter();
 //             if (pToolbar == null)
@@ -2755,8 +2755,8 @@ _Form::OnActionPerformed(const _Control& source, int actionId)
                {
                        if (__keypadShowstate)
                        {
-                               _SystemUtilImpl::GenerateKeyEvent(KEY_EVENT_TYPE_PRESSED, _KEY_CLEAR);
-                               _SystemUtilImpl::GenerateKeyEvent(KEY_EVENT_TYPE_RELEASED, _KEY_CLEAR);
+                               _SystemUtilImpl::GenerateKeyEvent(KEY_EVENT_TYPE_PRESSED, _KEY_BACK);
+                               _SystemUtilImpl::GenerateKeyEvent(KEY_EVENT_TYPE_RELEASED, _KEY_BACK);
                        }
 
                        if (__clipboardShowstate)

diff --git a/src/ui/controls/FUiCtrl_Keypad.cpp b/src/ui/controls/FUiCtrl_Keypad.cpp
index 3607e1d..ef2dff4 100644 (file)
--- a/src/ui/controls/FUiCtrl_Keypad.cpp
+++ b/src/ui/controls/FUiCtrl_Keypad.cpp
@@ -818,7 +818,7 @@ _Keypad::SendOpaqueCommand (const Tizen::Base::String& command)
 bool
 _Keypad::OnKeyReleased(const _Control& source, const _KeyInfo& keyInfo)
 {
-       if (keyInfo.GetKeyCode() == _KEY_ESC || keyInfo.GetKeyCode() == _KEY_CLEAR)
+       if (keyInfo.GetKeyCode() == _KEY_ESC || keyInfo.GetKeyCode() == _KEY_BACK)
        {
                OnActionPerformed(source, FOOTER_BACK_BUTTON_ID);
        }
@@ -841,16 +841,16 @@ _Keypad::OnActionPerformed(const _Control& source, int actionId)
                {
                        if (__pChildEdit->IsKeypadExist() && __pChildEdit->IsClipboardExist())
                        {
-                               _SystemUtilImpl::GenerateKeyEvent(KEY_EVENT_TYPE_PRESSED, _KEY_CLEAR);
-                               _SystemUtilImpl::GenerateKeyEvent(KEY_EVENT_TYPE_RELEASED, _KEY_CLEAR);
+                               _SystemUtilImpl::GenerateKeyEvent(KEY_EVENT_TYPE_PRESSED, _KEY_BACK);
+                               _SystemUtilImpl::GenerateKeyEvent(KEY_EVENT_TYPE_RELEASED, _KEY_BACK);
                                _SystemUtilImpl::SendKeyStopMessage();
                                return;
                        }
 
                        if (__pChildEdit->IsKeypadExist())
                        {
-                               _SystemUtilImpl::GenerateKeyEvent(KEY_EVENT_TYPE_PRESSED, _KEY_CLEAR);
-                               _SystemUtilImpl::GenerateKeyEvent(KEY_EVENT_TYPE_RELEASED, _KEY_CLEAR);
+                               _SystemUtilImpl::GenerateKeyEvent(KEY_EVENT_TYPE_PRESSED, _KEY_BACK);
+                               _SystemUtilImpl::GenerateKeyEvent(KEY_EVENT_TYPE_RELEASED, _KEY_BACK);
                                return;
                        }
 

diff --git a/src/ui/inc/FUi_UiKeyEvent.h b/src/ui/inc/FUi_UiKeyEvent.h
index e518873..3500791 100644 (file)
--- a/src/ui/inc/FUi_UiKeyEvent.h
+++ b/src/ui/inc/FUi_UiKeyEvent.h
@@ -812,7 +812,105 @@ enum _KeyCode
        */
        _KEY_OEM_20 = KEY_OEM_20,
 
-       _KEY_HARDWARE_MAX = KEY_HARDWARE_MAX,
+       /**
+       *       The back key
+       */
+       _KEY_BACK = KEY_BACK,
+
+       /**
+       *       The home key
+       */
+       _KEY_HOME = KEY_HOME,
+
+       /**
+       *       The web page key
+       */
+       _KEY_WEB_PAGE = KEY_WEB_PAGE,
+
+       /**
+       *       The mail key
+       */
+       _KEY_MAIL = KEY_MAIL,
+
+       /**
+       *       The screen saver key
+       */
+       _KEY_SCREEN_SAVER = KEY_SCREEN_SAVER,
+
+       /**
+       *       The brightness down key
+       */
+       _KEY_BRIGHTNESS_DOWN = KEY_BRIGHTNESS_DOWN,
+
+       /**
+       *       The brightness up key
+       */
+       _KEY_BRIGHTNESS_UP = KEY_BRIGHTNESS_UP,
+
+       /**
+       *       The mute key
+       */
+       _KEY_MUTE = KEY_MUTE,
+
+       /**
+       *       The volume down key
+       */
+       _KEY_VOLUME_DOWN = KEY_VOLUME_DOWN,
+
+       /**
+       *       The volume up key
+       */
+       _KEY_VOLUME_UP = KEY_VOLUME_UP,
+
+       /**
+       *       The play pause key
+       */
+       _KEY_PLAY_PAUSE = KEY_PLAY_PAUSE,
+
+       /**
+       *       The next song key
+       */
+       _KEY_NEXT_SONG = KEY_NEXT_SONG,
+
+       /**
+       *       The previous song key
+       */
+       _KEY_PREVIOUS_SONG = KEY_PREVIOUS_SONG,
+
+       /**
+       *       The apps key
+       */
+       _KEY_APPS = KEY_APPS,
+
+       /**
+       *       The menu key
+       */
+       _KEY_MENU = KEY_MENU,
+
+       /**
+       *       The soft keyboard key
+       */
+       _KEY_SOFT_KEYBOARD = KEY_SOFT_KEYBOARD,
+
+       /**
+       *       The search key
+       */
+       _KEY_SEARCH = KEY_SEARCH,
+
+       /**
+       *       The voice key
+       */
+       _KEY_VOICE = KEY_VOICE,
+
+       /**
+       *       The quick panel key
+       */
+       _KEY_QUICKPANEL = KEY_QUICKPANEL,
+
+       /**
+       *       The clipboard key
+       */
+       _KEY_CLIPBOARD = KEY_CLIPBOARD,
 
        _KEY_CTRL_L,
 
@@ -838,7 +936,9 @@ enum _KeyCode
        /**
         *      internal Key  - send
         */
-       _KEY_SEND
+       _KEY_SEND,
+
+       _KEY_HARDWARE_MAX = KEY_HARDWARE_MAX
 };
 
 enum _KeyModifier