diff options
| author | Peng Wu <alexepico@gmail.com> | 2014-07-07 13:55:58 +0800 |
|---|---|---|
| committer | Peng Wu <alexepico@gmail.com> | 2014-07-07 15:06:06 +0800 |
| commit | f37abf8bf0d4566f0e569626861dfaef331a0a03 (patch) | |
| tree | bc4084573b383325f12285f86d52f5ec2a6a4ea1 /src | |
| parent | 4fc26f38ff37ea7859fe7ca8041bda2acde3c6a5 (diff) | |
| download | ibus-libzhuyin-f37abf8bf0d4566f0e569626861dfaef331a0a03.tar.gz ibus-libzhuyin-f37abf8bf0d4566f0e569626861dfaef331a0a03.tar.xz ibus-libzhuyin-f37abf8bf0d4566f0e569626861dfaef331a0a03.zip | |
fixes typos
Diffstat (limited to 'src')
| -rw-r--r-- | src/ZYZConfig.cc | 4 | ||||
| -rw-r--r-- | src/ZYZPhoneticEditor.cc | 17 | ||||
| -rw-r--r-- | src/ZYZZhuyinEditor.cc | 9 |
3 files changed, 24 insertions, 6 deletions
diff --git a/src/ZYZConfig.cc b/src/ZYZConfig.cc index a9d1fcb..d07ed73 100644 --- a/src/ZYZConfig.cc +++ b/src/ZYZConfig.cc @@ -172,7 +172,7 @@ ZhuyinConfig::readDefaultValues (void) m_init_full_punct = read (CONFIG_INIT_FULL_PUNCT, true); m_init_trad_chinese = read (CONFIG_INIT_TRAD_CHINESE, true); - m_candidate_keys = read (CONFIG_CANDIDATE_KEYS, "1234567890"); + m_candidate_keys = read (CONFIG_CANDIDATE_KEYS, std::string ("1234567890")); /* fuzzy zhuyin */ if (read (CONFIG_FUZZY_ZHUYIN, false)) @@ -223,7 +223,7 @@ ZhuyinConfig::valueChanged (const std::string §ion, } } } else if (CONFIG_CANDIDATE_KEYS == name) { - m_candidate_keys = normalizeGVariant (value, "1234567890"); + m_candidate_keys = normalizeGVariant (value, std::string ("1234567890")); } /* lookup table page size */ else if (CONFIG_ORIENTATION == name) { m_orientation = normalizeGVariant (value, IBUS_ORIENTATION_VERTICAL); diff --git a/src/ZYZPhoneticEditor.cc b/src/ZYZPhoneticEditor.cc index 5ae92d4..98369ed 100644 --- a/src/ZYZPhoneticEditor.cc +++ b/src/ZYZPhoneticEditor.cc @@ -342,6 +342,8 @@ PhoneticEditor::candidateClicked (guint index, guint button, void PhoneticEditor::reset (void) { + m_input_state = STATE_INPUT; + m_lookup_table.clear (); m_buffer = ""; @@ -371,8 +373,15 @@ PhoneticEditor::commit (const gchar *str) gboolean PhoneticEditor::selectCandidate (guint index) { - if (STATE_CANDIDATE_SHOWN == m_input_state) - return m_phonetic_section->selectCandidate (index); + if (STATE_CANDIDATE_SHOWN == m_input_state) { + int retval = m_phonetic_section->selectCandidate (index); + + m_input_state = STATE_INPUT; + + updateZhuyin (); + update (); + return retval; + } if (STATE_BUILTIN_SYMBOL_SHOWN == m_input_state || STATE_BOPOMOFO_SYMBOL_SHOWN == m_input_state /* || @@ -386,6 +395,8 @@ PhoneticEditor::selectCandidate (guint index) insert_symbol (m_text, m_cursor, symbols->m_type, symbols->m_lookup, symbols->m_choice); + m_input_state = STATE_INPUT; + update (); return retval; } @@ -575,6 +586,8 @@ PhoneticEditor::getZhuyinCursor (void) zhuyin_cursor += cursor; cursor = 0; } + + ++ index; } if (SYMBOL_SECTION == type) { diff --git a/src/ZYZZhuyinEditor.cc b/src/ZYZZhuyinEditor.cc index 221f20f..c0b4f8e 100644 --- a/src/ZYZZhuyinEditor.cc +++ b/src/ZYZZhuyinEditor.cc @@ -189,11 +189,15 @@ ZhuyinEditor::insert (gint ch) return TRUE; } - if (insertPunct (ch)) + if (insertPunct (ch)) { + update (); return TRUE; + } - if (insertEnglish (ch)) + if (insertEnglish (ch)) { + update (); return TRUE; + } return FALSE; } @@ -210,6 +214,7 @@ ZhuyinEditor::processKeyEvent (guint keyval, guint keycode, guint modifiers) IBUS_LOCK_MASK); if (STATE_INPUT == m_input_state) { + if (insert (keyval)) return TRUE; |