Process key events if the pictureoff mode is disabled

Change-Id: Ifa0278923f4113d0989f11755dd7499bb656e41d

diff --git a/src/e_mod_keyrouter_conf.c b/src/e_mod_keyrouter_conf.c
index d730db542b560234ccb5808e30d36474c27afa41..d43b7a7ef90736198a1cb9cdc27c64f17c1d4312 100644 (file)
--- a/src/e_mod_keyrouter_conf.c
+++ b/src/e_mod_keyrouter_conf.c
@@ -22,6 +22,7 @@ e_keyrouter_conf_init(E_Keyrouter_Config_Data *kconfig)
 #define D kconfig->conf_edd
    E_CONFIG_VAL(D, T, num_keycode, INT);
    E_CONFIG_VAL(D, T, max_keycode, INT);
+   E_CONFIG_VAL(D, T, pictureoff_disabled, INT);
    E_CONFIG_LIST(D, T, KeyList, kconfig->conf_hwkeys_edd);
 
 #undef T

diff --git a/src/e_mod_main_wl.c b/src/e_mod_main_wl.c
index 4497326a3499f3e780bf3ce0b32e10759d955b8a..ad5923e1e82d23fdf9654bfef3722156c4692408 100644 (file)
--- a/src/e_mod_main_wl.c
+++ b/src/e_mod_main_wl.c
@@ -907,6 +907,7 @@ _e_keyrouter_init(E_Module *m)
    e_keyrouter_conf_init(kconfig);
    EINA_SAFETY_ON_NULL_GOTO(kconfig->conf, err);
    krt->conf = kconfig;
+   krt->pictureoff_disabled = !!kconfig->conf->pictureoff_disabled;
 
    e_keyrouter_key_combination_init();
 
@@ -917,7 +918,8 @@ _e_keyrouter_init(E_Module *m)
    /* Add filtering mechanism */
    krt->ef_handler = ecore_event_filter_add(NULL, _event_filter, NULL, NULL);
    //ecore handler add for power callback registration
-   ecore_idle_enterer_add(_e_keyrouter_cb_idler, NULL);
+   if (!krt->pictureoff_disabled)
+     ecore_idle_enterer_add(_e_keyrouter_cb_idler, NULL);
    _e_keyrouter_init_handlers();
 
    krt->global = wl_global_create(e_comp_wl->wl.disp, &tizen_keyrouter_interface, 1, krt, _e_keyrouter_cb_bind);

diff --git a/src/e_mod_main_wl.h b/src/e_mod_main_wl.h
index 27c63c963ad72467c31f2a8ee08f3082d04167de..cb6f66b46d0b6e0e9922e85540f553a00b51d352 100644 (file)
--- a/src/e_mod_main_wl.h
+++ b/src/e_mod_main_wl.h
@@ -62,6 +62,7 @@ struct _E_Keyrouter_Conf_Edd
 {
    int num_keycode;
    int max_keycode;
+   int pictureoff_disabled;
    Eina_List *KeyList;
 };
 
@@ -137,6 +138,7 @@ struct _E_Keyrouter
    cynara *p_cynara;
 #endif
    int isPictureOffEnabled;
+   Eina_Bool pictureoff_disabled;
    Eina_Bool isRegisterDelivery;
 };