Add ExtEditor.h

diff --git a/src/ExtEditor.h b/src/ExtEditor.h
new file mode 100644 (file)
index 0000000..53bcff6
--- /dev/null
+++ b/src/ExtEditor.h
@@ -0,0 +1,16 @@
+/* vim:set et sts=4: */
+#ifndef __PY_EXT_EDITOR__
+#define __PY_EXT_EDITOR__
+
+#include <glib.h>
+#include "Editor.h"
+
+namespace PY {
+
+class ExtEditor : public Editor {
+public:
+    ExtEditor (PinyinProperties &props) : Editor (props) {}
+};
+
+};
+#endif

diff --git a/src/Makefile.am b/src/Makefile.am
index 48a9743..f580ce5 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -66,6 +66,7 @@ ibus_engine_h_sources = \
        DoublePinyinTable.h \
        Editor.h \
        Engine.h \
+       ExtEditor.h \
        FallbackEditor.h \
        FullPinyinEditor.h \
        HalfFullConverter.h \

diff --git a/src/PinyinEngine.cc b/src/PinyinEngine.cc
index 4cfdfa9..6447f31 100644 (file)
--- a/src/PinyinEngine.cc
+++ b/src/PinyinEngine.cc
@@ -3,6 +3,8 @@
 #include <ibus.h>
 #include <string.h>
 #include <libintl.h>
+#include "RawEditor.h"
+#include "ExtEditor.h"
 #include "FullPinyinEditor.h"
 #include "DoublePinyinEditor.h"
 #include "PinyinEngine.h"
@@ -31,9 +33,7 @@ PinyinEngine::PinyinEngine (IBusEngine *engine)
     else
         m_editors[MODE_INIT] = new FullPinyinEditor (m_props);
 
-    for (i = MODE_RAW; i < MODE_LAST; i++) {
-        m_editors[i] = new RawEditor (m_props);
-    }
+    m_editors[MODE_EXTENSION] = new ExtEditor (m_props);
 
     m_props.signalUpdateProperty ().connect (sigc::mem_fun (*this, &PinyinEngine::slotUpdateProperty));
 

diff --git a/src/PinyinEngine.h b/src/PinyinEngine.h
index 7786c16..4981fed 100644 (file)
--- a/src/PinyinEngine.h
+++ b/src/PinyinEngine.h
@@ -5,7 +5,6 @@
 #include <ibus.h>
 #include "Pointer.h"
 #include "Database.h"
-#include "RawEditor.h"
 #include "LookupTable.h"
 #include "Property.h"
 #include "Config.h"
@@ -81,9 +80,11 @@ private:
 
     enum {
         MODE_INIT = 0,          // init mode
+    #if 0
         MODE_RAW,               // raw mode
         MODE_ENGLISH,           // press v into English input mode
         MODE_STROKE,            // press u into stroke input mode
+    #endif
         MODE_EXTENSION,         // press i into extension input mode
         MODE_LAST,
     } m_input_mode;