From e45b8be71b6f5a0e95db2b6f1d4d92fbe59d2cdc Mon Sep 17 00:00:00 2001
From: Elliot Smith <elliot.smith@intel.com>
Date: Mon, 19 Jul 2010 12:52:00 +0100
Subject: [PATCH] cookbook: Fix key press to examine modifers correctly

The simple key press example in the cookbook used a brittle
and incorrect switch statement to test modifier values. Instead,
use logical "&" of the state with the modifiers we're interested
in to check which keys were pressed.

http://bugzilla.clutter-project.org/show_bug.cgi?id=2223
---
 doc/cookbook/events.xml | 32 ++++++++++++++------------------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/doc/cookbook/events.xml b/doc/cookbook/events.xml
index d47ad1954..a4cc5c118 100644
--- a/doc/cookbook/events.xml
+++ b/doc/cookbook/events.xml
@@ -102,31 +102,26 @@ g_signal_connect (actor, "key-press-event", G_CALLBACK (_key_press_cb), NULL);
 
         <informalexample>
           <programlisting>
+<![CDATA[
 static gboolean
 _key_press_cb (ClutterActor *actor,
-             ClutterEvent *event,
-             gpointer      user_data)
+               ClutterEvent *event,
+               gpointer      user_data)
 {
   guint keyval = clutter_event_get_key_symbol (event);
 
+  ClutterModifierType state = clutter_event_get_state (event);
+  gboolean shift_pressed = (state & CLUTTER_SHIFT_MASK ? TRUE : FALSE);
+  gboolean ctrl_pressed = (state & CLUTTER_CONTROL_MASK ? TRUE : FALSE);
+
   if (CLUTTER_Up == keyval)
     {
-      ClutterModifierType modifiers = clutter_event_get_state (event);
-
-      switch (modifiers)
-        {
-        case CLUTTER_SHIFT_MASK:
-          g_debug ("Up and shift pressed");
-          break;
-
-        case CLUTTER_SHIFT_MASK + CLUTTER_CONTROL_MASK:
-          g_debug ("Up and shift and control pressed");
-          break;
-
-        default:
-          g_debug ("Up pressed");
-          break;
-        }
+      if (shift_pressed & ctrl_pressed)
+        g_debug ("Up and shift and control pressed");
+      else if (shift_pressed)
+        g_debug ("Up and shift pressed");
+      else
+        g_debug ("Up pressed");
 
       /* The event was handled, and the emission should stop */
       return TRUE;
@@ -135,6 +130,7 @@ _key_press_cb (ClutterActor *actor,
   /* The event was not handled, and the emission should continue */
   return FALSE;
 }
+]]>
           </programlisting>
         </informalexample>