diff options
| author | michi_cc <michi_cc@openttd.org> | 2013-11-14 23:03:59 +0000 |
|---|---|---|
| committer | michi_cc <michi_cc@openttd.org> | 2013-11-14 23:03:59 +0000 |
| commit | 8f8173c3fe3fe0fcd00032225ea07be5d9cb5290 (patch) | |
| tree | a9335219395eeb130cc170ca69667cb294b1fb61 /src/video/cocoa | |
| parent | 8ceef6ec61cf82268805cf2a0db5bf6718e344a3 (diff) | |
| download | openttd-8f8173c3fe3fe0fcd00032225ea07be5d9cb5290.tar.xz | |
(svn r26002) -Fix: [OSX] If the console hotkey is a dead key, require two presses to toggle the console, allowing input of accented characters.
Diffstat (limited to 'src/video/cocoa')
| -rw-r--r-- | src/video/cocoa/event.mm | 26 |
1 files changed, 23 insertions, 3 deletions
diff --git a/src/video/cocoa/event.mm b/src/video/cocoa/event.mm index f5474800f..d77022a19 100644 --- a/src/video/cocoa/event.mm +++ b/src/video/cocoa/event.mm @@ -272,8 +272,10 @@ static uint32 QZ_MapKey(unsigned short sym) return key; } -static void QZ_KeyEvent(unsigned short keycode, unsigned short unicode, BOOL down) +static bool QZ_KeyEvent(unsigned short keycode, unsigned short unicode, BOOL down) { + bool interpret_keys = true; + switch (keycode) { case QZ_UP: SB(_dirkeys, 1, 1, down); break; case QZ_DOWN: SB(_dirkeys, 3, 1, down); break; @@ -292,6 +294,21 @@ static void QZ_KeyEvent(unsigned short keycode, unsigned short unicode, BOOL dow if (down) { uint32 pressed_key = QZ_MapKey(keycode); + + static bool console = false; + + if (pressed_key == WKC_BACKQUOTE && unicode == 0) { + if (!console) { + /* Backquote is a dead key, require a double press for hotkey behaviour (i.e. console). */ + console = true; + return true; + } else { + /* Second backquote, don't interpret as text input. */ + interpret_keys = false; + } + } + console = false; + /* Don't handle normal characters if an edit box has the focus. */ if (!EditBoxInGlobalFocus() || (!IsInsideMM(pressed_key, 'A', 'Z' + 1) && !IsInsideMM(pressed_key, '0', '9' + 1))) { HandleKeypress(pressed_key, unicode); @@ -300,6 +317,8 @@ static void QZ_KeyEvent(unsigned short keycode, unsigned short unicode, BOOL dow } else { DEBUG(driver, 2, "cocoa_v: QZ_KeyEvent: %x (%x), up", keycode, unicode); } + + return interpret_keys; } static void QZ_DoUnsidedModifiers(unsigned int newMods) @@ -521,8 +540,9 @@ static bool QZ_PollEvent() } if (EditBoxInGlobalFocus()) { - [ _cocoa_subdriver->cocoaview interpretKeyEvents:[ NSArray arrayWithObject:event ] ]; - QZ_KeyEvent([ event keyCode ], 0, YES); + if (QZ_KeyEvent([ event keyCode ], 0, YES)) { + [ _cocoa_subdriver->cocoaview interpretKeyEvents:[ NSArray arrayWithObject:event ] ]; + } } else { chars = [ event characters ]; if ([ chars length ] == 0) { |