Merge pull request #34 from chrisws/0_11_20

0 12 2

Author: chrisws

ChangeLog

@@ -1,3 +1,9 @@
+2015-12-05
+	Implemented loading recent files via ALT+1 .. ALT+9
+	Fix potential editor crash with empty support widget
+	Fix potential crash with debug target
+	Fix restore path to only function when no other arguments supplied
+
 2015-11-01
 	Fix debugger launch in linux build
 	Fix editor display issue with keyword completion

configure.ac

@@ -7,7 +7,7 @@ dnl This program is distributed under the terms of the GPL v2.0
 dnl Download the GNU Public License (GPL) from www.gnu.org
 dnl
 
-AC_INIT([smallbasic], [0.12.1])
+AC_INIT([smallbasic], [0.12.2])
 AC_CONFIG_SRCDIR([configure.ac])
 
 AC_CANONICAL_TARGET

debian/changelog

@@ -1,3 +1,8 @@
+smallbasic (0.12.2) unstable; urgency=low
+  * Various - see web site
+
+ -- Chris Warren-Smith <cwarrensmith@gmail.com>  Sat, 5 Dec 2015 09:45:25 +1000
+
 smallbasic (0.12.1) unstable; urgency=low
   * Various - see web site
 

documentation/sbasic_ref.csv

@@ -304,4 +304,4 @@ Graphics,command,SHOWPAGE,0,"SHOWPAGE","This command is used to display pending
 Data,function,ISMAP,0,"ISMAP (x)","Returns true if x is an MAP variable type. A MAP provides value-key pair access along with array or dotted notation. The MAP can be initialized from a String variable using the ARRAY command"
 Data,function,ISREF,0,"ISREF (x)","Returns true if x is a reference variable type. The REF variable type is a ""reference"" to another variable (like a pointer in c). You create a reference by assigning a variable with the BYREF keyword (or @ symbol)."
 Data,function,ARRAY,0,"ARRAY [var | expr]","Creates a ARRAY or MAP variable from the given string or expression"
-Console,command,FORM,0,"FORM","Create a form widget. "
+Console,command,FORM,0,"FORM","Creates a form object from a MAP variable. This provides access to the following sub-commands: doEvents, close, refresh. The form MAP may contain the following properties: value, inputs, focusColor. Inputs is an array of MAP, each may contain the following properties: x, y, width, height, value, label, name, type, backgroundColor, color, visible, isExit, selectedIndex, length, noFocus, onclick"

ide/android/assets/main.bas

@@ -55,7 +55,7 @@ sub do_about()
   print "(_ ._ _  _.|||_) /\ (_ |/ "
   print "__)| | |(_||||_)/--\__)|\_"
   print
-  print "Version 0.12.1"
+  print "Version 0.12.2"
   print
   print "Copyright (c) 2002-2015 Chris Warren-Smith"
   print "Copyright (c) 1999-2006 Nic Christopoulos" + chr(10)

src/platform/sdl/editor.cpp

@@ -11,6 +11,9 @@
 #include "common/sbapp.h"
 #include "ui/textedit.h"
 #include "platform/sdl/runtime.h"
+#include "platform/sdl/settings.h"
+
+using namespace strlib;
 
 void onlineHelp(Runtime *runtime, TextEditInput *widget) {
   char path[100];
@@ -29,26 +32,36 @@ void onlineHelp(Runtime *runtime, TextEditInput *widget) {
   runtime->browseFile(path);
 }
 
-void System::editSource(strlib::String &loadPath) {
-  logEntered();
-
-  strlib::String fileName;
+void setupStatus(String &dirtyFile, String &cleanFile, String &loadPath) {
+  const char *help = " Ctrl+h (C-h)=Help";
+  String fileName;
   int i = loadPath.lastIndexOf('/', 0);
   if (i != -1) {
     fileName = loadPath.substring(i + 1);
   } else {
     fileName = loadPath;
   }
-
-  const char *help = " Ctrl+h (C-h)=Help";
-  strlib::String dirtyFile;
+  dirtyFile.empty();
   dirtyFile.append(" * ");
   dirtyFile.append(fileName);
   dirtyFile.append(help);
-  strlib::String cleanFile;
+  cleanFile.empty();
   cleanFile.append(" - ");
   cleanFile.append(fileName);
   cleanFile.append(help);
+}
+
+void showRecentFiles(TextEditHelpWidget *helpWidget) {
+  helpWidget->createMessage();
+  helpWidget->show();
+  helpWidget->reload(NULL);
+  String fileList;
+  getRecentFileList(fileList);
+  helpWidget->setText(fileList);
+}
+
+void System::editSource(String &loadPath) {
+  logEntered();
 
   int w = _output->getWidth();
   int h = _output->getHeight();
@@ -58,8 +71,11 @@ void System::editSource(strlib::String &loadPath) {
   TextEditInput *editWidget = new TextEditInput(_programSrc, charWidth, charHeight, 0, 0, w, h);
   TextEditHelpWidget *helpWidget = new TextEditHelpWidget(editWidget, charWidth, charHeight);
   TextEditInput *widget = editWidget;
-  _modifiedTime = getModifiedTime();
+  String dirtyFile;
+  String cleanFile;
 
+  setupStatus(dirtyFile, cleanFile, loadPath);
+  _modifiedTime = getModifiedTime();
   editWidget->updateUI(NULL, NULL);
   editWidget->setLineNumbers();
   editWidget->setFocus(true);
@@ -85,6 +101,7 @@ void System::editSource(strlib::String &loadPath) {
   _state = kEditState;
 
   showCursor(kIBeam);
+  setRecentFile(loadPath.c_str());
 
   while (_state == kEditState) {
     MAEvent event = getNextEvent();
@@ -216,6 +233,31 @@ void System::editSource(strlib::String &loadPath) {
         _output->selectScreen(SOURCE_SCREEN);
         _state = kEditState;
         break;
+      case SB_KEY_ALT('0'):
+        _output->setStatus("Recent files. Esc=Close");
+        widget = helpWidget;
+        showRecentFiles(helpWidget);
+        break;
+      case SB_KEY_ALT('1'):
+      case SB_KEY_ALT('2'):
+      case SB_KEY_ALT('3'):
+      case SB_KEY_ALT('4'):
+      case SB_KEY_ALT('5'):
+      case SB_KEY_ALT('6'):
+      case SB_KEY_ALT('7'):
+      case SB_KEY_ALT('8'):
+      case SB_KEY_ALT('9'):
+        if (editWidget->isDirty()) {
+          saveFile(editWidget, loadPath);
+        }
+        if (getRecentFile(loadPath, event.key - SB_KEY_ALT('1'))) {
+          loadSource(loadPath.c_str());
+          editWidget->reload(_programSrc);
+          dirty = !editWidget->isDirty();
+          setupStatus(dirtyFile, cleanFile, loadPath);
+          _modifiedTime = getModifiedTime();
+        }
+        break;
       default:
         redraw = widget->edit(event.key, sw, charWidth);
         break;

src/platform/sdl/main.cpp

@@ -263,7 +263,6 @@ int main(int argc, char* argv[]) {
   char *fontFamily = NULL;
   char *runFile = NULL;
   bool debug = false;
-  bool restoreDir = true;
   int fontScale;
   int ide_option = -1;
   SDL_Rect rect;
@@ -281,9 +280,7 @@ int main(int argc, char* argv[]) {
               && ((strcasecmp(s + len - 4, ".bas") == 0 && access(s, 0) == 0)
                   || (strstr(s, "://") != NULL))) {
             runFile = strdup(s);
-          } else if (chdir(s) == 0) {
-            restoreDir = false;
-          } else {
+          } else if (chdir(s) != 0) {
             strcpy(opt_command, s);
           }
         }
@@ -347,7 +344,7 @@ int main(int argc, char* argv[]) {
     }
   }
 
-  restoreSettings(rect, fontScale, debug, restoreDir);
+  restoreSettings(rect, fontScale, debug, argc == 1);
   if (ide_option != -1) {
     opt_ide = ide_option;
   }

src/platform/sdl/runtime.cpp

@@ -906,16 +906,22 @@ int debugThread(void *data) {
         break;
       case 'v':
         // variables
-        net_print(socket, "Variables:\n");
-        for (unsigned i = SYSVAR_COUNT; i < prog_varcount; i++) {
-          if (!v_isempty(tvar[i])) {
-            pv_writevar(tvar[i], PV_NET, socket);
-            net_print(socket, "\n");
+        SDL_LockMutex(g_lock);
+        if (!runtime->isRunning()) {
+          net_printf(socket, "\n");
+        } else {
+          net_print(socket, "Variables:\n");
+          for (unsigned i = SYSVAR_COUNT; i < prog_varcount; i++) {
+            if (!v_isempty(tvar[i])) {
+              pv_writevar(tvar[i], PV_NET, socket);
+              net_print(socket, "\n");
+            }
           }
+          net_print(socket, "Stack:\n");
+          dumpStack(socket);
+          net_print(socket, "\1");
         }
-        net_print(socket, "Stack:\n");
-        dumpStack(socket);
-        net_print(socket, "\1");
+        SDL_UnlockMutex(g_lock);
         break;
       case 'b':
         // set breakpoint

src/platform/sdl/settings.cpp

@@ -13,10 +13,12 @@
 #include <ctype.h>
 #include <sys/stat.h>
 
-#include "platform/sdl/settings.h"
 #include "ui/utils.h"
 #include "ui/textedit.h"
 #include "common/smbas.h"
+#include "platform/sdl/settings.h"
+
+using namespace strlib;
 
 static const char *ENV_VARS[] = {
   "APPDATA", "HOME", "TMP", "TEMP", "TMPDIR"
@@ -29,13 +31,17 @@ static const char *ENV_VARS[] = {
 #define DEFAULT_WIDTH 640
 #define DEFAULT_HEIGHT 480
 #define DEFAULT_SCALE 100
+#define NUM_RECENT_ITEMS 9
 
 #if defined(__MINGW32__)
 #define makedir(f) mkdir(f)
 #else
 #define makedir(f) mkdir(f, 0700)
 #endif
 
+String recentPath[NUM_RECENT_ITEMS];
+int recentPosition[NUM_RECENT_ITEMS];
+
 FILE *openConfig(const char *flags, bool debug) {
   FILE *result = NULL;
   char path[FILENAME_MAX];
@@ -94,19 +100,39 @@ int nextHex(FILE *fp, int def) {
 }
 
 //
-// sets the next string in the file as the current working directory
+// returns the length of the next string
 //
-void restorePath(FILE *fp) {
+int nextString(FILE *fp) {
   int pos = ftell(fp);
   int len = 0;
-  for (int c = fgetc(fp); c != EOF && c != ',' && c != '\n'; c = fgetc(fp)) {
+  for (int c = fgetc(fp); c != EOF; c = fgetc(fp)) {
+    if (c == '\n') {
+      if (len > 0) {
+        // string terminator
+        break;
+      } else {
+        // skip previous terminator
+        pos++;
+        continue;
+      }
+    }
     len++;
   }
   fseek(fp, pos, SEEK_SET);
+  return len;
+}
+
+//
+// sets the next string in the file as the current working directory
+//
+void restorePath(FILE *fp, bool restoreDir) {
+  int len = nextString(fp);
   if (len > 0) {
     String path;
     path.append(fp, len);
-    chdir(path.c_str());
+    if (restoreDir) {
+      chdir(path.c_str());
+    }
   }
 }
 
@@ -127,8 +153,17 @@ void restoreSettings(SDL_Rect &rect, int &fontScale, bool debug, bool restoreDir
     for (int i = 0; i < THEME_COLOURS; i++) {
       g_user_theme[i] = nextHex(fp, g_user_theme[i]);
     }
-    if (restoreDir) {
-      restorePath(fp);
+    restorePath(fp, restoreDir);
+
+    // restore recent paths
+    for (int i = 0; i < NUM_RECENT_ITEMS; i++) {
+      int len = nextString(fp);
+      if (len > 1) {
+        recentPath[i].empty();
+        recentPath[i].append(fp, len);
+      } else {
+        break;
+      }
     }
     fclose(fp);
   } else {
@@ -158,6 +193,7 @@ void saveSettings(SDL_Window *window, int fontScale, bool debug) {
     for (int i = 0; i < THEME_COLOURS; i++) {
       fprintf(fp, (i + 1 < THEME_COLOURS ? "%06x," : "%06x"), g_user_theme[i]);
     }
+    fprintf(fp, "\n");
 
     // save the current working directory
     char path[FILENAME_MAX + 1];
@@ -168,11 +204,56 @@ void saveSettings(SDL_Window *window, int fontScale, bool debug) {
           path[i] = '/';
         }
       }
-      fprintf(fp, "\n%s\n", path);
-    } else {
-      fprintf(fp, "\n%s\n", path);
     }
+    fprintf(fp, "%s\n", path);
+
+    // save the recent editor paths
+    for (int i = 0; i < NUM_RECENT_ITEMS; i++) {
+      if (recentPath[i].length() > 0) {
+        fprintf(fp, "%s\n", recentPath[i].c_str());
+      }
+    }
+
     fclose(fp);
   }
 }
 
+bool getRecentFile(String &path, unsigned position) {
+  bool result = false;
+  if (position < NUM_RECENT_ITEMS && recentPath[position].length() > 0 &&
+      !recentPath[position].equals(path)) {
+    path.empty();
+    path.append(recentPath[position]);
+    result = true;
+  }
+  return result;
+}
+
+void getRecentFileList(String &fileList) {
+  for (int i = 0; i < NUM_RECENT_ITEMS; i++) {
+    if (recentPath[i].length() > 0) {
+      fileList.append(i + 1).append(" ");
+      fileList.append(recentPath[i]).append("\n\n");
+    }
+  }
+}
+
+void setRecentFile(const char *filename) {
+  bool found = false;
+  for (int i = 0; i < NUM_RECENT_ITEMS && !found; i++) {
+    if (recentPath[i].equals(filename, false)) {
+      found = true;
+    }
+  }
+  if (!found) {
+    // shift items downwards
+    for (int i = NUM_RECENT_ITEMS - 1; i > 0; i--) {
+      recentPath[i].empty();
+      recentPath[i].append(recentPath[i - 1]);
+    }
+
+    // create new item in first position
+    recentPath[0].empty();
+    recentPath[0].append(filename);
+  }
+}

src/platform/sdl/settings.h

@@ -13,6 +13,9 @@
 
 void restoreSettings(SDL_Rect &rect, int &fontScale, bool debug, bool restoreDir);
 void saveSettings(SDL_Window *window, int fontScale, bool debug);
+void setRecentFile(const char *path);
+bool getRecentFile(strlib::String &path, unsigned position);
+void getRecentFileList(strlib::String &fileList);
 
 #endif