support input panel geometry

Change-Id: I0c278eef70ebb8cfb89070839b6ccc2a443667b9

diff --git a/src/modules/ecore_imf/wayland/wayland_imcontext.c b/src/modules/ecore_imf/wayland/wayland_imcontext.c
index b29a534..b5fe867 100755 (executable)
--- a/src/modules/ecore_imf/wayland/wayland_imcontext.c
+++ b/src/modules/ecore_imf/wayland/wayland_imcontext.c
@@ -41,9 +41,9 @@ static Ecore_Event_Filter   *_ecore_event_filter_handler = NULL;
 static Ecore_IMF_Context    *_active_ctx                 = NULL;
 static Ecore_IMF_Context    *_hide_req_ctx               = NULL;
 
-static Ecore_Event_Handler  *_ecore_event_conformant_handler = NULL;
-
 static Ecore_Timer          *_hide_timer  = NULL;
+
+static Eina_Rectangle        _keyboard_geometry = {0, 0, 0, 0};
 //
 static Ecore_IMF_Input_Panel_State _input_panel_state    = ECORE_IMF_INPUT_PANEL_STATE_HIDE;
 
@@ -143,7 +143,7 @@ key_up_cb(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
 }
 
 static Eina_Bool
-_ecore_event_filter_cb(void *data, void *loop_data, int type, void *event)
+_ecore_event_filter_cb(void *data, void *loop_data EINA_UNUSED, int type, void *event)
 {
    if (type == ECORE_EVENT_KEY_DOWN)
      {
@@ -172,40 +172,6 @@ unregister_key_handler()
         ecore_event_filter_del(_ecore_event_filter_handler);
         _ecore_event_filter_handler = NULL;
      }
-}
-
-static Eina_Bool
-_ecore_event_cb_conformant_change(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
-{
-   Ecore_Evas *ee;
-   Ecore_Wl_Event_Conformant_Change *ev;
-
-   ev = event;
-   ee = ecore_event_window_match(ev->win);
-   if (!ee) return ECORE_CALLBACK_PASS_ON;
-
-   if (ev->part_type == ECORE_WL_KEYBOARD_PART && _active_ctx)
-     ecore_imf_context_input_panel_event_callback_call(_active_ctx, ECORE_IMF_INPUT_PANEL_GEOMETRY_EVENT, 0);
-
-   return ECORE_CALLBACK_PASS_ON;
-}
-
-EAPI void
-register_ecore_event_handler()
-{
-   if (!_ecore_event_conformant_handler)
-     _ecore_event_conformant_handler = ecore_event_handler_add(ECORE_WL_EVENT_CONFORMANT_CHANGE,
-                                            _ecore_event_cb_conformant_change, NULL);
-}
-
-EAPI void
-unregister_ecore_event_handler()
-{
-   if (_ecore_event_conformant_handler)
-     {
-        ecore_event_handler_del(_ecore_event_conformant_handler);
-        _ecore_event_conformant_handler = NULL;
-     }
 
    _clear_hide_timer();
 }
@@ -798,6 +764,41 @@ text_input_input_panel_state(void                 *data EINA_UNUSED,
     ecore_imf_context_input_panel_event_callback_call(imcontext->ctx,
                                                       ECORE_IMF_INPUT_PANEL_STATE_EVENT,
                                                       _input_panel_state);
+
+    if (state == WL_TEXT_INPUT_INPUT_PANEL_STATE_HIDE)
+      {
+        static Evas_Coord scr_w = 0, scr_h = 0;
+        if (scr_w == 0 || scr_h == 0)
+          {
+            ecore_wl_sync();
+            ecore_wl_screen_size_get(&scr_w, &scr_h);
+          }
+         _keyboard_geometry.x = 0;
+         _keyboard_geometry.y = scr_h;
+         _keyboard_geometry.w = 0;
+         _keyboard_geometry.h = 0;
+         ecore_imf_context_input_panel_event_callback_call(imcontext->ctx, ECORE_IMF_INPUT_PANEL_GEOMETRY_EVENT, 0);
+      }
+}
+
+static void
+text_input_input_panel_geometry(void                 *data EINA_UNUSED,
+                                struct wl_text_input *text_input EINA_UNUSED,
+                                uint32_t              x,
+                                uint32_t              y,
+                                uint32_t              w,
+                                uint32_t              h)
+{
+    WaylandIMContext *imcontext = (WaylandIMContext *)data;
+
+    if (_keyboard_geometry.x != (int)x || _keyboard_geometry.y != (int)y || _keyboard_geometry.w != (int)w || _keyboard_geometry.h != (int)h)
+      {
+         _keyboard_geometry.x = x;
+         _keyboard_geometry.y = y;
+         _keyboard_geometry.w = w;
+         _keyboard_geometry.h = h;
+         ecore_imf_context_input_panel_event_callback_call(imcontext->ctx, ECORE_IMF_INPUT_PANEL_GEOMETRY_EVENT, 0);
+      }
 }
 
 static void
@@ -880,7 +881,8 @@ static const struct wl_text_input_listener text_input_listener =
    text_input_language,
    text_input_text_direction,
    text_input_selection_region,
-   text_input_private_command
+   text_input_private_command,
+   text_input_input_panel_geometry
 };
 
 EAPI void
@@ -1288,13 +1290,17 @@ wayland_im_context_prediction_allow_set(Ecore_IMF_Context *ctx,
 }
 
 EAPI void
-wayland_im_context_input_panel_geometry_get(Ecore_IMF_Context *ctx,
+wayland_im_context_input_panel_geometry_get(Ecore_IMF_Context *ctx EINA_UNUSED,
                                             int *x, int *y, int *w, int *h)
 {
-   WaylandIMContext *imcontext = (WaylandIMContext *)ecore_imf_context_data_get(ctx);
-
-   if (imcontext->window)
-     ecore_wl_window_keyboard_geometry_get(imcontext->window, x, y, w, h);
+   if (x)
+     *x = _keyboard_geometry.x;
+   if (y)
+     *y = _keyboard_geometry.y;
+   if (w)
+     *w = _keyboard_geometry.w;
+   if (h)
+     *h = _keyboard_geometry.h;
 }
 
 EAPI void

diff --git a/src/modules/ecore_imf/wayland/wayland_module.c b/src/modules/ecore_imf/wayland/wayland_module.c
index bd9b9a0..48feed0 100755 (executable)
--- a/src/modules/ecore_imf/wayland/wayland_module.c
+++ b/src/modules/ecore_imf/wayland/wayland_module.c
@@ -164,7 +164,6 @@ im_module_init(void)
 
    // TIZEN_ONLY(20150708): Support back key
    register_key_handler();
-   register_ecore_event_handler();
    //
    EINA_LOG_DOM_INFO(_ecore_imf_wayland_log_dom, "im module initalized");
 
@@ -176,7 +175,6 @@ im_module_shutdown(void)
 {
    // TIZEN_ONLY(20150708): Support back key
    unregister_key_handler();
-   unregister_ecore_event_handler();
    //
    EINA_LOG_DOM_INFO(_ecore_imf_wayland_log_dom, "im module shutdown");
    ecore_wl_shutdown();