Zengtudor
/
glfw
mirror of https://github.com/glfw/glfw.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Renamed control modifier bit to match key token.

This commit is contained in:
Camilla Berglund 2013-05-23 14:11:05 +02:00
parent 47b06e1fdc
commit 3bcffba24a
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/GLFW/glfw3.h
View File

@ -415,7 +415,7 @@ extern "C" {
#define GLFW_MOD_SHIFT 0x0001 #define GLFW_MOD_SHIFT 0x0001
/*! @ingroup input /*! @ingroup input
*/ */
#define GLFW_MOD_CTRL 0x0002 #define GLFW_MOD_CONTROL 0x0002
/*! @ingroup input /*! @ingroup input
*/ */
#define GLFW_MOD_ALT 0x0004 #define GLFW_MOD_ALT 0x0004

2
src/cocoa_window.m
View File

@ -210,7 +210,7 @@ static int convertKeyMods(NSUInteger flags)
if (flags & NSShiftKeyMask) if (flags & NSShiftKeyMask)
mods |= GLFW_MOD_SHIFT; mods |= GLFW_MOD_SHIFT;
if (flags & NSControlKeyMask) if (flags & NSControlKeyMask)
mods |= GLFW_MOD_CTRL; mods |= GLFW_MOD_CONTROL;
if (flags & NSAlternateKeyMask) if (flags & NSAlternateKeyMask)
mods |= GLFW_MOD_ALT; mods |= GLFW_MOD_ALT;

4
src/win32_window.c
View File

@ -113,7 +113,7 @@ static int getKeyMods(void)
if (GetKeyState(VK_SHIFT) & (1 << 31)) if (GetKeyState(VK_SHIFT) & (1 << 31))
mods |= GLFW_MOD_SHIFT; mods |= GLFW_MOD_SHIFT;
if (GetKeyState(VK_CONTROL) & (1 << 31)) if (GetKeyState(VK_CONTROL) & (1 << 31))
mods |= GLFW_MOD_CTRL; mods |= GLFW_MOD_CONTROL;
if (GetKeyState(VK_MENU) & (1 << 31)) if (GetKeyState(VK_MENU) & (1 << 31))
mods |= GLFW_MOD_ALT; mods |= GLFW_MOD_ALT;
@ -129,7 +129,7 @@ static int getAsyncKeyMods(void)
if (GetAsyncKeyState(VK_SHIFT) & (1 << 31)) if (GetAsyncKeyState(VK_SHIFT) & (1 << 31))
mods |= GLFW_MOD_SHIFT; mods |= GLFW_MOD_SHIFT;
if (GetAsyncKeyState(VK_CONTROL) & (1 << 31)) if (GetAsyncKeyState(VK_CONTROL) & (1 << 31))
mods |= GLFW_MOD_CTRL; mods |= GLFW_MOD_CONTROL;
if (GetAsyncKeyState(VK_MENU) & (1 << 31)) if (GetAsyncKeyState(VK_MENU) & (1 << 31))
mods |= GLFW_MOD_ALT; mods |= GLFW_MOD_ALT;

4
src/x11_window.c
View File

@ -67,7 +67,7 @@ int translateState(int state)
if (state & ShiftMask) if (state & ShiftMask)
mods |= GLFW_MOD_SHIFT; mods |= GLFW_MOD_SHIFT;
if (state & ControlMask) if (state & ControlMask)
mods |= GLFW_MOD_CTRL; mods |= GLFW_MOD_CONTROL;
if (state & Mod1Mask) if (state & Mod1Mask)
mods |= GLFW_MOD_ALT; mods |= GLFW_MOD_ALT;
@ -532,7 +532,7 @@ static void processEvent(XEvent *event)
_glfwInputKey(window, key, GLFW_PRESS, mods); _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)); _glfwInputChar(window, translateChar(&event->xkey));
break; break;