From 4b796e395dad8d91881e8a7bd41de06668dcc9bf Mon Sep 17 00:00:00 2001 From: "jin0.kim" Date: Tue, 23 Feb 2016 14:44:51 +0830 Subject: [PATCH] Update keygrab API instead of UtilX Change-Id: Ice55ac8fd5358ff37d62df0ff45b1dfcec53415b --- daemon/quickpanel-ui.c | 5 +++-- daemon/service/keyboard.c | 27 +++++++++++---------------- 2 files changed, 14 insertions(+), 18 deletions(-) diff --git a/daemon/quickpanel-ui.c b/daemon/quickpanel-ui.c index 369f5c2..4248d77 100755 --- a/daemon/quickpanel-ui.c +++ b/daemon/quickpanel-ui.c @@ -654,8 +654,9 @@ void _event_message_cb(void *data, Evas_Object *obj, void *event_info) DBG("quickpanel is opened"); ad->is_opened = 1; + quickpanel_util_time_timer_enable_set(1); + quickpanel_keyboard_openning_init(ad); quickpanel_modules_opened(data); - quickpanel_media_player_stop(); quickpanel_uic_opened_reason_set(OPENED_NO_REASON); } else { DBG("quickpanel is closed"); @@ -664,8 +665,8 @@ void _event_message_cb(void *data, Evas_Object *obj, void *event_info) quickpanel_util_time_timer_enable_set(0); quickpanel_keyboard_closing_fini(ad); quickpanel_modules_closed(data); - quickpanel_media_player_stop(); } + quickpanel_media_player_stop(); } #endif diff --git a/daemon/service/keyboard.c b/daemon/service/keyboard.c index 946cc79..1f87dfd 100755 --- a/daemon/service/keyboard.c +++ b/daemon/service/keyboard.c @@ -94,11 +94,9 @@ HAPI void quickpanel_keyboard_init(void *data) Ecore_Event_Handler *hdl_key_up = NULL; retif(ad == NULL, , "Invalid parameter!"); -#if defined(WINSYS_X11) - if (utilx_grab_key(ecore_x_display_get(), elm_win_xwindow_get(ad->win), KEY_QUICKPANEL, SHARED_GRAB) != 0) { + if (elm_win_keygrab_set(ad->win, KEY_QUICKPANEL, 0, 0, 0, ELM_WIN_KEYGRAB_SHARED) == EINA_FALSE) { ERR("failed to grab KEY_QUICKPANEL"); } -#endif hdl_key_down = ecore_event_handler_add(ECORE_EVENT_KEY_DOWN, _service_hardkey_down_cb, ad); if (hdl_key_down == NULL) { @@ -129,11 +127,9 @@ HAPI void quickpanel_keyboard_fini(void *data) ad->hdl_hardkey_down = NULL; } -#if defined(WINSYS_X11) - if (utilx_ungrab_key(ecore_x_display_get(), elm_win_xwindow_get(ad->win), KEY_QUICKPANEL) != 0) { + if (elm_win_keygrab_unset(ad->win, KEY_QUICKPANEL, 0, 0) == EINA_FALSE) { ERR("failed to ungrab KEY_QUICKPANEL"); } -#endif } HAPI void quickpanel_keyboard_openning_init(void *data) @@ -141,19 +137,18 @@ HAPI void quickpanel_keyboard_openning_init(void *data) struct appdata *ad = data; retif(ad == NULL, , "Invalid parameter!"); -#if defined(WINSYS_X11) - if (utilx_grab_key(ecore_x_display_get(), elm_win_xwindow_get(ad->win), KEY_BACK, EXCLUSIVE_GRAB) != 0) { + if (elm_win_keygrab_set(ad->win, KEY_BACK, 0, 0, 0, ELM_WIN_KEYGRAB_EXCLUSIVE) == EINA_FALSE) { ERR("failed to grab KEY_BACK"); } - if (utilx_grab_key(ecore_x_display_get(), elm_win_xwindow_get(ad->win), KEY_MENU, EXCLUSIVE_GRAB) != 0) { + if (elm_win_keygrab_set(ad->win, KEY_MENU, 0, 0, 0, ELM_WIN_KEYGRAB_EXCLUSIVE) == EINA_FALSE) { ERR("failed to grab KEY_MENU"); } - if (utilx_grab_key(ecore_x_display_get(), elm_win_xwindow_get(ad->win), KEY_HOME, SHARED_GRAB) != 0) { + if (elm_win_keygrab_set(ad->win, KEY_HOME, 0, 0, 0, ELM_WIN_KEYGRAB_SHARED) == EINA_FALSE) { ERR("failed to grab KEY_HOME"); } -#endif + } HAPI void quickpanel_keyboard_closing_fini(void *data) @@ -161,17 +156,17 @@ HAPI void quickpanel_keyboard_closing_fini(void *data) struct appdata *ad = data; retif(ad == NULL, , "Invalid parameter!"); -#if defined(WINSYS_X11) - if (utilx_ungrab_key(ecore_x_display_get(), elm_win_xwindow_get(ad->win), KEY_BACK) != 0) { + if (elm_win_keygrab_unset(ad->win, KEY_BACK, 0, 0) == EINA_FALSE) { ERR("failed to ungrab KEY_BACK"); } - if (utilx_ungrab_key(ecore_x_display_get(), elm_win_xwindow_get(ad->win), KEY_MENU) != 0) { + if (elm_win_keygrab_unset(ad->win, KEY_MENU, 0, 0) == EINA_FALSE) { ERR("failed to ungrab KEY_MENU"); } - if (utilx_ungrab_key(ecore_x_display_get(), elm_win_xwindow_get(ad->win), KEY_HOME) != 0) { + if (elm_win_keygrab_unset(ad->win, KEY_HOME, 0, 0) == EINA_FALSE) { ERR("failed to ungrab KEY_HOME"); } -#endif } + + -- 2.7.4