ANDROID: fix v4.4 startup crash

chrisws · chrisws · commit f04354fc7dac · 2014-07-13T11:22:09.000+10:00
diff --git a/ide/android/AndroidManifest.xml b/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="6"
-          android:versionName="0.11.6">
+          android:versionCode="8"
+          android:versionName="0.11.7">
   <!-- This is the platform API where NativeActivity was introduced. -->
   <uses-sdk android:minSdkVersion="9" />
 
diff --git a/ide/android/assets/main.bas b/ide/android/assets/main.bas
@@ -30,7 +30,7 @@ sub about()
   print "(_ ._ _  _.|||_) /\ (_ |/ "
   print "__)| | |(_||||_)/--\__)|\_"
   print
-  print "Version 0.11.6"
+  print "Version 0.11.7"
   print
   print "Copyright (c) 2002-2014 Chris Warren-Smith"
   print "Copyright (c) 2000-2006 Nic Christopoulos" + chr(10)
@@ -56,7 +56,7 @@ sub setup()
   print boldOn + "Setup web service port number."
   print boldOff
   print "Enter a port number to allow web browser or desktop IDE access. ";
-  print "Enter -1 to diable this feature, or press <enter> to leave ";
+  print "Enter -1 to disable this feature, or press <enter> to leave ";
   print "this screen without making any changes."
   print "The current setting is: " + env("serverSocket")
   print
diff --git a/src/platform/android/jni/runtime.cpp b/src/platform/android/jni/runtime.cpp
@@ -136,7 +136,9 @@ 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) {
-  runtime->onResize(width, height);
+  if (runtime != NULL && runtime->isActive()) {
+    runtime->onResize(width, height);
+  }
 }
 
 void onContentRectChanged(ANativeActivity *activity, const ARect *rect) {
diff --git a/src/platform/common/system.cpp b/src/platform/common/system.cpp
@@ -49,6 +49,7 @@ System::System() :
   _systemMenu(false),
   _systemScreen(false),
   _mainBas(false),
+  _buttonPressed(false),
   _programSrc(NULL) {
   g_system = this;
 }
@@ -204,14 +205,15 @@ void System::handleEvent(MAEvent event) {
     _touchX = _touchCurX = event.point.x;
     _touchY = _touchCurY = event.point.y;
     dev_pushkey(SB_KEY_MK_PUSH);
-    _output->pointerTouchEvent(event);
+    _buttonPressed = _output->pointerTouchEvent(event);
     break;
   case EVENT_TYPE_POINTER_DRAGGED:
     _touchCurX = event.point.x;
     _touchCurY = event.point.y;
     _output->pointerMoveEvent(event);
     break;
   case EVENT_TYPE_POINTER_RELEASED:
+    _buttonPressed = false;
     _touchX = _touchY = _touchCurX = _touchCurY = -1;
     _output->pointerReleaseEvent(event);
     break;
diff --git a/src/platform/common/system.h b/src/platform/common/system.h
@@ -79,6 +79,7 @@ struct System : public IButtonListener {
   bool _systemMenu;
   bool _systemScreen;
   bool _mainBas;
+  bool _buttonPressed;
   char *_programSrc;
 };
 
diff --git a/src/platform/common/utils.h b/src/platform/common/utils.h
@@ -22,7 +22,7 @@ typedef signed long    S32;
  #define MIN(a,b) ((a>b) ? (b) : (a))
 #endif
 
-#if defined(_FLTK)
+#if defined(_FLTK) || defined(_SDL)
  #define DEFAULT_FOREGROUND 0
  #define DEFAULT_BACKGROUND 0xecedef
  #define HANDLE_SCREEN_BUFFER HANDLE_SCREEN + 1
diff --git a/src/platform/sdl/Makefile.am b/src/platform/sdl/Makefile.am
@@ -15,15 +15,16 @@ EXTRA_DIST =																		\
 bin_PROGRAMS = sbasicg
 
 sbasicg_SOURCES =																\
-  ../common/graphics.cpp  											\
+  ../common/graphics.cpp												\
   ../common/ansiwidget.cpp											\
   ../common/screen.cpp													\
   ../common/system.cpp													\
   ../common/form_ui.cpp													\
   ../common/StringLib.cpp												\
   main.cpp																			\
   display.cpp																		\
-  runtime.cpp
+  runtime.cpp																		\
+  settings.cpp																		
 
 sbasicg_LDADD = -L$(top_srcdir)/src/common -lsb_common @PACKAGE_LIBS@
 
diff --git a/src/platform/sdl/main.cpp b/src/platform/sdl/main.cpp
@@ -14,6 +14,7 @@
 #include "platform/common/utils.h"
 #include "platform/common/StringLib.h"
 #include "platform/sdl/runtime.h"
+#include "platform/sdl/settings.h"
 #include "common/smbas.h"
 
 using namespace strlib;
@@ -38,6 +39,8 @@ static struct option OPTIONS[] = {
   {0, 0, 0, 0}
 };
 
+const char *CONFIG_NAME = "SmallBASIC";
+
 void appLog(const char *format, ...) {
   char buf[4096], *p = buf;
   va_list args;
@@ -192,27 +195,31 @@ int main(int argc, char* argv[]) {
     }
   }
 
+  int fontScale;
+  SDL_Rect rect;
+
+  restoreSettings(CONFIG_NAME, rect, fontScale);
   SDL_Init(SDL_INIT_VIDEO | SDL_INIT_EVENTS);
-  SDL_Window *window = SDL_CreateWindow("SmallBASIC",
-                                        SDL_WINDOWPOS_UNDEFINED,
-                                        SDL_WINDOWPOS_UNDEFINED,
-                                        640, 480,
+  SDL_Window *window = SDL_CreateWindow("SmallBASIC", 
+                                        rect.x, rect.y, rect.w, rect.h,
                                         SDL_WINDOW_SHOWN | 
+                                        SDL_WINDOW_RESIZABLE |
                                         SDL_WINDOW_INPUT_FOCUS |
                                         SDL_WINDOW_MOUSE_FOCUS);
   if (window != NULL) {
     String font, fontBold;
     if (getFontFiles(fontFamily, font, fontBold)) {
       Runtime *runtime = new Runtime(window);
       runtime->construct(font.c_str(), fontBold.c_str());
-      runtime->runShell(runFile);
+      fontScale = runtime->runShell(runFile, fontScale);
       delete runtime;
     } else {
-      trace("Failed to locate display font\n");
+      fprintf(stderr, "Failed to locate display font\n");
     }
+    saveSettings(CONFIG_NAME, window, fontScale);
     SDL_DestroyWindow(window);
   } else {
-    trace("Could not create window: %s\n", SDL_GetError());
+    fprintf(stderr, "Could not create window: %s\n", SDL_GetError());
   }
 
   SDL_Quit();
diff --git a/src/platform/sdl/runtime.cpp b/src/platform/sdl/runtime.cpp
@@ -22,13 +22,16 @@
 #include "platform/sdl/main_bas.h"
 
 #define WAIT_INTERVAL 10
+#define DEFAULT_FONT_SIZE 16
 #define MAIN_BAS "__main_bas__"
 
 Runtime *runtime;
 
 Runtime::Runtime(SDL_Window *window) :
   System(),
-  _window(window) {
+  _window(window),
+  _cursorHand(NULL),
+  _cursorArrow(NULL) {
   runtime = this;
 }
 
@@ -41,12 +44,21 @@ Runtime::~Runtime() {
   _output = NULL;
   _eventQueue = NULL;
   _graphics = NULL;
+
+  SDL_FreeCursor(_cursorHand);
+  SDL_FreeCursor(_cursorArrow);
+  _cursorHand = NULL;
+  _cursorArrow = NULL;
 }
 
 void Runtime::construct(const char *font, const char *boldFont) {
   logEntered();
   _state = kClosingState;
   _graphics = new Graphics(_window);
+
+  _cursorHand = SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_HAND);
+  _cursorArrow = SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_ARROW);
+
   if (_graphics && _graphics->construct(font, boldFont)) {
     int w, h;
     SDL_GetWindowSize(_window, &w, &h);
@@ -68,7 +80,7 @@ MAEvent *Runtime::popEvent() {
   return _eventQueue->pop();
 }
 
-void Runtime::runShell(const char *startupBas) {
+int Runtime::runShell(const char *startupBas, int fontScale) {
   logEntered();
 
   os_graphics = 1;
@@ -80,6 +92,15 @@ void Runtime::runShell(const char *startupBas) {
   opt_pref_bpp = 0;
   opt_nosave = true;
 
+  _output->setTextColor(DEFAULT_FOREGROUND, DEFAULT_BACKGROUND);
+  _output->setFontSize(DEFAULT_FONT_SIZE);
+  _initialFontSize = _output->getFontSize();
+  if (fontScale != 100) {
+    _fontScale = fontScale;
+    int fontSize = (_initialFontSize * _fontScale / 100);
+    _output->setFontSize(fontSize);
+  }
+
   if (startupBas != NULL) {
     runOnce(startupBas);
   } else {
@@ -88,6 +109,7 @@ void Runtime::runShell(const char *startupBas) {
 
   _state = kDoneState;
   logLeaving();
+  return _fontScale;
 }
 
 char *Runtime::loadResource(const char *fileName) {
@@ -166,6 +188,7 @@ void Runtime::pollEvents(bool blocking) {
         maEvent = getMotionEvent(EVENT_TYPE_POINTER_DRAGGED, &ev);
         break;
       case SDL_MOUSEBUTTONUP:
+        SDL_SetCursor(_cursorArrow);
         maEvent = getMotionEvent(EVENT_TYPE_POINTER_RELEASED, &ev);
         break;
       case SDL_WINDOWEVENT_SIZE_CHANGED:
@@ -217,6 +240,9 @@ MAEvent Runtime::processEvents(int waitFlag) {
     break;
   default:
     handleEvent(event);
+    if (event.type == EVENT_TYPE_POINTER_PRESSED && _buttonPressed) {
+      SDL_SetCursor(_cursorHand);
+    }
     break;
   }
   return event;
diff --git a/src/platform/sdl/runtime.h b/src/platform/sdl/runtime.h
@@ -31,7 +31,7 @@ struct Runtime : public System {
   MAEvent *popEvent();
   void pushEvent(MAEvent *event);
   void setExit(bool quit);
-  void runShell(const char *startupBas);
+  int runShell(const char *startupBas, int fontScale);
   char *loadResource(const char *fileName);
   void showAlert(const char *title, const char *message);
   void optionsBox(StringList *items);
@@ -42,6 +42,8 @@ struct Runtime : public System {
   Graphics *_graphics;
   Stack<MAEvent *> *_eventQueue;
   SDL_Window *_window;
+  SDL_Cursor *_cursorHand;
+  SDL_Cursor *_cursorArrow;
 };
 
 #endif

Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,9 @@ extern "C" JNIEXPORT void JNICALL Java_net_sourceforge_smallbasic_MainActivity_r`
`136`	`136`
`137`	`137`	`extern "C" JNIEXPORT void JNICALL Java_net_sourceforge_smallbasic_MainActivity_onResize`
`138`	`138`	`(JNIEnv *env, jclass jclazz, jint width, jint height) {`
`139`		`- runtime->onResize(width, height);`
	`139`	`+ if (runtime != NULL && runtime->isActive()) {`
	`140`	`+ runtime->onResize(width, height);`
	`141`	`+ }`
`140`	`142`	`}`
`141`	`143`
`142`	`144`	`void onContentRectChanged(ANativeActivity activity, const ARect rect) {`