SDL: added mobile export command

Author: chrisws

ChangeLog

@@ -1,3 +1,6 @@
+2016-02-11
+	Added export to mobile command (SDL)
+
 2015-12-05
 	Implemented loading recent files via ALT+1 .. ALT+9
 	Fix potential editor crash with empty support widget

src/platform/android/Makefile.am

@@ -17,7 +17,7 @@ test: ant-build-test
 	(cd ../../../ide/android && \
    adb -a logcat -c && \
    adb -a shell am start net.sourceforge.smallbasic/net.sourceforge.smallbasic.MainActivity && \
-   adb -a logcat)
+   adb -a logcat DEBUG:I smallbasic:I AndroidRuntime:E *:S)
 
 clean-ant:
 	(cd ../../../ide/android && ant -quiet clean)

src/platform/sdl/editor.cpp

@@ -15,6 +15,9 @@
 
 using namespace strlib;
 
+String g_exportAddr;
+String g_exportToken;
+
 void onlineHelp(Runtime *runtime, TextEditInput *widget) {
   char path[100];
   const char *nodeId = widget->getNodeId();
@@ -60,6 +63,26 @@ void showRecentFiles(TextEditHelpWidget *helpWidget, String &loadPath) {
   helpWidget->setText(fileList);
 }
 
+void exportBuffer(AnsiWidget *out, const char *text, String &dest, String &token) {
+  int handle = 1;
+  char buffer[PATH_MAX];
+
+  sprintf(buffer, "SOCL:%s\n", dest.c_str());
+  if (dev_fopen(handle, buffer, DEV_FILE_OUTPUT)) {
+    sprintf(buffer, "# %s\n", token.c_str());
+    dev_fwrite(handle, (byte *)buffer, strlen(buffer));
+    if (!dev_fwrite(handle, (byte *)text, strlen(text))) {
+      sprintf(buffer, "Failed to write: %s", dest.c_str());
+    } else {
+      sprintf(buffer, "Exported file to %s", dest.c_str());
+    }
+  } else {
+    sprintf(buffer, "Failed to open: %s", dest.c_str());
+  }
+  out->setStatus(buffer);
+  dev_fclose(handle);
+}
+
 void System::editSource(String &loadPath) {
   logEntered();
 
@@ -73,6 +96,9 @@ void System::editSource(String &loadPath) {
   TextEditInput *widget = editWidget;
   String dirtyFile;
   String cleanFile;
+  enum InputMode {
+    kInit, kExportAddr, kExportToken
+  } inputMode = kInit;
 
   setupStatus(dirtyFile, cleanFile, loadPath);
   _modifiedTime = getModifiedTime();
@@ -124,7 +150,6 @@ void System::editSource(String &loadPath) {
       }
 
       switch (event.key) {
-      case SB_KEY_F(3):
       case SB_KEY_F(8):
       case SB_KEY_F(10):
       case SB_KEY_F(11):
@@ -168,6 +193,16 @@ void System::editSource(String &loadPath) {
         redraw = false;
         onlineHelp((Runtime *)this, editWidget);
         break;
+      case SB_KEY_F(3):
+        if (editWidget->getTextLength()) {
+          saveFile(editWidget, loadPath);
+          _output->setStatus("Export to mobile SmallBASIC. Enter <IP>:<Port>");
+          widget = helpWidget;
+          helpWidget->createLineEdit(g_exportAddr);
+          helpWidget->show();
+          inputMode = kExportAddr;
+        }
+        break;
       case SB_KEY_F(5):
         saveFile(editWidget, loadPath);
         _output->setStatus("Debug. F6=Step, F7=Continue, Esc=Close");
@@ -269,6 +304,27 @@ void System::editSource(String &loadPath) {
         if (helpWidget->replaceMode()) {
           _output->setStatus("Replace string with. Esc=Close");
           dirty = editWidget->isDirty();
+        } else if (helpWidget->lineEditMode() && helpWidget->getTextLength()) {
+          switch (inputMode) {
+          case kExportAddr:
+            g_exportAddr = helpWidget->getText();
+            inputMode = kExportToken;
+            helpWidget->createLineEdit(g_exportToken);
+            _output->setStatus("Enter token. Esc=Close");
+            break;
+          case kExportToken:
+            _output->setStatus("Sending ...");
+            _output->redraw();
+            g_exportToken = helpWidget->getText();
+            inputMode = kInit;
+            widget = editWidget;
+            exportBuffer(_output, editWidget->getText(), g_exportAddr, g_exportToken);
+            helpWidget->hide();
+            break;
+          default:
+            break;
+          }
+          redraw = true;
         } else if (helpWidget->closeOnEnter() && helpWidget->isVisible()) {
           if (helpWidget->replaceDoneMode()) {
             _output->setStatus(dirtyFile);

src/ui/textedit.cpp

@@ -108,6 +108,7 @@ const char *helpText =
   "TAB indent line\n"
   "F1,A-h keyword help\n"
   "F2 online help\n"
+  "F3 export\n"
   "F5 debug\n"
   "F9, C-r run\n";
 
@@ -1528,7 +1529,6 @@ bool TextEditHelpWidget::closeOnEnter() const {
 
 bool TextEditHelpWidget::edit(int key, int screenWidth, int charWidth) {
   bool result = false;
-
   switch (_mode) {
   case kSearch:
     result = TextEditInput::edit(key, screenWidth, charWidth);
@@ -1558,6 +1558,11 @@ bool TextEditHelpWidget::edit(int key, int screenWidth, int charWidth) {
       _editor->gotoLine(_buf._buffer);
     }
     break;
+  case kLineEdit:
+    if (key != SB_KEY_ENTER) {
+      result = TextEditInput::edit(key, screenWidth, charWidth);
+    }
+    break;
   default:
     switch (key) {
     case STB_TEXTEDIT_K_LEFT:
@@ -1690,6 +1695,13 @@ void TextEditHelpWidget::createHelp() {
   _buf.append(helpText, strlen(helpText));
 }
 
+void TextEditHelpWidget::createLineEdit(const char *value) {
+  reset(kLineEdit);
+  if (value && value[0]) {
+    _buf.append(value, strlen(value));
+  }
+}
+
 void TextEditHelpWidget::createKeywordIndex() {
   char *keyword = _editor->getWordBeforeCursor();
   reset(kHelpKeyword);

src/ui/textedit.h

@@ -181,13 +181,15 @@ struct TextEditHelpWidget : public TextEditInput {
     kReplace,
     kReplaceDone,
     kGotoLine,
-    kMessage
+    kMessage,
+    kLineEdit
   };
 
   void clicked(int x, int y, bool pressed);
   void createCompletionHelp();
   void createGotoLine();
   void createHelp();
+  void createLineEdit(const char *value);
   void createKeywordIndex();
   void createMessage() { reset(kMessage); }
   void createOutline();
@@ -198,6 +200,7 @@ struct TextEditHelpWidget : public TextEditInput {
   void resize(int w, int h) { _x = w - _width; _height = h; }
   void reset(HelpMode mode);
   bool closeOnEnter() const;
+  bool lineEditMode() const { return _mode == kLineEdit; }
   bool messageMode() const { return _mode == kMessage; }
   bool replaceMode() const { return _mode == kReplace; }
   bool replaceDoneMode() const { return _mode == kReplaceDone; }