ANDROID: add missing permissions

Author: chrisws

ide/android/AndroidManifest.xml

@@ -57,6 +57,7 @@
   <!-- Permissions -->
   <uses-permission android:name="android.permission.INTERNET" />
   <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" />
 </manifest>
 

src/common/blib_func.c

@@ -654,10 +654,14 @@ var_num_t cmd_math1(long funcCode, var_t *arg) {
 var_int_t cmd_fre(var_int_t arg) {
   var_int_t r = 0;
 #if defined(_UnixOS)
+  // assumes first two items are total + free
+  #define I_MEM_TOTAL 0
+  #define I_MEM_FREE  1
   int memfd = open("/proc/meminfo", O_RDONLY);
   if (memfd) {
-    ssize_t n;
     int i_val = 0;
+    var_int_t total = 0;
+    ssize_t n;
     char ch;
 
     for (n = read(memfd, &ch, sizeof(ch));
@@ -676,12 +680,18 @@ var_int_t cmd_fre(var_int_t arg) {
           n = read(memfd, &ch, sizeof(ch));
         }
 
-        // assumes the first two items are MemTotal, MemFree
         if (arg == i_val
-            || (arg == -10 && i_val == 0)
-            || (arg == -12 && i_val == 2)) {
+            || (arg == -10 && i_val == I_MEM_TOTAL)
+            || (arg == -12 && i_val == I_MEM_FREE)) {
           r = val * 1024 / 1000;
         }
+        if (i_val == I_MEM_TOTAL) {
+          total = val;
+        }
+        else if (i_val == I_MEM_FREE && arg == -11) {
+          // return used memory
+          r = (total - val) * 1024 / 1000;
+        }
         i_val++;
       }
     }

src/platform/sdl/main.cpp

@@ -200,7 +200,7 @@ int main(int argc, char* argv[]) {
 
   restoreSettings(CONFIG_NAME, rect, fontScale);
   SDL_Init(SDL_INIT_VIDEO | SDL_INIT_EVENTS);
-  SDL_Window *window = SDL_CreateWindow("SmallBASIC", 
+  SDL_Window *window = SDL_CreateWindow("SmallBASIC - [Break=Ctrl+c] [Menu=Ctrl+m] [Back=Ctrl+b]", 
                                         rect.x, rect.y, rect.w, rect.h,
                                         SDL_WINDOW_SHOWN | 
                                         SDL_WINDOW_RESIZABLE |

src/platform/sdl/runtime.cpp

@@ -176,9 +176,9 @@ void Runtime::pollEvents(bool blocking) {
       case SDL_KEYDOWN:
         if (ev.key.keysym.sym == SDLK_c && (ev.key.keysym.mod & KMOD_CTRL)) {
           runtime->setExit(true);
-        } else if (ev.key.keysym.sym == SDLK_HOME && (ev.key.keysym.mod & KMOD_CTRL)) {
+        } else if (ev.key.keysym.sym == SDLK_m && (ev.key.keysym.mod & KMOD_CTRL)) {
           showMenu();
-        } else if (ev.key.keysym.sym == SDLK_BACKSPACE && (ev.key.keysym.mod & KMOD_CTRL)) {
+        } else if (ev.key.keysym.sym == SDLK_b && (ev.key.keysym.mod & KMOD_CTRL)) {
           setBack();
         } else {
           maEvent = new MAEvent();