Skip to content

Commit

Permalink
Fix interrupt modifier detection
Browse files Browse the repository at this point in the history
  • Loading branch information
fniephaus committed Dec 17, 2023
1 parent 31f7b41 commit 4c7f9f2
Showing 1 changed file with 5 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,17 @@

import java.awt.event.KeyEvent;
import java.awt.event.KeyListener;
import java.util.function.Predicate;

import de.hpi.swa.trufflesqueak.io.SqueakIOConstants.EVENT_TYPE;
import de.hpi.swa.trufflesqueak.io.SqueakIOConstants.KEYBOARD_EVENT;
import de.hpi.swa.trufflesqueak.util.OS;

public final class SqueakKeyboard implements KeyListener {
private final SqueakDisplay display;

private static final Predicate<KeyEvent> IS_INTERRUPT_MODIFIER = OS.isMacOS() ? e -> e.isMetaDown() : e -> e.isAltDown();

public SqueakKeyboard(final SqueakDisplay display) {
this.display = display;
}
Expand All @@ -27,7 +31,7 @@ public void keyPressed(final KeyEvent e) {
if (keyChar != KeyEvent.CHAR_UNDEFINED) {
addKeyboardEvent(KEYBOARD_EVENT.CHAR, keyChar);
}
if (e.isMetaDown() && keyChar == '.') {
if (IS_INTERRUPT_MODIFIER.test(e) && keyChar == '.') {
display.image.interrupt.setInterruptPending();
}
}
Expand Down

0 comments on commit 4c7f9f2

Please sign in to comment.