XQuartz: xp_is_symbolic_hotkey_event catches the input menu, but not our mainMenu, so we still need to do that the old way.

This commit is contained in:
Jeremy Huddleston 2008-08-29 03:54:55 -07:00
parent 03f1a3f1ff
commit 25eccf12c8

View file

@ -243,13 +243,15 @@ static void message_kit_thread (SEL selector, NSObject *arg) {
for_x = NO; for_x = NO;
DarwinSendDDXEvent(kXquartzToggleFullscreen, 0); DarwinSendDDXEvent(kXquartzToggleFullscreen, 0);
#endif #endif
} else if(X11EnableKeyEquivalents &&
#if XPLUGIN_VERSION >= 1 #if XPLUGIN_VERSION >= 1
} else if(X11EnableKeyEquivalents &&
xp_is_symbolic_hotkey_event([e eventRef])) { xp_is_symbolic_hotkey_event([e eventRef])) {
#else swallow_up = [e keyCode];
for_x = NO;
#endif
} else if(X11EnableKeyEquivalents &&
[[self mainMenu] performKeyEquivalent:e]) { [[self mainMenu] performKeyEquivalent:e]) {
for_appkit = NO; for_appkit = NO;
#endif
swallow_up = [e keyCode]; swallow_up = [e keyCode];
for_x = NO; for_x = NO;
} else { } else {