apply SKeyDownListener and SKeyUpListener in application-common

[profile/tv/apps/native/filebrowser.git] / src / views / BaseView / FbBaseView.cpp

diff --git a/src/views/BaseView/FbBaseView.cpp b/src/views/BaseView/FbBaseView.cpp
index 88393e3..03bd6c7 100644 (file)
--- a/src/views/BaseView/FbBaseView.cpp
+++ b/src/views/BaseView/FbBaseView.cpp
@@ -125,21 +125,27 @@ struct SFbBaseView {
                        delete pHandlerGroup[a];
        }
 
-       class CHandlerBase : public CListenerMgr, public IKeyDownListener, public IKeyUpListener{
+       class CHandlerBase : public CListenerMgr, public ISKeyDownListener, public ISKeyUpListener{
                SFbBaseView *m;
 
        public:
-               CHandlerBase(SFbBaseView *ins) : IKeyDownListener(this), IKeyUpListener(this) { m = ins; }
+               CHandlerBase(SFbBaseView *ins) : ISKeyDownListener(this), ISKeyUpListener(this) { m = ins; }
 
-               virtual void OnKeyDown(int id, Evas *e, Evas_Object *obj, Evas_Event_Key_Down *ev) {
+               virtual void OnSKeyDown(int id, Evas *e, Evas_Object *obj, Evas_Event_SKey_Down *ev) {
                        _DBG("m->curLayoutId = %d",m->curLayoutId);
-                       if (!strcmp(ev->keyname, KEY_EXIT))
+                       switch (ev->skey) {
+                       case SKEY_EXIT:
                                elm_exit();
+                               break;
+                       default:
+                               break;
+                       }
                }
-               virtual void OnKeyUp(int id, Evas *e, Evas_Object *obj, Evas_Event_Key_Up *ev)
+               virtual void OnSKeyUp(int id, Evas *e, Evas_Object *obj, Evas_Event_SKey_Up *ev)
                {
                        _DBG("m->curLayoutId = %d",m->curLayoutId);
-                       if (!strcmp(ev->keyname, KEY_ENTER) || !strcmp(ev->keyname, KEY_ENTER_REMOTE)) {
+                       switch (ev->skey) {
+                       case SKEY_ENTER:
                                if (elm_object_focus_get(m->eoSelectedBtnGroup)) {
                                        switch(m->curLayoutId)
                                        {
@@ -157,12 +163,14 @@ struct SFbBaseView {
                                                        break;
                                        }
                                }
+                               break;
+                       default:
+                               break;
                        }
-
                }
        } *pHandlerBase;
 
-       class CHandlerButton : public CListenerMgr, protected IKeyDownListener, IMouseMoveListener, IMouseClickedListener {
+       class CHandlerButton : public CListenerMgr, protected ISKeyDownListener, IMouseMoveListener, IMouseClickedListener {
        private:
                SFbBaseView *m;
        private:
@@ -220,12 +228,17 @@ struct SFbBaseView {
                }
 
        public:
-               CHandlerButton(SFbBaseView *ins) : IKeyDownListener(this), IMouseMoveListener(this), IMouseClickedListener(this) { m = ins; }
+               CHandlerButton(SFbBaseView *ins) : ISKeyDownListener(this), IMouseMoveListener(this), IMouseClickedListener(this) { m = ins; }
 
-               virtual void OnKeyDown(int id, Evas *e, Evas_Object *obj, Evas_Event_Key_Down *ev) {
+               virtual void OnSKeyDown(int id, Evas *e, Evas_Object *obj, Evas_Event_SKey_Down *ev) {
                        _DBG("id = %d", id);
-                       if (!strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_BACK_REMOTE))
+                       switch (ev->skey) {
+                       case SKEY_BACK:
                                elm_object_focus_set(m->eoSelectedBtnGroup, EINA_TRUE);
+                               break;
+                       default:
+                               break;
+                       }
                }
                virtual void OnMouseMove(int id, Evas *e, Evas_Object *obj, Evas_Event_Mouse_Move *ev) {
                        _DBG("id = %d", id);
@@ -251,13 +264,13 @@ struct SFbBaseView {
                }
        } *pHandlerButton[TOTAL_TOP_BTNS];
 
-       class CHandlerGroup : public CListenerMgr, IMouseMoveListener, IKeyDownListener, IMouseClickedListener {
+       class CHandlerGroup : public CListenerMgr, IMouseMoveListener, ISKeyDownListener, IMouseClickedListener {
        private:
                SFbBaseView *m;
        public:
                CHandlerGroup(SFbBaseView *ins) :
                        IMouseMoveListener(this),
-                       IKeyDownListener(this),
+                       ISKeyDownListener(this),
                        IMouseClickedListener(this) { m = ins; }
 
                virtual void OnMouseMove(int id, Evas *e, Evas_Object *obj, Evas_Event_Mouse_Move *ev) {
@@ -265,10 +278,15 @@ struct SFbBaseView {
                        if (!elm_object_focus_get(obj))
                                elm_object_focus_set(obj, EINA_TRUE);
                }
-               virtual void OnKeyDown(int id, Evas *e, Evas_Object *obj, Evas_Event_Key_Down *ev) {
+               virtual void OnSKeyDown(int id, Evas *e, Evas_Object *obj, Evas_Event_SKey_Down *ev) {
                        _DBG("id = %d", id);
-                       if (!strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_BACK_REMOTE))
+                       switch (ev->skey) {
+                       case SKEY_BACK:
                                elm_exit();
+                               break;
+                       default:
+                               break;
+                       }
                }
                virtual void OnMouseClicked(int id, Evas_Object *obj) {
                        if (m->eoSelectedBtnGroup == obj)