Modified to deliver floating IME requests by ISF

Change-Id: I682876d1dfc82fa5fffbfb5a4246379d82126fdb

diff --git a/src/sclconnection-isf.cpp b/src/sclconnection-isf.cpp
index 667a1e36c44dd44748c0953a2b75923a4316dc59..2e62e2891cd29082a9ecf63aaf0a6d460a2c7531 100644 (file)
--- a/src/sclconnection-isf.cpp
+++ b/src/sclconnection-isf.cpp
@@ -1478,6 +1478,20 @@ void CSCLConnectionISF::send_key_event_processing_result(scim::KeyEvent &key, sc
     }
 }
 
+void CSCLConnectionISF::set_floating_mode(sclboolean floating_mode)
+{
+    if (m_initialized) {
+        m_helper_agent.set_floating_mode(floating_mode);
+    }
+}
+
+void CSCLConnectionISF::set_floating_drag_enabled(sclboolean enabled)
+{
+    if (m_initialized) {
+        m_helper_agent.set_floating_drag_enabled(enabled);
+    }
+}
+
 extern "C"
 {
     EXAPI void scim_module_init(void) {

diff --git a/src/sclconnection-isf.h b/src/sclconnection-isf.h
index dc67c5efe3c51c430083da00f97966eee34265ab..1d1f84703bf91786fc426ba39b4751eed3cb4bc5 100644 (file)
--- a/src/sclconnection-isf.h
+++ b/src/sclconnection-isf.h
@@ -99,6 +99,8 @@ public:
     void set_candidate_style(scim::ISF_CANDIDATE_PORTRAIT_LINE_T portrait_line, scim::ISF_CANDIDATE_MODE_T mode);
     void set_engine_loader_flag(sclboolean flag);
     void send_key_event_processing_result(scim::KeyEvent &key, sclu32 serial, sclboolean is_success);
+    void set_floating_mode(sclboolean floating_mode);
+    void set_floating_drag_enabled(sclboolean enabled);
 private:
     sclboolean m_initialized;
 

diff --git a/src/sclconnection.cpp b/src/sclconnection.cpp
index 561dfc2710bcf79fa8b44395f249af3bbab59e5b..7e8be62af8b2bdb592b03528a502c3aaee14c98a 100644 (file)
--- a/src/sclconnection.cpp
+++ b/src/sclconnection.cpp
@@ -441,4 +441,18 @@ void CSCLConnection::send_key_event_processing_result(scim::KeyEvent &key, sclu3
     if (m_impl) {
         m_impl->send_key_event_processing_result(key, serial, is_success);
     }
+}
+
+void CSCLConnection::set_floating_mode(sclboolean floating_mode)
+{
+    if (m_impl) {
+        m_impl->set_floating_mode(floating_mode);
+    }
+}
+
+void CSCLConnection::set_floating_drag_enabled(sclboolean enabled)
+{
+    if (m_impl) {
+        m_impl->set_floating_drag_enabled(enabled);
+    }
 }
\ No newline at end of file

diff --git a/src/sclconnection.h b/src/sclconnection.h
index db4656ec90f4130db20aa2d401e37c5f46b90efa..80a57226225c92baacc7d8c7f1109f2cb10ee406 100644 (file)
--- a/src/sclconnection.h
+++ b/src/sclconnection.h
@@ -105,6 +105,8 @@ public:
     virtual void set_candidate_style(scim::ISF_CANDIDATE_PORTRAIT_LINE_T portrait_line, scim::ISF_CANDIDATE_MODE_T mode);
     virtual void set_engine_loader_flag(sclboolean flag);
     virtual void send_key_event_processing_result(scim::KeyEvent &key, sclu32 serial, sclboolean is_success);
+    virtual void set_floating_mode(sclboolean floating_mode);
+    virtual void set_floating_drag_enabled(sclboolean enabled);
 protected:
     std::string m_backend_identifier;
 

diff --git a/src/sclcoreimpl.cpp b/src/sclcoreimpl.cpp
index 9d0d7bb3ce6e09d1db8934a70889bb6ebc900e7e..5876aab45ac69290c1add08adec3c7e2fe7efce0 100644 (file)
--- a/src/sclcoreimpl.cpp
+++ b/src/sclcoreimpl.cpp
@@ -415,12 +415,12 @@ void CSCLCoreImpl::commit_content(const sclchar *content, const sclchar *descrip
 
 void CSCLCoreImpl::set_floating_mode(sclboolean floating_mode)
 {
-    m_core_ui.set_floating_mode(floating_mode);
+    m_connection.set_floating_mode(floating_mode);
 }
 
 void CSCLCoreImpl::set_floating_drag_enabled(sclboolean enabled)
 {
-    m_core_ui.set_floating_drag_enabled(enabled);
+    m_connection.set_floating_drag_enabled(enabled);
 }
 
 void CSCLCoreImpl::set_window_creation_defer_flag(sclboolean flag)

diff --git a/src/sclcoreui-efl.cpp b/src/sclcoreui-efl.cpp
index 0140baa04354e62e8be40de42a367e6abb1a829b..3d3a157392e93529ee24be2271080c0c2381ec5e 100644 (file)
--- a/src/sclcoreui-efl.cpp
+++ b/src/sclcoreui-efl.cpp
@@ -150,18 +150,6 @@ void CSCLCoreUIEFL::set_keyboard_size_hints(SclSize portrait, SclSize landscape)
     m_landscape_size = landscape;
 }
 
-void CSCLCoreUIEFL::set_floating_mode(sclboolean floating_mode)
-{
-    if (wlkb.ips)
-        wl_input_panel_surface_set_floating_panel(wlkb.ips, floating_mode);
-}
-
-void CSCLCoreUIEFL::set_floating_drag_enabled(sclboolean enabled)
-{
-    if (wlkb.ips)
-        wl_input_panel_surface_set_floating_drag_enabled(wlkb.ips, enabled);
-}
-
 void CSCLCoreUIEFL::update_keyboard_geometry(SclSize portrait, SclSize landscape)
 {
     Evas_Object *main_window = NATIVE_WINDOW_CAST(m_main_window);

diff --git a/src/sclcoreui-efl.h b/src/sclcoreui-efl.h
index 73585900051f2896ae8206dca6d7745d0a8b3680..df11037bd39007bfe31a6236f89dc3804ee1d0b8 100644 (file)
--- a/src/sclcoreui-efl.h
+++ b/src/sclcoreui-efl.h
@@ -62,9 +62,6 @@ public:
 
     void process_keyboard_ui_state_change(KEYBOARD_UI_STATE state);
 
-    void set_floating_mode(sclboolean floating_mode);
-    void set_floating_drag_enabled(sclboolean enabled);
-
     void update_keyboard_geometry(SclSize portrait, SclSize landscape);
     void get_keyboard_size(SclSize *portrait, SclSize *landscape);
 private:

diff --git a/src/sclcoreui.cpp b/src/sclcoreui.cpp
index e688166fe0e63e9f2843fd4ba6a21806b39b36cc..8fa0e26bdd988800b1a3034fca336dd8bf4463c3 100644 (file)
--- a/src/sclcoreui.cpp
+++ b/src/sclcoreui.cpp
@@ -140,20 +140,6 @@ void CSCLCoreUI::process_keyboard_ui_state_change(KEYBOARD_UI_STATE state)
     }
 }
 
-void CSCLCoreUI::set_floating_mode(sclboolean floating_mode)
-{
-    if (m_impl) {
-        m_impl->set_floating_mode(floating_mode);
-    }
-}
-
-void CSCLCoreUI::set_floating_drag_enabled(sclboolean enabled)
-{
-    if (m_impl) {
-        m_impl->set_floating_drag_enabled(enabled);
-    }
-}
-
 void CSCLCoreUI::update_keyboard_geometry(SclSize portrait, SclSize landscape)
 {
     if (m_impl) {

diff --git a/src/sclcoreui.h b/src/sclcoreui.h
index 724c7e1db9903ef782e426b09e815ba3a9f89cfa..738c985fcf962ec2f28f62c811ef78504b9cf4b1 100644 (file)
--- a/src/sclcoreui.h
+++ b/src/sclcoreui.h
@@ -101,16 +101,6 @@ public:
     */
     virtual void process_keyboard_ui_state_change(KEYBOARD_UI_STATE state);
 
-    /**
-     * @brief Requests to set floating mode
-     */
-    virtual void set_floating_mode(sclboolean floating_mode);
-
-    /**
-     * @brief Request to allow the user to move floating ISE
-     */
-    virtual void set_floating_drag_enabled(sclboolean enabled);
-
     /**
      * @brief Requests to update the keyboard window's geometry
      */