diff options
| author | michi_cc <michi_cc@openttd.org> | 2013-08-05 20:36:36 +0000 |
|---|---|---|
| committer | michi_cc <michi_cc@openttd.org> | 2013-08-05 20:36:36 +0000 |
| commit | 019984a14f01e4463ae479765d2340ff26055367 (patch) | |
| tree | 291b47c56523ebef7368f3588e921a1cdb78f331 /src/video/cocoa | |
| parent | 270d8aa639341f8be7fde9aa6e6f5bb6fa894d4f (diff) | |
| download | openttd-019984a14f01e4463ae479765d2340ff26055367.tar.xz | |
(svn r25671) -Codechange: Pass character and key code separately to the keyboard handler.
Diffstat (limited to 'src/video/cocoa')
| -rw-r--r-- | src/video/cocoa/event.mm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/video/cocoa/event.mm b/src/video/cocoa/event.mm index 0e7831c34..40bf57eb6 100644 --- a/src/video/cocoa/event.mm +++ b/src/video/cocoa/event.mm @@ -267,7 +267,7 @@ static uint32 QZ_MapKey(unsigned short sym) if (_current_mods & NSAlternateKeyMask) key |= WKC_ALT; if (_current_mods & NSCommandKeyMask) key |= (_settings_client.gui.right_mouse_btn_emulation != RMBE_CONTROL ? WKC_META : WKC_CTRL); - return key << 16; + return key; } static void QZ_KeyEvent(unsigned short keycode, unsigned short unicode, BOOL down) @@ -289,8 +289,8 @@ static void QZ_KeyEvent(unsigned short keycode, unsigned short unicode, BOOL dow } if (down) { - uint32 pressed_key = QZ_MapKey(keycode) | unicode; - HandleKeypress(pressed_key); + uint32 pressed_key = QZ_MapKey(keycode); + HandleKeypress(pressed_key, unicode); DEBUG(driver, 2, "cocoa_v: QZ_KeyEvent: %x (%x), down, mapping: %x", keycode, unicode, pressed_key); } else { DEBUG(driver, 2, "cocoa_v: QZ_KeyEvent: %x (%x), up", keycode, unicode); |