SDL: added -n command line option to run then not pause for back key

Author: chrisws

ChangeLog

@@ -1,3 +1,6 @@
+2019-07-27 (0.12.15)
+	SDL: added -n command line option to run then not pause for back key
+
 2019-07-10 (0.12.15)
 	SDL: update editor find and replace
 

src/platform/android/jni/runtime.cpp

@@ -485,7 +485,7 @@ void Runtime::runShell() {
     if (getBoolean("getUntrusted")) {
       opt_file_permitted = 0;
     }
-    runOnce(startupBas.c_str());
+    runOnce(startupBas.c_str(), true);
   } else {
     runMain(MAIN_BAS);
   }

src/platform/sdl/main.cpp

@@ -48,6 +48,7 @@ static struct option OPTIONS[] = {
   {"font",      optional_argument, NULL, 'f'},
   {"run",       optional_argument, NULL, 'r'},
   {"run-live",  optional_argument, NULL, 'x'},
+  {"run-n-wait",optional_argument, NULL, 'n'},
   {"module",    optional_argument, NULL, 'm'},
   {"edit",      optional_argument, NULL, 'e'},
   {"debug",     optional_argument, NULL, 'd'},
@@ -291,13 +292,14 @@ int main(int argc, char* argv[]) {
   char *fontFamily = NULL;
   char *runFile = NULL;
   bool debug = false;
+  bool runWait = true;
   int fontScale;
   int ide_option = -1;
   SDL_Rect rect;
 
   while (1) {
     int option_index = 0;
-    int c = getopt_long(argc, argv, "hvkc:f:r:x:m:e:d:p:", OPTIONS, &option_index);
+    int c = getopt_long(argc, argv, "hvkc:f:r:x:n:m:e:d:p:", OPTIONS, &option_index);
     if (c == -1) {
       // no more options
       if (!option_index) {
@@ -341,6 +343,11 @@ int main(int argc, char* argv[]) {
       runFile = strdup(optarg);
       ide_option = IDE_NONE;
       break;
+    case 'n':
+      runWait = false;
+      runFile = strdup(optarg);
+      ide_option = IDE_NONE;
+      break;
     case 'x':
       runFile = strdup(optarg);
       g_debugPort = 0;
@@ -404,7 +411,7 @@ int main(int argc, char* argv[]) {
       loadIcon(window);
       Runtime *runtime = new Runtime(window);
       runtime->construct(font.c_str(), fontBold.c_str());
-      fontScale = runtime->runShell(runFile, fontScale, debug ? g_debugPort : 0);
+      fontScale = runtime->runShell(runFile, runWait, fontScale, debug ? g_debugPort : 0);
       rect = runtime->getWindowRect();
       delete runtime;
     } else {

src/platform/sdl/runtime.cpp

@@ -312,7 +312,7 @@ MAEvent *Runtime::popEvent() {
   return _eventQueue->pop();
 }
 
-int Runtime::runShell(const char *startupBas, int fontScale, int debugPort) {
+int Runtime::runShell(const char *startupBas, bool runWait, int fontScale, int debugPort) {
   logEntered();
 
   os_graphics = 1;
@@ -359,14 +359,14 @@ int Runtime::runShell(const char *startupBas, int fontScale, int debugPort) {
     } else if (opt_ide == IDE_EXTERNAL) {
       runLive(bas.c_str());
     } else {
-      runOnce(bas.c_str());
+      runOnce(bas.c_str(), runWait);
     }
     while (_state == kRestartState) {
       _state = kActiveState;
       if (!_loadPath.empty()) {
         bas = _loadPath;
       }
-      runOnce(bas.c_str());
+      runOnce(bas.c_str(), runWait);
     }
   } else {
     runMain(MAIN_BAS);

src/platform/sdl/runtime.h

@@ -47,7 +47,7 @@ struct Runtime : public System {
   void setWindowTitle(const char *title);
   void share(const char *path) {}
   void showCursor(CursorType cursorType);
-  int runShell(const char *startupBas, int fontScale, int debugPort);
+  int runShell(const char *startupBas, bool once, int fontScale, int debugPort);
   char *loadResource(const char *fileName);
   void logStack(int line, bool subOrFunc);
   void optionsBox(StringList *items);

src/ui/system.cpp

@@ -694,7 +694,7 @@ void System::runMain(const char *mainBasPath) {
   }
 }
 
-void System::runOnce(const char *startupBas) {
+void System::runOnce(const char *startupBas, bool runWait) {
   // startupBas must not be _loadPath.c_str()
   logEntered();
   _mainBas = false;
@@ -705,7 +705,9 @@ void System::runOnce(const char *startupBas) {
     if (_state == kActiveState) {
       showCompletion(success);
     }
-    waitForBack();
+    if (runWait) {
+      waitForBack();
+    }
     restart = isRestart();
   }
 }

src/ui/system.h

@@ -86,7 +86,7 @@ struct System {
   void runEdit(const char *startupBas);
   void runLive(const char *startupBas);
   void runMain(const char *mainBasPath);
-  void runOnce(const char *startupBas);
+  void runOnce(const char *startupBas, bool runWait);
   void saveFile(TextEditInput *edit, strlib::String &path);
   void setupPath(String &loadpath);
   bool setParentPath();