From: JuWan Kim <juwan.kim@samsung.com>
Date: Wed, 25 Feb 2015 08:31:07 +0000 (+0900)
Subject: Add Remote Key define and flow
X-Git-Tag: accepted/tizen/tv/20150226.042220^0
X-Git-Url: http://review.tizen.org/git/?p=profile%2Ftv%2Fapps%2Fnative%2Ffilebrowser.git;a=commitdiff_plain;h=583efb80d227da8fc56da007954950ac5a39921d

Add Remote Key define and flow

Change-Id: Ibef4f3da481107dec0e50a47c9a2a17e037e65a6
Signed-off-by: JuWan Kim <juwan.kim@samsung.com>
---

diff --git a/include/define.h b/include/define.h
index 3a09f3f..27054b3 100644
--- a/include/define.h
+++ b/include/define.h
@@ -148,9 +148,12 @@
 
 /* KEY DEFINES */
 #define KEY_ENTER "Return"
+#define KEY_ENTER_REMOTE "KP_Enter"
 #define KEY_EXIT  "Exit"
 #define KEY_BACK  "Escape"
+#define KEY_BACK_REMOTE  "XF86Close"
 #define KEY_MENU  "Super_L"
+#define KEY_MENU_REMOTE  "XF86MenuKB"
 
 /* CTXPOPUP POSITION */
 #define POSITION_SORT_POPUP_X 1344
diff --git a/src/views/BaseView/FbBaseView.cpp b/src/views/BaseView/FbBaseView.cpp
index 1fde9b6..b646fad 100644
--- a/src/views/BaseView/FbBaseView.cpp
+++ b/src/views/BaseView/FbBaseView.cpp
@@ -128,7 +128,7 @@ struct SFbBaseView {
 		virtual void OnKeyDown(int id, Evas *e, Evas_Object *obj, Evas_Event_Key_Down *ev) {
 			if (!strcmp(ev->keyname, KEY_EXIT))
 				elm_exit();
-			else if (!strcmp(ev->keyname, KEY_ENTER)) {
+			else if (!strcmp(ev->keyname, KEY_ENTER) || !strcmp(ev->keyname, KEY_ENTER_REMOTE)) {
 				if (elm_object_focus_get(m->eoSelectedBtnGroup)) {
 					m->pFbAllLayout->SetFocus(EINA_TRUE);
 					// TODO: Each layout SetFocus???
@@ -176,7 +176,7 @@ struct SFbBaseView {
 		CHandlerButton(SFbBaseView *ins) : IKeyDownListener(this), IMouseMoveListener(this), IMouseClickedListener(this) { m = ins; }
 
 		virtual void OnKeyDown(int id, Evas *e, Evas_Object *obj, Evas_Event_Key_Down *ev) {
-			if (!strcmp(ev->keyname, KEY_BACK))
+			if (!strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_BACK_REMOTE))
 				elm_object_focus_set(m->eoSelectedBtnGroup, EINA_TRUE);
 		}
 		virtual void OnMouseMove(int id, Evas *e, Evas_Object *obj, Evas_Event_Mouse_Move *ev) {
@@ -215,7 +215,7 @@ struct SFbBaseView {
 				elm_object_focus_set(obj, EINA_TRUE);
 		}
 		virtual void OnKeyDown(int id, Evas *e, Evas_Object *obj, Evas_Event_Key_Down *ev) {
-			if (!strcmp(ev->keyname, KEY_BACK))
+			if (!strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_BACK_REMOTE))
 				elm_exit();
 		}
 		virtual void OnMouseClicked(int id, Evas_Object *obj) {
diff --git a/src/views/BaseView/FileGrid.cpp b/src/views/BaseView/FileGrid.cpp
index d331e4d..981a55a 100644
--- a/src/views/BaseView/FileGrid.cpp
+++ b/src/views/BaseView/FileGrid.cpp
@@ -444,7 +444,7 @@ void CFileGrid::OnKeyUp(int id, Evas *e, Evas_Object *obj, Evas_Event_Key_Up *ev
 	if(ev->keyname)
 		_DBG("%s", ev->keyname);
 
-	if (strcmp(ev->keyname, KEY_BACK) == 0) {
+	if (!strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_BACK_REMOTE)) {
 		if (m->depth == 0) {
 			if (m->callback.cbUnsetFocus)
 				m->callback.cbUnsetFocus(m->callback.cookie);
@@ -456,7 +456,7 @@ void CFileGrid::OnKeyUp(int id, Evas *e, Evas_Object *obj, Evas_Event_Key_Up *ev
 			elm_object_item_focus_set(it, EINA_TRUE);
 		}
 	}
-	else if (strcmp(ev->keyname, KEY_MENU) == 0) {
+	else if (!strcmp(ev->keyname, KEY_MENU) || !strcmp(ev->keyname, KEY_MENU_REMOTE)) {
 		it = elm_object_focused_item_get(obj);
 		if (!it) {
 			_ERR(" unable to get focused item ");
diff --git a/src/views/FbContextView.cpp b/src/views/FbContextView.cpp
index 800a09c..6f0dea2 100644
--- a/src/views/FbContextView.cpp
+++ b/src/views/FbContextView.cpp
@@ -90,14 +90,14 @@ struct SContextView {
 			_DBG();
 			if (m->eoBtnOpen == obj) {
 				_DBG();
-				if (strcmp(ev->keyname, KEY_ENTER))
+				if (strcmp(ev->keyname, KEY_ENTER) && strcmp(ev->keyname, KEY_ENTER_REMOTE))
 					return;
 
 				CViewMgr::GetInstance()->UpdateView(FBR_BASE_VIEW, NULL);
 			}
 			else {
 				_DBG();
-				if (strcmp(ev->keyname, KEY_ENTER))
+				if (strcmp(ev->keyname, KEY_ENTER) && strcmp(ev->keyname, KEY_ENTER_REMOTE))
 					return;
 
 				elm_object_signal_emit(obj, FBR_SIGNAL_CONTENT_CLICKED, FBR_CONTEXT_VIEW);
@@ -724,7 +724,7 @@ void CContextView::sm_CbKeyPressed(void *dt, Evas *e, Evas_Object *obj, void *ei
 
 	ev = (Evas_Event_Key_Down *)ei;
 
-	if (!strcmp(ev->keyname, KEY_BACK))
+	if (!strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_BACK_REMOTE))
 	{
 		CViewMgr::GetInstance()->PopView();
 	}