SDL: Update editor popup appearance

Author: chrisw-s

src/platform/sdl/editor.cpp

@@ -13,6 +13,7 @@
 #include "ui/textedit.h"
 #include "platform/sdl/runtime.h"
 #include "platform/sdl/settings.h"
+#include "platform/sdl/syswm.h"
 
 using namespace strlib;
 
@@ -120,11 +121,11 @@ void onlineHelp(Runtime *runtime, TextEditInput *widget) {
 }
 
 void showHelpPopup(TextEditHelpWidget *helpWidget) {
-  helpWidget->showPopup(-20, -8);
+  helpWidget->showPopup(-12, -4);
 }
 
-void showHelpLineInput(TextEditHelpWidget *helpWidget) {
-  helpWidget->showPopup(40, 1);
+void showHelpLineInput(TextEditHelpWidget *helpWidget, int width = 35) {
+  helpWidget->showPopup(width, 1);
 }
 
 void showHelpSideabar(TextEditHelpWidget *helpWidget) {
@@ -319,7 +320,10 @@ void System::editSource(String loadPath, bool restoreOnExit) {
           onlineHelp((Runtime *)this, editWidget);
           break;
         case SB_KEY_F(4):
-          if (editWidget->getTextLength() && !g_exportAddr.empty() && !g_exportToken.empty()) {
+          if (editWidget->getTextLength() && !g_exportAddr.empty() && g_exportAddr.indexOf("sbasic", 0) != -1) {
+            launch(g_exportAddr, loadPath);
+            break;
+          } else if (editWidget->getTextLength() && !g_exportAddr.empty() && !g_exportToken.empty()) {
             exportBuffer(_output, editWidget->getText(), g_exportAddr, g_exportToken);
             break;
           }
@@ -331,7 +335,7 @@ void System::editSource(String loadPath, bool restoreOnExit) {
             _output->setStatus("Export to SmallBASIC. Enter <IP>:<Port> | <sbasic command>");
             widget = helpWidget;
             helpWidget->createLineEdit(g_exportAddr);
-            showHelpLineInput(helpWidget);
+            showHelpLineInput(helpWidget, 60);
             inputMode = kExportAddr;
           }
           break;
@@ -395,7 +399,7 @@ void System::editSource(String loadPath, bool restoreOnExit) {
           _output->setStatus("Goto line. Esc=Close");
           widget = helpWidget;
           helpWidget->createGotoLine();
-          showHelpLineInput(helpWidget);
+          showHelpLineInput(helpWidget, 5);
           break;
         case SB_KEY_CTRL(' '):
           _output->setStatus("Auto-complete. Esc=Close");
@@ -488,9 +492,16 @@ void System::editSource(String loadPath, bool restoreOnExit) {
             switch (inputMode) {
             case kExportAddr:
               g_exportAddr = helpWidget->getText();
-              inputMode = kExportToken;
-              helpWidget->createLineEdit(g_exportToken);
-              _output->setStatus("Enter token. Esc=Close");
+              if (g_exportAddr.indexOf("sbasic", 0) == -1) {
+                inputMode = kExportToken;
+                helpWidget->createLineEdit(g_exportToken);
+                _output->setStatus("Enter token. Esc=Close");
+              } else {
+                inputMode = kInit;
+                widget = editWidget;
+                helpWidget->hide();
+                launch(g_exportAddr, loadPath);
+              }
               break;
             case kExportToken:
               g_exportToken = helpWidget->getText();
@@ -501,6 +512,7 @@ void System::editSource(String loadPath, bool restoreOnExit) {
               break;
             case kCommand:
               strlcpy(opt_command, helpWidget->getText(), sizeof(opt_command));
+              statusMessage._dirty = !editWidget->isDirty();
               inputMode = kInit;
               widget = editWidget;
               helpWidget->hide();
@@ -509,11 +521,11 @@ void System::editSource(String loadPath, bool restoreOnExit) {
               break;
             }
           } else if (helpWidget->closeOnEnter() && helpWidget->isVisible()) {
+            statusMessage._dirty = !editWidget->isDirty();
             widget = editWidget;
             helpWidget->hide();
             helpWidget->cancelMode();
           }
-          statusMessage._dirty = !editWidget->isDirty();
           redraw = true;
         } else if (helpWidget->replaceDoneMode()) {
           statusMessage._dirty = !editWidget->isDirty();

src/platform/sdl/runtime.cpp

@@ -779,6 +779,12 @@ SDL_Rect Runtime::getWindowRect() {
     result = _windowRect;
   } else {
     setWindowRect(result);
+#if defined(__linux__)
+    int top, left,bottom, right;
+    SDL_GetWindowBordersSize(_window, &top, &left, &bottom, &right);
+    // subtract the X11 border
+    result.y -= top;
+#endif
   }
   return result;
 }

src/platform/sdl/syswm.cpp

@@ -58,13 +58,13 @@ void launchDebug(const char *file) {
   }
 }
 
-void launchExec(const char *file) {
+void launch(const char *command, const char *file) {
   STARTUPINFO info = {sizeof(info)};
   PROCESS_INFORMATION processInfo;
   char cmd[1024];
-  sprintf(cmd, "%s -x %s", g_appPath, file);
-  if (!CreateProcess(g_appPath, cmd, NULL, NULL, TRUE, 0, NULL, NULL, &info, &processInfo)) {
-    appLog("failed to start %d %s %s\n", GetLastError(), g_appPath, cmd);
+  sprintf(cmd, "%s -x %s", command, file);
+  if (!CreateProcess(command, cmd, NULL, NULL, TRUE, 0, NULL, NULL, &info, &processInfo)) {
+    appLog("failed to start %d %s %s\n", GetLastError(), command, cmd);
   }
 }
 
@@ -126,7 +126,7 @@ void launchDebug(const char *file) {
   }
 }
 
-void launchExec(const char *file) {
+void launch(const char *command, const char *file) {
   pid_t pid = fork();
 
   switch (pid) {
@@ -135,8 +135,8 @@ void launchExec(const char *file) {
     break;
   case 0:
     // child process
-    if (execl(g_appPath, g_appPath, "-x", file, (char *)0) == -1) {
-      fprintf(stderr, "exec failed [%s] %s\n", strerror(errno), g_appPath);
+    if (execl(command, command, "-x", file, (char *)0) == -1) {
+      fprintf(stderr, "exec failed [%s] %s\n", strerror(errno), command);
       exit(1);
     }
     break;
@@ -166,3 +166,7 @@ void browseFile(SDL_Window *window, const char *url) {
 }
 
 #endif
+
+void launchExec(const char *file) {
+  launch(g_appPath, file);
+}

src/platform/sdl/syswm.h

@@ -15,6 +15,7 @@ void loadIcon(SDL_Window *window);
 int getStartupFontSize(SDL_Window *window);
 void launchDebug(const char *file);
 void launchExec(const char *file);
+void launch(const char *command, const char *file);
 void browseFile(SDL_Window *window, const char *url);
 
 #endif

src/ui/audio.cpp

@@ -30,6 +30,7 @@ extern "C" {
 #define MILLIS_TO_MICROS(n) (n * 1000)
 
 struct Sound;
+static ma_context context;
 static ma_device device;
 static ma_device_config config;
 static strlib::Queue<Sound *> queue;
@@ -124,7 +125,7 @@ static void setup_format(ma_format format, ma_uint32 channels, ma_uint32 sampleR
       config.sampleRate != sampleRate) {
     audio_close();
     setup_config(format, channels, sampleRate);
-    ma_result result = ma_device_init(nullptr, &config, &device);
+    ma_result result = ma_device_init(&context, &config, &device);
     if (result != MA_SUCCESS) {
       err_throw("Failed to prepare sound device [%d]", result);
     }
@@ -141,14 +142,29 @@ static void device_start() {
 }
 
 bool audio_open() {
-  setup_config(DEFAULT_FORMAT, DEFAULT_CHANNELS, DEFAULT_SAMPLE_RATE);
-  queuePos = 0;
-  return (ma_device_init(nullptr, &config, &device) == MA_SUCCESS);
+  bool result;
+  ma_backend backends[] = {
+    // uncomment for audio in linux
+    //ma_backend_alsa,
+    //ma_backend_jack,
+    //ma_backend_pulseaudio,
+    ma_backend_wasapi,
+    ma_backend_dsound
+  };
+  if (ma_context_init(backends, sizeof(backends)/sizeof(backends[0]), NULL, &context) != MA_SUCCESS) {
+    result = false;
+  } else {
+    queuePos = 0;
+    setup_config(DEFAULT_FORMAT, DEFAULT_CHANNELS, DEFAULT_SAMPLE_RATE);
+    result = (ma_device_init(&context, &config, &device) == MA_SUCCESS);
+  }
+  return result;
 }
 
 void audio_close() {
   osd_clear_sound_queue();
   ma_device_uninit(&device);
+  ma_context_uninit(&context);
 }
 
 void osd_audio(const char *path) {

src/ui/textedit.cpp

@@ -2384,7 +2384,7 @@ void TextEditHelpWidget::showPopup(int cols, int rows) {
   }
   _x = (_editor->_width - _width) / 2;
   if (rows == 1) {
-    _y = _editor->_height - (_charHeight * 3);
+    _y = _editor->_height - (_charHeight * 2.5);
   } else {
     _y = (_editor->_height - _height) / 2;
   }