Merge pull request #37 from chrisws/0_11_20

0 12 5

Author: chrisws

ChangeLog

@@ -1,3 +1,7 @@
+2016-02-11
+	Added export to mobile command (SDL)
+	Added Desktop shortcut command (android)
+
 2015-12-05
 	Implemented loading recent files via ALT+1 .. ALT+9
 	Fix potential editor crash with empty support widget

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.3])
+AC_INIT([smallbasic], [0.12.5])
 AC_CONFIG_SRCDIR([configure.ac])
 
 AC_CANONICAL_TARGET

ide/android/AndroidManifest.xml

@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="net.sourceforge.smallbasic"
           android:installLocation="preferExternal"
-          android:versionCode="17"
-          android:versionName="0.12.3">
+          android:versionCode="19"
+          android:versionName="0.12.5">
   <!-- This is the platform API where NativeActivity was introduced. -->
   <uses-sdk android:minSdkVersion="9"/>
 
@@ -64,5 +64,6 @@
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
   <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
   <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+  <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
 </manifest>
 

ide/android/assets/main.bas

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

src/platform/android/Makefile.am

@@ -17,7 +17,7 @@ test: ant-build-test
 	(cd ../../../ide/android && \
    adb -a logcat -c && \
    adb -a shell am start net.sourceforge.smallbasic/net.sourceforge.smallbasic.MainActivity && \
-   adb -a logcat)
+   adb -a logcat DEBUG:I smallbasic:I AndroidRuntime:E *:S)
 
 clean-ant:
 	(cd ../../../ide/android && ant -quiet clean)

src/platform/android/jni/runtime.cpp

@@ -89,6 +89,7 @@ void handleCommand(android_app *app, int32_t cmd) {
   case APP_CMD_GAINED_FOCUS:
     trace("gainedFocus");
     runtime->setFocus(true);
+    runtime->redraw();
     break;
   case APP_CMD_LOST_FOCUS:
     trace("lostFocus");
@@ -138,7 +139,7 @@ extern "C" JNIEXPORT void JNICALL Java_net_sourceforge_smallbasic_MainActivity_r
 
 extern "C" JNIEXPORT void JNICALL Java_net_sourceforge_smallbasic_MainActivity_onResize
   (JNIEnv *env, jclass jclazz, jint width, jint height) {
-  if (runtime != NULL && runtime->isActive() && os_graphics) {
+  if (runtime != NULL && !runtime->isClosing() && runtime->isActive() && os_graphics) {
     runtime->onResize(width, height);
   }
 }
@@ -176,6 +177,10 @@ Runtime::~Runtime() {
   pthread_mutex_destroy(&_mutex);
 }
 
+void Runtime::addShortcut(const char *path) {
+  setString("addShortcut", path);
+}
+
 void Runtime::alert(const char *title, const char *message) {
   logEntered();
 
@@ -200,8 +205,7 @@ void Runtime::alert(const char *title, bool longDuration) {
   _app->activity->vm->AttachCurrentThread(&env, NULL);
   jstring titleString = env->NewStringUTF(title);
   jclass clazz = env->GetObjectClass(_app->activity->clazz);
-  jmethodID method = env->GetMethodID(clazz, "showToast",
-                                      "(Ljava/lang/String;Z)V");
+  jmethodID method = env->GetMethodID(clazz, "showToast", "(Ljava/lang/String;Z)V");
   env->CallVoidMethod(_app->activity->clazz, method, titleString, longDuration);
   env->DeleteLocalRef(clazz);
   env->DeleteLocalRef(titleString);

src/platform/android/jni/runtime.h

@@ -21,6 +21,7 @@ struct Runtime : public System {
   Runtime(android_app *app);
   virtual ~Runtime();
 
+  void addShortcut(const char *path);
   void alert(const char *title, const char *message);
   void alert(const char *title, bool longDuration=true);
   int ask(const char *title, const char *prompt, bool cancel);

src/platform/android/src/net/sourceforge/smallbasic/MainActivity.java

@@ -84,6 +84,23 @@ public class MainActivity extends NativeActivity {
   public static native void onResize(int width, int height);
   public static native void runFile(String fileName);
 
+  public void addShortcut(final String path) {
+    Intent shortcut = new Intent(getApplicationContext(), MainActivity.class);
+    shortcut.setAction(Intent.ACTION_MAIN);
+    shortcut.setData(Uri.parse("smallbasic://" + path));
+    Intent intent = new Intent();
+    int index = path.lastIndexOf('/');
+    String name = (index == -1) ? path : path.substring(index + 1);
+    intent.putExtra(Intent.EXTRA_SHORTCUT_INTENT, shortcut);
+    intent.putExtra(Intent.EXTRA_SHORTCUT_NAME, name);
+    intent.putExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE,
+                    Intent.ShortcutIconResource.fromContext(getApplicationContext(),
+                                                            R.drawable.ic_launcher));
+    intent.putExtra("duplicate", false);
+    intent.setAction("com.android.launcher.action.INSTALL_SHORTCUT");
+    getApplicationContext().sendBroadcast(intent);
+  }
+
   public int ask(final String title, final String prompt, final boolean cancel) {
     final AskResult result = new AskResult();
     final Activity activity = this;

src/platform/sdl/editor.cpp

@@ -9,12 +9,16 @@
 #include "config.h"
 
 #include "common/sbapp.h"
+#include "common/fs_socket_client.h"
 #include "ui/textedit.h"
 #include "platform/sdl/runtime.h"
 #include "platform/sdl/settings.h"
 
 using namespace strlib;
 
+String g_exportAddr;
+String g_exportToken;
+
 void onlineHelp(Runtime *runtime, TextEditInput *widget) {
   char path[100];
   const char *nodeId = widget->getNodeId();
@@ -60,6 +64,27 @@ void showRecentFiles(TextEditHelpWidget *helpWidget, String &loadPath) {
   helpWidget->setText(fileList);
 }
 
+void exportBuffer(AnsiWidget *out, const char *text, String &dest, String &token) {
+  char buffer[PATH_MAX];
+  dev_file_t f;
+  memset(&f, 0, sizeof(dev_file_t));
+
+  sprintf(f.name, "SOCL:%s\n", dest.c_str());
+  if (dest.indexOf(':', 0) != -1 && sockcl_open(&f)) {
+    sprintf(buffer, "# %s\n", token.c_str());
+    sockcl_write(&f, (byte *)buffer, strlen(buffer));
+    if (!sockcl_write(&f, (byte *)text, strlen(text))) {
+      sprintf(buffer, "Failed to write: %s", dest.c_str());
+    } else {
+      sprintf(buffer, "Exported file to %s", dest.c_str());
+    }
+    sockcl_close(&f);
+  } else {
+    sprintf(buffer, "Failed to open: %s", dest.c_str());
+  }
+  out->setStatus(buffer);
+}
+
 void System::editSource(String &loadPath) {
   logEntered();
 
@@ -73,6 +98,9 @@ void System::editSource(String &loadPath) {
   TextEditInput *widget = editWidget;
   String dirtyFile;
   String cleanFile;
+  enum InputMode {
+    kInit, kExportAddr, kExportToken
+  } inputMode = kInit;
 
   setupStatus(dirtyFile, cleanFile, loadPath);
   _modifiedTime = getModifiedTime();
@@ -124,7 +152,6 @@ void System::editSource(String &loadPath) {
       }
 
       switch (event.key) {
-      case SB_KEY_F(3):
       case SB_KEY_F(8):
       case SB_KEY_F(10):
       case SB_KEY_F(11):
@@ -168,6 +195,22 @@ void System::editSource(String &loadPath) {
         redraw = false;
         onlineHelp((Runtime *)this, editWidget);
         break;
+      case SB_KEY_F(4):
+        if (editWidget->getTextLength() && g_exportAddr.length() && g_exportToken.length()) {
+          exportBuffer(_output, editWidget->getText(), g_exportAddr, g_exportToken);
+          break;
+        }
+        // else fallthru to F3 handler
+      case SB_KEY_F(3):
+        if (editWidget->getTextLength()) {
+          saveFile(editWidget, loadPath);
+          _output->setStatus("Export to mobile SmallBASIC. Enter <IP>:<Port>");
+          widget = helpWidget;
+          helpWidget->createLineEdit(g_exportAddr);
+          helpWidget->show();
+          inputMode = kExportAddr;
+        }
+        break;
       case SB_KEY_F(5):
         saveFile(editWidget, loadPath);
         _output->setStatus("Debug. F6=Step, F7=Continue, Esc=Close");
@@ -269,6 +312,25 @@ void System::editSource(String &loadPath) {
         if (helpWidget->replaceMode()) {
           _output->setStatus("Replace string with. Esc=Close");
           dirty = editWidget->isDirty();
+        } else if (helpWidget->lineEditMode() && helpWidget->getTextLength()) {
+          switch (inputMode) {
+          case kExportAddr:
+            g_exportAddr = helpWidget->getText();
+            inputMode = kExportToken;
+            helpWidget->createLineEdit(g_exportToken);
+            _output->setStatus("Enter token. Esc=Close");
+            break;
+          case kExportToken:
+            g_exportToken = helpWidget->getText();
+            inputMode = kInit;
+            widget = editWidget;
+            exportBuffer(_output, editWidget->getText(), g_exportAddr, g_exportToken);
+            helpWidget->hide();
+            break;
+          default:
+            break;
+          }
+          redraw = true;
         } else if (helpWidget->closeOnEnter() && helpWidget->isVisible()) {
           if (helpWidget->replaceDoneMode()) {
             _output->setStatus(dirtyFile);

src/platform/sdl/runtime.h

@@ -21,6 +21,7 @@ struct Runtime : public System {
   Runtime(SDL_Window *window);
   virtual ~Runtime();
 
+  void addShortcut(const char *) {}
   void alert(const char *title, const char *message);
   int ask(const char *title, const char *prompt, bool cancel);
   void browseFile(const char *url);