Merge branch 'bopomofo'

Conflicts:
	ibus-pinyin.spec.in

1 files changed, 53 insertions, 0 deletions

diff --git a/src/PunctEditor.h b/src/PunctEditor.h
new file mode 100644
index 0000000..773ee87
--- /dev/null
+++ b/src/PunctEditor.h
@@ -0,0 +1,53 @@
+/* vim:set et sts=4: */
+#ifndef __PY_PUNCT_EDITOR__
+#define __PY_PUNCT_EDITOR__
+
+#include <glib.h>
+#include "Editor.h"
+#include "PhraseEditor.h"
+
+namespace PY {
+
+class PunctEditor : public Editor {
+public:
+    PunctEditor (PinyinProperties &props);
+
+    virtual gboolean processKeyEvent (guint keyval, guint keycode, guint modifiers);
+    virtual void pageUp (void);
+    virtual void pageDown (void);
+    virtual void cursorUp (void);
+    virtual void cursorDown (void);
+    virtual void update (void);
+    virtual void reset (void);
+    virtual void candidateClicked (guint index, guint button, guint state);
+
+    virtual gboolean processPunct (guint keyval, guint keycode, guint modifiers);
+    virtual gboolean processSpace (guint keyval, guint keycode, guint modifiers);
+    virtual gboolean insert (gchar ch);
+    virtual void updateLookupTable (void);
+    virtual gboolean fillLookupTableByPage (void);
+    virtual void updateAuxiliaryText (void);
+    virtual void updatePreeditText (void);
+    virtual void getPunctCandidates (void);
+    virtual gboolean selectCandidate (guint i);
+    virtual gboolean selectCandidateInPage (guint i);
+    virtual void commit (const gchar *str);
+    virtual void commit (void);
+    virtual gboolean removeCharBefore (void);
+    virtual gboolean removeCharAfter (void);
+    virtual gboolean moveCursorLeft (void);
+    virtual gboolean moveCursorRight (void);
+    virtual gboolean moveCursorToBegin (void);
+    virtual gboolean moveCursorToEnd (void);
+
+protected:
+    gboolean m_punct_mode;
+    LookupTable m_lookup_table;
+    //PhraseEditor m_phrase_editor;
+    String m_buffer;
+    std::vector<String> m_punct_candidates;
+
+};
+
+};
+#endif