From 04a7a6e75df3f95e6cce4a3af4124f0a539bcda8 Mon Sep 17 00:00:00 2001 From: Michael Lutz Date: Thu, 14 Nov 2013 23:43:46 +0100 Subject: -Fix [FS#5795] (r25743): [OSX] Some hotkeys were still triggered during text input. --- src/video/cocoa/event.mm | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/video/cocoa/event.mm b/src/video/cocoa/event.mm index d77022a..489b385 100644 --- a/src/video/cocoa/event.mm +++ b/src/video/cocoa/event.mm @@ -310,7 +310,7 @@ static bool QZ_KeyEvent(unsigned short keycode, unsigned short unicode, BOOL dow 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))) { + if (!EditBoxInGlobalFocus() || ((pressed_key & ~WKC_SPECIAL_KEYS) <= WKC_TAB) || IsInsideMM(pressed_key & ~WKC_SPECIAL_KEYS, WKC_F1, WKC_PAUSE + 1)) { HandleKeypress(pressed_key, unicode); } DEBUG(driver, 2, "cocoa_v: QZ_KeyEvent: %x (%x), down, mapping: %x", keycode, unicode, pressed_key); -- 1.7.9