From 3bcffba24a28a8b82922a3c6b99c9b4ec56174e0 Mon Sep 17 00:00:00 2001
From: Camilla Berglund <elmindreda@elmindreda.org>
Date: Thu, 23 May 2013 14:11:05 +0200
Subject: [PATCH] Renamed control modifier bit to match key token.

---
 include/GLFW/glfw3.h | 2 +-
 src/cocoa_window.m   | 2 +-
 src/win32_window.c   | 4 ++--
 src/x11_window.c     | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/GLFW/glfw3.h b/include/GLFW/glfw3.h
index f973b33f..7f0df16c 100644
--- a/include/GLFW/glfw3.h
+++ b/include/GLFW/glfw3.h
@@ -415,7 +415,7 @@ extern "C" {
 #define GLFW_MOD_SHIFT           0x0001
 /*! @ingroup input
  */
-#define GLFW_MOD_CTRL            0x0002
+#define GLFW_MOD_CONTROL         0x0002
 /*! @ingroup input
  */
 #define GLFW_MOD_ALT             0x0004
diff --git a/src/cocoa_window.m b/src/cocoa_window.m
index ba093572..c7c4c115 100644
--- a/src/cocoa_window.m
+++ b/src/cocoa_window.m
@@ -210,7 +210,7 @@ static int convertKeyMods(NSUInteger flags)
     if (flags & NSShiftKeyMask)
         mods |= GLFW_MOD_SHIFT;
     if (flags & NSControlKeyMask)
-        mods |= GLFW_MOD_CTRL;
+        mods |= GLFW_MOD_CONTROL;
     if (flags & NSAlternateKeyMask)
         mods |= GLFW_MOD_ALT;
 
diff --git a/src/win32_window.c b/src/win32_window.c
index 23efc67f..3dffd964 100644
--- a/src/win32_window.c
+++ b/src/win32_window.c
@@ -113,7 +113,7 @@ static int getKeyMods(void)
     if (GetKeyState(VK_SHIFT) & (1 << 31))
         mods |= GLFW_MOD_SHIFT;
     if (GetKeyState(VK_CONTROL) & (1 << 31))
-        mods |= GLFW_MOD_CTRL;
+        mods |= GLFW_MOD_CONTROL;
     if (GetKeyState(VK_MENU) & (1 << 31))
         mods |= GLFW_MOD_ALT;
 
@@ -129,7 +129,7 @@ static int getAsyncKeyMods(void)
     if (GetAsyncKeyState(VK_SHIFT) & (1 << 31))
         mods |= GLFW_MOD_SHIFT;
     if (GetAsyncKeyState(VK_CONTROL) & (1 << 31))
-        mods |= GLFW_MOD_CTRL;
+        mods |= GLFW_MOD_CONTROL;
     if (GetAsyncKeyState(VK_MENU) & (1 << 31))
         mods |= GLFW_MOD_ALT;
 
diff --git a/src/x11_window.c b/src/x11_window.c
index ea8a8821..56c66777 100644
--- a/src/x11_window.c
+++ b/src/x11_window.c
@@ -67,7 +67,7 @@ int translateState(int state)
     if (state & ShiftMask)
         mods |= GLFW_MOD_SHIFT;
     if (state & ControlMask)
-        mods |= GLFW_MOD_CTRL;
+        mods |= GLFW_MOD_CONTROL;
     if (state & Mod1Mask)
         mods |= GLFW_MOD_ALT;
 
@@ -532,7 +532,7 @@ static void processEvent(XEvent *event)
 
             _glfwInputKey(window, key, GLFW_PRESS, mods);
 
-            if (!(mods & GLFW_MOD_CTRL) && !(mods & GLFW_MOD_ALT))
+            if (!(mods & GLFW_MOD_CONTROL) && !(mods & GLFW_MOD_ALT))
                 _glfwInputChar(window, translateChar(&event->xkey));
 
             break;