Add code for checking hotkey

Change-Id: I799b653a7e10a17644beb7ee932021bbefc355a4

diff --git a/packaging/ise-engine-default.spec b/packaging/ise-engine-default.spec
index 902ddc3a3cd631c93abeaa58cfe2d5c9bebc14da..0bd3597847faaa366678eba0d50f9cebb7c7beb7 100644 (file)
--- a/packaging/ise-engine-default.spec
+++ b/packaging/ise-engine-default.spec
@@ -1,7 +1,7 @@
 Name:       ise-engine-default
 Summary:    Multilingual Keyboard ISE
 Version:    0.1.5023
-Release:    6
+Release:    7
 Group:      System Environment/Libraries
 License:    Apache License, Version 2.0
 Source0:    %{name}-%{version}.tar.gz

diff --git a/src/isf_default_imengine.cpp b/src/isf_default_imengine.cpp
index 06b9d759e481e585eda2c6e37f969cf86114cc92..18b0b766e59f7f70a5547823a6b0023f8e39dd69 100644 (file)
--- a/src/isf_default_imengine.cpp
+++ b/src/isf_default_imengine.cpp
@@ -258,9 +258,15 @@ bool DefaultInstance::_process_keyrelease(const KeyEvent & key) {
 
 bool DefaultInstance::_process_keypress(const KeyEvent & key_raw) {
        KeyEvent key = key_raw;
-       unsigned int keyvalue;
+       unsigned int keyvalue = key.code;
 
-       keyvalue = key.code;
+       if (key.is_control_down() || key.is_alt_down())
+               return false;
+
+       if (key.code == SCIM_KEY_NullKey || key.code == SCIM_KEY_Cancel) {
+               m_prevkeyval = keyvalue;
+               return false;
+       }
 
        if (m_lang >= IM_LANGUAGE_CNT) {
                return false;