diff options
| author | Jeremy Huddleston <jeremyhu@freedesktop.org> | 2008-08-29 03:54:55 -0700 |
|---|---|---|
| committer | Jeremy Huddleston <jeremyhu@freedesktop.org> | 2008-08-29 20:53:10 -0700 |
| commit | aee19c7b5542aa147b89b1ae8340e9931d81729f (patch) | |
| tree | 811afc1330830a2ac3a1563aa1679b0889dad4bf /hw | |
| parent | 974db58f5b730c3770ee461665a02dd4334d1dea (diff) | |
XQuartz: xp_is_symbolic_hotkey_event catches the input menu, but not our mainMenu, so we still need to do that the old way.
(cherry picked from commit 25eccf12c89d73b8bce2c9be14841efb230acedc)
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/xquartz/X11Application.m | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m index 5b1d171db..a1c09efb1 100644 --- a/hw/xquartz/X11Application.m +++ b/hw/xquartz/X11Application.m @@ -244,13 +244,15 @@ static void message_kit_thread (SEL selector, NSObject *arg) { for_x = NO; DarwinSendDDXEvent(kXquartzToggleFullscreen, 0); #endif - } else if(X11EnableKeyEquivalents && #if XPLUGIN_VERSION >= 1 + } else if(X11EnableKeyEquivalents && xp_is_symbolic_hotkey_event([e eventRef])) { -#else + swallow_up = [e keyCode]; + for_x = NO; +#endif + } else if(X11EnableKeyEquivalents && [[self mainMenu] performKeyEquivalent:e]) { for_appkit = NO; -#endif swallow_up = [e keyCode]; for_x = NO; } else { |