fix(core/emulator): make sure SDL keyboard and quit events are always…

… processed

fixes #973

core/.changelog.d/973.fixed

@@ -0,0 +1 @@
+_(Emulator)_ Emulator window will always react to shutdown events, even while waiting for USB packets.

core/embed/unix/common.c

@@ -17,6 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <SDL.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -110,6 +111,31 @@ error_shutdown(const char *line1, const char *line2, const char *line3,
 
 void hal_delay(uint32_t ms) { usleep(1000 * ms); }
 
+static void handle_key_event(const SDL_Event *event) {
+  if (event->key.repeat) {
+    return;
+  }
+  switch (event->key.keysym.sym) {
+    case SDLK_ESCAPE:
+      __shutdown();
+      return;
+    case SDLK_p:
+      display_save("emu");
+      return;
+  }
+}
+
+void emulator_poll_events(void) {
+  SDL_Event event;
+  SDL_PumpEvents();
+  while (SDL_PeepEvents(&event, 1, SDL_GETEVENT, SDL_KEYUP, SDL_KEYUP) > 0) {
+    handle_key_event(&event);
+  }
+  if (SDL_PeepEvents(&event, 1, SDL_GETEVENT, SDL_QUIT, SDL_QUIT) > 0) {
+    __shutdown();
+  }
+}
+
 uint8_t HW_ENTROPY_DATA[HW_ENTROPY_LEN];
 
 void collect_hw_entropy(void) { memzero(HW_ENTROPY_DATA, HW_ENTROPY_LEN); }

core/embed/unix/common.h

@@ -53,6 +53,7 @@ error_shutdown(const char *line1, const char *line2, const char *line3,
        : __fatal_error(#expr, msg, __FILE__, __LINE__, __func__))
 
 void hal_delay(uint32_t ms);
+void emulator_poll_events(void);
 
 void collect_hw_entropy(void);
 #define HW_ENTROPY_LEN (12 + 32)

core/embed/unix/mpconfigport.h

@@ -235,6 +235,8 @@ typedef unsigned int mp_uint_t; // must be pointer size
     do { \
         extern void mp_handle_pending(bool); \
         mp_handle_pending(true); \
+        extern void emulator_poll_events(void); \
+        emulator_poll_events(); \
         mp_hal_delay_us(500); \
     } while (0);
 

core/embed/unix/touch.c

@@ -24,28 +24,6 @@
 extern void __shutdown(void);
 extern const char *display_save(const char *prefix);
 
-static bool handle_emulator_events(const SDL_Event *event) {
-  switch (event->type) {
-    case SDL_KEYUP:
-      if (event->key.repeat) {
-        break;
-      }
-      switch (event->key.keysym.sym) {
-        case SDLK_ESCAPE:
-          __shutdown();
-          return true;
-        case SDLK_p:
-          display_save("emu");
-          return true;
-      }
-      break;
-    case SDL_QUIT:
-      __shutdown();
-      return true;
-  }
-  return false;
-}
-
 #if defined TREZOR_MODEL_T
 
 #include "touch.h"
@@ -57,9 +35,6 @@ uint32_t touch_read(void) {
   SDL_Event event;
   SDL_PumpEvents();
   if (SDL_PollEvent(&event) > 0) {
-    if (handle_emulator_events(&event)) {
-      return 0;
-    }
     switch (event.type) {
       case SDL_MOUSEBUTTONDOWN:
       case SDL_MOUSEMOTION: