support remote control key handling

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

diff --git a/include/common/define.h b/include/common/define.h
index 0a8aef4..58199a2 100644 (file)
--- a/include/common/define.h
+++ b/include/common/define.h
@@ -29,10 +29,13 @@
 #define LAYOUT_FOLDER_DATA "LAYOUT_FOLDER_DATA"
 
 #define KEY_ENTER "Return"
+#define KEY_ENTER_REMOTE "KP_Enter"
 #define KEY_BACK "Escape"
+#define KEY_BACK_REMOTE "XF86Close"
 #define KEY_RIGHT "Right"
 #define KEY_LEFT "Left"
 #define KEY_MENU "Super_L"
+#define KEY_MENU_REMOTE "XF86MenuKB"
 
 /* Part name definitions */
 #define PART_CONTENTAREA "content.area"

diff --git a/src/view/ctxtmenu-view/ctxtmenu_view.cpp b/src/view/ctxtmenu-view/ctxtmenu_view.cpp
index 1648fde..92fd0a0 100644 (file)
--- a/src/view/ctxtmenu-view/ctxtmenu_view.cpp
+++ b/src/view/ctxtmenu-view/ctxtmenu_view.cpp
@@ -928,17 +928,20 @@ void CCtxtMenuView::OnKeyDown(int id, Evas *e,
 {
        switch (id) {
        case CTXT_MENU_VIEW:
-               if (strcmp(ev->keyname, KEY_BACK) == 0)
+               if (!strcmp(ev->keyname, KEY_BACK) ||
+                       !strcmp(ev->keyname, KEY_BACK_REMOTE))
                        CViewMgr::GetInstance()->PopView();
 
                break;
        case CTXT_MENU_BTN_SHOW:
-               if (!strcmp(ev->keyname, KEY_ENTER))
+               if (!strcmp(ev->keyname, KEY_ENTER) ||
+                       !strcmp(ev->keyname, KEY_ENTER_REMOTE))
                        m_SlideshowBtnSelected();
 
                break;
        case CTXT_MENU_BTN_PLAY:
-               if (!strcmp(ev->keyname, KEY_ENTER))
+               if (!strcmp(ev->keyname, KEY_ENTER) ||
+                       !strcmp(ev->keyname, KEY_ENTER_REMOTE))
                        m_PlayBtnSelected();
 
                break;

diff --git a/src/view/gallery-view/gallery_view.cpp b/src/view/gallery-view/gallery_view.cpp
index 77c3c22..f6324ce 100644 (file)
--- a/src/view/gallery-view/gallery_view.cpp
+++ b/src/view/gallery-view/gallery_view.cpp
@@ -782,15 +782,17 @@ void CGalleryView::OnKeyDown(int id, Evas *e, Evas_Object *obj, Evas_Event_Key_D
 {
        switch (id) {
        case GALLERY_MENU:
-               if (strcmp(ev->keyname, KEY_RIGHT) == 0 ||
-                       strcmp(ev->keyname, KEY_ENTER) == 0) {
+               if (!strcmp(ev->keyname, KEY_RIGHT) ||
+                       !strcmp(ev->keyname, KEY_ENTER) ||
+                       !strcmp(ev->keyname, KEY_ENTER_REMOTE)) {
                        m_FocusLayout();
 
                        elm_object_signal_emit(obj, "highlight", "");
 
                        m->focused_btn = obj;
                        m->focus_area = FOCUS_CONTENT_AREA;
-               } else if (strcmp(ev->keyname, KEY_BACK) == 0) {
+               } else if (!strcmp(ev->keyname, KEY_BACK) ||
+                               !strcmp(ev->keyname, KEY_BACK_REMOTE)) {
                        m->pViewMgr->PopView();
                        if (CViewMgr::GetInstance()->CheckEmpty())
                                elm_exit();
@@ -798,7 +800,8 @@ void CGalleryView::OnKeyDown(int id, Evas *e, Evas_Object *obj, Evas_Event_Key_D
                break;
        case GALLERY_SORTBTN:
        case GALLERY_SOURCEBTN:
-               if (strcmp(ev->keyname, KEY_BACK) == 0)
+               if (!strcmp(ev->keyname, KEY_BACK) ||
+                       !strcmp(ev->keyname, KEY_BACK_REMOTE))
                        elm_object_focus_set(m->focused_btn, EINA_TRUE);
                break;
        case GALLERY_CTXPOPUP:

diff --git a/src/view/gallery-view/layout_all.cpp b/src/view/gallery-view/layout_all.cpp
index 0646e4f..74f2f8d 100644 (file)
--- a/src/view/gallery-view/layout_all.cpp
+++ b/src/view/gallery-view/layout_all.cpp
@@ -645,7 +645,8 @@ void CAllLayout::OnKeyDown(int id, Evas *e, Evas_Object *obj, Evas_Event_Key_Dow
                CEventLayout *pEventLayout;
                CFolderLayout *pFolderLayout;
 
-               if (strcmp(ev->keyname, KEY_BACK) == 0) {
+               if (!strcmp(ev->keyname, KEY_BACK) ||
+                       !strcmp(ev->keyname, KEY_BACK_REMOTE)) {
                        switch (m->ld->prev_layout) {
                        case E_LAYOUT_NONE:
                                m->Sigcb->cb(m->Sigcb->cookie, E_RETURN);
@@ -669,7 +670,8 @@ void CAllLayout::OnKeyDown(int id, Evas *e, Evas_Object *obj, Evas_Event_Key_Dow
                        default:
                                break;
                        }
-               } else if (strcmp(ev->keyname, KEY_MENU) == 0)
+               } else if (!strcmp(ev->keyname, KEY_MENU) ||
+                       !strcmp(ev->keyname, KEY_MENU_REMOTE))
                        m_CreateCtxtMenu();
 
                break;

diff --git a/src/view/gallery-view/layout_events.cpp b/src/view/gallery-view/layout_events.cpp
index 850167b..8875f58 100644 (file)
--- a/src/view/gallery-view/layout_events.cpp
+++ b/src/view/gallery-view/layout_events.cpp
@@ -747,7 +747,8 @@ void CEventLayout::OnKeyDown(int id, Evas *e, Evas_Object *obj, Evas_Event_Key_D
 {
        switch (id) {
        case EVENT_GRID:
-               if (strcmp(ev->keyname, KEY_BACK) == 0)
+               if (!strcmp(ev->keyname, KEY_BACK) ||
+                       !strcmp(ev->keyname, KEY_BACK_REMOTE))
                        m->SigCb->cb(m->SigCb->cookie, E_RETURN);
                break;
        default:

diff --git a/src/view/gallery-view/layout_folder.cpp b/src/view/gallery-view/layout_folder.cpp
index c606767..0ec7529 100644 (file)
--- a/src/view/gallery-view/layout_folder.cpp
+++ b/src/view/gallery-view/layout_folder.cpp
@@ -563,7 +563,8 @@ void CFolderLayout::OnKeyDown(int id, Evas *e, Evas_Object *obj, Evas_Event_Key_
 {
        switch (id) {
        case FOLDER_GRID:
-               if (strcmp(ev->keyname, KEY_BACK) == 0)
+               if (!strcmp(ev->keyname, KEY_BACK) ||
+                       !strcmp(ev->keyname, KEY_BACK_REMOTE))
                        m->Sigcb->cb(m->Sigcb->cookie, E_RETURN);
                break;
        default:

diff --git a/src/view/photo-viewer/photoviewer_view.cpp b/src/view/photo-viewer/photoviewer_view.cpp
index d490117..6c8a92b 100644 (file)
--- a/src/view/photo-viewer/photoviewer_view.cpp
+++ b/src/view/photo-viewer/photoviewer_view.cpp
@@ -876,11 +876,13 @@ void CPhotoViewerView::OnKeyDown(int id, Evas *e, Evas_Object *obj, Evas_Event_K
 {
        switch (id) {
        case PHOTOVIEWER_BTN:
-               if (!strcmp(ev->keyname, KEY_BACK)) {
+               if (!strcmp(ev->keyname, KEY_BACK) ||
+                       !strcmp(ev->keyname, KEY_BACK_REMOTE)) {
                        m->pViewMgr->PopView();
                        if (CViewMgr::GetInstance()->CheckEmpty())
                                elm_exit();
-               } else if (!strcmp(ev->keyname, KEY_MENU)) {
+               } else if (!strcmp(ev->keyname, KEY_MENU) ||
+                       !strcmp(ev->keyname, KEY_MENU_REMOTE)) {
                        m->pViewMgr->PushView(VIEW_CTXT_MENU, m->vd);
                        t_OnPause();
                }

diff --git a/src/view/photo-viewer/zoom_view.cpp b/src/view/photo-viewer/zoom_view.cpp
index 8939d4c..f5bcd58 100644 (file)
--- a/src/view/photo-viewer/zoom_view.cpp
+++ b/src/view/photo-viewer/zoom_view.cpp
@@ -548,11 +548,12 @@ void CPhotoZoomView::m_ViewKeyDown(Evas_Event_Key_Down *ev)
 
        m->updated = EINA_FALSE;
 
-       if (!strcmp(ev->keyname, KEY_BACK)) {
+       if (!strcmp(ev->keyname, KEY_BACK) ||
+               !strcmp(ev->keyname, KEY_BACK_REMOTE)) {
                CViewMgr::GetInstance()->PopView();
                return;
-       }
-       else if (!strcmp(ev->keyname, KEY_ENTER)) {
+       } else if (!strcmp(ev->keyname, KEY_ENTER) ||
+               !strcmp(ev->keyname, KEY_ENTER_REMOTE)) {
 
                elm_photocam_image_size_get(m->eoPhotocam, &width, &height);
                if (m->data->zoom_level == E_ZOOM_X2) {