FLTK: added live editing menu

Author: chrisws

ChangeLog

@@ -1,3 +1,8 @@
+2020-02-08 (0.12.18)
+	SDL: fix issue #81 - numlock handling
+	FLTK: added live editing menu item
+	COMMON: increase stack size to 1024
+
 2019-12-21 (0.12.17)
 	SDL: fix issue #81 - numlock handling
 

src/common/sys.h

@@ -78,7 +78,7 @@ extern "C" {
 #define SB_KEYWORD_SIZE     128
 #define SB_SOURCELINE_SIZE  65536 // compiler
 #define SB_TEXTLINE_SIZE    8192  // RTL
-#define SB_EXEC_STACK_SIZE  512   // executor's stack size
+#define SB_EXEC_STACK_SIZE  1024  // executor's stack size
 #define SB_EVAL_STACK_SIZE  16    // evaluation stack size
 #define SB_KW_NONE_STR "Nil"
 

src/platform/fltk/MainWindow.cxx

@@ -1,6 +1,6 @@
 // This file is part of SmallBASIC
 //
-// Copyright(C) 2001-2019 Chris Warren-Smith.
+// Copyright(C) 2001-2020 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
@@ -9,6 +9,7 @@
 #include <config.h>
 #include <FL/fl_ask.H>
 #include <FL/Fl_PNG_Image.H>
+#include <FL/fl_utf8.h>
 #include "platform/fltk/MainWindow.h"
 #include "platform/fltk/EditorWidget.h"
 #include "platform/fltk/HelpView.h"
@@ -524,6 +525,16 @@ void MainWindow::run_selection(Fl_Widget *w, void *eventData) {
   }
 }
 
+/**
+ * run the active program in sbasicg
+ */
+void MainWindow::run_live(Fl_Widget *w, void *eventData) {
+  EditorWidget *editWidget = getEditor();
+  if (editWidget) {
+    launchExec(editWidget->getFilename());
+  }
+}
+
 /**
  * callback for editor-plug-in plug-ins. we assume the target
  * program will be changing the contents of the editor buffer
@@ -978,7 +989,8 @@ MainWindow::MainWindow(int w, int h) :
   scanPlugIns(m);
 
   m->add("&Program/&Run", FL_F+9, run_cb);
-  m->add("&Program/_&Run Selection", FL_F+8, run_selection_cb);
+  m->add("&Program/Run &Live Editing", FL_F+8, run_live_cb);
+  m->add("&Program/_Run &Selection", FL_F+7, run_selection_cb);
   m->add("&Program/&Break", FL_CTRL + 'b', run_break_cb);
   m->add("&Program/_&Restart", FL_CTRL + 'r', restart_run_cb);
   m->add("&Program/&Command", FL_F+10, set_options_cb);

src/platform/fltk/MainWindow.h

@@ -1,6 +1,6 @@
 // This file is part of SmallBASIC
 //
-// Copyright(C) 2001-2019 Chris Warren-Smith.
+// Copyright(C) 2001-2020 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
@@ -138,6 +138,7 @@ struct MainWindow : public BaseWindow {
   CALLBACK_METHOD(run_samples);
   CALLBACK_METHOD(run_break);
   CALLBACK_METHOD(run_selection);
+  CALLBACK_METHOD(run_live);
   CALLBACK_METHOD(save_file_as);
   CALLBACK_METHOD(set_options);
   CALLBACK_METHOD(set_theme);

src/platform/fltk/utils.cxx

@@ -1,14 +1,18 @@
 // This file is part of SmallBASIC
 //
-// Copyright(C) 2001-2019 Chris Warren-Smith.
+// Copyright(C) 2001-2020 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
 //
 
 #include <config.h>
-#if !defined(_Win32)
+#if defined(_Win32)
+#include <shellapi.h>
+#else
 #include <sys/socket.h>
+#include <unistd.h>
+#include <errno.h>
 #endif
 #include <stdint.h>
 #include "lib/str.h"
@@ -232,3 +236,38 @@ void vsncat(char *buffer, size_t size, ...) {
   }
   va_end(args);
 }
+
+
+#if defined(_Win32)
+void launchExec(const char *file) {
+  STARTUPINFO info = {sizeof(info)};
+  PROCESS_INFORMATION processInfo;
+  char cmd[1024];
+  auto app = "./sbasicg.exe";
+  sprintf(cmd, "%s -x %s", app, file);
+  if (!CreateProcess(app, cmd, NULL, NULL, TRUE, 0, NULL, NULL, &info, &processInfo)) {
+    appLog("failed to start %d %s %s\n", GetLastError(), app, cmd);
+  }
+}
+#else
+void launchExec(const char *file) {
+  pid_t pid = fork();
+  auto app = "/usr/bin/sbasicg";
+
+  switch (pid) {
+  case -1:
+    // failed
+    break;
+  case 0:
+    // child process
+    if (execl(app, app, "-x", file, (char *)0) == -1) {
+      fprintf(stderr, "exec failed [%s] %s\n", strerror(errno), app);
+      exit(1);
+    }
+    break;
+  default:
+    // parent process - continue
+    break;
+  }
+}
+#endif

src/platform/fltk/utils.h

@@ -56,5 +56,6 @@ Fl_Font get_font(const char *name);
 void getHomeDir(char *fileName, size_t size, bool appendSlash = true);
 bool cacheLink(dev_file_t *df, char *localFile, size_t size);
 void vsncat(char *buffer, size_t size, ...);
+void launchExec(const char *file);
 
 #endif

src/platform/sdl/editor.cpp

@@ -63,7 +63,7 @@ struct StatusMessage {
         .append(editor->getCol())
         .append(") ");
       if (!_insert) {
-        message.append(" Ovwrt ");
+        message.append("Ovwrt");
       }
       int digits = snprintf(NULL, 0, "%d%d",
                             editor->getRow(), editor->getCol());

src/platform/sdl/keymap.h

@@ -12,7 +12,6 @@
 const int keymap[][2] = {
   {SDLK_RETURN, SB_KEY_ENTER},
   {SDLK_ESCAPE, SB_KEY_ESCAPE},
-  {SDLK_KP_PERIOD, '.'},
   {SDLK_KP_ENTER, SB_KEY_ENTER},
   {SDLK_TAB, SB_KEY_TAB},
   {SDLK_BACKSPACE, SB_KEY_BACKSPACE},

src/platform/sdl/runtime.cpp

@@ -65,6 +65,14 @@ MAEvent *getMotionEvent(int type, SDL_Event *event) {
   return result;
 }
 
+MAEvent *getKeyPressedEvent(int keycode, int nativeKey) {
+  MAEvent *result = new MAEvent();
+  result->type = EVENT_TYPE_KEY_PRESSED;
+  result->key = keycode;
+  result->nativeKey = nativeKey;
+  return result;
+}
+
 Runtime::Runtime(SDL_Window *window) :
   System(),
   _menuX(0),
@@ -450,19 +458,10 @@ void Runtime::pollEvents(bool blocking) {
           if (ev.text.text[0] < 0) {
             wchar_t keycode;
             mbstowcs(&keycode, ev.text.text, 1);
-
-            MAEvent *keyEvent = new MAEvent();
-            keyEvent->type = EVENT_TYPE_KEY_PRESSED;
-            keyEvent->key = (int)keycode;
-            keyEvent->nativeKey = 0;
-            pushEvent(keyEvent);
+            pushEvent(getKeyPressedEvent((int)keycode, 0));
           } else {
             for (int i = 0; ev.text.text[i] != 0; i++) {
-              MAEvent *keyEvent = new MAEvent();
-              keyEvent->type = EVENT_TYPE_KEY_PRESSED;
-              keyEvent->key = ev.text.text[i];
-              keyEvent->nativeKey = 0;
-              pushEvent(keyEvent);
+              pushEvent(getKeyPressedEvent(ev.text.text[i], 0));
             }
           }
         }
@@ -502,12 +501,17 @@ void Runtime::pollEvents(bool blocking) {
           }
         } else {
           int lenMap = sizeof(keymap) / sizeof(keymap[0]);
+          if (ev.key.keysym.sym == SDLK_KP_PERIOD) {
+            if (ev.key.keysym.mod == KMOD_NUM) {
+              // '.' character sent as SDL_TEXTINPUT
+            } else {
+              pushEvent(getKeyPressedEvent(SB_KEY_DELETE, 0));
+            }
+            lenMap = 0;
+          }
           for (int i = 0; i < lenMap; i++) {
             if (ev.key.keysym.sym == keymap[i][0]) {
-              maEvent = new MAEvent();
-              maEvent->type = EVENT_TYPE_KEY_PRESSED;
-              maEvent->key = keymap[i][1];
-              maEvent->nativeKey = ev.key.keysym.mod;
+              pushEvent(getKeyPressedEvent(keymap[i][1], ev.key.keysym.mod));
               break;
             }
           }
@@ -521,10 +525,7 @@ void Runtime::pollEvents(bool blocking) {
                 ev.key.keysym.sym != SDLK_LCTRL &&
                 ev.key.keysym.sym != SDLK_RCTRL) ||
                (ev.key.keysym.mod & KMOD_ALT))) {
-            maEvent = new MAEvent();
-            maEvent->type = EVENT_TYPE_KEY_PRESSED;
-            maEvent->key = ev.key.keysym.sym;
-            maEvent->nativeKey = ev.key.keysym.mod;
+            maEvent = getKeyPressedEvent(ev.key.keysym.sym, ev.key.keysym.mod);
           }
         }
         break;