Merge "Added websocket server for supporting legacy Web IMEs" into tizen

[platform/core/uifw/libscl-core.git] / src / sclcoreui-efl.cpp

diff --git a/src/sclcoreui-efl.cpp b/src/sclcoreui-efl.cpp
index 63c08a2..1b582e4 100644 (file)
--- a/src/sclcoreui-efl.cpp
+++ b/src/sclcoreui-efl.cpp
@@ -71,7 +71,6 @@ sclboolean CSCLCoreUIEFL::init()
 
     for (int loop = 0;loop < OPTION_WINDOW_TYPE_MAX;loop++) {
         m_option_window_info[loop].window = SCLWINDOW_INVALID;
-        m_option_window_info[loop].handler = NULL;
     }
 
     m_websocket.init();
@@ -489,7 +488,7 @@ void CSCLCoreUIEFL::run(const sclchar *display)
     }
 }
 
-static Eina_Bool focus_out_cb(void *data, int type, void *event)
+static void focus_out_cb(void *data, Evas *e, void *event)
 {
     OptionWindowInfo *info = static_cast<OptionWindowInfo*>(data);
     if (info) {
@@ -506,13 +505,7 @@ static Eina_Bool focus_out_cb(void *data, int type, void *event)
             evas_object_del(NATIVE_WINDOW_CAST(info->window));
             info->window = NULL;
         }
-        if (info->handler) {
-            ecore_event_handler_del(info->handler);
-            info->handler = NULL;
-        }
     }
-
-    return ECORE_CALLBACK_CANCEL;
 }
 
 static void
@@ -638,13 +631,9 @@ sclwindow CSCLCoreUIEFL::create_option_window(SCLOptionWindowType type)
         callback->on_create_option_window(window, type);
     }
 
-    Ecore_Event_Handler *handler = NULL;
     if (type == OPTION_WINDOW_TYPE_NORMAL) {
-#ifdef WAYLAND
-        handler = ecore_event_handler_add(ECORE_WL_EVENT_FOCUS_OUT, focus_out_cb, &m_option_window_info[type]);
-#else
-        handler = ecore_event_handler_add(ECORE_X_EVENT_WINDOW_FOCUS_OUT, focus_out_cb, &m_option_window_info[type]);
-#endif
+        Evas *evas = evas_object_evas_get(window);
+        evas_event_callback_add(evas, EVAS_CALLBACK_CANVAS_FOCUS_OUT, focus_out_cb, &m_option_window_info[type]);
         set_transient_for_app_window(window);
     } else if (type == OPTION_WINDOW_TYPE_SETTING_APPLICATION) {
         set_transient_for_isf_setting_window(window);
@@ -652,7 +641,6 @@ sclwindow CSCLCoreUIEFL::create_option_window(SCLOptionWindowType type)
     }
 
     m_option_window_info[type].window = window;
-    m_option_window_info[type].handler = handler;
 
     return window;
 }
@@ -671,10 +659,6 @@ void CSCLCoreUIEFL::destroy_option_window(sclwindow window)
         if (m_option_window_info[loop].window == window) {
             evas_object_del(NATIVE_WINDOW_CAST(window));
             m_option_window_info[loop].window = SCLWINDOW_INVALID;
-            if (m_option_window_info[loop].handler) {
-                ecore_event_handler_del(m_option_window_info[loop].handler);
-                m_option_window_info[loop].handler = NULL;
-            }
         }
     }
 }