use pinyin pos

diff --git a/src/PYPPhoneticEditor.cc b/src/PYPPhoneticEditor.cc
index a26ce85..217e545 100644 (file)
--- a/src/PYPPhoneticEditor.cc
+++ b/src/PYPPhoneticEditor.cc
@@ -299,13 +299,15 @@ guint
 LibPinyinPhoneticEditor::getPinyinCursor ()
 {
     /* Translate cursor position to pinyin position. */
-    guint pinyin_cursor = m_pinyins.size ();
-    PinyinArray::const_iterator iter = m_pinyins.begin ();
-    for ( ; iter != m_pinyins.end (); ++iter) {
-        guint end = iter->begin + iter->len;
-        if ( iter->begin <= m_cursor && m_cursor < end )
-            pinyin_cursor = iter - m_pinyins.begin ();
+    PinyinKeyPosVector & pinyin_poses = m_instance->m_pinyin_poses;
+    guint pinyin_cursor = pinyin_poses->len;
+    for (size_t i = 0; i < pinyin_poses->len; ++i) {
+        PinyinKeyPos *pos = &g_array_index
+            (pinyin_poses, PinyinKeyPos, i);
+        if (pos->get_pos () <= m_cursor && m_cursor < pos->get_end_pos ())
+            pinyin_cursor = i;
     }
+
     g_assert (pinyin_cursor >= 0);
     return pinyin_cursor;
 }

diff --git a/src/PYPPinyinEditor.cc b/src/PYPPinyinEditor.cc
index a435b82..68617a3 100644 (file)
--- a/src/PYPPinyinEditor.cc
+++ b/src/PYPPinyinEditor.cc
@@ -272,12 +272,12 @@ LibPinyinPinyinEditor::updateAuxiliaryText ()
 
     /* Note: cursor handling is defered to full/double pinyin editors. */
     guint pinyin_cursor = getPinyinCursor ();
-    for (guint i = 0; i < m_pinyins.size (); ++i) {
+    PinyinKeyVector & pinyin_keys = m_instance->m_pinyin_keys;
+    for (guint i = 0; i < pinyin_keys->len; ++i) {
         if (G_LIKELY (i))
             m_buffer << ' ';
-        const Pinyin *pinyin = m_pinyins[i];
-        m_buffer << pinyin->sheng
-                 << pinyin->yun;
+        PinyinKey * key = &g_array_index (pinyin_keys, PinyinKey, i);
+        m_buffer << key->get_key_string ();
     }
 
     /* append rest text */