Fix issue surrounding_text does not deliver to Thai IMEngine

Change-Id: I5f0d194928dadf7166a2d305377b7096fecfb1d9

diff --git a/data/layout/common/ise_lang_table.xml b/data/layout/common/ise_lang_table.xml
index 0e66d34..92c0eb9 100644 (file)
--- a/data/layout/common/ise_lang_table.xml
+++ b/data/layout/common/ise_lang_table.xml
@@ -63,7 +63,7 @@
   <rec language="Hongkong" language_name="繁體中文-倉頡" language_name_abbr="HK" inputmode_QTY="CANGJIE_QTY" inputmode_QTY_name="倉頡" main_keyboard_name="中" keyboard_ise_uuid="uuid_cangjie_3" country_code_URL="hk" locale_string="zh_HK"/>
   <rec language="Japanese" language_name="日本語" language_name_abbr="JA" inputmode_QTY="JAPANESE_QTY" inputmode_QTY_name="Qwerty" main_keyboard_name="あ" keyboard_ise_uuid="uuid_anthy" country_code_URL="jp" locale_string="ja_JP"/>
   <rec language="Vietnamese" language_name="Tiếng Việt" language_name_abbr="VI" inputmode_QTY="VIETNAMESE_QTY" inputmode_QTY_name="Vietnamese Qwerty" keyboard_ise_uuid="uuid_unikey" country_code_URL="vn" is_latin_language="true" accepts_caps_mode="true" locale_string="vi_VN"/>
-  <rec language="Thai" language_name="ภาษาไทย" language_name_abbr="ภาษาไทย" inputmode_QTY="THAI_QTY" inputmode_QTY_name="Thai" main_keyboard_name="กขค" keyboard_ise_uuid="uuid_thai" country_code_URL="th" locale_string="th_TH"/>
+  <rec language="Thai" language_name="ภาษาไทย" language_name_abbr="ภาษาไทย" inputmode_QTY="THAI_QTY" inputmode_QTY_name="Thai" main_keyboard_name="กขค" keyboard_ise_uuid="uuid_thai" country_code_URL="th" locale_string="th_TH" need_surrounding_text="true"/>
   <!--
   <rec language="Tamil" language_name="தமிழ்" language_name_abbr="TA" inputmode_QTY="TAMIL_QTY" inputmode_QTY_name="Tamil" main_keyboard_name="அஆ" keyboard_ise_uuid="uuid_default" country_code_URL="tn"/>
   -->

diff --git a/data/layout/mobile/LYT_PORTRAIT_QTY_THAI.xml b/data/layout/mobile/LYT_PORTRAIT_QTY_THAI.xml
index 2735908..24bc2f0 100644 (file)
--- a/data/layout/mobile/LYT_PORTRAIT_QTY_THAI.xml
+++ b/data/layout/mobile/LYT_PORTRAIT_QTY_THAI.xml
@@ -629,7 +629,7 @@
         <rec>Space</rec>
       </key_value>
     </key>
-    <key popup_type="longpress_popup_once" label_type="QTY_DOT" image_label_type="IMAGE_CUE" popup_offset_x="-391" popup_offset_y="-254">
+    <key key_type="string" popup_type="longpress_popup_once" label_type="QTY_DOT" image_label_type="IMAGE_CUE" popup_offset_x="-391" popup_offset_y="-254">
       <label>
         <rec>.</rec>
       </label>
@@ -706,7 +706,7 @@
         <rec>Space</rec>
       </key_value>
     </key>
-    <key key_type="string" label_type="QTY_LINE1">
+    <key key_type="string" label_type="QTY_DOT">
       <label>
         <rec>.</rec>
       </label>
@@ -788,7 +788,7 @@
         <rec>Space</rec>
       </key_value>
     </key>
-    <key key_type="string" label_type="QTY_LINE1">
+    <key key_type="string" label_type="QTY_DOT">
       <label>
         <rec>.</rec>
       </label>

diff --git a/data/layout/mobile/ise_lang_table.xml b/data/layout/mobile/ise_lang_table.xml
index 0e66d34..92c0eb9 100644 (file)
--- a/data/layout/mobile/ise_lang_table.xml
+++ b/data/layout/mobile/ise_lang_table.xml
@@ -63,7 +63,7 @@
   <rec language="Hongkong" language_name="繁體中文-倉頡" language_name_abbr="HK" inputmode_QTY="CANGJIE_QTY" inputmode_QTY_name="倉頡" main_keyboard_name="中" keyboard_ise_uuid="uuid_cangjie_3" country_code_URL="hk" locale_string="zh_HK"/>
   <rec language="Japanese" language_name="日本語" language_name_abbr="JA" inputmode_QTY="JAPANESE_QTY" inputmode_QTY_name="Qwerty" main_keyboard_name="あ" keyboard_ise_uuid="uuid_anthy" country_code_URL="jp" locale_string="ja_JP"/>
   <rec language="Vietnamese" language_name="Tiếng Việt" language_name_abbr="VI" inputmode_QTY="VIETNAMESE_QTY" inputmode_QTY_name="Vietnamese Qwerty" keyboard_ise_uuid="uuid_unikey" country_code_URL="vn" is_latin_language="true" accepts_caps_mode="true" locale_string="vi_VN"/>
-  <rec language="Thai" language_name="ภาษาไทย" language_name_abbr="ภาษาไทย" inputmode_QTY="THAI_QTY" inputmode_QTY_name="Thai" main_keyboard_name="กขค" keyboard_ise_uuid="uuid_thai" country_code_URL="th" locale_string="th_TH"/>
+  <rec language="Thai" language_name="ภาษาไทย" language_name_abbr="ภาษาไทย" inputmode_QTY="THAI_QTY" inputmode_QTY_name="Thai" main_keyboard_name="กขค" keyboard_ise_uuid="uuid_thai" country_code_URL="th" locale_string="th_TH" need_surrounding_text="true"/>
   <!--
   <rec language="Tamil" language_name="தமிழ்" language_name_abbr="TA" inputmode_QTY="TAMIL_QTY" inputmode_QTY_name="Tamil" main_keyboard_name="அஆ" keyboard_ise_uuid="uuid_default" country_code_URL="tn"/>
   -->

diff --git a/data/layout/wearable/ise_lang_table.xml b/data/layout/wearable/ise_lang_table.xml
index 0c62487..3b8bfb6 100644 (file)
--- a/data/layout/wearable/ise_lang_table.xml
+++ b/data/layout/wearable/ise_lang_table.xml
@@ -65,7 +65,7 @@
   <rec language="Vietnamese" language_name="Tiếng Việt" language_name_abbr="VI" inputmode_QTY="VIETNAMESE_4X4" inputmode_QTY_name="3x4 keyboard" keyboard_ise_uuid="uuid_unikey" country_code_URL="vn" is_latin_language="true" accepts_caps_mode="true" locale_string="vi_VN"/>
   -->
   <!--
-  <rec language="Thai" language_name="ภาษาไทย" language_name_abbr="TH" inputmode_QTY="THAI_4X4" inputmode_QTY_name="Thai" keyboard_ise_uuid="uuid_default" country_code_URL="th"/>
+  <rec language="Thai" language_name="ภาษาไทย" language_name_abbr="TH" inputmode_QTY="THAI_4X4" inputmode_QTY_name="Thai" keyboard_ise_uuid="uuid_default" country_code_URL="th" need_surrounding_text="true"/>
   -->
   <!--
   <rec language="Tamil" language_name="தமிழ்" language_name_abbr="TA" inputmode_QTY="TAMIL_4X4" inputmode_QTY_name="Tamil" main_keyboard_name="அஆ" keyboard_ise_uuid="uuid_default" country_code_URL="tn"/>

diff --git a/src/ise-dbus.cpp b/src/ise-dbus.cpp
index 23aeb63..eb3a5fc 100644 (file)
--- a/src/ise-dbus.cpp
+++ b/src/ise-dbus.cpp
@@ -896,7 +896,7 @@ void engine_loader_process_key_event(scim::KeyEvent& key, uint32_t serial, bool
         int cursor;
 
         ime_get_surrounding_text(-1, -1, &text, &cursor);
-        SECURE_LOGD("surrounding text : %s\n", text);
+        SECURE_LOGD("surrounding text : %s, cursor : %d\n", text, cursor);
 
         if (_send_sync_message(dbus_info->gdbus_connection, g_variant_new("(si)", text, cursor), &reply, "set_surrounding_text")) {
             reply_body = g_dbus_message_get_body(reply);