EMCC: Emscripten version wip

- implemented audio
- update keyboard handling

Author: chrisws

ChangeLog

@@ -1,3 +1,6 @@
+2022-02-23 (12.24)
+	EMCC: Implemented emscripten web version
+
 2022-02-23 (12.24)
 	COMMON: Fix array access with embedded strings #136
 

src/platform/emcc/Makefile.am

@@ -37,6 +37,7 @@ sbasic_html_SOURCES =																				\
   ../../ui/textedit.cpp																			\
   ../../ui/image.cpp																				\
   ../../ui/strlib.cpp																				\
+  ../../ui/audio.cpp																				\
   runtime.h runtime.cpp																			\
   canvas.h canvas.cpp																				\
   main.cpp

src/platform/emcc/canvas.cpp

@@ -397,15 +397,3 @@ int maFontDelete(MAHandle maHandle) {
   }
   return RES_FONT_OK;
 }
-
-//
-// not implemented
-//
-void maShowVirtualKeyboard(void) {
-}
-
-void maHideVirtualKeyboard(void) {
-}
-
-void maUpdateScreen(void) {
-}

src/platform/emcc/keymap.h

@@ -79,32 +79,6 @@ const int SHIFT_KEYMAP[][2] = {
   {DOM_VK_9, '('},
   {DOM_VK_COLON, ':'},
   {DOM_VK_EQUALS, '+'},
-  {DOM_VK_A, 'a'},
-  {DOM_VK_B, 'b'},
-  {DOM_VK_C, 'c'},
-  {DOM_VK_D, 'd'},
-  {DOM_VK_E, 'e'},
-  {DOM_VK_F, 'f'},
-  {DOM_VK_G, 'g'},
-  {DOM_VK_H, 'h'},
-  {DOM_VK_I, 'i'},
-  {DOM_VK_J, 'j'},
-  {DOM_VK_K, 'k'},
-  {DOM_VK_L, 'l'},
-  {DOM_VK_M, 'm'},
-  {DOM_VK_N, 'n'},
-  {DOM_VK_O, 'o'},
-  {DOM_VK_P, 'p'},
-  {DOM_VK_Q, 'q'},
-  {DOM_VK_R, 'r'},
-  {DOM_VK_S, 's'},
-  {DOM_VK_T, 't'},
-  {DOM_VK_U, 'u'},
-  {DOM_VK_V, 'v'},
-  {DOM_VK_W, 'w'},
-  {DOM_VK_X, 'x'},
-  {DOM_VK_Y, 'y'},
-  {DOM_VK_Z, 'z'},
   {'`', '~'},
   {'-', '_'},
   {'=', '+'},

src/platform/emcc/main.cpp

@@ -53,6 +53,7 @@ void init() {
   os_graf_my = 768;
   os_graphics = 1;
   os_color_depth = 16;
+  opt_mute_audio = 0;
 }
 
 int main(int argc, char* argv[]) {

src/platform/emcc/runtime.cpp

@@ -11,10 +11,12 @@
 #include <emscripten.h>
 #include <emscripten/key_codes.h>
 #include "include/osd.h"
+#include "common/inet.h"
 #include "common/smbas.h"
 #include "lib/maapi.h"
-#include "ui/utils.h"
+#include "ui/audio.h"
 #include "ui/theme.h"
+#include "ui/utils.h"
 #include "platform/emcc/runtime.h"
 #include "platform/emcc/main_bas.h"
 #include "platform/emcc/keymap.h"
@@ -135,11 +137,11 @@ char *Runtime::loadResource(const char *fileName) {
 bool Runtime::handleKeyboard(int eventType, const EmscriptenKeyboardEvent *e) {
   int keyCode = e->keyCode;
   bool result = true;
+  static bool capsLock = false;
   switch (e->keyCode) {
   case DOM_VK_SHIFT:
   case DOM_VK_CONTROL:
   case DOM_VK_ALT:
-  case DOM_VK_CAPS_LOCK:
     // ignore press without modifier key
     result = false;
     break;
@@ -151,24 +153,25 @@ bool Runtime::handleKeyboard(int eventType, const EmscriptenKeyboardEvent *e) {
     result = false;
     break;
 
+  case DOM_VK_CAPS_LOCK:
+    capsLock = !capsLock;
+    break;
+
   default:
     for (int i = 0; i < KEYMAP_LEN; i++) {
       if (keyCode == KEYMAP[i][0]) {
         keyCode = KEYMAP[i][1];
         break;
       }
     }
-
     if (e->ctrlKey && e->altKey) {
       pushEvent(getKeyPressedEvent(SB_KEY_CTRL_ALT(keyCode)));
     } else if (e->ctrlKey && e->shiftKey) {
       pushEvent(getKeyPressedEvent(SB_KEY_SHIFT_CTRL(keyCode)));
     } else if (e->altKey && e->shiftKey) {
       pushEvent(getKeyPressedEvent(SB_KEY_ALT_SHIFT(keyCode)));
     } else if (e->ctrlKey) {
-      if (keyCode >= 'A' && keyCode <= 'Z') {
-        keyCode += ('a' - 'A');
-      }
+      keyCode = to_lower(keyCode);
       switch (keyCode) {
       case 'b':
         pushEvent(getMotionEvent(EVENT_TYPE_BACK, nullptr));
@@ -216,7 +219,7 @@ bool Runtime::handleKeyboard(int eventType, const EmscriptenKeyboardEvent *e) {
         pushEvent(getKeyPressedEvent(SB_KEY_SHIFT(keyCode)));
       }
     } else {
-      pushEvent(getKeyPressedEvent(keyCode));
+      pushEvent(getKeyPressedEvent(capsLock ? keyCode : to_lower(keyCode)));
     }
     break;
   }
@@ -337,6 +340,8 @@ void Runtime::processEvent(MAEvent &event) {
 
 void Runtime::runShell() {
   logEntered();
+  audio_open();
+  net_init();
   while (1) {
     runMain(MAIN_BAS);
   }
@@ -605,10 +610,6 @@ bool System::getPen3() {
   return result;
 }
 
-void System::completeKeyword(int index) {
-  // empty
-}
-
 //
 // sbasic implementation
 //
@@ -622,16 +623,10 @@ int osd_devrestore(void) {
   return 0;
 }
 
-
-void osd_audio(const char *path) {
-}
-
-void osd_beep() {
-}
-
-void osd_clear_sound_queue() {
-}
-
-void osd_sound(int frequency, int millis, int volume, int background) {
-}
-
+//
+// not implemented
+//
+void System::completeKeyword(int index) {}
+void maHideVirtualKeyboard(void) {}
+void maShowVirtualKeyboard(void) {}
+void maUpdateScreen(void) {}

src/ui/audio.cpp

@@ -143,11 +143,15 @@ static void device_start() {
 bool audio_open() {
   bool result;
   ma_backend backends[] = {
+#if defined(_EMCC)
+    ma_backend_webaudio
+#else
     ma_backend_alsa,
     ma_backend_jack,
     ma_backend_pulseaudio,
     ma_backend_wasapi,
-    ma_backend_dsound
+    ma_backend_dsound,
+#endif
   };
   if (ma_context_init(backends, sizeof(backends)/sizeof(backends[0]), NULL, &context) != MA_SUCCESS) {
     result = false;

src/ui/system.cpp

@@ -1127,11 +1127,9 @@ void System::showMenu() {
         items->add(new String(buffer));
         _systemMenu[index++] = MENU_THEME;
       }
-#if !defined(_EMCC)
       sprintf(buffer, MENU_STR_AUDIO, (opt_mute_audio ? MENU_STR_OFF : MENU_STR_ON));
       items->add(new String(buffer));
       _systemMenu[index++] = MENU_AUDIO;
-#endif
 #if !defined(_SDL) && !defined(_FLTK) && !defined(_EMCC)
       if (!_mainBas && !_activeFile.empty()) {
         items->add(new String(MENU_STR_SHORT));