mirrors/SFML
1
0
Fork 0
mirror of https://github.com/SFML/SFML.git synced 2024-12-01 15:51:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add keypad return, equal and period keys support for OS X

Browse Source 
Related to #401
This commit is contained in:
Marco Antognini 2013-06-28 13:05:15 +02:00
parent eca4502424
commit af81ac60f3
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/SFML/Window/OSX/HIDInputManager.mm
View File

@ -449,10 +449,7 @@ void HIDInputManager::loadKey(IOHIDElementRef key)
// 0x1b | 0x2d | Hyphen // 0x1b | 0x2d | Hyphen
// 0x39 | 0x39 | CapsLock // 0x39 | 0x39 | CapsLock
// 0x47 | 0x53 | NumLock // 0x47 | 0x53 | NumLock
// 0x4c | 0x58 | Keypad Enter
// 0x41 | 0x63 | Keypad Period
// 0x6e | 0x65 | Application // 0x6e | 0x65 | Application
// 0x51 | 0x67 | Keypad Equal
// 0x4c | 0x77 | Select // 0x4c | 0x77 | Select
//if (code == Keyboard::Unknown) { // The key is unknown. //if (code == Keyboard::Unknown) { // The key is unknown.
@ -917,7 +914,7 @@ Keyboard::Key HIDInputManager::nonLocalizedKeys(UniChar virtualKeycode)
case 0x1e: return sf::Keyboard::RBracket; case 0x1e: return sf::Keyboard::RBracket;
case 0x29: return sf::Keyboard::SemiColon; case 0x29: return sf::Keyboard::SemiColon;
case 0x2b: return sf::Keyboard::Comma; case 0x2b: return sf::Keyboard::Comma;
// case 0x41: /* keypad */ return sf::Keyboard::Period; case 0x41: /* keypad */ return sf::Keyboard::Period;
case 0x2f: /* keyboard */ return sf::Keyboard::Period; case 0x2f: /* keyboard */ return sf::Keyboard::Period;
case 0x27: return sf::Keyboard::Quote; case 0x27: return sf::Keyboard::Quote;
case 0x2c: return sf::Keyboard::Slash; case 0x2c: return sf::Keyboard::Slash;
@ -927,12 +924,12 @@ Keyboard::Key HIDInputManager::nonLocalizedKeys(UniChar virtualKeycode)
// 0x0a is for "Non-US Backslash" according to HID Calibrator, // 0x0a is for "Non-US Backslash" according to HID Calibrator,
// a sample provided by Apple. // a sample provided by Apple.
case 0x0a: return sf::Keyboard::Tilde; case 0x0a: return sf::Keyboard::Tilde;
// case 0x51: /* keypad */ return sf::Keyboard::Equal; case 0x51: /* keypad */ return sf::Keyboard::Equal;
case 0x18: /* keyboard */ return sf::Keyboard::Equal; case 0x18: /* keyboard */ return sf::Keyboard::Equal;
case 0x32: return sf::Keyboard::Dash; case 0x32: return sf::Keyboard::Dash;
case 0x31: return sf::Keyboard::Space; case 0x31: return sf::Keyboard::Space;
// case 0x4c: /* keypad */ return sf::Keyboard::Return; case 0x4c: /* keypad */ return sf::Keyboard::Return;
case 0x24: /* keyboard */ return sf::Keyboard::Return; case 0x24: /* keyboard */ return sf::Keyboard::Return;
case 0x33: return sf::Keyboard::BackSpace; case 0x33: return sf::Keyboard::BackSpace;
case 0x30: return sf::Keyboard::Tab; case 0x30: return sf::Keyboard::Tab;