EMCC: Emscripten version wip

- fix crash after showing the menu

Author: chrisws

src/platform/emcc/Makefile.am

@@ -37,7 +37,6 @@ 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

@@ -173,6 +173,12 @@ Font::Font(int size, bool bold, bool italic) :
   _face.append(size).append("px monospace");
 }
 
+Font::~Font() {
+  if (this == font) {
+    font = nullptr;
+  }
+}
+
 Canvas::Canvas() :
   _clip(nullptr),
   _id(-1),
@@ -190,10 +196,15 @@ Canvas::Canvas(int width, int height) :
 Canvas::~Canvas() {
   if (_id != -1) {
     EM_ASM_({
-        var element = document.getElementById($0);
+        var element = document.getElementById($0 == -1 ? "canvas" : "canvas_" + $0);
         document.body.removeChild(element);
       }, _id);
   }
+  if (this == screen) {
+    screen = nullptr;
+  } else if (this == drawTarget) {
+    drawTarget = nullptr;
+  }
 }
 
 bool Canvas::create(int width, int height) {
@@ -359,11 +370,8 @@ void maGetImageData(MAHandle maHandle, void *dst, const MARect *srcRect, int str
 MAHandle maFontLoadDefault(int type, int style, int size) {
   bool italic = (style & FONT_STYLE_ITALIC);
   bool bold = (style & FONT_STYLE_BOLD);
-  if (font) {
-    delete font;
-  }
-  font = new Font(size, bold, italic);
-  return (MAHandle)font;
+  Font *newFont = new Font(size, bold, italic);
+  return (MAHandle)newFont;
 }
 
 MAHandle maFontSetCurrent(MAHandle maHandle) {
@@ -374,9 +382,6 @@ MAHandle maFontSetCurrent(MAHandle maHandle) {
 int maFontDelete(MAHandle maHandle) {
   if (maHandle != -1) {
     Font *handleFont = (Font *)maHandle;
-    if (font == handleFont) {
-      font = nullptr;
-    }
     delete handleFont;
   }
   return RES_FONT_OK;

src/platform/emcc/canvas.h

@@ -24,10 +24,11 @@ struct Canvas {
 
 struct Font {
   Font(int size, bool bold, bool italic);
+  virtual ~Font();
 
   int _size;
   bool _bold;
   bool _italic;
 
-  strlib::String _face;  
+  strlib::String _face;
 };

src/platform/emcc/runtime.cpp

@@ -13,13 +13,14 @@
 #include "common/smbas.h"
 #include "lib/maapi.h"
 #include "ui/utils.h"
-#include "ui/audio.h"
 #include "ui/theme.h"
 #include "platform/emcc/runtime.h"
 #include "platform/emcc/main_bas.h"
 
 #define MAIN_BAS "__main_bas__"
 #define WAIT_INTERVAL 10
+#define EVENT_TYPE_RESTART 101
+#define EVENT_TYPE_SHOW_MENU 102
 
 Runtime *runtime;
 
@@ -54,6 +55,7 @@ Runtime::Runtime() :
   logEntered();
   runtime = this;
 
+  // note: cannot call emscripten_sleep from inside the callbacks
   emscripten_set_mousedown_callback(EMSCRIPTEN_EVENT_TARGET_WINDOW, this, true, mouse_callback);
   emscripten_set_mouseup_callback(EMSCRIPTEN_EVENT_TARGET_WINDOW, this, true, mouse_callback);
   emscripten_set_mousemove_callback(EMSCRIPTEN_EVENT_TARGET_WINDOW, this, true, mouse_callback);
@@ -124,9 +126,7 @@ void Runtime::handleMouse(int eventType, const EmscriptenMouseEvent *e) {
   switch (eventType) {
   case EMSCRIPTEN_EVENT_MOUSEDOWN:
     if (e->button == 2) {
-      _menuX = e->clientX;
-      _menuY = e->clientY;
-      showMenu();
+      pushEvent(getMotionEvent(EVENT_TYPE_SHOW_MENU, e));
     } else {
       pushEvent(getMotionEvent(EVENT_TYPE_POINTER_PRESSED, e));
     }
@@ -144,7 +144,7 @@ void Runtime::pause(int timeout) {
   if (timeout == -1) {
     if (hasEvent()) {
       MAEvent *event = popEvent();
-      handleEvent(*event);
+      processEvent(*event);
       delete event;
     }
   } else {
@@ -154,7 +154,7 @@ void Runtime::pause(int timeout) {
         break;
       } else if (hasEvent()) {
         MAEvent *event = popEvent();
-        handleEvent(*event);
+        processEvent(*event);
         delete event;
       }
       emscripten_sleep(WAIT_INTERVAL);
@@ -164,7 +164,6 @@ void Runtime::pause(int timeout) {
       }
     }
   }
-
 }
 
 MAEvent Runtime::processEvents(int waitFlag) {
@@ -187,7 +186,7 @@ MAEvent Runtime::processEvents(int waitFlag) {
   MAEvent event;
   if (hasEvent()) {
     MAEvent *nextEvent = popEvent();
-    handleEvent(*nextEvent);
+    processEvent(*nextEvent);
     event = *nextEvent;
     delete nextEvent;
   } else {
@@ -196,14 +195,30 @@ MAEvent Runtime::processEvents(int waitFlag) {
   return event;
 }
 
+void Runtime::processEvent(MAEvent &event) {
+  switch (event.type) {
+  case EVENT_TYPE_KEY_PRESSED:
+    //handleKeyEvent(event);
+    handleEvent(event);
+    break;
+  case EVENT_TYPE_RESTART:
+    setRestart();
+    break;
+  case EVENT_TYPE_SHOW_MENU:
+    _menuX = event.point.x;
+    _menuY = event.point.y;
+    showMenu();
+    break;
+  default:
+    handleEvent(event);
+    break;
+  }
+}
+
 void Runtime::runShell() {
   logEntered();
-
-  audio_open();
   runMain(MAIN_BAS);
-  audio_close();
   _state = kDoneState;
-  logLeaving();
 }
 
 void Runtime::setClipboardText(const char *text) {
@@ -271,3 +286,17 @@ int osd_devrestore(void) {
   runtime->setRunning(false);
   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) {
+}
+

src/platform/emcc/runtime.h

@@ -33,6 +33,7 @@ struct Runtime : public System {
   void pushEvent(MAEvent *event) { _eventQueue->push(event); }
   MAEvent *popEvent() { return _eventQueue->pop(); }
   MAEvent processEvents(int waitFlag);
+  void processEvent(MAEvent &event);
   bool run(const char *bas) { return execute(bas); }
   void runShell();
   void resize(int w, int h);