Merge branch 'master' into tizen_2.1

diff --git a/configure.ac b/configure.ac
index 50bf0fa..51c7235 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 # Process this file with autoconf to produce a configure script
 #AC_INIT(scim, 1.4.7, suzhe@tsinghua.org.cn)
-AC_INIT(isf, 2.4.6403, isf@samsung.com)
+AC_INIT(isf, 2.4.6404, isf@samsung.com)
 AC_CONFIG_SRCDIR([ism/src/scim.h])
 m4_pattern_allow([^AS_])
 
@@ -11,7 +11,7 @@ m4_pattern_allow([^AS_])
 # ISF version
 ISF_MAJOR_VERSION=2
 ISF_MINOR_VERSION=4
-ISF_MICRO_VERSION=6403
+ISF_MICRO_VERSION=6404
 
 ISF_VERSION=$ISF_MAJOR_VERSION.$ISF_MINOR_VERSION.$ISF_MICRO_VERSION
 

diff --git a/ism/extras/efl_immodule/isf_imf_context.cpp b/ism/extras/efl_immodule/isf_imf_context.cpp
index 14bbbeb..3d6307c 100644 (file)
--- a/ism/extras/efl_immodule/isf_imf_context.cpp
+++ b/ism/extras/efl_immodule/isf_imf_context.cpp
@@ -724,12 +724,12 @@ caps_mode_check (Ecore_IMF_Context *ctx, Eina_Bool force, Eina_Bool noti)
     }
 
     if (force) {
-        context_scim->impl->next_shift_status = uppercase?SHIFT_MODE_ON:SHIFT_MODE_OFF;
+        context_scim->impl->next_shift_status = uppercase ? SHIFT_MODE_ON : SHIFT_MODE_OFF;
         if (noti)
             isf_imf_context_input_panel_caps_mode_set (ctx, uppercase);
     } else {
-        if (context_scim->impl->next_shift_status != (uppercase?SHIFT_MODE_ON:SHIFT_MODE_OFF)) {
-            context_scim->impl->next_shift_status = uppercase?SHIFT_MODE_ON:SHIFT_MODE_OFF;
+        if (context_scim->impl->next_shift_status != (uppercase ? SHIFT_MODE_ON : SHIFT_MODE_OFF)) {
+            context_scim->impl->next_shift_status = uppercase ? SHIFT_MODE_ON : SHIFT_MODE_OFF;
             if (noti)
                 isf_imf_context_input_panel_caps_mode_set (ctx, uppercase);
         }
@@ -2028,37 +2028,39 @@ static void
 panel_slot_process_key_event (int context, const KeyEvent &key)
 {
     EcoreIMFContextISF *ic = find_ic (context);
+    Eina_Bool keygen = EINA_TRUE;
     SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << " context=" << context << " key=" << key.get_key_string () << " ic=" << ic << "\n";
     if (!(ic && ic->impl))
         return;
     KeyEvent _key = key;
-    if (key.is_key_press() &&
+    if (key.is_key_press () &&
         ecore_imf_context_input_panel_layout_get (ic->ctx) == ECORE_IMF_INPUT_PANEL_LAYOUT_NORMAL) {
-        if (key.code == SHIFT_MODE_OFF /*Shift_OFF*/ ||
-            key.code == SHIFT_MODE_ON /*Shift_ON*/ ||
-            key.code == SHIFT_MODE_LOCK /*Shift_Lock*/) {
+        if (key.code == SHIFT_MODE_OFF ||
+            key.code == SHIFT_MODE_ON ||
+            key.code == SHIFT_MODE_LOCK) {
             ic->impl->next_shift_status = _key.code;
         } else if ((key.code >= 'a' && key.code <= 'z') ||
             (key.code >= 'A' && key.code <= 'Z')) {
             Eina_Bool uppercase;
             switch (ic->impl->next_shift_status) {
                 case 0:
-                    uppercase = caps_mode_check(ic->ctx,EINA_FALSE,EINA_FALSE);
+                    uppercase = caps_mode_check (ic->ctx, EINA_FALSE, EINA_FALSE);
                     break;
-                case SHIFT_MODE_OFF: /*Shift_OFF*/
+                case SHIFT_MODE_OFF:
                     uppercase = EINA_FALSE;
                     ic->impl->next_shift_status = 0;
                     break;
-                case SHIFT_MODE_ON: /*Shift_ON*/
+                case SHIFT_MODE_ON:
                     uppercase = EINA_TRUE;
                     ic->impl->next_shift_status = 0;
                     break;
-                case SHIFT_MODE_LOCK: /*Shift_Lock*/
+                case SHIFT_MODE_LOCK:
                     uppercase = EINA_TRUE;
                     break;
                 default:
                     uppercase = EINA_FALSE;
             }
+
             if (uppercase) {
                 if(key.code >= 'a' && key.code <= 'z')
                     _key.code -= 32;
@@ -2068,7 +2070,15 @@ panel_slot_process_key_event (int context, const KeyEvent &key)
             }
         }
     }
-    if (feed_key_event (ic, _key, false) == EINA_TRUE) return;
+
+    if (key.code == SHIFT_MODE_OFF ||
+        key.code == SHIFT_MODE_ON ||
+        key.code == SHIFT_MODE_LOCK) {
+        keygen = EINA_FALSE;
+    }
+
+    if (keygen)
+        if (feed_key_event (ic, _key, false) == EINA_TRUE) return;
 
     _panel_client.prepare (ic->id);
 

diff --git a/packaging/isf.spec b/packaging/isf.spec
index 1501998..0e0099c 100755 (executable)
--- a/packaging/isf.spec
+++ b/packaging/isf.spec
@@ -3,8 +3,8 @@
 
 Name:       isf
 Summary:    Input Service Framework
-Version:    2.4.6403
-Release:    2
+Version:    2.4.6404
+Release:    1
 Group:      System Environment/Libraries
 License:    LGPL
 Source0:    %{name}-%{version}.tar.gz

diff --git a/releasenote.txt b/releasenote.txt
index ebf0fba..1bbffd1 100644 (file)
--- a/releasenote.txt
+++ b/releasenote.txt
@@ -1,3 +1,9 @@
+ISF 2.4.6404 :
+ 1. [panel] settle candidate window when keyboard state is changed
+ 2. [immodule] Fix bug shift key event for autocapital is generated.
+ 3. Added update_ise_exit
+
+
 ISF 2.4.6403 :
  1. Fix defects according to prevent report
  2. [setting] separate ug package to support osp setting