fix "<" went use with *_IM_MODULE=xim

git-svn-id: svn://localhost/trunk@37 79bd180b-0a32-48ee-ac55-ada8cae9df61

diff --git a/po/scim-unikey.pot b/po/scim-unikey.pot
index de3c28a..3c30b43 100644 (file)
--- a/po/scim-unikey.pot
+++ b/po/scim-unikey.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: scim-unikey 0.3~r32\n"
 "Report-Msgid-Bugs-To: mr.lequoctuan@gmail.com\n"
-"POT-Creation-Date: 2009-06-25 18:20+0700\n"
+"POT-Creation-Date: 2009-07-01 19:50+0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -38,67 +38,67 @@ msgid ""
 "  http://forum.ubuntu-vn.org/viewforum.php?f=85"
 msgstr ""
 
-#: src/scim_unikey_imengine.cpp:700
+#: src/scim_unikey_imengine.cpp:685
 msgid "Choose input method"
 msgstr ""
 
-#: src/scim_unikey_imengine.cpp:717
+#: src/scim_unikey_imengine.cpp:702
 msgid "Choose output charset"
 msgstr ""
 
-#: src/scim_unikey_imengine.cpp:732
+#: src/scim_unikey_imengine.cpp:717
 msgid "Options"
 msgstr ""
 
-#: src/scim_unikey_imengine.cpp:734
+#: src/scim_unikey_imengine.cpp:719
 msgid "Configure Unikey here"
 msgstr ""
 
-#: src/scim_unikey_imengine.cpp:740 setup/scim_unikey_setup.cpp:146
+#: src/scim_unikey_imengine.cpp:725 setup/scim_unikey_setup.cpp:146
 msgid "Enable spell check"
 msgstr ""
 
-#: src/scim_unikey_imengine.cpp:742 setup/scim_unikey_setup.cpp:152
+#: src/scim_unikey_imengine.cpp:727 setup/scim_unikey_setup.cpp:152
 msgid "If enable, you can decrease mistake when typing"
 msgstr ""
 
-#: src/scim_unikey_imengine.cpp:748 setup/scim_unikey_setup.cpp:155
+#: src/scim_unikey_imengine.cpp:733 setup/scim_unikey_setup.cpp:155
 msgid "Auto restore keys with invalid words"
 msgstr ""
 
-#: src/scim_unikey_imengine.cpp:750 setup/scim_unikey_setup.cpp:161
+#: src/scim_unikey_imengine.cpp:735 setup/scim_unikey_setup.cpp:161
 msgid ""
 "When typing a word not in Vietnamese,\n"
-"it will auto restore keystroke into orginal"
+"it will auto restore keystroke into original"
 msgstr ""
 
-#: src/scim_unikey_imengine.cpp:757 setup/scim_unikey_setup.cpp:165
+#: src/scim_unikey_imengine.cpp:742 setup/scim_unikey_setup.cpp:165
 msgid "Use oà, uý (instead of òa, úy)"
 msgstr ""
 
-#: src/scim_unikey_imengine.cpp:765 setup/scim_unikey_setup.cpp:171
+#: src/scim_unikey_imengine.cpp:750 setup/scim_unikey_setup.cpp:171
 msgid "Allow type with more freedom"
 msgstr ""
 
-#: src/scim_unikey_imengine.cpp:773 setup/scim_unikey_setup.cpp:184
+#: src/scim_unikey_imengine.cpp:758 setup/scim_unikey_setup.cpp:184
 msgid "Enable Macro"
 msgstr ""
 
-#: src/scim_unikey_imengine.cpp:780
+#: src/scim_unikey_imengine.cpp:765
 msgid "Enable PreEdit"
 msgstr ""
 
-#: src/scim_unikey_imengine.cpp:782 setup/scim_unikey_setup.cpp:249
+#: src/scim_unikey_imengine.cpp:767 setup/scim_unikey_setup.cpp:250
 msgid ""
 "This option is best for most application\n"
 "But you may don't like it because it have an underline when typing"
 msgstr ""
 
-#: src/scim_unikey_imengine.cpp:789 setup/scim_unikey_setup.cpp:207
+#: src/scim_unikey_imengine.cpp:774 setup/scim_unikey_setup.cpp:207
 msgid "Process W at word begin"
 msgstr ""
 
-#: src/scim_unikey_imengine.cpp:791 setup/scim_unikey_setup.cpp:213
+#: src/scim_unikey_imengine.cpp:776 setup/scim_unikey_setup.cpp:213
 msgid ""
 "If enable, type W at begin\n"
 "of word will change to Ư."
@@ -136,30 +136,30 @@ msgstr ""
 msgid "Mode switch key:"
 msgstr ""
 
-#: setup/scim_unikey_setup.cpp:243
+#: setup/scim_unikey_setup.cpp:244
 msgid "Preedit is default"
 msgstr ""
 
-#: setup/scim_unikey_setup.cpp:400
+#: setup/scim_unikey_setup.cpp:401
 msgid "Macro table definition"
 msgstr ""
 
-#: setup/scim_unikey_setup.cpp:428
+#: setup/scim_unikey_setup.cpp:429
 msgid "Word"
 msgstr ""
 
-#: setup/scim_unikey_setup.cpp:436
+#: setup/scim_unikey_setup.cpp:437
 msgid "Replace with"
 msgstr ""
 
-#: setup/scim_unikey_setup.cpp:443
+#: setup/scim_unikey_setup.cpp:444
 msgid "Delete"
 msgstr ""
 
-#: setup/scim_unikey_setup.cpp:448
+#: setup/scim_unikey_setup.cpp:449
 msgid "Delete All"
 msgstr ""
 
-#: setup/scim_unikey_setup.cpp:600
+#: setup/scim_unikey_setup.cpp:601
 msgid "(replace text)"
 msgstr ""

diff --git a/po/vi.po b/po/vi.po
index c179c12..f113bb8 100644 (file)
--- a/po/vi.po
+++ b/po/vi.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: scim-unikey\n"
 "Report-Msgid-Bugs-To: mr.lequoctuan@gmail.com\n"
-"POT-Creation-Date: 2009-06-25 18:20+0700\n"
+"POT-Creation-Date: 2009-07-01 19:50+0700\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Le Quoc Tuan <mr.lequoctuan@gmail.com>\n"
 "Language-Team: Le Quoc Tuan <mr.lequoctuan@gmail.com>\n"
@@ -52,59 +52,59 @@ msgstr ""
 "Để nhận được sự hỗ trợ hãy ghé thăm:\n"
 "  http://forum.ubuntu-vn.org/viewforum.php?f=85"
 
-#: src/scim_unikey_imengine.cpp:700
+#: src/scim_unikey_imengine.cpp:685
 msgid "Choose input method"
 msgstr "Chọn kiểu gõ"
 
-#: src/scim_unikey_imengine.cpp:717
+#: src/scim_unikey_imengine.cpp:702
 msgid "Choose output charset"
 msgstr "Chọn bảng mã"
 
-#: src/scim_unikey_imengine.cpp:732
+#: src/scim_unikey_imengine.cpp:717
 msgid "Options"
 msgstr "Tùy chọn"
 
-#: src/scim_unikey_imengine.cpp:734
+#: src/scim_unikey_imengine.cpp:719
 msgid "Configure Unikey here"
 msgstr "Cấu hình Unikey ở đây"
 
-#: src/scim_unikey_imengine.cpp:740 setup/scim_unikey_setup.cpp:146
+#: src/scim_unikey_imengine.cpp:725 setup/scim_unikey_setup.cpp:146
 msgid "Enable spell check"
 msgstr "Bật kiểm tra chính tả"
 
-#: src/scim_unikey_imengine.cpp:742 setup/scim_unikey_setup.cpp:152
+#: src/scim_unikey_imengine.cpp:727 setup/scim_unikey_setup.cpp:152
 msgid "If enable, you can decrease mistake when typing"
 msgstr "Nếu bật, bạn có thể giảm lỗi chính tả khi gõ"
 
-#: src/scim_unikey_imengine.cpp:748 setup/scim_unikey_setup.cpp:155
+#: src/scim_unikey_imengine.cpp:733 setup/scim_unikey_setup.cpp:155
 msgid "Auto restore keys with invalid words"
 msgstr "Tự động khôi phục phím với từ sai"
 
-#: src/scim_unikey_imengine.cpp:750 setup/scim_unikey_setup.cpp:161
+#: src/scim_unikey_imengine.cpp:735 setup/scim_unikey_setup.cpp:161
 msgid ""
 "When typing a word not in Vietnamese,\n"
-"it will auto restore keystroke into orginal"
+"it will auto restore keystroke into original"
 msgstr ""
 "Khi gõ một từ không phải tiếng Việt,\n"
 "nó sẽ tự động khôi phục phím gốc"
 
-#: src/scim_unikey_imengine.cpp:757 setup/scim_unikey_setup.cpp:165
+#: src/scim_unikey_imengine.cpp:742 setup/scim_unikey_setup.cpp:165
 msgid "Use oà, uý (instead of òa, úy)"
 msgstr "Đặt dấu oà, uý (thay vì òa, úy)"
 
-#: src/scim_unikey_imengine.cpp:765 setup/scim_unikey_setup.cpp:171
+#: src/scim_unikey_imengine.cpp:750 setup/scim_unikey_setup.cpp:171
 msgid "Allow type with more freedom"
 msgstr "Cho phép gõ tự do"
 
-#: src/scim_unikey_imengine.cpp:773 setup/scim_unikey_setup.cpp:184
+#: src/scim_unikey_imengine.cpp:758 setup/scim_unikey_setup.cpp:184
 msgid "Enable Macro"
 msgstr "Cho phép gõ tắt"
 
-#: src/scim_unikey_imengine.cpp:780
+#: src/scim_unikey_imengine.cpp:765
 msgid "Enable PreEdit"
 msgstr "Bật PreEdit"
 
-#: src/scim_unikey_imengine.cpp:782 setup/scim_unikey_setup.cpp:249
+#: src/scim_unikey_imengine.cpp:767 setup/scim_unikey_setup.cpp:250
 msgid ""
 "This option is best for most application\n"
 "But you may don't like it because it have an underline when typing"
@@ -112,11 +112,11 @@ msgstr ""
 "Tùy chọn này thì tốt cho hầu hết mọi ứng dụng\n"
 "Nhưng bạn có thể không thích nó, bởi vì nó có một đường gạch chân khi gõ"
 
-#: src/scim_unikey_imengine.cpp:789 setup/scim_unikey_setup.cpp:207
+#: src/scim_unikey_imengine.cpp:774 setup/scim_unikey_setup.cpp:207
 msgid "Process W at word begin"
 msgstr "Xử lý phím W ở đầu từ"
 
-#: src/scim_unikey_imengine.cpp:791 setup/scim_unikey_setup.cpp:213
+#: src/scim_unikey_imengine.cpp:776 setup/scim_unikey_setup.cpp:213
 msgid ""
 "If enable, type W at begin\n"
 "of word will change to Ư."
@@ -156,30 +156,31 @@ msgstr "Chế độ gõ"
 msgid "Mode switch key:"
 msgstr "Phím chuyển chế độ"
 
-#: setup/scim_unikey_setup.cpp:243
+#: setup/scim_unikey_setup.cpp:244
 msgid "Preedit is default"
 msgstr "Preedit là mặc định"
 
-#: setup/scim_unikey_setup.cpp:400
+#: setup/scim_unikey_setup.cpp:401
 msgid "Macro table definition"
 msgstr "Định nghĩa bảng gõ tắt"
 
-#: setup/scim_unikey_setup.cpp:428
+#: setup/scim_unikey_setup.cpp:429
 msgid "Word"
 msgstr "Từ"
 
-#: setup/scim_unikey_setup.cpp:436
+#: setup/scim_unikey_setup.cpp:437
 msgid "Replace with"
 msgstr "Thay thế bởi"
 
-#: setup/scim_unikey_setup.cpp:443
+#: setup/scim_unikey_setup.cpp:444
 msgid "Delete"
 msgstr "Xóa"
 
-#: setup/scim_unikey_setup.cpp:448
+#: setup/scim_unikey_setup.cpp:449
 msgid "Delete All"
 msgstr "Xóa tất cả"
 
-#: setup/scim_unikey_setup.cpp:600
+#: setup/scim_unikey_setup.cpp:601
 msgid "(replace text)"
 msgstr "(chuỗi thay thế)"
+

diff --git a/setup/scim_unikey_setup.cpp b/setup/scim_unikey_setup.cpp
index 44afe2d..cb8bd8c 100644 (file)
--- a/setup/scim_unikey_setup.cpp
+++ b/setup/scim_unikey_setup.cpp
@@ -159,7 +159,7 @@ static GtkWidget* create_setup_window()
 
         gtk_tooltips_set_tip (__widget_tooltips, __widget_autononvnrestore,
                               _("When typing a word not in Vietnamese,\n"
-                              "it will auto restore keystroke into orginal"), NULL);
+                              "it will auto restore keystroke into original"), NULL);
 
         // create modernstyle checkbox
         __widget_modernstyle = gtk_check_button_new_with_label(_("Use oà, uý (instead of òa, úy)"));

diff --git a/src/scim_unikey_const.h b/src/scim_unikey_const.h
index 198232d..6153bbc 100644 (file)
--- a/src/scim_unikey_const.h
+++ b/src/scim_unikey_const.h
@@ -10,35 +10,35 @@
 #if !defined (__SCIM_UNIKEY_IMENGINE_CONST_H)
 #define __SCIM_UNIKEY_IMENGINE_CONST_H
 
-#define SCIM_UNIKEY_ICON_FILENAME                      "/scim-unikey.png"
-#define SCIM_UNIKEY_ICON_CONFIGURE                     "/scim-unikey-configure.png"
-#define SCIM_UNIKEY_ICON_CHECK                         "/scim-unikey-check.png"
+#define SCIM_UNIKEY_ICON_FILENAME                       "/scim-unikey.png"
+#define SCIM_UNIKEY_ICON_CONFIGURE                      "/scim-unikey-configure.png"
+#define SCIM_UNIKEY_ICON_CHECK                          "/scim-unikey-check.png"
 
-#define SCIM_IMENGINE_UNIKEY_MACROPATH                 "/.scim/scim-unikey/macro"
+#define SCIM_IMENGINE_UNIKEY_MACROPATH                  "/.scim/scim-unikey/macro"
 
 /** define the config string off the unikey engine */
-#define SCIM_IMENGINE_UNIKEY_PREEDIT                   "/IMEngine/Unikey/preEdit"
-#define SCIM_IMENGINE_UNIKEY_PREEDIT_SWITCH_KEY                "/IMEngine/Unikey/preEditSwitchKey"
-#define SCIM_IMENGINE_UNIKEY_PROCESSWATWORDBEGIN       "/IMEngine/Unikey/processWAtBeginWord"
+#define SCIM_IMENGINE_UNIKEY_PREEDIT                    "/IMEngine/Unikey/preEdit"
+#define SCIM_IMENGINE_UNIKEY_PREEDIT_SWITCH_KEY         "/IMEngine/Unikey/preEditSwitchKey"
+#define SCIM_IMENGINE_UNIKEY_PROCESSWATWORDBEGIN        "/IMEngine/Unikey/processWAtBeginWord"
 
-#define SCIM_IMENGINE_UNIKEY_FREEMARKING               "/IMEngine/Unikey/freeMarking"
-#define SCIM_IMENGINE_UNIKEY_MODERNSTYLE               "/IMEngine/Unikey/modernStyle"
-#define SCIM_IMENGINE_UNIKEY_MACROENABLED              "/IMEngine/Unikey/macroEnabled"
-#define SCIM_IMENGINE_UNIKEY_SPELLCHECKENABLED         "/IMEngine/Unikey/spellCheckEnabled"
-#define SCIM_IMENGINE_UNIKEY_AUTONONVNRESTORE          "/IMEngine/Unikey/autoNonVnRestore"
+#define SCIM_IMENGINE_UNIKEY_FREEMARKING                "/IMEngine/Unikey/freeMarking"
+#define SCIM_IMENGINE_UNIKEY_MODERNSTYLE                "/IMEngine/Unikey/modernStyle"
+#define SCIM_IMENGINE_UNIKEY_MACROENABLED               "/IMEngine/Unikey/macroEnabled"
+#define SCIM_IMENGINE_UNIKEY_SPELLCHECKENABLED          "/IMEngine/Unikey/spellCheckEnabled"
+#define SCIM_IMENGINE_UNIKEY_AUTONONVNRESTORE           "/IMEngine/Unikey/autoNonVnRestore"
 
-#define SCIM_IMENGINE_UNIKEY_INPUTMETHOD               "/IMEngine/Unikey/InputMethod"
-#define SCIM_IMENGINE_UNIKEY_OUTPUTCHARSET             "/IMEngine/Unikey/OutputCharset"
+#define SCIM_IMENGINE_UNIKEY_INPUTMETHOD                "/IMEngine/Unikey/InputMethod"
+#define SCIM_IMENGINE_UNIKEY_OUTPUTCHARSET              "/IMEngine/Unikey/OutputCharset"
 
 /** define the default value off the unikey engine */
-#define SCIM_IMENGINE_UNIKEY_PROCESSWATWORDBEGIN_DEF   true
-
-#define SCIM_IMENGINE_UNIKEY_PREEDIT_DEF               true
-#define SCIM_IMENGINE_UNIKEY_PREEDIT_SWITCH_KEY_DEF    "Control+Alt+backslash"
-#define SCIM_IMENGINE_UNIKEY_FREEMARKING_DEF           true
-#define SCIM_IMENGINE_UNIKEY_MODERNSTYLE_DEF           false
-#define SCIM_IMENGINE_UNIKEY_MACROENABLED_DEF          false
-#define SCIM_IMENGINE_UNIKEY_SPELLCHECKENABLED_DEF     true
-#define SCIM_IMENGINE_UNIKEY_AUTONONVNRESTORE_DEF      true
+#define SCIM_IMENGINE_UNIKEY_PROCESSWATWORDBEGIN_DEF    true
+
+#define SCIM_IMENGINE_UNIKEY_PREEDIT_DEF                true
+#define SCIM_IMENGINE_UNIKEY_PREEDIT_SWITCH_KEY_DEF     "Control+Alt+backslash"
+#define SCIM_IMENGINE_UNIKEY_FREEMARKING_DEF            true
+#define SCIM_IMENGINE_UNIKEY_MODERNSTYLE_DEF            false
+#define SCIM_IMENGINE_UNIKEY_MACROENABLED_DEF           false
+#define SCIM_IMENGINE_UNIKEY_SPELLCHECKENABLED_DEF      true
+#define SCIM_IMENGINE_UNIKEY_AUTONONVNRESTORE_DEF       true
 
 #endif

diff --git a/src/scim_unikey_imengine.cpp b/src/scim_unikey_imengine.cpp
index 24e671e..01f81fb 100644 (file)
--- a/src/scim_unikey_imengine.cpp
+++ b/src/scim_unikey_imengine.cpp
@@ -320,6 +320,15 @@ void UnikeyInstance::Unikey_update_preedit_string(const WideString s, const bool
     }
 }
 
+void UnikeyInstance::Unikey_commit_key_event(const KeyEvent& key)
+{
+    static WideString s;
+
+    s.clear();
+    s.push_back(key.code);
+    commit_string(s);
+}
+
 bool UnikeyInstance::process_key_event(const KeyEvent& key)
 {
     bool tmp;
@@ -451,7 +460,7 @@ bool UnikeyInstance::Unikey_process_key_event_direct(const KeyEvent& key)
         }
         else
         {
-            forward_key_event(key);
+            Unikey_commit_key_event(key);
             return true;
         }
 

diff --git a/src/scim_unikey_imengine.h b/src/scim_unikey_imengine.h
index 786213a..2226c7b 100644 (file)
--- a/src/scim_unikey_imengine.h
+++ b/src/scim_unikey_imengine.h
@@ -49,6 +49,7 @@ private:
     bool Unikey_process_key_event_preedit(const KeyEvent& key);
     void Unikey_send_backspace(int nBackspace);
     void Unikey_update_preedit_string(const WideString s, const bool visible);
+    void Unikey_commit_key_event(const KeyEvent& key);
     PropertyList CreatePropertyList();
 
     int m_im;                             // input method