ANDROID: fix POINT

Author: chrisws

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.4])
+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="18"
-          android:versionName="0.12.4">
+          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.4"
+  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/jni/runtime.cpp

@@ -177,6 +177,19 @@ Runtime::~Runtime() {
   pthread_mutex_destroy(&_mutex);
 }
 
+void Runtime::addShortcut(const char *path) {
+  JNIEnv *env;
+  _app->activity->vm->AttachCurrentThread(&env, NULL);
+  jclass clazz = env->GetObjectClass(_app->activity->clazz);
+  jstring pathString = env->NewStringUTF(path);
+  jmethodID methodId = env->GetMethodID(clazz, "addShortcut",
+                                        "(Ljava/lang/String;)V");
+  env->CallVoidMethod(_app->activity->clazz, methodId, pathString);
+  env->DeleteLocalRef(clazz);
+  env->DeleteLocalRef(pathString);
+  _app->activity->vm->DetachCurrentThread();
+}
+
 void Runtime::alert(const char *title, const char *message) {
   logEntered();
 
@@ -818,6 +831,9 @@ void System::editSource(strlib::String &loadPath) {
           saveFile(editWidget, loadPath);
         }
         break;
+      case SB_KEY_F(10):
+        runtime->addShortcut(loadPath.c_str());
+        break;
       case SB_KEY_CTRL('s'):
         saveFile(editWidget, loadPath);
         break;

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,21 @@ 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 intent = new Intent(getApplicationContext(), MainActivity.class);
+    intent.setAction(Intent.ACTION_MAIN);
+    Intent addIntent = new Intent();
+    addIntent.putExtra(Intent.EXTRA_SHORTCUT_INTENT, intent);
+    addIntent.putExtra(Intent.EXTRA_SHORTCUT_NAME, "SmallBASIC");
+    addIntent.putExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE,
+                       Intent.ShortcutIconResource.fromContext(getApplicationContext(),
+                                                               R.drawable.ic_launcher));
+    addIntent.putExtra("duplicate", false);
+    addIntent.setAction("com.android.launcher.action.INSTALL_SHORTCUT");
+    getApplicationContext().sendBroadcast(addIntent);
+    showToast("The shortcut was created and has been placed on your home screen", true);
+  }
+
   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,6 +9,7 @@
 #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"
@@ -64,23 +65,24 @@ void showRecentFiles(TextEditHelpWidget *helpWidget, String &loadPath) {
 }
 
 void exportBuffer(AnsiWidget *out, const char *text, String &dest, String &token) {
-  int handle = 1;
   char buffer[PATH_MAX];
+  dev_file_t f;
+  memset(&f, 0, sizeof(dev_file_t));
 
-  sprintf(buffer, "SOCL:%s\n", dest.c_str());
-  if (dev_fopen(handle, buffer, DEV_FILE_OUTPUT)) {
+  sprintf(f.name, "SOCL:%s\n", dest.c_str());
+  if (dest.indexOf(':', 0) != -1 && sockcl_open(&f)) {
     sprintf(buffer, "# %s\n", token.c_str());
-    dev_fwrite(handle, (byte *)buffer, strlen(buffer));
-    if (!dev_fwrite(handle, (byte *)text, strlen(text))) {
+    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);
-  dev_fclose(handle);
 }
 
 void System::editSource(String &loadPath) {
@@ -193,6 +195,12 @@ 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);
@@ -313,8 +321,6 @@ void System::editSource(String &loadPath) {
             _output->setStatus("Enter token. Esc=Close");
             break;
           case kExportToken:
-            _output->setStatus("Sending ...");
-            _output->redraw();
             g_exportToken = helpWidget->getText();
             inputMode = kInit;
             widget = editWidget;

src/ui/graphics.cpp

@@ -314,6 +314,11 @@ int Graphics::getPixel(Canvas *canvas, int posX, int posY) {
       && posY < canvas->_h - 1) {
     pixel_t *line = canvas->getLine(posY);
     result = line[posX];
+#if defined(PIXELFORMAT_RGBA8888)
+    uint8_t r,g,b;
+    GET_RGB2(result, r, g, b);
+    result = SET_RGB(r, g, b);
+#endif
   }
   return result;
 }

src/ui/system.cpp

@@ -41,7 +41,8 @@
 #define MENU_DEBUG      18
 #define MENU_OUTPUT     19
 #define MENU_HELP       20
-#define MENU_SIZE       21
+#define MENU_SHORTCUT   21
+#define MENU_SIZE       22
 #define MENU_COMPETION_0  (MENU_SIZE + 1)
 #define MENU_COMPETION_1  (MENU_SIZE + 2)
 #define MENU_COMPETION_2  (MENU_SIZE + 3)
@@ -342,6 +343,10 @@ void System::handleMenu(MAEvent &event) {
     event.type = EVENT_TYPE_KEY_PRESSED;
     event.key = SB_KEY_F(1);
     break;
+  case MENU_SHORTCUT:
+    event.type = EVENT_TYPE_KEY_PRESSED;
+    event.key = SB_KEY_F(10);
+    break;
   case MENU_COMPETION_0:
     completeKeyword(0);
     break;
@@ -834,6 +839,9 @@ void System::showMenu() {
         sprintf(buffer, "Control Mode [%s]", (controlMode ? "ON" : "OFF"));
         items->add(new String(buffer));
         _systemMenu[index++] = MENU_CTRL_MODE;
+      } else {
+        items->add(new String("Desktop Shortcut"));
+        _systemMenu[index++] = MENU_SHORTCUT;
       }
 #endif
     } else {

src/ui/textedit.cpp

@@ -108,7 +108,7 @@ const char *helpText =
   "TAB indent line\n"
   "F1,A-h keyword help\n"
   "F2 online help\n"
-  "F3 export\n"
+  "F3,F4 export\n"
   "F5 debug\n"
   "F9, C-r run\n";