From dbf038b76dcc99fc8cec4532c272999c9d1a4c53 Mon Sep 17 00:00:00 2001
From: Peng Wu <alexepico@gmail.com>
Date: Thu, 25 Jun 2015 13:34:06 +0800
Subject: Revert "auto commit when press space key"

This reverts commit 4300168afda16a42df805cdff8a0c5c192356283.
---
 src/ZYZPhoneticEditor.h |  3 +--
 src/ZYZPinyinEditor.cc  | 21 +++------------------
 src/ZYZPinyinEditor.h   |  2 +-
 src/ZYZZhuyinEditor.cc  | 21 +++------------------
 src/ZYZZhuyinEditor.h   |  2 +-
 5 files changed, 9 insertions(+), 40 deletions(-)

diff --git a/src/ZYZPhoneticEditor.h b/src/ZYZPhoneticEditor.h
index 6ba04fc..ae82615 100644
--- a/src/ZYZPhoneticEditor.h
+++ b/src/ZYZPhoneticEditor.h
@@ -97,8 +97,7 @@ protected:
     virtual void commit (void) = 0;
     virtual void updateAuxiliaryText (void) = 0;
     virtual void updatePreeditText (void) = 0;
-    /* return the last position of zhuyin symbols.  */
-    virtual guint updateZhuyin (void) = 0;
+    virtual void updateZhuyin (void) = 0;
 
     /* for class DaChen26Editor to override this. */
     virtual guint getZhuyinCursor (void);
diff --git a/src/ZYZPinyinEditor.cc b/src/ZYZPinyinEditor.cc
index 30457f1..a3683a8 100644
--- a/src/ZYZPinyinEditor.cc
+++ b/src/ZYZPinyinEditor.cc
@@ -63,12 +63,10 @@ PinyinEditor::commit (void)
 void
 PinyinEditor::reset (void)
 {
-    m_preedit_text = "";
-
     PhoneticEditor::reset ();
 }
 
-guint
+void
 PinyinEditor::updateZhuyin (void)
 {
     const String & enhanced_text = m_text;
@@ -77,7 +75,6 @@ PinyinEditor::updateZhuyin (void)
 
     size_t index = 0;
     size_t start_pos = 0, end_pos = 0;
-    guint pos = 0;
 
     while (end_pos != enhanced_text.size ()) {
         section_t type = probe_section_quick (enhanced_text, start_pos);
@@ -87,12 +84,9 @@ PinyinEditor::updateZhuyin (void)
             get_phonetic_section (enhanced_text, start_pos, end_pos, section);
 
             zhuyin_instance_t * instance = m_instances[index];
-            size_t len = zhuyin_parse_more_full_pinyins
-                (instance, section.c_str ());
+            zhuyin_parse_more_full_pinyins (instance, section.c_str ());
             zhuyin_guess_sentence (instance);
 
-            pos = start_pos + len;
-
             ++index;
         }
 
@@ -106,7 +100,7 @@ PinyinEditor::updateZhuyin (void)
         start_pos = end_pos;
     }
 
-    return pos;
+    return;
 }
 
 void
@@ -187,15 +181,6 @@ PinyinEditor::insert (guint keyval, guint keycode, guint modifiers)
     if (modifiers != 0 && m_text.empty ())
         return FALSE;
 
-    /* the space key is not part of pinyin string. */
-    if (IBUS_space == keyval &&
-        m_cursor == get_enhanced_text_length (m_text)) {
-        commit ();
-        StaticText space (" ");
-        commitText (space);
-        return TRUE;
-    }
-
     if (IS_PINYIN (keyval)) {
         insert_phonetic (m_text, m_cursor++, keyval);
 
diff --git a/src/ZYZPinyinEditor.h b/src/ZYZPinyinEditor.h
index cee3735..0693947 100644
--- a/src/ZYZPinyinEditor.h
+++ b/src/ZYZPinyinEditor.h
@@ -40,7 +40,7 @@ protected:
 
     virtual void updatePreeditText ();
     virtual void updateAuxiliaryText ();
-    virtual guint updateZhuyin (void);
+    virtual void updateZhuyin (void);
 
     void commit ();
     void reset ();
diff --git a/src/ZYZZhuyinEditor.cc b/src/ZYZZhuyinEditor.cc
index d377afe..26fc028 100644
--- a/src/ZYZZhuyinEditor.cc
+++ b/src/ZYZZhuyinEditor.cc
@@ -62,12 +62,10 @@ ZhuyinEditor::commit (void)
 void
 ZhuyinEditor::reset (void)
 {
-    m_preedit_text = "";
-
     PhoneticEditor::reset ();
 }
 
-guint
+void
 ZhuyinEditor::updateZhuyin (void)
 {
     const String & enhanced_text = m_text;
@@ -76,7 +74,6 @@ ZhuyinEditor::updateZhuyin (void)
 
     size_t index = 0;
     size_t start_pos = 0, end_pos = 0;
-    guint pos = 0;
 
     while (end_pos != enhanced_text.size ()) {
         section_t type = probe_section_quick (enhanced_text, start_pos);
@@ -90,8 +87,6 @@ ZhuyinEditor::updateZhuyin (void)
                 (instance, section.c_str ());
             zhuyin_guess_sentence (instance);
 
-            pos = start_pos + len;
-
             ++index;
         }
 
@@ -104,7 +99,7 @@ ZhuyinEditor::updateZhuyin (void)
         start_pos = end_pos;
     }
 
-    return pos;
+    return;
 }
 
 void
@@ -199,17 +194,7 @@ ZhuyinEditor::insert (guint keyval, guint keycode, guint modifiers)
 
         insert_phonetic (m_text, m_cursor++, keyval);
 
-        guint len = updateZhuyin ();
-
-        /* the space key is part of zhuyin string. */
-        if (IBUS_space == keyval &&
-            len < m_text.size () &&
-            m_cursor == get_enhanced_text_length (m_text)) {
-            update ();
-            commit ();
-            return TRUE;
-        }
-
+        updateZhuyin ();
         update ();
         return TRUE;
     }
diff --git a/src/ZYZZhuyinEditor.h b/src/ZYZZhuyinEditor.h
index 246c77b..40920d2 100644
--- a/src/ZYZZhuyinEditor.h
+++ b/src/ZYZZhuyinEditor.h
@@ -40,7 +40,7 @@ protected:
 
     virtual void updatePreeditText ();
     virtual void updateAuxiliaryText ();
-    virtual guint updateZhuyin (void);
+    virtual void updateZhuyin (void);
 
     void commit ();
     void reset ();
-- 
cgit