SDL: avoid flicker moving between screens

Author: Chris Warren-Smith

src/common/brun.c

@@ -1658,7 +1658,7 @@ int sbasic_exec(const char *file) {
     exec_rq = 0;
     gsb_last_error = 1;
   } else if (gsb_err_mod_perm) {
-    exec_rq = 0;                // a module is not permitted to be run
+    exec_rq = 0;                // a module was not permitted to run
   }
 
   if (exec_rq) {                // we will run it

src/platform/sdl/editor.cpp

@@ -199,7 +199,7 @@ void Runtime::editSource(String loadPath, bool restoreOnExit) {
   int h = _output->getHeight();
   int charWidth = _output->getCharWidth();
   int charHeight = _output->getCharHeight();
-  int prevScreenId = _output->selectScreen(FORM_SCREEN);
+  _output->selectScreen(FORM_SCREEN);
 
   TextEditInput *editWidget;
   if (_editor != nullptr) {
@@ -267,10 +267,6 @@ void Runtime::editSource(String loadPath, bool restoreOnExit) {
         _output->setStatus(!gsb_last_errmsg[0] ? "Error" : gsb_last_errmsg);
       }
     }
-  } else if (gsb_err_mod_perm) {
-    _output->setStatus("Running ...");
-    saveFile(editWidget, loadPath);
-    launchConsole(loadPath);
   } else {
     statusMessage.update(editWidget, _output, true);
   }
@@ -604,9 +600,6 @@ void Runtime::editSource(String loadPath, bool restoreOnExit) {
 
   // deletes editWidget and _keypad unless it has been removed
   _output->removeInputs();
-  if (!isClosing() && restoreOnExit) {
-    _output->selectScreen(prevScreenId, false);
-  }
   logLeaving();
 }
 

src/ui/system.cpp

@@ -135,7 +135,8 @@ System::System() :
   _mainBas(false),
   _buttonPressed(false),
   _srcRendered(false),
-  _menuActive(false) {
+  _menuActive(false),
+  _compileError(false) {
   g_system = this;
 }
 
@@ -150,6 +151,7 @@ System::~System() {
 }
 
 bool System::execute(const char *bas) {
+  _compileError = true;
   _stackTrace.removeAll();
   reset_image_cache();
 
@@ -167,6 +169,22 @@ bool System::execute(const char *bas) {
   saveWindowRect();
 
   int result = ::sbasic_main(bas);
+
+  if (isExternalLaunch()) {
+    if (_editor != nullptr) {
+      // returning to the editor
+      String path(bas);
+      saveFile(_editor, path);
+    }
+    //executeConsole(bas); TODO
+  }
+
+  if (_editor == nullptr) {
+    _output->selectScreen(USER_SCREEN1);
+  }
+  _output->resetFont();
+  _output->flush(false);
+
   if (isRunning()) {
     _state = kActiveState;
   }
@@ -864,6 +882,15 @@ void System::runMain(const char *mainBasPath) {
 
     bool success = execute(_loadPath);
     bool networkFile = isNetworkLoad();
+
+    if (isExternalLaunch()) {
+      if (_editor == nullptr) {
+        _loadPath.clear();
+        _state = kActiveState;
+      }
+      continue;
+    }
+
     if (!isBack() && !isClosing() &&
         (success || networkFile || !isEditEnabled())) {
       // when editing, only pause here when successful, otherwise the editor shows
@@ -1010,24 +1037,18 @@ void System::setRunning(bool running) {
   if (running) {
     dev_fgcolor = -DEFAULT_FOREGROUND;
     dev_bgcolor = -DEFAULT_BACKGROUND;
-    setDimensions();
     dev_clrkb();
 
-    // setup output screen
+    setDimensions();
     showCursor(kArrow);
-    _output->setAutoflush(!opt_show_page);
     _output->reset();
-
+    _output->setAutoflush(!opt_show_page);
+    _userScreenId = -1;
+    _compileError = false;
     if (_mainBas || isNetworkLoad() || !isEditEnabled()) {
       _loadPath.clear();
     }
-    _userScreenId = -1;
   } else {
-    // restore output screen
-    _output->selectScreen(isEditReady() ? FORM_SCREEN : USER_SCREEN1);
-    _output->resetFont();
-    _output->flush(false);
-
     enableCursor(true);
     osd_clear_sound_queue();
     if (!isClosing() && !isRestart() && !isBack()) {
@@ -1041,8 +1062,11 @@ void System::showCompletion(bool success) {
   if (success) {
     _output->setStatus("Done - press back [<-]");
   } else {
-    printErrorLine();
+    if (_compileError) {
+      _output->reset();
+    }
     _output->setStatus("Error - see console");
+    printErrorLine();
     showSystemScreen(true);
   }
   _output->flush(true);

src/ui/system.h

@@ -86,6 +86,7 @@ struct System {
   bool isEditReady() const {return !isRestart() && isEditEnabled() && !isNetworkLoad();}
   bool isNetworkLoad() const {return _loadPath.indexOf("://", 1) != -1;}
   bool isScratchLoad() const {return _loadPath.indexOf("scratch", 0) != -1;}
+  bool isExternalLaunch() const { return !gsb_last_error && gsb_err_mod_perm; }
   bool loadSource(const char *fileName);
   void resize() const;
   void runEdit(const char *startupBas);
@@ -144,6 +145,7 @@ struct System {
   bool _buttonPressed;
   bool _srcRendered;
   bool _menuActive;
+  bool _compileError;
   strlib::String _loadPath;
   strlib::String _activeFile;
 };