Add update_geometry ()

Change-Id: I6f8c98e43865107ab5f1f28cf5b78b920b593579
Signed-off-by: Haifeng Deng <haifeng.deng@samsung.com>

diff --git a/src/sclconnection-isf.cpp b/src/sclconnection-isf.cpp
index 199c6a2..d78ab42 100644 (file)
--- a/src/sclconnection-isf.cpp
+++ b/src/sclconnection-isf.cpp
@@ -903,6 +903,13 @@ void CSCLConnectionISF::update_input_context(sclu32 type, sclu32 value)
     }
 }
 
+void CSCLConnectionISF::update_geometry(sclint x, sclint y, sclint width, sclint height)
+{
+    if (m_initialized) {
+        m_helper_agent.update_geometry(x, y, width, height);
+    }
+}
+
 void CSCLConnectionISF::get_surrounding_text(const sclchar *ic_uuid, sclint maxlen_before, sclint maxlen_after) const
 {
     if (m_initialized) {
@@ -966,13 +973,6 @@ void CSCLConnectionISF::set_selection(sclint start, sclint end)
     }
 }
 
-void CSCLConnectionISF::update_geometry(int x, int y, int width, int height)
-{
-    if (m_initialized) {
-        m_helper_agent.update_geometry(x, y, width, height);
-    }
-}
-
 extern "C"
 {
     void scim_module_init (void) {

diff --git a/src/sclconnection-isf.h b/src/sclconnection-isf.h
index 2432933..9a647fe 100644 (file)
--- a/src/sclconnection-isf.h
+++ b/src/sclconnection-isf.h
@@ -73,6 +73,7 @@ public:
     void update_preedit_string(sclint ic, const sclchar *ic_uuid, const sclchar *str, const scim::AttributeList &attrs);
     void update_aux_string(const sclchar *str);
     void update_input_context(sclu32 type, sclu32 value);
+    void update_geometry(sclint x, sclint y, sclint width, sclint height);
     void get_surrounding_text(const sclchar *ic_uuid, sclint maxlen_before, sclint maxlen_after) const;
     void delete_surrounding_text(sclint offset, sclint len) const;
     void set_candidate_position(sclint left, sclint top);
@@ -81,7 +82,6 @@ public:
     void set_keyboard_ise_by_uuid(const sclchar *uuid);
     void get_keyboard_ise(const sclchar *uuid);
     void set_selection(sclint start, sclint end);
-    void update_geometry(int x, int y, int width, int height);
 
 private:
     sclboolean m_initialized;

diff --git a/src/sclconnection.cpp b/src/sclconnection.cpp
index 83226a5..1607355 100644 (file)
--- a/src/sclconnection.cpp
+++ b/src/sclconnection.cpp
@@ -259,6 +259,13 @@ void CSCLConnection::update_input_context(sclu32 type, sclu32 value)
     }
 }
 
+void CSCLConnection::update_geometry(sclint x, sclint y, sclint width, sclint height)
+{
+    if (m_impl) {
+        m_impl->update_geometry(x, y, width, height);
+    }
+}
+
 void CSCLConnection::get_surrounding_text(const sclchar *ic_uuid, sclint maxlen_before, sclint maxlen_after) const
 {
     if (m_impl) {
@@ -314,11 +321,3 @@ void CSCLConnection::set_selection(sclint start, sclint end)
         m_impl->set_selection(start, end);
     }
 }
-
-void CSCLConnection::update_geometry(int x, int y, int width, int height)
-{
-    if (m_impl) {
-        m_impl->update_geometry(x, y, width, height);
-    }
-}
-

diff --git a/src/sclconnection.h b/src/sclconnection.h
index c493078..a313607 100644 (file)
--- a/src/sclconnection.h
+++ b/src/sclconnection.h
@@ -73,6 +73,7 @@ public:
     virtual void update_preedit_string(sclint ic, const sclchar *ic_uuid, const sclchar *str, const scim::AttributeList &attrs);
     virtual void update_aux_string(const sclchar *str);
     virtual void update_input_context(sclu32 type, sclu32 value);
+    virtual void update_geometry(sclint x, sclint y, sclint width, sclint height);
     virtual void get_surrounding_text(const sclchar *ic_uuid, sclint maxlen_before, sclint maxlen_after) const;
     virtual void delete_surrounding_text(sclint offset, sclint len) const;
     virtual void set_candidate_position(sclint left, sclint top);
@@ -81,7 +82,6 @@ public:
     virtual void set_keyboard_ise_by_uuid(const sclchar *uuid);
     virtual void get_keyboard_ise(const sclchar *uuid);
     virtual void set_selection(sclint start, sclint end);
-    virtual void update_geometry(int x, int y, int width, int height);
 
 protected:
     std::string m_backend_identifier;

diff --git a/src/sclcore.cpp b/src/sclcore.cpp
index 839c7e3..8ebda48 100644 (file)
--- a/src/sclcore.cpp
+++ b/src/sclcore.cpp
@@ -228,6 +228,13 @@ void CSCLCore::update_input_context(sclu32 type, sclu32 value)
     }
 }
 
+void CSCLCore::update_geometry(sclint x, sclint y, sclint width, sclint height)
+{
+    if (m_impl) {
+        m_impl->update_geometry(x, y, width, height);
+    }
+}
+
 void CSCLCore::get_surrounding_text(const sclchar *ic_uuid, sclint maxlen_before, sclint maxlen_after) const
 {
     if (m_impl) {

diff --git a/src/sclcore.h b/src/sclcore.h
index 38ace4b..d6fe3d7 100644 (file)
--- a/src/sclcore.h
+++ b/src/sclcore.h
@@ -238,6 +238,17 @@ public:
     void update_input_context(sclu32 type, sclu32 value);
 
     /**
+     * @ brief When the geometry of ISE is changed,
+     *         ISE can call this function to notify application
+     *
+     * @param[in] x x position of ISE geometry.
+     * @param[in] y y position of ISE geometry.
+     * @param[in] width the width of ISE geometry.
+     * @param[in] height the height of ISE geometry.
+     */
+    void update_geometry(sclint x, sclint y, sclint width, sclint height);
+
+    /**
      * @ brief Request to get surrounding text.
      *
      * @param[in] ic_uuid The helper ISE UUID.

diff --git a/src/sclcoreimpl.cpp b/src/sclcoreimpl.cpp
index d6e4586..4d19821 100644 (file)
--- a/src/sclcoreimpl.cpp
+++ b/src/sclcoreimpl.cpp
@@ -220,6 +220,11 @@ void CSCLCoreImpl::update_input_context(sclu32 type, sclu32 value)
     m_connection.update_input_context(type, value);
 }
 
+void CSCLCoreImpl::update_geometry(sclint x, sclint y, sclint width, sclint height)
+{
+    m_connection.update_geometry(x, y, width, height);
+}
+
 void CSCLCoreImpl::get_surrounding_text(const sclchar* ic_uuid, sclint maxlen_before, sclint maxlen_after) const
 {
     m_connection.get_surrounding_text(ic_uuid, maxlen_before, maxlen_after);
@@ -297,11 +302,6 @@ int CSCLCoreImpl::get_screen_rotation_degree()
 
 void CSCLCoreImpl::set_keyboard_size_hints(SclSize portrait, SclSize landscape)
 {
-    int degree = m_core_ui.get_screen_rotation_degree();
-    if (degree == 90 || degree == 270)
-        m_connection.update_geometry(0, 0, landscape.width, landscape.height);
-    else
-        m_connection.update_geometry(0, 0, portrait.width, portrait.height);
     m_core_ui.set_keyboard_size_hints(portrait, landscape);
 }
 

diff --git a/src/sclcoreimpl.h b/src/sclcoreimpl.h
index 447c553..8ba540d 100644 (file)
--- a/src/sclcoreimpl.h
+++ b/src/sclcoreimpl.h
@@ -81,6 +81,7 @@ public:
     //void update_candidate_string (const LookupTable &table) const;
     //void update_associate_string (const LookupTable &table) const;
     void update_input_context(sclu32 type, sclu32 value);
+    void update_geometry(sclint x, sclint y, sclint width, sclint height);
     void get_surrounding_text(const sclchar* ic_uuid, sclint maxlen_before, sclint maxlen_after) const;
     void delete_surrounding_text(sclint offset, sclint len) const;
     void set_candidate_position(sclint left, sclint top);