SDL: use same pause time as FLTK for performance

Author: chrisws

ChangeLog

@@ -1,3 +1,6 @@
+2015-08-02
+	Fix display output before DELAY
+
 2015-07-18
 	Added IDE editor sdl/android
 	Made a few minor performance improvements (SDL)

src/platform/sdl/display.cpp

@@ -1,6 +1,6 @@
 // This file is part of SmallBASIC
 //
-// Copyright(C) 2001-2014 Chris Warren-Smith.
+// Copyright(C) 2001-2015 Chris Warren-Smith.
 //
 // This program is distributed under the terms of the GPL v2.0 or later
 // Download the GNU Public License (GPL) from www.gnu.org
@@ -122,10 +122,10 @@ bool Graphics::construct(const char *font, const char *boldFont) {
 
   if (loadFonts(font, boldFont)) {
     _screen = new Canvas();
-    result = _screen != NULL;
-    if (result) {
+    if (_screen != NULL) {
       if (_surface == NULL) {
         _screen->setSurface(SDL_GetWindowSurface(_window), w, h);
+        result = true;
       } else {
         result = _screen->create(w, h);
       }

src/platform/sdl/runtime.cpp

@@ -1,6 +1,6 @@
 // This file is part of SmallBASIC
 //
-// Copyright(C) 2001-2014 Chris Warren-Smith.
+// Copyright(C) 2001-2015 Chris Warren-Smith.
 //
 // This program is distributed under the terms of the GPL v2.0 or later
 // Download the GNU Public License (GPL) from www.gnu.org
@@ -26,10 +26,13 @@
 #include <queue>
 #include <cmath>
 
-#define WAIT_INTERVAL 25
+#define WAIT_INTERVAL 5
 #define MAIN_BAS "__main_bas__"
 #define AMPLITUDE 22000
 #define FREQUENCY 44100
+#define OPTIONS_BOX_WIDTH_EXTRA 4
+#define OPTIONS_BOX_BG 0xd2d1d0
+#define OPTIONS_BOX_FG 0x3e3f3e
 
 Runtime *runtime;
 
@@ -310,11 +313,8 @@ void Runtime::pause(int timeout) {
 
 void Runtime::pollEvents(bool blocking) {
   if (isActive() && !isRestart()) {
-    if (blocking) {
-      SDL_WaitEvent(NULL);
-    }
     SDL_Event ev;
-    if (SDL_PollEvent(&ev)) {
+    if (blocking ? SDL_WaitEvent(&ev) : SDL_PollEvent(&ev)) {
       MAEvent *maEvent = NULL;
       switch (ev.type) {
       case SDL_QUIT:
@@ -479,27 +479,27 @@ void Runtime::onResize(int width, int height) {
 }
 
 void Runtime::optionsBox(StringList *items) {
-  int width = 0;
-  int textHeight = 0;
-
   if (!_menuX) {
     _menuX = 2;
   }
   if (!_menuY) {
     _menuY = 2;
   }
 
+  int width = 0;
+  int charWidth = _output->getCharWidth();
   _output->registerScreen(MENU_SCREEN);
   List_each(String *, it, *items) {
     char *str = (char *)(* it)->c_str();
-    MAExtent extent = maGetTextSize(str);
-    int w = EXTENT_X(extent);
-    int h = EXTENT_Y(extent);
+    int w = (strlen(str) * charWidth);
     if (w > width) {
-      width = w + 48;
+      width = w;
     }
-    textHeight = h + 8;
   }
+  width += (charWidth * OPTIONS_BOX_WIDTH_EXTRA);
+
+  int charHeight = _output->getCharHeight();
+  int textHeight = charHeight + (charHeight / 3);
   int height = textHeight * items->size();
   if (_menuX + width >= _output->getWidth()) {
     _menuX = _output->getWidth() - width;
@@ -518,7 +518,7 @@ void Runtime::optionsBox(StringList *items) {
     char *str = (char *)(* it)->c_str();
     FormInput *item = new MenuButton(index, selectedIndex, str, 0, y, width, textHeight);
     _output->addInput(item);
-    item->setColor(0xd2d1d0, 0x3e3f3e);
+    item->setColor(OPTIONS_BOX_BG, OPTIONS_BOX_FG);
     index++;
     y += textHeight;
   }

src/ui/system.cpp

@@ -709,6 +709,9 @@ void System::runMain(const char *mainBasPath) {
           // unexpected error in main.bas
           alert("", gsb_last_errmsg);
           _state = kClosingState;
+        } else {
+          // don't reload
+          _loadPath.empty();
         }
       }
       if (!_mainBas && !networkFile) {
@@ -1198,6 +1201,7 @@ void lwrite(const char *str) {
 }
 
 void dev_delay(dword ms) {
+  g_system->getOutput()->redraw();
   maWait(ms);
 }