EMCC: Emscripten version wip

- updated keyboard handling

Author: chrisws

src/platform/emcc/keymap.h

@@ -35,8 +35,89 @@ const int KEYMAP[][2] = {
   {DOM_VK_F9, SB_KEY_F(9)},
   {DOM_VK_F10, SB_KEY_F(10)},
   {DOM_VK_F11, SB_KEY_F(11)},
-  {DOM_VK_F12, SB_KEY_F(12)}
+  {DOM_VK_F12, SB_KEY_F(12)},
+  {DOM_VK_CIRCUMFLEX, '^'},
+  {DOM_VK_EXCLAMATION, '!'},
+  {DOM_VK_DOUBLE_QUOTE, '"'},
+  {DOM_VK_HASH, '#'},
+  {DOM_VK_DOLLAR, '$'},
+  {DOM_VK_PERCENT, '%'},
+  {DOM_VK_AMPERSAND, '&'},
+  {DOM_VK_UNDERSCORE, '_'},
+  {DOM_VK_OPEN_PAREN, '('},
+  {DOM_VK_CLOSE_PAREN, ')'},
+  {DOM_VK_ASTERISK, '*'},
+  {DOM_VK_PLUS, '+'},
+  {DOM_VK_PIPE, '|'},
+  {DOM_VK_HYPHEN_MINUS, '-'},
+  {DOM_VK_OPEN_CURLY_BRACKET, '{'},
+  {DOM_VK_CLOSE_CURLY_BRACKET, '}'},
+  {DOM_VK_TILDE, '~'},
+  {DOM_VK_COMMA, ','},
+  {DOM_VK_PERIOD, '.'},
+  {DOM_VK_SLASH, '/'},
+  {DOM_VK_BACK_QUOTE, '`'},
+  {DOM_VK_OPEN_BRACKET, '['},
+  {DOM_VK_BACK_SLASH, '\\'},
+  {DOM_VK_CLOSE_BRACKET, ']'},
+  {DOM_VK_QUOTE, '\''},
+  {0xBD, '-'},
+  {0xBB, '='},
+  {0xBA, ';'},
 };
 
+const int SHIFT_KEYMAP[][2] = {
+  {DOM_VK_0, ')'},
+  {DOM_VK_1, '!'},
+  {DOM_VK_2, '@'},
+  {DOM_VK_3, '#'},
+  {DOM_VK_4, '$'},
+  {DOM_VK_5, '%'},
+  {DOM_VK_6, '^'},
+  {DOM_VK_7, '&'},
+  {DOM_VK_8, '*'},
+  {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'},
+  {'`', '~'},
+  {'-', '_'},
+  {'=', '+'},
+  {'[', '{'},
+  {']', '}'},
+  {'\\', '|'},
+  {'\'', '"'},
+  {';', ':'},
+  {',', '<'},
+  {'.', '>'},
+  {'/', '?'},
+};
+
+const int SHIFT_KEYMAP_LEN = sizeof(SHIFT_KEYMAP) / sizeof(SHIFT_KEYMAP[0]);
 const int KEYMAP_LEN = sizeof(KEYMAP) / sizeof(KEYMAP[0]);
 

src/platform/emcc/main.cpp

@@ -41,7 +41,7 @@ void init() {
   opt_command[0] = '\0';
   opt_file_permitted = 0;
   opt_graphics = 1;
-  opt_ide = 0;
+  opt_ide = IDE_INTERNAL;
   opt_modpath[0] = '\0';
   opt_nosave = 1;
   opt_pref_height = 0;

src/platform/emcc/runtime.cpp

@@ -26,6 +26,7 @@
 #define EVENT_TYPE_RESIZE 103
 
 Runtime *runtime;
+String clipboard;
 
 MAEvent *getMotionEvent(int type, const EmscriptenMouseEvent *event) {
   MAEvent *result = new MAEvent();
@@ -111,6 +112,10 @@ void Runtime::browseFile(const char *url) {
     }, url);
 }
 
+char *Runtime::getClipboardText() {
+  return strdup(clipboard.c_str());
+}
+
 char *Runtime::loadResource(const char *fileName) {
   logEntered();
   char *buffer = System::loadResource(fileName);
@@ -131,25 +136,42 @@ void Runtime::handleKeyboard(int eventType, const EmscriptenKeyboardEvent *e) {
   case DOM_VK_CAPS_LOCK:
     // ignore press without modifier key
     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');
+      }
       pushEvent(getKeyPressedEvent(SB_KEY_CTRL(keyCode)));
     } else if (e->altKey) {
       pushEvent(getKeyPressedEvent(SB_KEY_ALT(keyCode)));
     } else if (e->shiftKey) {
-      pushEvent(getKeyPressedEvent(SB_KEY_SHIFT(keyCode)));
+      bool shifted = false;
+      for (int i = 0; i < SHIFT_KEYMAP_LEN; i++) {
+        if (keyCode == SHIFT_KEYMAP[i][0]) {
+          keyCode = SHIFT_KEYMAP[i][1];
+          shifted = true;
+          break;
+        }
+      }
+      if (shifted) {
+        pushEvent(getKeyPressedEvent(keyCode));
+      } else {
+        pushEvent(getKeyPressedEvent(SB_KEY_SHIFT(keyCode)));
+      }
     } else {
       pushEvent(getKeyPressedEvent(keyCode));
     }
@@ -256,6 +278,10 @@ void Runtime::runShell() {
   }
 }
 
+void Runtime::setClipboardText(const char *text) {
+  clipboard = text;
+}
+
 void Runtime::showCursor(CursorType cursorType) {
   static CursorType _cursorType;
   if (_cursorType != cursorType) {
@@ -366,11 +392,16 @@ void System::editSource(strlib::String loadPath, bool restoreOnExit) {
         case SB_KEY_F(11):
         case SB_KEY_F(12):
         case SB_KEY_MENU:
-        case SB_KEY_ESCAPE:
         case SB_KEY_BREAK:
           // unhandled keys
           redraw = false;
         break;
+        case SB_KEY_ESCAPE:
+          widget = editWidget;
+          helpWidget->hide();
+          helpWidget->cancelMode();
+          editWidget->setFocus(true);
+          break;
         case SB_KEY_F(1):
           widget = helpWidget;
           helpWidget->createKeywordIndex();
@@ -379,22 +410,20 @@ void System::editSource(strlib::String loadPath, bool restoreOnExit) {
           showStatus = false;
           break;
         case SB_KEY_F(9):
+        case SB_KEY_CTRL('r'):
           _state = kRunState;
-          if (editWidget->isDirty()) {
-            saveFile(editWidget, loadPath);
-          }
           break;
         case SB_KEY_CTRL('s'):
           saveFile(editWidget, loadPath);
           break;
         case SB_KEY_CTRL('c'):
         case SB_KEY_CTRL('x'):
           text = widget->copy(event.key == (int)SB_KEY_CTRL('x'));
-        if (text) {
-          setClipboardText(text);
-          free(text);
-        }
-        break;
+          if (text) {
+            setClipboardText(text);
+            free(text);
+          }
+          break;
         case SB_KEY_CTRL('v'):
           text = getClipboardText();
           widget->paste(text);

src/platform/emcc/runtime.h

@@ -19,7 +19,7 @@ struct Runtime : public System {
   void alert(const char *title, const char *message);
   int  ask(const char *title, const char *prompt, bool cancel=true);
   void browseFile(const char *url);
-  char *getClipboardText() { return nullptr; }
+  char *getClipboardText();
   int  getFontSize() { return _output->getFontSize(); }
   void enableCursor(bool enabled) {}
   int  handle(int event);
@@ -36,7 +36,7 @@ struct Runtime : public System {
   void processEvent(MAEvent &event);
   bool run(const char *bas) { return execute(bas); }
   void runShell();
-  void setClipboardText(const char *text) {}
+  void setClipboardText(const char *text);
   void setFontSize(int size);
   void setLoadBreak(const char *url) {}
   void setLoadPath(const char *url) {}