Fix Added support for buttons strings for wayland.

Added Escape, Back and Menu buttons.

Change-Id: I29b488e39cd3b68c595c7313490720f8da6dddb8
Signed-off-by: Radek Kintop <r.kintop@samsung.com>

diff --git a/include/key_define.h b/include/key_define.h
index 8a34b2b..5440b91 100644 (file)
--- a/include/key_define.h
+++ b/include/key_define.h
@@ -26,6 +26,9 @@
 #define KEY_ESC                                                        "XF86Exit"
 #define KEY_BACK                                               "XF86Back"
 #define KEY_MENU                                               "XF86SysMenu"
-#define KEY_MENU_EMULATOR                                      "XF86Menu"
+#define KEY_ESC_WAY                                            "Escape"
+#define KEY_BACK_WAY                                   "BackSpace"
+#define KEY_MENU_WAY                                   "F1"
+#define KEY_MENU_EMULATOR                              "XF86Menu"
 
 #endif /* __AIR_SETTINGS_KEY_DEFINE_H__ */

diff --git a/src/common/menumgr.c b/src/common/menumgr.c
index 7c4f631..4dbf30e 100755 (executable)
--- a/src/common/menumgr.c
+++ b/src/common/menumgr.c
@@ -64,7 +64,9 @@ static void _key_down_cb(int id, void *data, Evas *e, Evas_Object *obj,
 
        m = data;
 
-       if (!strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_ESC)) {
+       if (!strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_ESC)
+               || !strcmp(ev->keyname, KEY_ESC_WAY) || !strcmp(ev->keyname, KEY_BACK_WAY)
+               ) {
                /* move the focus to the menu */
                viewmgr_update_view(VIEW_BASE, UPDATE_FOCUS, NULL);
        }
@@ -73,7 +75,8 @@ static void _key_down_cb(int id, void *data, Evas *e, Evas_Object *obj,
                if (!strcmp(ev->keyname, KEY_ENTER) && m->info[id]->selected)
                                m->info[id]->selected(m->data, id);
 
-               if ((!strcmp(ev->keyname, KEY_MENU) || !strcmp(ev->keyname, KEY_MENU_EMULATOR)) &&
+               if ((!strcmp(ev->keyname, KEY_MENU) || !strcmp(ev->keyname, KEY_MENU_WAY)
+                               ||!strcmp(ev->keyname, KEY_MENU_EMULATOR)) &&
                                m->info[id]->selected_menu)
                        m->info[id]->selected_menu(m->data, id);
        }

diff --git a/src/layout/layout_channel.c b/src/layout/layout_channel.c
index 67e6513..ee2952b 100755 (executable)
--- a/src/layout/layout_channel.c
+++ b/src/layout/layout_channel.c
@@ -366,7 +366,9 @@ static void _key_down_cb(int id, void *data, Evas *e, Evas_Object *obj,
                return;
        }
 
-       if (!strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_ESC))
+       if (!strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_BACK_WAY) ||
+               !strcmp(ev->keyname, KEY_ESC) || !strcmp(ev->keyname, KEY_ESC_WAY)
+       )
                viewmgr_update_view(VIEW_BASE, UPDATE_FOCUS, NULL);
 }
 

diff --git a/src/layout/layout_network.c b/src/layout/layout_network.c
index 50fe12f..4ffa3da 100644 (file)
--- a/src/layout/layout_network.c
+++ b/src/layout/layout_network.c
@@ -194,7 +194,9 @@ static void _network_type_option_key_down_cb(int id, void *data, Evas *e,
        }
        priv = data;
 
-       if (!strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_ESC))
+       if (!strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_BACK_WAY)
+               ||!strcmp(ev->keyname, KEY_ESC) || !strcmp(ev->keyname, KEY_ESC_WAY)
+       )
                _destroy_network_type_popup(priv);
        else if (!strcmp(ev->keyname, KEY_ENTER))
                _network_type_option_selected(priv, id, obj);
@@ -263,7 +265,8 @@ static void _network_type_key_down_cb(int id, void *data, Evas *e,
                return;
        }
 
-       if (!strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_ESC)
+       if (!strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_BACK_WAY)
+               || !strcmp(ev->keyname, KEY_ESC) || !strcmp(ev->keyname, KEY_ESC_WAY)
                        || !strcmp(ev->keyname, KEY_UP))
                viewmgr_update_view(VIEW_BASE, UPDATE_FOCUS, NULL);
 }
@@ -394,7 +397,8 @@ static void _action_key_down_cb(int id, void *data, Evas *e, Evas_Object *obj,
                return;
        }
 
-       if (!strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_ESC)
+       if (!strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_BACK_WAY)
+               || !strcmp(ev->keyname, KEY_ESC) || !strcmp(ev->keyname, KEY_ESC_WAY)
                        || !strcmp(ev->keyname, KEY_UP)) {
                viewmgr_update_view(VIEW_BASE, UPDATE_FOCUS, NULL);
        }
@@ -673,7 +677,9 @@ static void _popup_key_down_cb(int id, void *data, Evas *e, Evas_Object *obj,
 
        priv = data;
 
-       if (!strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_ESC)) {
+       if (!strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_BACK_WAY)
+               || !strcmp(ev->keyname, KEY_ESC) || !strcmp(ev->keyname, KEY_ESC_WAY)
+               ) {
                _remove_wifi_passcode_popup(priv);
        } else if (!strcmp(ev->keyname, KEY_ENTER)) {
                if (id == EO_ENTRY_PASSCODE)
@@ -699,7 +705,9 @@ static void _popup_entry_key_down_cb(void *data, Evas *e, Evas_Object *obj, void
 
        if (!strcmp(ev->keyname, KEY_ENTER)) {
                elm_object_focus_set(priv->popup_btn2, EINA_TRUE);
-       } else if (!strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_ESC)) {
+       } else if (!strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_BACK_WAY)
+                       || !strcmp(ev->keyname, KEY_ESC) || !strcmp(ev->keyname, KEY_ESC_WAY)
+               ) {
                elm_object_focus_set(priv->popup_btn1, EINA_TRUE);
        }
 }

diff --git a/src/layout/layout_sound.c b/src/layout/layout_sound.c
index 789e0fa..0b1e081 100644 (file)
--- a/src/layout/layout_sound.c
+++ b/src/layout/layout_sound.c
@@ -120,7 +120,9 @@ static void _key_down_cb(int id, void *data, Evas *e, Evas_Object *obj,
                return;
        }
 
-       if (!strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_ESC)) {
+       if (!strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_BACK_WAY)
+               || !strcmp(ev->keyname, KEY_ESC) || !strcmp(ev->keyname, KEY_ESC_WAY)
+               ) {
                elm_object_focus_set(priv->tab_btn, EINA_TRUE);
        }
 }

diff --git a/src/view/picture/view_picture_mode.c b/src/view/picture/view_picture_mode.c
index fe00b73..c0ebbc1 100644 (file)
--- a/src/view/picture/view_picture_mode.c
+++ b/src/view/picture/view_picture_mode.c
@@ -194,7 +194,7 @@ static void _key_down_cb(int id, void *data, Evas *e, Evas_Object *obj,
                return;
        }
 
-       if (!strcmp(ev->keyname, KEY_BACK))
+       if (!strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_BACK_WAY))
                viewmgr_pop_view();
 }
 

diff --git a/src/view/picture/view_picture_screen_adj.c b/src/view/picture/view_picture_screen_adj.c
index 673072f..eaf39be 100644 (file)
--- a/src/view/picture/view_picture_screen_adj.c
+++ b/src/view/picture/view_picture_screen_adj.c
@@ -167,7 +167,7 @@ static void _key_down_cb(int id, void *data, Evas *e, Evas_Object *obj,
                return;
        }
 
-       if (!strcmp(ev->keyname, KEY_BACK))
+       if (!strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_BACK_WAY))
                viewmgr_pop_view();
 }
 

diff --git a/src/view/picture/view_picture_slider_generic.c b/src/view/picture/view_picture_slider_generic.c
index 6e85629..21c02cb 100644 (file)
--- a/src/view/picture/view_picture_slider_generic.c
+++ b/src/view/picture/view_picture_slider_generic.c
@@ -170,7 +170,8 @@ static void _key_down_cb(int id, void *data, Evas *e, Evas_Object *obj,
                return;
        }
 
-       if (!strcmp(ev->keyname, KEY_BACK) || (!strcmp(ev->keyname, KEY_ENTER)))
+       if (!strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_BACK_WAY)
+               || (!strcmp(ev->keyname, KEY_ENTER)))
                viewmgr_pop_view();
 }
 

diff --git a/src/view/system/view_clock.c b/src/view/system/view_clock.c
index 661a6de..a087187 100644 (file)
--- a/src/view/system/view_clock.c
+++ b/src/view/system/view_clock.c
@@ -399,7 +399,8 @@ static void _auto_manual_setup_key_down_cb(int id, void *data, Evas *e, Evas_Obj
 
        priv = (clock_view_priv_data *)data;
 
-       if (!strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_ESC)
+       if (!strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_BACK_WAY)
+               || !strcmp(ev->keyname, KEY_ESC) || !strcmp(ev->keyname, KEY_ESC_WAY)
                        || !strcmp(ev->keyname, KEY_UP)) {
                if(priv->setup_type_popup) {
                        _destroy_setup_type_popup(priv);
@@ -438,7 +439,9 @@ static void _auto_manual_setup_option_key_down_cb(int id, void *data, Evas *e,
 
        priv = (clock_view_priv_data *)data;
 
-       if (!strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_ESC)) {
+       if (!strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_BACK_WAY)
+               || !strcmp(ev->keyname, KEY_ESC) || !strcmp(ev->keyname, KEY_ESC_WAY)
+               ) {
                _destroy_setup_type_popup(priv);
        } else {
                if(!strcmp(ev->keyname, KEY_ENTER))
@@ -454,7 +457,9 @@ static void _any_item_back_key_down_cb(int id, void *data, Evas *e,
                return;
        }
 
-       if (!strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_ESC))
+       if (!strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_BACK_WAY)
+               || !strcmp(ev->keyname, KEY_ESC) || !strcmp(ev->keyname, KEY_ESC_WAY)
+               )
                viewmgr_pop_view();
 }
 

diff --git a/src/view/system/view_language.c b/src/view/system/view_language.c
index bb5b32f..b80882e 100644 (file)
--- a/src/view/system/view_language.c
+++ b/src/view/system/view_language.c
@@ -193,7 +193,7 @@ static void _key_down_cb(int id, void *data, Evas *e, Evas_Object *obj,
                return;
        }
 
-       if (!strcmp(ev->keyname, KEY_BACK))
+       if (!strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_BACK_WAY))
                viewmgr_pop_view();
 }
 

diff --git a/src/view/system/view_location.c b/src/view/system/view_location.c
index 0143f2d..4f669f7 100644 (file)
--- a/src/view/system/view_location.c
+++ b/src/view/system/view_location.c
@@ -177,7 +177,9 @@ static void _btn_key_down_cb(int id, void *data, Evas *e, Evas_Object *obj,
                return;
        }
 
-       if (!strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_ESC)) {
+       if (!strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_BACK_WAY)
+               || !strcmp(ev->keyname, KEY_ESC) || !strcmp(ev->keyname, KEY_ESC_WAY)
+               ) {
                viewmgr_pop_view();
        }
 }

diff --git a/src/view/system/view_pincode.c b/src/view/system/view_pincode.c
index 92bcfad..70d16e7 100644 (file)
--- a/src/view/system/view_pincode.c
+++ b/src/view/system/view_pincode.c
@@ -273,7 +273,7 @@ static void _pin_entry_key_cb(int id, void *data, Evas *e, Evas_Object *obj,
                elm_object_focus_set(priv->pin_entries[(id + 1)], EINA_TRUE);
        }
 
-       if (!strcmp(ev->keyname, KEY_BACK)) {
+       if (!strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_BACK_WAY)) {
                if (id <= 0) {
                        viewmgr_pop_view();
                } else {
@@ -295,7 +295,7 @@ static void _last_pin_entry_key_cb(int id, void *data, Evas *e, Evas_Object *obj
 
        priv = (pincode_view_data *)data;
 
-       if (!strcmp(ev->keyname, KEY_BACK)) {
+       if (!strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_BACK_WAY)) {
                elm_object_focus_set(priv->pin_entries[(id - 1)], EINA_TRUE);
                return;
        }

diff --git a/src/view/system/view_reset.c b/src/view/system/view_reset.c
index e331b36..d9d0a7b 100644 (file)
--- a/src/view/system/view_reset.c
+++ b/src/view/system/view_reset.c
@@ -191,6 +191,6 @@ static void _button_key_cb(int id, void *data, Evas *e, Evas_Object *obj,
        if (!ev)
                return;
 
-       if (!strcmp(ev->keyname, KEY_BACK))
+       if (!strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_BACK_WAY))
                viewmgr_pop_view();
 }

diff --git a/src/view/system/view_sleep_timer.c b/src/view/system/view_sleep_timer.c
index aa2b8b7..69e7139 100644 (file)
--- a/src/view/system/view_sleep_timer.c
+++ b/src/view/system/view_sleep_timer.c
@@ -171,7 +171,7 @@ static void _key_down_cb(int id, void *data, Evas *e, Evas_Object *obj,
                return;
        }
 
-       if (!strcmp(ev->keyname, KEY_BACK))
+       if (!strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_BACK_WAY))
                viewmgr_pop_view();
 }
 

diff --git a/src/view/system/view_subtitle.c b/src/view/system/view_subtitle.c
index 4081c49..04a63b1 100644 (file)
--- a/src/view/system/view_subtitle.c
+++ b/src/view/system/view_subtitle.c
@@ -192,7 +192,7 @@ static void _key_down_cb(int id, void *data, Evas *e, Evas_Object *obj,
                return;
        }
 
-       if (!strcmp(ev->keyname, KEY_BACK))
+       if (!strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_BACK_WAY))
                viewmgr_pop_view();
 }
 

diff --git a/src/view/system/view_wakeup_timer.c b/src/view/system/view_wakeup_timer.c
index ed4f4e4..64f7a50 100644 (file)
--- a/src/view/system/view_wakeup_timer.c
+++ b/src/view/system/view_wakeup_timer.c
@@ -314,10 +314,10 @@ static void _key_down_cb(int id, void *data, Evas *e, Evas_Object *obj,
                return;
        }
 
-       if (!strcmp(ev->keyname, KEY_ESC))
+       if (!strcmp(ev->keyname, KEY_ESC) || !strcmp(ev->keyname, KEY_ESC_WAY))
                viewmgr_pop_view();
 
-       if (!strcmp(ev->keyname, KEY_BACK)) {
+       if (!strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_BACK_WAY)) {
                switch (id) {
                        case EO_TYPE_SETUP_HOVERSEL:
                                if(elm_hoversel_expanded_get(priv->setup_hs)) {

diff --git a/src/view/view_action_menu.c b/src/view/view_action_menu.c
index 50cb80e..47e1a60 100644 (file)
--- a/src/view/view_action_menu.c
+++ b/src/view/view_action_menu.c
@@ -420,7 +420,9 @@ static void _keypad_cb(int id, void *data, Evas *e,
                return;
        }
 
-       if (!strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_ESC))
+       if (!strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_BACK_WAY)
+               || !strcmp(ev->keyname, KEY_ESC) || !strcmp(ev->keyname, KEY_ESC_WAY)
+               )
                viewmgr_pop_view();
 }
 

diff --git a/src/view/view_base.c b/src/view/view_base.c
index 223a5da..8b9cbf7 100755 (executable)
--- a/src/view/view_base.c
+++ b/src/view/view_base.c
@@ -345,7 +345,8 @@ static void _menu_key_down_cb(int id, void *data, Evas *e, Evas_Object *obj,
        }
 
        if(priv->reorder_mode_on) {
-               if (!strcmp(ev->keyname, KEY_ENTER) || !strcmp(ev->keyname, KEY_BACK)) {
+               if (!strcmp(ev->keyname, KEY_ENTER) || !strcmp(ev->keyname, KEY_BACK)
+                       || !strcmp(ev->keyname, KEY_BACK_WAY)) {
                        _set_reorder_mode(priv, EINA_FALSE);
                        return;
                } else if (!strcmp(ev->keyname, KEY_LEFT)) {
@@ -363,10 +364,13 @@ static void _menu_key_down_cb(int id, void *data, Evas *e, Evas_Object *obj,
                }
        }
 
-       if (!strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_ESC))
+       if (!strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_BACK_WAY)
+               || !strcmp(ev->keyname, KEY_ESC) || !strcmp(ev->keyname, KEY_ESC_WAY)
+               )
                ui_app_exit();
 
-       if (!strcmp(ev->keyname, KEY_MENU) || !strcmp(ev->keyname, KEY_MENU_EMULATOR)) {
+       if (!strcmp(ev->keyname, KEY_MENU) || !strcmp(ev->keyname, KEY_MENU_WAY)
+               || !strcmp(ev->keyname, KEY_MENU_EMULATOR)) {
                if (id >= 0 && id < LAYOUT_MAX) {
                        am_param.layout_id = _mdata_p[id]->get_lclass()->layout_id;
                        viewmgr_update_view(VIEW_ACTION_MENU, ACT_MENU_SRC_VIEW_UPDATE,

diff --git a/src/view/view_new_network.c b/src/view/view_new_network.c
index 24e0ff0..3b43a66 100644 (file)
--- a/src/view/view_new_network.c
+++ b/src/view/view_new_network.c
@@ -312,7 +312,9 @@ static void _base_key_down_cb(int id, void *data, Evas *e, Evas_Object *obj,
                return;
        }
 
-       if (!strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_ESC)) {
+       if (!strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_BACK_WAY)
+               || !strcmp(ev->keyname, KEY_ESC) || !strcmp(ev->keyname, KEY_ESC_WAY)
+               ) {
                _set_result(priv, EO_BTN_CANCEL);
                viewmgr_remove_view(VIEW_NEW_NETWORK);
        }