From df464d2b06026dcfcb0d215238333d40bcecd29e Mon Sep 17 00:00:00 2001
From: Peng Huang <shawn.p.huang@gmail.com>
Date: Mon, 8 Jun 2009 16:52:38 +0800
Subject: [PATCH] Filter release key events follow the hotkey.

---
 bus/inputcontext.c | 44 +++++++++++++++++++++++++++++++++++---------
 1 file changed, 35 insertions(+), 9 deletions(-)

diff --git a/bus/inputcontext.c b/bus/inputcontext.c
index b26797f..511ebf5 100644
--- a/bus/inputcontext.c
+++ b/bus/inputcontext.c
@@ -97,6 +97,9 @@ struct _BusInputContextPrivate {
     IBusLookupTable *lookup_table;
     gboolean lookup_table_visible;
 
+    /* filter release */
+    gboolean filter_release;
+
 };
 
 typedef struct _BusInputContextPrivate BusInputContextPrivate;
@@ -706,6 +709,7 @@ _ic_process_key_event (BusInputContext *context,
     retval = bus_input_context_filter_keyboard_shortcuts (context, keyval, modifiers);
 
     if (retval) {
+        priv->filter_release = TRUE;
         reply = ibus_message_new_method_return (message);
         ibus_message_append_args (reply,
                                   G_TYPE_BOOLEAN, &retval,
@@ -2027,6 +2031,8 @@ bus_input_context_filter_keyboard_shortcuts (BusInputContext    *context,
     BusInputContextPrivate *priv;
     priv = BUS_INPUT_CONTEXT_GET_PRIVATE (context);
 
+    gboolean retval = FALSE;
+
     static GQuark trigger;
     static GQuark next_factory;
     static GQuark prev_factory;
@@ -2039,6 +2045,17 @@ bus_input_context_filter_keyboard_shortcuts (BusInputContext    *context,
         prev_factory = g_quark_from_static_string ("prev-engine");
     }
 
+    if (priv->filter_release){
+        if(modifiers & IBUS_RELEASE_MASK) {
+            /* filter release key event */
+            return TRUE;
+        }
+        else {
+            /* stop filter release key event */
+            priv->filter_release = FALSE;
+        }
+    }
+
     event = ibus_hotkey_profile_filter_key_event (BUS_DEFAULT_HOTKEY_PROFILE,
                                                   keyval,
                                                   modifiers,
@@ -2058,24 +2075,33 @@ bus_input_context_filter_keyboard_shortcuts (BusInputContext    *context,
             bus_input_context_enable (context);
         }
 
-        return enabled != priv->enabled;
+        retval = (enabled != priv->enabled);
     }
     else if (event == next_factory) {
         if (priv->engine == NULL || priv->enabled == FALSE) {
-            return FALSE;
+            retval =  FALSE;
+        }
+        else {
+            g_signal_emit (context, context_signals[REQUEST_NEXT_ENGINE], 0);
+            retval = TRUE;
         }
-        g_signal_emit (context, context_signals[REQUEST_NEXT_ENGINE], 0);
-        return TRUE;
     }
     else if (event == prev_factory) {
         if (priv->engine == NULL || priv->enabled == FALSE) {
-            return FALSE;
+            retval = FALSE;
+        }
+        else {
+            g_signal_emit (context, context_signals[REQUEST_PREV_ENGINE], 0);
+            retval = TRUE;
         }
-        g_signal_emit (context, context_signals[REQUEST_PREV_ENGINE], 0);
-        return TRUE;
     }
-    else
-        return FALSE;
+
+    if (retval == TRUE) {
+        /* begine filter release key event */
+        priv->filter_release = TRUE;
+    }
+
+    return retval;
 }
 
 
-- 
2.7.4