Merge pull request #76 from chrisws/0_12_15

0 12 15

Author: chrisws

ChangeLog

@@ -1,3 +1,8 @@
+2018-12-28 (0.12.15)
+	Fix crash when using GOTO with a non-existent label
+	Fix crash in editor when double tapping empty document
+	Fix menu display on chromebook and other devices
+
 2018-11-11 (0.12.14)
 	CONSOLE: added support for IMAGE command
 

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

debian/changelog

@@ -1,3 +1,8 @@
+smallbasic (0.12.15) unstable; urgency=low
+  * Various see web site
+
+ -- Chris Warren-Smith <cwarrensmith@gmail.com>  Fri, 28 Dec 2018 09:45:25 +1000
+
 smallbasic (0.12.14) unstable; urgency=low
   * Various see web site
 

samples/distro-examples/tests/goto.bas

@@ -0,0 +1,2 @@
+REM Don't crash when label does not exist
+goto 1

samples/distro-examples/tests/output/goto.out

@@ -0,0 +1,6 @@
+
+
+ * COMP-ERROR AT Main:2 * 
+Description:
+Label '1' is not defined
+

src/common/scan.c

@@ -3401,7 +3401,7 @@ void comp_pass2_scan() {
         w = label->ip;
 
         // adjust the address to compensate for optimisation to remove adjoining kwEOC
-        if (comp_prog.ptr[w] != kwTYPE_LINE && comp_prog.ptr[w - 1] == kwTYPE_LINE) {
+        if (w > 0 && w < comp_prog.count && comp_prog.ptr[w] != kwTYPE_LINE && comp_prog.ptr[w - 1] == kwTYPE_LINE) {
           w--;
         }
         memcpy(comp_prog.ptr + node->pos + (j * ADDRSZ) + (ADDRSZ + ADDRSZ + 3), &w, ADDRSZ);
@@ -3419,7 +3419,7 @@ void comp_pass2_scan() {
         w = label->ip;
 
         // adjust the address to compensate for optimisation to remove adjoining kwEOC
-        if (comp_prog.ptr[w] != kwTYPE_LINE && comp_prog.ptr[w - 1] == kwTYPE_LINE) {
+        if (w > 0 && w < comp_prog.count && comp_prog.ptr[w] != kwTYPE_LINE && comp_prog.ptr[w - 1] == kwTYPE_LINE) {
           w--;
         }
 
@@ -3697,12 +3697,14 @@ bcip_t comp_optimise_line_goto(bcip_t ip) {
 
   ip = comp_read_goto(ip + 1, &addr, &level);
   bcip_t goto_ip = addr;
-  if (comp_prog.ptr[goto_ip] == kwTYPE_EOC) {
+
+  // note: INVALID_ADDR is assumed to be > comp_prog.count
+  if (goto_ip < comp_prog.count && comp_prog.ptr[goto_ip] == kwTYPE_EOC) {
     new_addr = goto_ip + 1;
   }
-  while (goto_ip > 0 && comp_prog.ptr[goto_ip] == kwTYPE_LINE) {
+  while (goto_ip > -1 && comp_prog.ptr[goto_ip] == kwTYPE_LINE) {
     goto_ip += 1 + sizeof(bcip_t);
-    if (comp_prog.ptr[goto_ip] == kwGOTO) {
+    if (goto_ip < comp_prog.count && comp_prog.ptr[goto_ip] == kwGOTO) {
       code_t next_level;
       comp_read_goto(goto_ip + 1, &addr, &next_level);
       goto_ip = addr;

src/platform/android/app/build.gradle

@@ -9,8 +9,8 @@ android {
     applicationId 'net.sourceforge.smallbasic'
     minSdkVersion 16
     targetSdkVersion 27
-    versionCode 31
-    versionName "0.12.14.2"
+    versionCode 32
+    versionName "0.12.15"
     resConfigs "en"
   }
 

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

@@ -12,6 +12,7 @@
 import android.content.DialogInterface.OnCancelListener;
 import android.content.Intent;
 import android.content.pm.PackageManager;
+import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.graphics.Rect;
 import android.location.Criteria;
@@ -101,6 +102,7 @@ public class MainActivity extends NativeActivity {
     System.loadLibrary("smallbasic");
   }
 
+  public static native void onActivityPaused(boolean paused);
   public static native void onResize(int width, int height);
   public static native void onUnicodeChar(int ch);
   public static native boolean optionSelected(int index);
@@ -378,7 +380,17 @@ public void optionsBox(final String[] items) {
     this._options = items;
     runOnUiThread(new Runnable() {
       public void run() {
-        openOptionsMenu();
+        invalidateOptionsMenu();
+        Configuration config = getResources().getConfiguration();
+        // https://stackoverflow.com/questions/9996333/openoptionsmenu-function-not-working-in-ics/17903128#17903128
+        if ((config.screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK) > Configuration.SCREENLAYOUT_SIZE_LARGE) {
+          int originalScreenLayout = config.screenLayout;
+          config.screenLayout = Configuration.SCREENLAYOUT_SIZE_LARGE;
+          openOptionsMenu();
+          config.screenLayout = originalScreenLayout;
+        } else {
+          openOptionsMenu();
+        }
       }
     });
   }
@@ -589,6 +601,18 @@ protected void onCreate(Bundle savedInstanceState) {
     checkFilePermission();
   }
 
+  @Override
+  protected void onPause() {
+    super.onPause();
+    onActivityPaused(true);
+  }
+
+  @Override
+  protected void onResume() {
+    super.onResume();
+    onActivityPaused(false);
+  }
+
   @Override
   protected void onStop() {
     super.onStop();

src/platform/android/jni/display.cpp

@@ -118,7 +118,8 @@ Graphics::Graphics(android_app *app) : ui::Graphics(),
   _fontBufferB(NULL),
   _app(app),
   _w(0),
-  _h(0) {
+  _h(0),
+  _paused(false) {
 }
 
 Graphics::~Graphics() {
@@ -154,7 +155,7 @@ bool Graphics::construct(int fontId) {
 }
 
 void Graphics::redraw() {
-  if (_app->window != NULL) {
+  if (_app->window != NULL && !_paused) {
     ANativeWindow_Buffer buffer;
     if (ANativeWindow_lock(_app->window, &buffer, NULL) < 0) {
       trace("Unable to lock window buffer");

src/platform/android/jni/display.h

@@ -25,6 +25,7 @@ struct Graphics : ui::Graphics {
   bool construct(int fontId);
   void redraw();
   void resize();
+  void onPaused(bool paused) { _paused=paused; }
   void setSize(int w, int h) { _w = w; _h = h; }
 
 private:
@@ -35,6 +36,7 @@ struct Graphics : ui::Graphics {
   FT_Byte *_fontBufferB;
   android_app *_app;
   int _w, _h;
+  bool _paused;
 };
 
 #endif