EMCC: Emscripten version wip

- fix text measurement

Author: chrisws

src/platform/emcc/Makefile.am

@@ -41,7 +41,7 @@ sbasic_html_SOURCES =																				\
   canvas.h canvas.cpp																				\
   main.cpp
 
-sbasic_html_LDFLAGS = -O3 -lembind --shell-file shell.html -s ASYNCIFY=1 --preload-file basic
+sbasic_html_LDFLAGS = -O3 -lembind --shell-file shell.html -s ASYNCIFY=1 -s ALLOW_MEMORY_GROWTH=1 --preload-file basic
 
 sbasic_html_LDADD = -L$(top_srcdir)/src/common -lsb_common @PACKAGE_LIBS@
 

src/platform/emcc/canvas.cpp

@@ -74,9 +74,9 @@ EM_JS(int, get_text_size, (int id, const char *str, const char *face), {
 
     var s = UTF8ToString(str);
     var metrics = ctx.measureText(s);
-    var height = metrics.fontBoundingBoxAscent + metrics.fontBoundingBoxDescent;
-    var width = metrics.width;
-    return (width << 16) + height;
+    var height = metrics.fontBoundingBoxAscent + metrics.fontBoundingBoxDescent + 2;
+    var width = s == "W" ? metrics.width : (metrics.actualBoundingBoxRight + 2);
+    return (Math.round(width) << 16) + height;
   });
 
 EM_JS(void, draw_arc, (int id, int xc, int yc, double r, double start, double end, double aspect), {

src/platform/emcc/runtime.cpp

@@ -65,7 +65,7 @@ Runtime::Runtime() :
   _output = new AnsiWidget(EXTENT_X(screenSize), EXTENT_Y(screenSize));
   _output->construct();
   _output->setTextColor(DEFAULT_FOREGROUND, DEFAULT_BACKGROUND);
-  _output->setFontSize(11);
+  _output->setFontSize(12);
   _eventQueue = new Stack<MAEvent *>();
   _state = kActiveState;
   g_themeId = 0;

src/ui/system.cpp

@@ -1085,7 +1085,7 @@ void System::showMenu() {
         _systemMenu[index++] = MENU_PASTE;
         _systemMenu[index++] = MENU_SELECT_ALL;
       }
-#if defined(_SDL) || defined(_FLTK)
+#if defined(_SDL) || defined(_FLTK) || defined(_EMCC)
       items->add(new String(MENU_STR_BACK));
       _systemMenu[index++] = MENU_BACK;
 #else
@@ -1109,7 +1109,7 @@ void System::showMenu() {
         _systemMenu[index++] = MENU_RESTART;
       }
 #endif
-#if !defined(_SDL) && !defined(_FLTK)
+#if !defined(_SDL) && !defined(_FLTK) && !defined(_EMCC)
       items->add(new String(MENU_STR_KEYPAD));
       _systemMenu[index++] = MENU_KEYPAD;
 #endif
@@ -1130,7 +1130,7 @@ void System::showMenu() {
       sprintf(buffer, MENU_STR_AUDIO, (opt_mute_audio ? MENU_STR_OFF : MENU_STR_ON));
       items->add(new String(buffer));
       _systemMenu[index++] = MENU_AUDIO;
-#if !defined(_SDL) && !defined(_FLTK)
+#if !defined(_SDL) && !defined(_FLTK) && !defined(_EMCC)
       if (!_mainBas && !_activeFile.empty()) {
         items->add(new String(MENU_STR_SHORT));
         items->add(new String(MENU_STR_SHARE));
@@ -1140,7 +1140,7 @@ void System::showMenu() {
 #endif
       items->add(new String(MENU_STR_SCREEN));
       _systemMenu[index++] = MENU_SCREENSHOT;
-#if defined(_SDL) || defined(_FLTK)
+#if defined(_SDL) || defined(_FLTK) || defined(_EMCC)
       items->add(new String(MENU_STR_BACK));
       _systemMenu[index++] = MENU_BACK;
 #endif

src/ui/utils.h

@@ -33,7 +33,7 @@
  #define deviceLog(...) appLog(__VA_ARGS__)
 #endif
 
-#if defined(_DEBUG) || defined(_EMCC)
+#if defined(_DEBUG)
  #define trace(...) deviceLog(__VA_ARGS__)
 #else
  #define trace(...)