modify key values as key_define

Change-Id: Ia1c1857b8a444d694dc6eb52f3775bd4bbb3f538
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>

diff --git a/src/main.c b/src/main.c
index a30282d..7414ae3 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -91,17 +91,17 @@ static Eina_Bool _key_down(void *data, int type, void *ei)
        ev = ei;
        ad = data;
 
-       if (!strcmp(ev->keyname, KEY_POWER_REMOTE)) {
+       if (!strcmp(ev->keyname, KEY_POWER)) {
                utils_launch_app(APP_ID_INFOSQUARE, PARAM_LAUNCH_TYPE,
                                VALUE_INFOSQUARE);
-       } else if (!strcmp(ev->keyname, KEY_TV_REMOTE)) {
+       } else if (!strcmp(ev->keyname, KEY_TV)) {
                utils_launch_app(APP_ID_LIVETV, NULL, NULL);
        } else if (!strcmp(ev->keyname, KEY_HOME) ||
                        !strcmp(ev->keyname, KEY_HOMEPAGE)) {
                if (!ad->activated)
                        _show(ad);
        } else if (!strcmp(ev->keyname, KEY_BACK) ||
-                       !strcmp(ev->keyname, KEY_BACK_REMOTE)) {
+                       !strcmp(ev->keyname, KEY_ESC)) {
                if (ad->activated && viewmgr_active_view_count() == 1 &&
                                viewmgr_get_view_state(VIEW_HOME) ==
                                                VIEW_STATE_VISIBLE)
@@ -119,9 +119,8 @@ static Eina_Bool _key_timer(void *data)
                return ECORE_CALLBACK_CANCEL;
        }
 
-       elm_win_keygrab_set(data, KEY_TV_REMOTE, 0, 0, 0,
-                       ELM_WIN_KEYGRAB_EXCLUSIVE);
-       elm_win_keygrab_set(data, KEY_POWER_REMOTE, 0, 0, 0,
+       elm_win_keygrab_set(data, KEY_TV, 0, 0, 0, ELM_WIN_KEYGRAB_EXCLUSIVE);
+       elm_win_keygrab_set(data, KEY_POWER, 0, 0, 0,
                        ELM_WIN_KEYGRAB_EXCLUSIVE);
        elm_win_keygrab_set(data, KEY_HOME, 0, 0, 0, ELM_WIN_KEYGRAB_EXCLUSIVE);
        elm_win_keygrab_set(data, KEY_HOMEPAGE, 0, 0, 0,
@@ -186,8 +185,8 @@ static void _terminate(void *user_data)
                if (ad->key_down)
                        ecore_event_handler_del(ad->key_down);
 
-               elm_win_keygrab_unset(ad->win, KEY_POWER_REMOTE, 0, 0);
-               elm_win_keygrab_unset(ad->win, KEY_TV_REMOTE, 0, 0);
+               elm_win_keygrab_unset(ad->win, KEY_POWER, 0, 0);
+               elm_win_keygrab_unset(ad->win, KEY_TV, 0, 0);
                elm_win_keygrab_unset(ad->win, KEY_HOME, 0, 0);
                elm_win_keygrab_unset(ad->win, KEY_HOMEPAGE, 0, 0);
 

diff --git a/src/view/view_action_menu.c b/src/view/view_action_menu.c
index 30cd4a0..2353914 100644 (file)
--- a/src/view/view_action_menu.c
+++ b/src/view/view_action_menu.c
@@ -293,7 +293,7 @@ static void _key_down(int id, void *data, Evas *e, Evas_Object *obj,
 
        priv = data;
        if (!strcmp(ev->keyname, KEY_BACK) ||
-                       !strcmp(ev->keyname, KEY_BACK_REMOTE)) {
+                       !strcmp(ev->keyname, KEY_ESC)) {
                switch (id) {
                case INPUT_HANDLER_TYPE_BTN:
                case INPUT_HANDLER_TYPE_MENU_RESET:
@@ -309,8 +309,7 @@ static void _key_down(int id, void *data, Evas *e, Evas_Object *obj,
                default:
                        return;
                }
-       } else if (!strcmp(ev->keyname, KEY_ENTER) ||
-                       !strcmp(ev->keyname, KEY_ENTER_REMOTE)) {
+       } else if (!strcmp(ev->keyname, KEY_ENTER)) {
                _select(id, data, obj);
        }
 }

diff --git a/src/view/view_home.c b/src/view/view_home.c
index 8937b22..b5490e5 100644 (file)
--- a/src/view/view_home.c
+++ b/src/view/view_home.c
@@ -105,8 +105,7 @@ static void _key_down(int id, void *data, Evas *e, Evas_Object *obj,
                priv = bi->priv;
                if (!strcmp(ev->keyname, KEY_DOWN)) {
                        viewmgr_push_view(VIEW_RECENT);
-               } else if (!strcmp(ev->keyname, KEY_ENTER) ||
-                               !strcmp(ev->keyname, KEY_ENTER_REMOTE)) {
+               } else if (!strcmp(ev->keyname, KEY_ENTER)) {
                        if (priv->foc->di->action == ITEM_SELECT_ACTION_PUSH)
                                elm_object_signal_emit(priv->base, SIG_HIDE,
                                                SRC_PROG);
@@ -118,8 +117,7 @@ static void _key_down(int id, void *data, Evas *e, Evas_Object *obj,
                priv = data;
                if (!strcmp(ev->keyname, KEY_UP))
                        elm_object_focus_set(priv->foc->eo, EINA_TRUE);
-               else if (!strcmp(ev->keyname, KEY_ENTER) ||
-                               !strcmp(ev->keyname, KEY_ENTER_REMOTE))
+               else if (!strcmp(ev->keyname, KEY_ENTER))
                        viewmgr_push_view(VIEW_RECENT);
                break;
        default:

diff --git a/src/view/view_photo.c b/src/view/view_photo.c
index c80235e..97fd219 100644 (file)
--- a/src/view/view_photo.c
+++ b/src/view/view_photo.c
@@ -117,7 +117,7 @@ static void _key_down(int id, void *data, Evas *e, Evas_Object *obj,
                /* fallthrough */
        case INPUT_HANDLER_TYPE_NO_CONTENTS:
                if (!strcmp(ev->keyname, KEY_BACK) ||
-                               !strcmp(ev->keyname, KEY_BACK_REMOTE))
+                               !strcmp(ev->keyname, KEY_ESC))
                        viewmgr_pop_view();
                break;
        case INPUT_HANDLER_TYPE_DONE:
@@ -125,11 +125,10 @@ static void _key_down(int id, void *data, Evas *e, Evas_Object *obj,
                        return;
 
                priv = data;
-               if (!strcmp(ev->keyname, KEY_ENTER) ||
-                               !strcmp(ev->keyname, KEY_ENTER_REMOTE)) {
+               if (!strcmp(ev->keyname, KEY_ENTER)) {
                        _select_done(priv, obj);
                } else if (!strcmp(ev->keyname, KEY_BACK) ||
-                               !strcmp(ev->keyname, KEY_BACK_REMOTE)) {
+                               !strcmp(ev->keyname, KEY_ESC)) {
                        _delete_popup(priv);
                        elm_object_focus_allow_set(priv->grid, EINA_TRUE);
                        elm_object_focus_set(priv->grid, EINA_TRUE);
@@ -141,9 +140,8 @@ static void _key_down(int id, void *data, Evas *e, Evas_Object *obj,
 
                priv = data;
                if (!strcmp(ev->keyname, KEY_ENTER) ||
-                               !strcmp(ev->keyname, KEY_ENTER_REMOTE) ||
                                !strcmp(ev->keyname, KEY_BACK) ||
-                               !strcmp(ev->keyname, KEY_BACK_REMOTE)) {
+                               !strcmp(ev->keyname, KEY_ESC)) {
                        _delete_popup(priv);
                        elm_object_focus_allow_set(priv->grid, EINA_TRUE);
                        elm_object_focus_set(priv->grid, EINA_TRUE);

diff --git a/src/view/view_recent.c b/src/view/view_recent.c
index 01c55dc..bca9818 100644 (file)
--- a/src/view/view_recent.c
+++ b/src/view/view_recent.c
@@ -113,10 +113,9 @@ static void _key_down(int id, void *data, Evas *e, Evas_Object *obj,
 
                if (!strcmp(ev->keyname, KEY_DOWN) ||
                                !strcmp(ev->keyname, KEY_BACK) ||
-                               !strcmp(ev->keyname, KEY_BACK_REMOTE)) {
+                               !strcmp(ev->keyname, KEY_ESC)) {
                        elm_object_signal_emit(priv->base, SIG_HIDE, SRC_PROG);
-               } else if (!strcmp(ev->keyname, KEY_ENTER) ||
-                               !strcmp(ev->keyname, KEY_ENTER_REMOTE)) {
+               } else if (!strcmp(ev->keyname, KEY_ENTER)) {
                        datamgr_select_item(priv->dm, bi->di);
                }
                break;
@@ -124,10 +123,9 @@ static void _key_down(int id, void *data, Evas *e, Evas_Object *obj,
                priv = data;
 
                if (!strcmp(ev->keyname, KEY_BACK) ||
-                               !strcmp(ev->keyname, KEY_BACK_REMOTE)) {
+                               !strcmp(ev->keyname, KEY_ESC)) {
                        elm_object_signal_emit(priv->base, SIG_HIDE, SRC_PROG);
-               } else if (!strcmp(ev->keyname, KEY_ENTER) ||
-                               !strcmp(ev->keyname, KEY_ENTER_REMOTE)) {
+               } else if (!strcmp(ev->keyname, KEY_ENTER)) {
                        datamgr_clear_item(priv->dm);
                        elm_object_signal_emit(priv->base, SIG_HIDE, SRC_PROG);
                } else if (!strcmp(ev->keyname, KEY_DOWN)) {
@@ -141,7 +139,7 @@ static void _key_down(int id, void *data, Evas *e, Evas_Object *obj,
 
                if (!strcmp(ev->keyname, KEY_DOWN) ||
                                !strcmp(ev->keyname, KEY_BACK) ||
-                               !strcmp(ev->keyname, KEY_BACK_REMOTE)) {
+                               !strcmp(ev->keyname, KEY_ESC)) {
                        elm_object_signal_emit(priv->base, SIG_HIDE, SRC_PROG);
                }
                break;

diff --git a/src/view/view_user.c b/src/view/view_user.c
index 9b3af7a..cbc90c9 100644 (file)
--- a/src/view/view_user.c
+++ b/src/view/view_user.c
@@ -182,14 +182,12 @@ static void _key_down(int id, void *data, Evas *e, Evas_Object *obj,
        switch (id) {
        case INPUT_HANDLER_TYPE_BUTTON:
                if (!strcmp(ev->keyname, KEY_ENTER) ||
-                               !strcmp(ev->keyname, KEY_ENTER_REMOTE) ||
                                !strcmp(ev->keyname, KEY_BACK) ||
-                               !strcmp(ev->keyname, KEY_BACK_REMOTE))
+                               !strcmp(ev->keyname, KEY_ESC))
                        _delete_popup(priv);
                break;
        case INPUT_HANDLER_TYPE_BASE:
-               if (!strcmp(ev->keyname, KEY_ENTER) ||
-                               !strcmp(ev->keyname, KEY_ENTER_REMOTE)) {
+               if (!strcmp(ev->keyname, KEY_ENTER)) {
                        if (priv->foc->di->action == ITEM_SELECT_ACTION_POP) {
                                elm_object_signal_emit(priv->base, SIG_HIDE,
                                                SRC_PROG);
@@ -206,7 +204,7 @@ static void _key_down(int id, void *data, Evas *e, Evas_Object *obj,
                                        NULL);
                        datamgr_select_item(priv->dm, priv->foc->di);
                } else if (!strcmp(ev->keyname, KEY_BACK) ||
-                               !strcmp(ev->keyname, KEY_BACK_REMOTE)) {
+                               !strcmp(ev->keyname, KEY_ESC)) {
                        elm_object_signal_emit(priv->base, SIG_HIDE, SRC_PROG);
                } else if (!strcmp(ev->keyname, KEY_DOWN)) {
                        if (priv->foc->di->action == ITEM_SELECT_ACTION_PUSH ||

diff --git a/src/view/view_user_edit.c b/src/view/view_user_edit.c
index cb78eda..a684e42 100644 (file)
--- a/src/view/view_user_edit.c
+++ b/src/view/view_user_edit.c
@@ -781,14 +781,13 @@ static void _key_up(int id, void *data, Evas *e, Evas_Object *obj,
        priv = data;
 
        if (!strcmp(ev->keyname, KEY_BACK) ||
-                       !strcmp(ev->keyname, KEY_BACK_REMOTE)) {
+                       !strcmp(ev->keyname, KEY_ESC)) {
                if (_check_changed_input(priv)) {
                        _add_discard_popup(priv);
                        return;
                }
                viewmgr_pop_view();
-       } else if (!strcmp(ev->keyname, KEY_ENTER) ||
-                       !strcmp(ev->keyname, KEY_ENTER_REMOTE)) {
+       } else if (!strcmp(ev->keyname, KEY_ENTER)) {
                if (!_check_done(priv))
                        return;
 
@@ -800,7 +799,7 @@ static void _key_up(int id, void *data, Evas *e, Evas_Object *obj,
                viewmgr_update_view(VIEW_PIN, UPDATE_TYPE_PIN_CODE, pincode);
                viewmgr_show_view(VIEW_PIN);
        } else if (!strcmp(ev->keyname, KEY_MENU) ||
-                       !strcmp(ev->keyname, KEY_MENU_REMOTE)) {
+                       !strcmp(ev->keyname, KEY_CONTEXT_MENU)) {
                _show_action_menu(priv);
        }
 }
@@ -817,7 +816,7 @@ static void _key_down(int id, void *data, Evas *e, Evas_Object *obj,
 
        priv = data;
        if (!strcmp(ev->keyname, KEY_BACK) ||
-                       !strcmp(ev->keyname, KEY_BACK_REMOTE)) {
+                       !strcmp(ev->keyname, KEY_ESC)) {
                switch (id) {
                case INPUT_HANDLER_TYPE_PHOTO:
                case INPUT_HANDLER_TYPE_BTN_CANCEL:
@@ -840,11 +839,10 @@ static void _key_down(int id, void *data, Evas *e, Evas_Object *obj,
                default:
                        return;
                }
-       } else if (!strcmp(ev->keyname, KEY_ENTER) ||
-                       !strcmp(ev->keyname, KEY_ENTER_REMOTE)) {
+       } else if (!strcmp(ev->keyname, KEY_ENTER)) {
                _select(priv, id, obj);
        } else if (!strcmp(ev->keyname, KEY_MENU) ||
-                       !strcmp(ev->keyname, KEY_MENU_REMOTE)) {
+                       !strcmp(ev->keyname, KEY_CONTEXT_MENU)) {
                switch (id) {
                case INPUT_HANDLER_TYPE_PHOTO:
                case INPUT_HANDLER_TYPE_BTN_CANCEL: