fix some of the quirks with cmd/ctrl keys on macosx and windows

This commit is contained in:
benfry
2005-05-11 08:34:16 +00:00
parent 4354cd30f3
commit ba43f2efc0
2 changed files with 75 additions and 10 deletions

View File

@@ -148,11 +148,26 @@ public class DefaultInputHandler extends InputHandler
*/
public void keyPressed(KeyEvent evt)
{
int keyCode = evt.getKeyCode();
int modifiers = evt.getModifiers();
int keyCode = evt.getKeyCode();
int modifiers = evt.getModifiers();
// don't get command-s or other menu key equivs on mac
if ((modifiers & KeyEvent.META_MASK) != 0) return;
// moved this earlier so it doesn't get random meta clicks
if (keyCode == KeyEvent.VK_CONTROL ||
keyCode == KeyEvent.VK_SHIFT ||
keyCode == KeyEvent.VK_ALT ||
keyCode == KeyEvent.VK_META) {
return;
}
// don't get command-s or other menu key equivs on mac
// unless it's something that's specifically bound (cmd-left or right)
//if ((modifiers & KeyEvent.META_MASK) != 0) return;
if ((modifiers & KeyEvent.META_MASK) != 0) {
KeyStroke keyStroke = KeyStroke.getKeyStroke(keyCode, modifiers);
if (currentBindings.get(keyStroke) == null) {
return;
}
}
/*
char keyChar = evt.getKeyChar();
@@ -162,12 +177,6 @@ public class DefaultInputHandler extends InputHandler
KeyEvent.VK_META);
*/
if(keyCode == KeyEvent.VK_CONTROL ||
keyCode == KeyEvent.VK_SHIFT ||
keyCode == KeyEvent.VK_ALT ||
keyCode == KeyEvent.VK_META)
return;
if((modifiers & ~KeyEvent.SHIFT_MASK) != 0
|| evt.isActionKey()
|| keyCode == KeyEvent.VK_BACK_SPACE