From: Hugo Chargois <hugo.chargois@free.fr>
Date: Sat, 18 Nov 2023 01:21:23 +0000 (+0100)
Subject: Simulator: Allow typing a, l & m in console input
X-Git-Url: https://git.earman.xyz/?a=commitdiff_plain;h=2534dc7a654b78b271495f37d2b5540c882a17f0;p=sensor-watch.git

Simulator: Allow typing a, l & m in console input

These keys are the shortcuts to "press" the alarm, light and mode
buttons. However, they prevent these letters from being input in the
debug console to send filesystem commands. Strangely, there was already
some code to allow typing these letters in the console output, but not
in the input.
---

diff --git a/watch-library/simulator/watch/watch_extint.c b/watch-library/simulator/watch/watch_extint.c
index cbba4c3..88e4f30 100644
--- a/watch-library/simulator/watch/watch_extint.c
+++ b/watch-library/simulator/watch/watch_extint.c
@@ -28,7 +28,7 @@
 #include <emscripten.h>
 #include <emscripten/html5.h>
 
-static bool output_focused = false;
+static bool debug_console_focused = false;
 static bool external_interrupt_enabled = false;
 static bool button_callbacks_installed = false;
 static ext_irq_cb_t external_interrupt_mode_callback = NULL;
@@ -45,7 +45,7 @@ static const uint8_t BTN_IDS[] = { BTN_ID_ALARM, BTN_ID_LIGHT, BTN_ID_MODE };
 static EM_BOOL watch_invoke_interrupt_callback(const uint8_t button_id, watch_interrupt_trigger trigger);
 
 static EM_BOOL watch_invoke_key_callback(int eventType, const EmscriptenKeyboardEvent *keyEvent, void *userData) {
-    if (output_focused || keyEvent->repeat) return EM_FALSE;
+    if (debug_console_focused || keyEvent->repeat) return EM_FALSE;
 
     const char *key = keyEvent->key;
     if (key[1] != 0) return EM_FALSE;
@@ -86,7 +86,7 @@ static EM_BOOL watch_invoke_touch_callback(int eventType, const EmscriptenTouchE
 }
 
 static EM_BOOL watch_invoke_focus_callback(int eventType, const EmscriptenFocusEvent *focusEvent, void *userData) {
-    output_focused = eventType == EMSCRIPTEN_EVENT_FOCUS;
+    debug_console_focused = eventType == EMSCRIPTEN_EVENT_FOCUS;
     return EM_TRUE;
 }
 
@@ -98,6 +98,10 @@ static void watch_install_button_callbacks(void) {
     emscripten_set_focus_callback(target_output, NULL, EM_FALSE, watch_invoke_focus_callback);
     emscripten_set_blur_callback(target_output, NULL, EM_FALSE, watch_invoke_focus_callback);
 
+    const char *target_input = "#input";
+    emscripten_set_focus_callback(target_input, NULL, EM_FALSE, watch_invoke_focus_callback);
+    emscripten_set_blur_callback(target_input, NULL, EM_FALSE, watch_invoke_focus_callback);
+
     for (int i = 0, count = sizeof(BTN_IDS) / sizeof(BTN_IDS[0]); i < count; i++) {
         char target[] = "#btn_";
         target[4] = BTN_IDS[i] + '0';