Add Remote Key defines / flow

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

diff --git a/include/def.h b/include/def.h
index 6d77209..0e77d7e 100644 (file)
--- a/include/def.h
+++ b/include/def.h
@@ -272,8 +272,10 @@
 #define KEY_LEFT "Left"
 #define KEY_RIGHT "Right"
 #define KEY_ENTER "Return"
-#define KEY_EXIT  "XF86Close"
+#define KEY_ENTER_REMOTE "KP_Enter"
+#define KEY_EXIT  "Exit"
 #define KEY_BACK "Escape"
+#define KEY_BACK_REMOTE "XF86Close"
 
 #define KEY_0 "0"
 #define KEY_1 "1"

diff --git a/src/view_maincatalog.c b/src/view_maincatalog.c
index 044dd1c..2fda8e7 100644 (file)
--- a/src/view_maincatalog.c
+++ b/src/view_maincatalog.c
@@ -117,8 +117,7 @@ static void _subitem_key_pressed_cb(void *data, Evas *e,
 
        priv = data;
 
-       if (!strcmp(ev->keyname, KEY_LEFT) ||
-                       !strcmp(ev->keyname, KEY_BACK)) {
+       if (!strcmp(ev->keyname, KEY_LEFT) || !strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_BACK_REMOTE)) {
                pb = evas_object_data_get(obj, PROGRESS_BAR_DATA);
                if (pb)
                        elm_object_signal_emit(pb,
@@ -1343,8 +1342,7 @@ static void _main_setting_key_pressed_cb(void *data, Evas *e,
                        _draw_subitems(priv, name);
        } else if (!strcmp(ev->keyname, KEY_RIGHT)) {
                _move_from_main_item_to_subitem(priv, obj);
-       } else if (!strcmp(ev->keyname, KEY_EXIT) ||
-                       !strcmp(ev->keyname, KEY_BACK)) {
+       } else if (!strcmp(ev->keyname, KEY_EXIT) || !strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_BACK_REMOTE)) {
                app_efl_exit();
        }
 }

diff --git a/src/view_need_pwd.c b/src/view_need_pwd.c
index 610b9a7..ca484a6 100644 (file)
--- a/src/view_need_pwd.c
+++ b/src/view_need_pwd.c
@@ -309,7 +309,7 @@ static void _key_down_cb(void *priv, Evas *e, Evas_Object *obj,
        if (btn_num == -1)
                return;
 
-       if (!strncmp(keyname, KEY_BACK, strlen(keyname))) {
+       if (!strncmp(keyname, KEY_BACK, strlen(keyname)) || !strncmp(keyname, KEY_BACK_REMOTE, strlen(keyname))) {
                settingmgr_view_pop(data->mgr);
        } else if (!strncmp(keyname, KEY_DOWN, strlen(keyname))) {
                elm_object_focus_set(data->cancel_btn, EINA_TRUE);

diff --git a/src/view_pwd_popup.c b/src/view_pwd_popup.c
index 0ac8192..4c60f04 100644 (file)
--- a/src/view_pwd_popup.c
+++ b/src/view_pwd_popup.c
@@ -484,7 +484,7 @@ static void _entry_keypress_cb(void *priv, Evas *e,
                }
        }
 
-       if (!strncmp(keyname, KEY_BACK, strlen(keyname))) {
+       if (!strncmp(keyname, KEY_BACK, strlen(keyname)) || !strncmp(keyname, KEY_BACK_REMOTE, strlen(keyname))) {
                settingmgr_view_pop(data->mgr);
        } else if (!strncmp(keyname, KEY_DOWN, strlen(keyname))) {
                elm_object_focus_set(data->cancel_btn, EINA_TRUE);

diff --git a/src/view_sublist.c b/src/view_sublist.c
index 6ace773..79ab5b9 100644 (file)
--- a/src/view_sublist.c
+++ b/src/view_sublist.c
@@ -373,7 +373,7 @@ static void _subitem_key_pressed_cb(void *data, Evas *e,
        ev = ei;
        priv = data;
 
-       if (!strcmp(ev->keyname, KEY_BACK))
+       if (!strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_BACK_REMOTE))
                _exit_view(priv);
 }
 

diff --git a/src/view_system_clock.c b/src/view_system_clock.c
index b3a1628..d43c344 100644 (file)
--- a/src/view_system_clock.c
+++ b/src/view_system_clock.c
@@ -344,7 +344,7 @@ static void _subitem_keypress_cb(void *priv, Evas *e,
        if (!ev->keyname)
                return;
 
-       if (!strncmp(ev->keyname, KEY_BACK, BUF_SIZE))
+       if (!strncmp(ev->keyname, KEY_BACK, BUF_SIZE) || !strncmp(ev->keyname, KEY_BACK_REMOTE, BUF_SIZE))
                _exit_view(data);
 }
 

diff --git a/ug/channel/include/defs.h b/ug/channel/include/defs.h
index 3962ad3..bb64ea4 100644 (file)
--- a/ug/channel/include/defs.h
+++ b/ug/channel/include/defs.h
@@ -94,4 +94,7 @@
 #define BORDER_H1  14
 #define BORDER_H2  14
 
+/* Key defines */
+#define KEY_BACK_REMOTE "XF86Close"
+
 #endif /* __DEFS_H__ */

diff --git a/ug/channel/src/view_scan_start.c b/ug/channel/src/view_scan_start.c
index 98825ea..7bb1b5c 100644 (file)
--- a/ug/channel/src/view_scan_start.c
+++ b/ug/channel/src/view_scan_start.c
@@ -107,7 +107,7 @@ static void _key_pressed_cb(void *data, Evas *e, Evas_Object *obj, void *ei)
                return;
        }
 
-       if (!strcmp(ev->keyname, KEY_BACK))
+       if (!strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_BACK_REMOTE))
                ug_destroy_me(ugd->ug);
 }
 

diff --git a/ug/network/include/defs.h b/ug/network/include/defs.h
index 4b73c97..21e4717 100644 (file)
--- a/ug/network/include/defs.h
+++ b/ug/network/include/defs.h
@@ -143,7 +143,9 @@
 #define KEY_LEFT "Left"
 #define KEY_RIGHT "Right"
 #define KEY_ENTER "Return"
-#define KEY_EXIT  "XF86Close"
+#define KEY_ENTER_REMOTE "KP_Enter"
+#define KEY_EXIT  "Exit"
+#define KEY_BACK_REMOTE "XF86Close"
 
 #define KEY_0 "0"
 #define KEY_1 "1"

diff --git a/ug/network/src/ip_setting_view.c b/ug/network/src/ip_setting_view.c
index a894510..e7e1817 100644 (file)
--- a/ug/network/src/ip_setting_view.c
+++ b/ug/network/src/ip_setting_view.c
@@ -715,7 +715,7 @@ static void _ip_ctxpopup_key_pressed_cb(void *data, Evas *evas,
                return;
        }
 
-       if (!strcmp(ev->keyname, KEY_BACK)) {
+       if (!strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_BACK_REMOTE)) {
                _unset_layout_dim(priv);
 
                evas_object_del(priv->ip_mode_ly);
@@ -752,7 +752,7 @@ static void _ctxpopup_pressed_cb(void *data, Evas *e,
                return;
        }
 
-       if (!strcmp(ev->keyname, KEY_BACK)) {
+       if (!strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_BACK_REMOTE)) {
                _unset_layout_dim(priv);
                evas_object_del(obj);
        }
@@ -1161,11 +1161,11 @@ static void _value_ctxpopup_key_pressed_cb(void *data, Evas *evas,
                return;
        }
 
-       if (!strcmp(ev->keyname, KEY_ENTER)) {
+       if (!strcmp(ev->keyname, KEY_ENTER) || !strcmp(ev->keyname, KEY_ENTER_REMOTE)) {
                _unset_layout_dim(priv);
                _set_the_value(priv);
                evas_object_del(obj);
-       } else if (!strcmp(ev->keyname, KEY_BACK)) {
+       } else if (!strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_BACK_REMOTE)) {
                _unset_layout_dim(priv);
                evas_object_del(obj);
        }
@@ -1686,7 +1686,7 @@ static void _dns_ctxpopup_key_pressed_cb(void *data, Evas *evas,
                return;
        }
 
-       if (!strcmp(ev->keyname, KEY_BACK)) {
+       if (!strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_BACK_REMOTE)) {
                _unset_layout_dim(priv);
                evas_object_del(priv->dns_mode_ly);
                priv->dns_mode_ly = NULL;
@@ -2495,7 +2495,7 @@ static void _base_key_pressed_cb(void *data, Evas *evas,
                return;
        }
 
-       if (!strcmp(ev->keyname, KEY_BACK)) {
+       if (!strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_BACK_REMOTE)) {
                viewmgr_pop(priv->vmgr);
                return;
        }

diff --git a/ug/network/src/main_view.c b/ug/network/src/main_view.c
index 6d05b9e..b444d0f 100644 (file)
--- a/ug/network/src/main_view.c
+++ b/ug/network/src/main_view.c
@@ -293,7 +293,7 @@ static void _ctxpopup_pressed_cb(void *data, Evas *e,
                return;
        }
 
-       if (!strcmp(ev->keyname, KEY_BACK)) {
+       if (!strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_BACK_REMOTE)) {
                _unset_layout_dim(priv);
                evas_object_del(obj);
        }
@@ -351,7 +351,7 @@ static void _main_ly_key_pressed_cb(void *data, Evas *e,
        if (!priv->ug)
                return;
 
-       if (!strcmp(ev->keyname, KEY_BACK))
+       if (!strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_BACK_REMOTE))
                ug_destroy_me(priv->ug);
 }
 
@@ -1383,7 +1383,7 @@ static void _type_key_pressed_cb(void *data,
                return;
        }
 
-       if (!strcmp(ev->keyname, KEY_BACK)) {
+       if (!strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_BACK_REMOTE)) {
                _unset_layout_dim(priv);
 
                if (priv->network_ctxpopup) {

diff --git a/ug/network/src/wifi_passcode_view.c b/ug/network/src/wifi_passcode_view.c
index c19dd16..eab3ab4 100644 (file)
--- a/ug/network/src/wifi_passcode_view.c
+++ b/ug/network/src/wifi_passcode_view.c
@@ -186,7 +186,7 @@ static void _base_key_press_cb(void *data, Evas *e,
                return;
        }
 
-       if (!strcmp(ev->keyname, KEY_BACK))
+       if (!strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_BACK_REMOTE))
                viewmgr_pop(priv->vmgr);
 }
 
@@ -298,7 +298,7 @@ static void _ctxpopup_pressed_cb(void *data, Evas *e,
                return;
        }
 
-       if (!strcmp(ev->keyname, KEY_BACK)) {
+       if (!strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_BACK_REMOTE)) {
                _unset_layout_dim(priv);
                evas_object_del(obj);
 

diff --git a/ug/proxy/include/defs.h b/ug/proxy/include/defs.h
index ea17ad2..7599202 100644 (file)
--- a/ug/proxy/include/defs.h
+++ b/ug/proxy/include/defs.h
@@ -100,7 +100,9 @@
 #define KEY_LEFT "Left"
 #define KEY_RIGHT "Right"
 #define KEY_ENTER "Return"
-#define KEY_EXIT  "XF86Close"
+#define KEY_ENTER_REMOTE "KP_Enter"
+#define KEY_EXIT  "Exit"
+#define KEY_BACK_REMOTE "XF86Close"
 
 #define KEY_0 "0"
 #define KEY_1 "1"

diff --git a/ug/proxy/src/main_view.c b/ug/proxy/src/main_view.c
index 269a600..b8c0cb1 100644 (file)
--- a/ug/proxy/src/main_view.c
+++ b/ug/proxy/src/main_view.c
@@ -240,7 +240,7 @@ static void _base_key_pressed_cb(void *data, Evas *evas,
                return;
        }
 
-       if (!strcmp(ev->keyname, KEY_BACK)) {
+       if (!strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_BACK_REMOTE)) {
                ug_destroy_me(priv->ug);
                return;
        }
@@ -599,7 +599,7 @@ static void _ctxpopup_key_pressed_cb(void *data, Evas *evas,
                return;
        }
 
-       if (!strcmp(ev->keyname, KEY_BACK)) {
+       if (!strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_BACK_REMOTE)) {
                _unset_layout_dim(priv);
 
                if (priv->ctxpopup) {
@@ -1090,11 +1090,11 @@ static void _value_ctxpopup_key_pressed_cb(void *data, Evas *evas,
                return;
        }
 
-       if (!strcmp(ev->keyname, KEY_ENTER)) {
+       if (!strcmp(ev->keyname, KEY_ENTER) || !strcmp(ev->keyname, KEY_ENTER_REMOTE)) {
                _unset_layout_dim(priv);
                _set_the_value(priv);
                evas_object_del(obj);
-       } else if (!strcmp(ev->keyname, KEY_BACK)) {
+       } else if (!strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_BACK_REMOTE)) {
                _unset_layout_dim(priv);
                evas_object_del(obj);
        }
@@ -1218,7 +1218,7 @@ static void _entry_key_pressed_cb(void *data, Evas *e,
 
        elm_entry_input_panel_show(obj);
 
-       if (!strcmp(ev->keyname, KEY_BACK)) {
+       if (!strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_BACK_REMOTE)) {
                if (priv->ctxpopup) {
                        evas_object_del(priv->ctxpopup);
                        priv->ctxpopup = NULL;

diff --git a/ug/system/clock/include/ug_clock_define.h b/ug/system/clock/include/ug_clock_define.h
index 6b0527f..e5b6d8a 100755 (executable)
--- a/ug/system/clock/include/ug_clock_define.h
+++ b/ug/system/clock/include/ug_clock_define.h
@@ -86,6 +86,7 @@
 #define KEY_DOWN "Down"
 #define KEY_LEFT "Left"
 #define KEY_RIGHT "Right"
+#define KEY_BACK_REMOTE "XF86Close"
 
 #define KEY_0 "0"
 #define KEY_1 "1"

diff --git a/ug/system/clock/src/ug_clock.c b/ug/system/clock/src/ug_clock.c
index 207c8e2..1dfd496 100755 (executable)
--- a/ug/system/clock/src/ug_clock.c
+++ b/ug/system/clock/src/ug_clock.c
@@ -86,7 +86,7 @@ static void _key_down_cb(const char *keyname, struct _ug_data *data)
        if (!keyname || !data || !data->ug)
                return;
 
-       if (!strncmp(keyname, KEY_BACK, strlen(keyname)))
+       if (!strncmp(keyname, KEY_BACK, strlen(keyname)) || !strncmp(keyname, KEY_BACK_REMOTE, strlen(keyname)))
                ug_destroy_me(data->ug);
 }
 

diff --git a/ug/system/clock/src/ug_clock_spin_control.c b/ug/system/clock/src/ug_clock_spin_control.c
index 5fe6a4c..96ff655 100644 (file)
--- a/ug/system/clock/src/ug_clock_spin_control.c
+++ b/ug/system/clock/src/ug_clock_spin_control.c
@@ -620,7 +620,7 @@ static void _date_spin_keydown_cb(void *priv, Evas *e,
        } else if (!strncmp(keyname, KEY_RIGHT, strlen(keyname)) ||
                                !strncmp(keyname, KEY_LEFT, strlen(keyname))) {
                data->entry[idx] = 0;
-       } else if (!strncmp(keyname, KEY_BACK, strlen(keyname))) {
+       } else if (!strncmp(keyname, KEY_BACK, strlen(keyname)) || !strncmp(keyname, KEY_BACK_REMOTE, strlen(keyname))) {
                _destroy(data->base);
        }
 }

diff --git a/ug/system/clock/src/ug_clock_sublist.c b/ug/system/clock/src/ug_clock_sublist.c
index 72415a1..a9d97da 100644 (file)
--- a/ug/system/clock/src/ug_clock_sublist.c
+++ b/ug/system/clock/src/ug_clock_sublist.c
@@ -203,7 +203,7 @@ static void _key_down_on_sublist_btn_cb(void *priv, Evas *e,
                        elm_object_signal_emit(on_btn, SIG_SRC_FOC_HIDE_ICON,
                                        SIG_NAME_SUBLIST);
                }
-       } else if (!strncmp(keyname, KEY_BACK, strlen(keyname))) {
+       } else if (!strncmp(keyname, KEY_BACK, strlen(keyname)) || !strncmp(keyname, KEY_BACK_REMOTE, strlen(keyname))) {
                _destroy(data->base);
        }
 }

diff --git a/ug/system/clock/src/ug_clock_time_spin_control.c b/ug/system/clock/src/ug_clock_time_spin_control.c
index cce33dc..04bf96e 100644 (file)
--- a/ug/system/clock/src/ug_clock_time_spin_control.c
+++ b/ug/system/clock/src/ug_clock_time_spin_control.c
@@ -254,7 +254,7 @@ static void _time_spin_keydown_cb(void *priv,
                        data->entry[TIME_MINUTE] = 0;
                else
                        return;
-       } else if (!strncmp(keyname, KEY_BACK, strlen(keyname))) {
+       } else if (!strncmp(keyname, KEY_BACK, strlen(keyname)) || !strncmp(keyname, KEY_BACK_REMOTE, strlen(keyname))) {
                _destroy(data->base);
        }
 }

diff --git a/ug/wifi-direct/include/defs.h b/ug/wifi-direct/include/defs.h
index a40c295..b8b3247 100644 (file)
--- a/ug/wifi-direct/include/defs.h
+++ b/ug/wifi-direct/include/defs.h
@@ -96,7 +96,10 @@
 #define KEY_DOWN "Down"
 #define KEY_LEFT "Left"
 #define KEY_RIGHT "Right"
-#define KEY_EXIT  "XF86Close"
+#define KEY_ENTER "Return"
+#define KEY_ENTER_REMOTE "KP_Enter"
+#define KEY_EXIT  "Exit"
+#define KEY_BACK_REMOTE "XF86Close"
 
 #define KEY_0 "0"
 #define KEY_1 "1"

diff --git a/ug/wifi-direct/src/wifi_direct_view.c b/ug/wifi-direct/src/wifi_direct_view.c
index 88f5424..a88695a 100644 (file)
--- a/ug/wifi-direct/src/wifi_direct_view.c
+++ b/ug/wifi-direct/src/wifi_direct_view.c
@@ -506,7 +506,7 @@ static void _popup_back_pressed_cb(void *data, Evas *e,
                return;
        }
 
-       if (!strcmp(ev->keyname, KEY_BACK)) {
+       if (!strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_BACK_REMOTE)) {
                if (priv->dim_ly)
                        evas_object_hide(priv->dim_ly);
 
@@ -1953,8 +1953,7 @@ static void _base_layout_key_down_cb(void *data,
                return;
        }
 
-       if (!strcmp(ei->keyname, KEY_BACK) ||
-                       !strcmp(ei->keyname, KEY_EXIT)) {
+       if (!strcmp(ei->keyname, KEY_BACK) || !strcmp(ei->keyname, KEY_BACK_REMOTE) || !strcmp(ei->keyname, KEY_EXIT)) {
                ug_destroy_me(priv->ug);
                _fini_priv(priv);
        }