Add baremetal pi support for ES locale while keeping US as default

Author: josei

build/baremetalpi/toolchain.cmake

@@ -51,3 +51,7 @@ set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
 
 set(BAREMETALPI TRUE)
 
+if(NOT DEFINED KEYBOARD_LAYOUT)
+    set(KEYBOARD_LAYOUT "US" CACHE STRING "Keyboard layout (US, ES, IT, etc.)")
+endif()
+add_compile_definitions(KEYBOARD_LAYOUT_${KEYBOARD_LAYOUT})

src/studio/studio.c

@@ -413,8 +413,16 @@ char getKeyboardText(Studio* studio)
         tic_mem* tic = studio->tic;
         tic80_input* input = &tic->ram->input;
 
+#ifdef KEYBOARD_LAYOUT_ES
+        // US KEYS:                     " abcdefghijklmnopqrstuvwxyz0123456789-=[]\\;'`,./< ";
+        static const char Symbols[] =   " abcdefghijklmnopqrstuvwxyz0123456789'!`+cn'o,.-< ";
+        static const char Shift[] =     " ABCDEFGHIJKLMNOPQRSTUVWXYZ=!\" $%&/()??^*CN\"a;:_> ";
+        static const char Alt[] =       "                            |@#        []} {\\     ";
+#else
         static const char Symbols[] =   " abcdefghijklmnopqrstuvwxyz0123456789-=[]\\;'`,./ ";
         static const char Shift[] =     " ABCDEFGHIJKLMNOPQRSTUVWXYZ)!@#$%^&*(_+{}|:\"~<>? ";
+        static const char Alt[] =       "                                                  ";
+#endif
 
         enum{Count = sizeof Symbols};
 
@@ -426,12 +434,13 @@ char getKeyboardText(Studio* studio)
             {
                 bool caps = tic_api_key(tic, tic_key_capslock);
                 bool shift = tic_api_key(tic, tic_key_shift);
+                bool alt = tic_api_key(tic, tic_key_alt);
 
-                return caps
-                    ? key >= tic_key_a && key <= tic_key_z
-                        ? shift ? Symbols[key] : Shift[key]
-                        : shift ? Shift[key] : Symbols[key]
-                    : shift ? Shift[key] : Symbols[key];
+                if (caps && key >= tic_key_a && key <= tic_key_z) shift = !shift;
+
+                return shift ? Shift[key]
+                    : alt ? Alt[key]
+                    : Symbols[key];
             }
         }
 
@@ -1827,6 +1836,7 @@ static void processShortcuts(Studio* studio)
 #if defined(BUILD_EDITORS)
         else if(studio->mode != TIC_RUN_MODE && studio->config->data.keyboardLayout != tic_layout_azerty)
         {
+#ifndef KEYBOARD_LAYOUT_ES
             if(keyWasPressedOnce(studio, tic_key_grave)) setStudioMode(studio, TIC_CONSOLE_MODE);
             else if(keyWasPressedOnce(studio, tic_key_1))
             {
@@ -1840,6 +1850,7 @@ static void processShortcuts(Studio* studio)
             else if(keyWasPressedOnce(studio, tic_key_3)) setStudioMode(studio, TIC_MAP_MODE);
             else if(keyWasPressedOnce(studio, tic_key_4)) setStudioMode(studio, TIC_SFX_MODE);
             else if(keyWasPressedOnce(studio, tic_key_5)) setStudioMode(studio, TIC_MUSIC_MODE);
+#endif
         }
 #endif
     }

src/system/baremetalpi/keycodes.h

@@ -49,18 +49,18 @@ tic_key_escape,	 // KeyEscape, 0x29
 tic_key_backspace,	 // KeyBackspace, 0x2A
 tic_key_tab,	 // KeyTabulator, 0x2B
 tic_key_space,	 // KeySpace, 0x2C
-tic_key_apostrophe,	 // '\'', 0x2D
-tic_key_unknown,	 // C('?'), 0x2E -- ^
-tic_key_leftbracket,	 // C('?'), 0x2F --  [
-tic_key_rightbracket,	 // '+', 0x30 --  ]
-tic_key_unknown,	 // C('?'), 0x31
-tic_key_unknown,	 // C('?'), 0x32
-tic_key_unknown,	 // C('?'), 0x33 -- @
-tic_key_unknown,	 // C('?'), 0x34 -- #
-tic_key_backslash,	 // '\\', 0x35
+tic_key_minus,	 // '-', 0x2D
+tic_key_equals,	 // '=', 0x2E
+tic_key_leftbracket,	 // '[', 0x2F
+tic_key_rightbracket,	 // ']', 0x30
+tic_key_backslash,	 // '\\', 0x31
+tic_key_backslash,	 // '\\', 0x32
+tic_key_semicolon,	 // ';', 0x33
+tic_key_apostrophe,	 // '\'', 0x34
+tic_key_grave,	 // '`', 0x35
 tic_key_comma,	 // ',', 0x36
 tic_key_period,	 // '.', 0x37
-tic_key_minus,	 // '-', 0x38
+tic_key_slash,	 // '/', 0x38
 tic_key_capslock,	 // KeyCapsLock, 0x39
 tic_key_f1,		 // KeyF1, 0x3A
 tic_key_f2,		 // KeyF2, 0x3B
@@ -104,7 +104,7 @@ tic_key_numpad8,	 // KeyUp, 0x60
 tic_key_numpad9,	 // KeyPageUp, 0x61
 tic_key_numpad0,	 // KeyInsert, 0x62
 tic_key_numpadperiod,	 // KeyDelete, 0x63
-tic_key_unknown,	 // '<', 0x64
+tic_key_iso_extra,	 // '<', 0x64
 tic_key_unknown,	 // KeyApplication, 0x65
 tic_key_unknown,	 // KeyNone, 0x66
 tic_key_unknown,	 // KeyNone, 0x67

src/tic.h

@@ -707,6 +707,7 @@ typedef enum
     tic_key_comma,
     tic_key_period,
     tic_key_slash,
+    tic_key_iso_extra,
 
     tic_key_space,
     tic_key_tab,