support remote control key handling

Change-Id: Icf682becd81d67affe0f4dde4b59016463f62f77
Signed-off-by: Jehun Lim <jehun.lim@samsung.com>

diff --git a/include/common/def.h b/include/common/def.h
index d890298..180b6de 100644 (file)
--- a/include/common/def.h
+++ b/include/common/def.h
@@ -17,8 +17,12 @@
 #ifndef __DEF_H__
 #define __DEF_H__
 
+#define KEY_ENTER "Return"
 #define KEY_BACK "Escape"
 #define KEY_MENU "Super_L"
+#define KEY_ENTER_REMOTE "KP_Enter"
+#define KEY_BACK_REMOTE "XF86Close"
+#define KEY_MENU_REMOTE "XF86Send"
 
 /* for source-list edc */
 #define GRP_BG "bg"
@@ -83,6 +87,5 @@
 #define NO_TYPE "Unknown Type"
 
 /* for key */
-#define KEY_ENTER "Return"
 
 #endif /* __DEF_H__ */

diff --git a/src/view/allsource_view.cpp b/src/view/allsource_view.cpp
index b9d2d42..b9fb48c 100644 (file)
--- a/src/view/allsource_view.cpp
+++ b/src/view/allsource_view.cpp
@@ -257,7 +257,8 @@ void CAllSourceView::OnKeyDown(int id, Evas *e, Evas_Object *obj, Evas_Event_Key
        switch (id) {
        case ALL_PLUG_BTN:
        case ALL_NEAR_BTN:
-               if (!strcmp(ev->keyname, KEY_BACK))
+               if (!strcmp(ev->keyname, KEY_BACK)
+                       || !strcmp(ev->keyname, KEY_BACK_REMOTE))
                        app_efl_exit();
        default:
                break;

diff --git a/src/view/menu_view.cpp b/src/view/menu_view.cpp
index 15fa6c0..69d0fe6 100644 (file)
--- a/src/view/menu_view.cpp
+++ b/src/view/menu_view.cpp
@@ -311,7 +311,8 @@ void CMenuView::OnKeyDown(int id, Evas *e, Evas_Object *obj, Evas_Event_Key_Down
                if (!ev->keyname)
                        return;
 
-               if (!strcmp(ev->keyname, KEY_BACK))
+               if (!strcmp(ev->keyname, KEY_BACK)
+                       || !strcmp(ev->keyname, KEY_BACK_REMOTE))
                        m->vmgr->PopView();
 
                break;
@@ -319,7 +320,8 @@ void CMenuView::OnKeyDown(int id, Evas *e, Evas_Object *obj, Evas_Event_Key_Down
                if (!ev->keyname)
                        return;
 
-               if (!strcmp(ev->keyname, KEY_ENTER))
+               if (!strcmp(ev->keyname, KEY_ENTER)
+                       || !strcmp(ev->keyname, KEY_ENTER_REMOTE))
                        m->node->SwitchTo();
 
                break;
@@ -327,7 +329,8 @@ void CMenuView::OnKeyDown(int id, Evas *e, Evas_Object *obj, Evas_Event_Key_Down
                if (!ev->keyname)
                        return;
 
-               if (!strcmp(ev->keyname, KEY_ENTER)) {
+               if (!strcmp(ev->keyname, KEY_ENTER)
+                       || !strcmp(ev->keyname, KEY_ENTER_REMOTE)) {
                        /* TODO call usb remove */
                        m->vmgr->PopView();
                }

diff --git a/src/view/nearby_layout.cpp b/src/view/nearby_layout.cpp
index b3f08f0..a73aefe 100644 (file)
--- a/src/view/nearby_layout.cpp
+++ b/src/view/nearby_layout.cpp
@@ -414,7 +414,8 @@ void CNearbyLayout::OnKeyDown(int id, Evas *e, Evas_Object *obj, Evas_Event_Key_
                if (!si)
                        return;
 
-               if (!strcmp(ev->keyname, KEY_MENU))
+               if (!strcmp(ev->keyname, KEY_MENU)
+                       || !strcmp(ev->keyname, KEY_MENU_REMOTE))
                        m->vmgr->PushView(MENU_VIEW, si);
 
                break;
@@ -423,7 +424,8 @@ void CNearbyLayout::OnKeyDown(int id, Evas *e, Evas_Object *obj, Evas_Event_Key_
                if (!ev->keyname)
                        return;
 
-               if (!strcmp(ev->keyname, KEY_ENTER))
+               if (!strcmp(ev->keyname, KEY_ENTER)
+                       || !strcmp(ev->keyname, KEY_ENTER_REMOTE))
                        m_LaunchSettingApp();
 
                break;

diff --git a/src/view/plugged_layout.cpp b/src/view/plugged_layout.cpp
index 0b82ef2..9565199 100644 (file)
--- a/src/view/plugged_layout.cpp
+++ b/src/view/plugged_layout.cpp
@@ -291,7 +291,8 @@ void CPluggedLayout::OnKeyDown(int id, Evas *e, Evas_Object *obj, Evas_Event_Key
                if (!si)
                        return;
 
-               if (!strcmp(ev->keyname, KEY_MENU))
+               if (!strcmp(ev->keyname, KEY_MENU)
+                       || !strcmp(ev->keyname, KEY_MENU_REMOTE))
                        m->vmgr->PushView(MENU_VIEW, si);
 
                break;