EMCC: Emscripten version wip

- added resize handling

Author: chrisws

src/platform/emcc/canvas.cpp

@@ -221,7 +221,7 @@ bool Canvas::create(int width, int height) {
       canvas.style.position = "absolute";
       canvas.className = "emscripten";
       document.body.appendChild(canvas);
-    }, _id, _w, _h);
+    }, _id, width, height);
   return true;
 };
 
@@ -268,10 +268,12 @@ MAExtent maGetTextSize(const char *str) {
 }
 
 MAExtent maGetScrSize(void) {
+  int w = get_screen_width();
+  int h = get_screen_height();
   if (screen == nullptr) {
-    screen = new Canvas(get_screen_width(), get_screen_height());
+    screen = new Canvas(w, h);
   }
-  return (MAExtent)((screen->_w << 16) + screen->_h);
+  return (MAExtent)((w << 16) + h);
 }
 
 void maDestroyPlaceholder(MAHandle maHandle) {

src/platform/emcc/runtime.cpp

@@ -23,6 +23,7 @@
 #define WAIT_INTERVAL 10
 #define EVENT_TYPE_RESTART 101
 #define EVENT_TYPE_SHOW_MENU 102
+#define EVENT_TYPE_RESIZE 103
 
 Runtime *runtime;
 
@@ -52,6 +53,15 @@ EM_BOOL key_callback(int eventType, const EmscriptenKeyboardEvent *e, void *user
   return 0;
 }
 
+EM_BOOL resize_callback(int eventType, const EmscriptenUiEvent *e, void *userData) {
+  MAEvent *event = new MAEvent();
+  event->type = EVENT_TYPE_RESIZE;
+  event->point.x = e->documentBodyClientWidth;
+  event->point.y = e->documentBodyClientHeight;
+  runtime->pushEvent(event);
+  return 0;
+}
+
 Runtime::Runtime() :
   System() {
   logEntered();
@@ -62,6 +72,7 @@ Runtime::Runtime() :
   emscripten_set_mouseup_callback(EMSCRIPTEN_EVENT_TARGET_WINDOW, this, true, mouse_callback);
   emscripten_set_mousemove_callback(EMSCRIPTEN_EVENT_TARGET_WINDOW, this, true, mouse_callback);
   emscripten_set_keydown_callback(EMSCRIPTEN_EVENT_TARGET_WINDOW, this, true, key_callback);
+  emscripten_set_resize_callback(EMSCRIPTEN_EVENT_TARGET_WINDOW, this, true, resize_callback);
 
   MAExtent screenSize = maGetScrSize();
   _output = new AnsiWidget(EXTENT_X(screenSize), EXTENT_Y(screenSize));
@@ -221,10 +232,6 @@ MAEvent Runtime::processEvents(int waitFlag) {
 
 void Runtime::processEvent(MAEvent &event) {
   switch (event.type) {
-  case EVENT_TYPE_KEY_PRESSED:
-    //handleKeyEvent(event);
-    handleEvent(event);
-    break;
   case EVENT_TYPE_RESTART:
     setRestart();
     break;
@@ -233,6 +240,9 @@ void Runtime::processEvent(MAEvent &event) {
     _menuY = event.point.y;
     showMenu();
     break;
+  case EVENT_TYPE_RESIZE:
+    resize();
+    break;
   default:
     handleEvent(event);
     break;
@@ -241,8 +251,9 @@ void Runtime::processEvent(MAEvent &event) {
 
 void Runtime::runShell() {
   logEntered();
-  runMain(MAIN_BAS);
-  _state = kDoneState;
+  while (1) {
+    runMain(MAIN_BAS);
+  }
 }
 
 void Runtime::showCursor(CursorType cursorType) {

src/platform/emcc/runtime.h

@@ -36,7 +36,6 @@ struct Runtime : public System {
   void processEvent(MAEvent &event);
   bool run(const char *bas) { return execute(bas); }
   void runShell();
-  void resize(int w, int h);
   void setClipboardText(const char *text) {}
   void setFontSize(int size);
   void setLoadBreak(const char *url) {}

src/ui/system.cpp

@@ -1140,8 +1140,10 @@ void System::showMenu() {
         _systemMenu[index++] = MENU_SHARE;
       }
 #endif
+#if !defined(_EMCC)
       items->add(new String(MENU_STR_SCREEN));
       _systemMenu[index++] = MENU_SCREENSHOT;
+#endif
 #if defined(_SDL) || defined(_FLTK) || defined(_EMCC)
       items->add(new String(MENU_STR_BACK));
       _systemMenu[index++] = MENU_BACK;