[ion/keyboard] Fix python keyboard interruption on web

Author: LeaNumworks

ion/include/ion/keyboard.h

@@ -53,6 +53,7 @@ class State {
 };
 
 State scan();
+State scanForInterruptionAndPopState();
 State popState();
 
 static_assert(sizeof(State)*8>NumberOfKeys, "Ion::Keyboard::State cannot hold a keyboard snapshot");

ion/src/device/shared/drivers/keyboard.cpp

@@ -47,7 +47,13 @@
 namespace Ion {
 
 namespace Keyboard {
- void willPopState() {}
+
+State scanForInterruptionAndPopState() {
+  /* There is no need to manually scan to get the interruptions, as they are
+   * done in hardware. We only need to do it on simulators. */
+  return popState();
+}
+
 }
 
 namespace Device {

ion/src/shared/keyboard.cpp

@@ -7,7 +7,6 @@ namespace Ion {
 namespace Keyboard {
 
 State popState() {
-  willPopState();
   if (Queue::sharedQueue()->isEmpty()) {
     return State(-1);
   }

ion/src/shared/keyboard.h

@@ -6,7 +6,6 @@
 namespace Ion {
 namespace Keyboard {
 
-void willPopState(); // Callback only implemented on simulator, to refresh the window
 void resetMemoizedState();
 void keyboardWasScanned(State state);
 

ion/src/simulator/shared/keyboard.cpp

@@ -47,9 +47,10 @@ constexpr int sNumberOfKeyPairs = sizeof(sKeyPairs)/sizeof(KeySDLKeyPair);
 namespace Ion {
 namespace Keyboard {
 
-void willPopState() {
-  // Grab this opportunity to refresh the display if needed
-  Simulator::Window::refresh();
+State scanForInterruptionAndPopState() {
+  // We get eventual user interruptions via the simulator keyboard
+  scan();
+  return popState();
 }
 
 State scan() {
@@ -65,6 +66,9 @@ State scan() {
   // Notify callbacks in case we need to do something
   Simulator::Keyboard::didScan();
 
+  // Grab this opportunity to refresh the display if needed
+  Simulator::Window::refresh();
+
 #if !EPSILON_SDL_SCREEN_ONLY
   // Register a key for the mouse, if any
   Key k = Simulator::Layout::getHighlightedKey();

python/port/helpers.cpp

@@ -57,7 +57,7 @@ bool micropython_port_interrupt_if_needed() {
   bool interruption = false;
   while (state != Ion::Keyboard::State(-1)) {
     interruption = state.keyDown(interruptKey) ? true : interruption;
-    state = Ion::Keyboard::popState();
+    state = Ion::Keyboard::scanForInterruptionAndPopState();
   };
 
   if (interruption) {