From f92c0cbe7e6d53f0bdf2dfe89d6fae8bed047dcc Mon Sep 17 00:00:00 2001
From: Marco Antognini <antognini.marco@gmail.com>
Date: Fri, 28 Jun 2013 12:48:18 +0200
Subject: [PATCH] Add support for right control key on OS X

Related to #401
---
 .../Window/OSX/SFKeyboardModifiersHelper.h    |  8 ++----
 .../Window/OSX/SFKeyboardModifiersHelper.mm   | 28 +++++++++----------
 2 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/src/SFML/Window/OSX/SFKeyboardModifiersHelper.h b/src/SFML/Window/OSX/SFKeyboardModifiersHelper.h
index 78146fd19..2020673c4 100644
--- a/src/SFML/Window/OSX/SFKeyboardModifiersHelper.h
+++ b/src/SFML/Window/OSX/SFKeyboardModifiersHelper.h
@@ -37,12 +37,8 @@ namespace sf {
 ////////////////////////////////////////////////////////////
 /// Keyboard Modifiers Helper
 ///
-/// Handle modifiers (cmd, ctrl, alt, shift) events and send
-/// them back to the requester.
-///
-/// As I don't have the right control keycode I cannot
-/// implement left-right recognition for this key.
-/// (See SFKeyboardModifiersHelper.mm for more info.)
+/// Handle left & right modifiers (cmd, ctrl, alt, shift)
+/// events and send them back to the requester.
 ///
 ////////////////////////////////////////////////////////////
 
diff --git a/src/SFML/Window/OSX/SFKeyboardModifiersHelper.mm b/src/SFML/Window/OSX/SFKeyboardModifiersHelper.mm
index b019d0d5c..d023079a0 100644
--- a/src/SFML/Window/OSX/SFKeyboardModifiersHelper.mm
+++ b/src/SFML/Window/OSX/SFKeyboardModifiersHelper.mm
@@ -32,13 +32,8 @@
 
 
 ////////////////////////////////////////////////////////////
-/// Here are define the mask value for the 'modifiers' keys (cmd, ctrl, alt, shift)
-///
-/// As I don't have the right control keycode I cannot implement left-right
-/// recognition for this key.
-#warning Missing keycode for right control key.
-/// #define NSRightControlKeyMask       0x...
-/// #define NSLeftControlKeyMask        0x40101
+/// Here are define the mask value for the 'modifiers'
+/// keys (cmd, ctrl, alt, shift)
 ///
 ////////////////////////////////////////////////////////////
 #define NSRightShiftKeyMask         0x020004
@@ -47,6 +42,8 @@
 #define NSLeftCommandKeyMask        0x100008
 #define NSRightAlternateKeyMask     0x080040
 #define NSLeftAlternateKeyMask      0x080020
+#define NSRightControlKeyMask       0x042000
+#define NSLeftControlKeyMask        0x040001
 
 
 ////////////////////////////////////////////////////////////
@@ -62,8 +59,8 @@ struct ModifiersState
     BOOL leftCommandWasDown;
     BOOL rightAlternateWasDown;
     BOOL leftAlternateWasDown;
-    BOOL controlWasDown;
-    // Left & right control keys not yet supported. See the note above.
+    BOOL leftControlWasDown;
+    BOOL rightControlWasDown;
 };
 
 
@@ -167,10 +164,11 @@ void handleModifiersChanged(NSUInteger modifiers, sf::priv::WindowImplCocoa& req
     );
 
     // Handle control
-    // Currently only the left control key will be used in SFML (see note above).
-    processOneModifier(
-        modifiers, NSControlKeyMask,
-        state.controlWasDown, sf::Keyboard::LControl,
+    processLeftRightModifiers(
+        modifiers,
+        NSLeftControlKeyMask, NSRightControlKeyMask,
+        state.leftControlWasDown, state.rightControlWasDown,
+        sf::Keyboard::LControl, sf::Keyboard::RControl,
         requester
     );
 }
@@ -200,8 +198,8 @@ void ensureModifiersStateIsInitilized()
     state.rightCommandWasDown     = isKeyMaskActive(modifiers, NSRightCommandKeyMask);
     state.leftAlternateWasDown    = isKeyMaskActive(modifiers, NSLeftAlternateKeyMask);
     state.rightAlternateWasDown   = isKeyMaskActive(modifiers, NSRightAlternateKeyMask);
-    state.controlWasDown          = isKeyMaskActive(modifiers, NSControlKeyMask);
-    // Currently only the left control key will be used in SFML (see note above).
+    state.leftControlWasDown      = isKeyMaskActive(modifiers, NSLeftControlKeyMask);
+    state.rightControlWasDown     = isKeyMaskActive(modifiers, NSRightControlKeyMask);
 
     isStateInitialized = YES;
 }