Fix bug in SqueakKeyBoard#recordKeyboardEvent

This led to debuggers in Cuis.
hpi-swa · Jun 27, 2020 · 0d8eac4 · 0d8eac4
1 parent 120e194
commit 0d8eac4
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/src/de.hpi.swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/io/SqueakKeyboard.java b/src/de.hpi.swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/io/SqueakKeyboard.java
@@ -21,7 +21,7 @@ public SqueakKeyboard(final SqueakDisplay display) {
 
     @Override
     public void keyTyped(final KeyEvent e) {
-        // Ignored.
+        /* Ignored. Called just after the user types a Unicode character. */
     }
 
     @Override
@@ -45,11 +45,14 @@ public void keyReleased(final KeyEvent e) {
 
     private void recordKeyboardEvent(final int key) {
         final int buttonsShifted = display.buttons >> 3;
-        final int code = buttonsShifted << 8 | key;
-        if (code == KEYBOARD.INTERRUPT_KEYCODE) {
+        if ((buttonsShifted << 8 | key) == KEYBOARD.INTERRUPT_KEYCODE) {
             display.image.interrupt.setInterruptPending();
         } else {
-            display.addEvent(EVENT_TYPE.KEYBOARD, code, KEYBOARD_EVENT.CHAR, buttonsShifted, key);
+            display.addEvent(EVENT_TYPE.KEYBOARD,
+                            key /* MacRoman */,
+                            KEYBOARD_EVENT.CHAR,
+                            buttonsShifted,
+                            key /* Unicode */);
         }
     }