FLATPAK: handle external execute error line

Author: Chris Warren-Smith

src/platform/android/jni/runtime.h

@@ -86,7 +86,7 @@ struct Runtime : public System {
 
 private:
   void editSource(String loadPath, bool restoreOnExit) override;
-  void externalExecute(const char *bas) const override {}
+  int externalExecute(const char *bas) const override { return 0;}
 
   bool _keypadActive;
   bool _hasFocus;

src/platform/emcc/runtime.h

@@ -22,7 +22,7 @@ struct Runtime : public System {
   char *getClipboardText();
   int  getFontSize() { return _output->getFontSize(); }
   void editSource(String loadPath, bool restoreOnExit) override;
-  void externalExecute(const char *bas) const override {}
+  int externalExecute(const char *bas) const override { return 0;}
   void enableCursor(bool enabled) {}
   int  handle(int event);
   char *loadResource(const char *fileName);

src/platform/fltk/runtime.h

@@ -21,7 +21,7 @@ struct Runtime : public System {
   int ask(const char *title, const char *prompt, bool cancel=true);
   void browseFile(const char *url);
   void editSource(String loadPath, bool restoreOnExit) override {}
-  void externalExecute(const char *bas) const override {}
+  int externalExecute(const char *bas) const override { return 0;}
   char *getClipboardText();
   int  getFontSize() { return _output->getFontSize(); }
   void enableCursor(bool enabled);

src/platform/sdl/editor.cpp

@@ -267,6 +267,12 @@ void Runtime::editSource(String loadPath, bool restoreOnExit) {
         _output->setStatus(!gsb_last_errmsg[0] ? "Error" : gsb_last_errmsg);
       }
     }
+  } else if (editWidget->getErrorAtLine() != -1) {
+    String message("Error at line: ");
+    message.append(editWidget->getErrorAtLine());
+    _output->setStatus(message);
+    editWidget->setCursorRow(editWidget->getErrorAtLine() - 1);
+    editWidget->setErrorAtLine(-1);
   } else {
     statusMessage.update(editWidget, _output, true);
   }

src/platform/sdl/runtime.cpp

@@ -262,8 +262,8 @@ void Runtime::exportRun(const char *file) const {
   SDL_RaiseWindow(_window);
 }
 
-void Runtime::externalExecute(const char *bas) const {
-  launchConsole(bas);
+int Runtime::externalExecute(const char *bas) const {
+  return launchConsole(bas);
 }
 
 bool Runtime::toggleFullscreen() {

src/platform/sdl/runtime.h

@@ -64,7 +64,7 @@ struct Runtime final : System {
 
 private:
   void editSource(String loadPath, bool restoreOnExit) override;
-  void externalExecute(const char *bas) const override;
+  int externalExecute(const char *bas) const override;
 
   bool _fullscreen;
   SDL_Rect _windowRect{};

src/platform/sdl/syswm.cpp

@@ -65,8 +65,9 @@ static void launch(const char *command, const char *file) {
   }
 }
 
-void launchConsole(const char *file) {
+int launchConsole(const char *file) {
   launch("sbasic", file);
+  return 0;
 }
 
 void launchDebug(const char *file) {
@@ -99,10 +100,16 @@ void browseFile(SDL_Window *window, const char *url) {
 }
 
 #else
-#include <unistd.h>
 #include <errno.h>
+#include <fcntl.h>
 #include <limits.h>
 #include <spawn.h>
+#include <sys/wait.h>
+#include <unistd.h>
+
+#include <SDL3/SDL_events.h>
+#include <SDL3/SDL_timer.h>
+
 #include "icon.h"
 #include "lib/lodepng/lodepng.h"
 
@@ -140,15 +147,48 @@ static void launch(const char *command, const char *argument, const char *file)
   char *argv[] = {(char *)command, (char *)argument, (char *)file, nullptr};
   int status = posix_spawnp(&pid, command, nullptr, nullptr, argv, environ);
   if (status != 0) {
-    fprintf(stderr, "exec failed [%d] %s\n", status, command);
+    fprintf(stderr, "%s failed [%s]\n", command, strerror(status));
   }
 }
 
 //
 // invoke sbasic console build to run external GUI based modules
 //
-void launchConsole(const char *file) {
-  launch("sbasic", "", file);
+int launchConsole(const char *file) {
+  pid_t pid;
+  char *argv[] = {(char*)"sbasic", (char *)file, nullptr};
+  int status = posix_spawnp(&pid, "sbasic", nullptr, nullptr, argv, environ);
+  if (status != 0) {
+    fprintf(stderr, "sbasic failed [%s]\n", strerror(status));
+    return 1;
+  }
+
+  bool running = true;
+  int result = 0;
+  while (running) {
+    SDL_Event event;
+    while (SDL_PollEvent(&event)) {
+      if (event.type == SDL_EVENT_QUIT) {
+        kill(pid, SIGTERM);
+        running = false;
+        break;
+      }
+    }
+    int wait_status;
+    pid_t wait_result = waitpid(pid, &wait_status, WNOHANG);
+    if (wait_result > 0) {
+      running = false;
+      if (WIFEXITED(wait_status)) {
+        // normal exit
+        result = WEXITSTATUS(wait_status);
+      } else if (WIFSIGNALED(wait_status)) {
+        // crashed
+        result = -1;
+      }
+    }
+    SDL_Delay(16);
+  }
+  return result;
 }
 
 //

src/platform/sdl/syswm.h

@@ -13,7 +13,7 @@
 
 void browseFile(SDL_Window *window, const char *url);
 int  getStartupFontSize(SDL_Window *window);
-void launchConsole(const char *file);
+int  launchConsole(const char *file);
 void launchDebug(const char *file);
 void launchExec(const char *file);
 void loadIcon(SDL_Window *window);

src/ui/system.cpp

@@ -176,7 +176,10 @@ bool System::execute(const char *bas) {
       String path(bas);
       saveFile(_editor, path);
     }
-    externalExecute(bas);
+    int result = externalExecute(bas);
+    if (_editor != nullptr && result > 0) {
+      _editor->setErrorAtLine(result);
+    }
   }
 
   if (_editor == nullptr) {

src/ui/system.h

@@ -77,7 +77,7 @@ struct System {
   static bool setParentPath();
 
   virtual void editSource(strlib::String loadPath, bool restoreOnExit) = 0;
-  virtual void externalExecute(const char *bas) const = 0;
+  virtual int externalExecute(const char *bas) const = 0;
   bool execute(const char *bas);
   MAEvent getNextEvent() { return processEvents(1); }
   uint32_t getModifiedTime() const;