SDL: updates for flatpak build

Author: Chris Warren-Smith

src/common/sys.h

@@ -71,8 +71,10 @@ extern "C" {
 #endif
 
 // SB's constants
-#if defined(_SDL)
- #define SB_STR_VER VERSION " SDL " _SDL_VERSION SB_VERSYS SB_BIT_SZ BUILD_DATE
+#if defined(_SDL) && defined(_FLATPAK)
+  #define SB_STR_VER VERSION " FLATPAK SDL " _SDL_VERSION SB_VERSYS SB_BIT_SZ BUILD_DATE
+#elif defined(_SDL)
+  #define SB_STR_VER VERSION " SDL " _SDL_VERSION SB_VERSYS SB_BIT_SZ BUILD_DATE
 #elif defined (_ANDROID)
   #define SB_STR_VER VERSION " Android " BUILD_DATE
 #elif defined (_FLTK)

src/platform/android/app/src/main/assets/main.bas

@@ -15,6 +15,7 @@ const colNav   = theme.text1
 const colNav2  = theme.text6
 const menu_gap = -(char_w / 2)
 const is_android = instr(sbver, "Android") != 0
+const is_sandboxed_fs = len(env("SANDBOXED_FS")) > 0
 const is_sdl = instr(sbver, "SDL") != 0
 const path_sep = iff(instr(sbver, "Win_") != 0, "\\", "/")
 const onlineUrl = "http://smallbasic.github.io/samples/index.bas"
@@ -366,6 +367,8 @@ sub loadFileList(path, byref basList)
     if (len(path) > 0) then
       dirwalk path, "", use androidWalker(x)
     endif
+  else if (is_sandboxed_fs) then
+    dirwalk path, "", use androidWalker(x)
   else
     dirwalk path, "", use walker(x)
   endif
@@ -435,7 +438,10 @@ sub listFiles(byref frm, path, sortDir, byref basList)
     frm.inputs << bn
   end
 
-  if (is_android) then
+  if (is_sandboxed_fs) then
+    mk_folder_link(path)
+    mk_link(sortNameId, "[Name]", name_col, 0, -linespacing)
+  else if (is_android) then
     mk_link(sortNameId, "[Name]", name_col, 0, -linespacing)
   else
     mk_folder_link(path)

src/platform/sdl/editor.cpp

@@ -387,9 +387,11 @@ void Runtime::editSource(String loadPath, bool restoreOnExit) {
         case SB_KEY_F(7):
           debugStep(editWidget, helpWidget, true);
           break;
+#if !defined(_FLATPAK)
         case SB_KEY_F(8):
           exportRun(loadPath);
           break;
+#endif
         case SB_KEY_F(9):
         case SB_KEY_CTRL('r'):
           _state = kRunState;

src/platform/sdl/settings.cpp

@@ -201,10 +201,13 @@ void restoreSettings(SDL_Rect &rect, int &fontScale, bool debug, bool restoreDir
     g_themeId = 0;
   }
 
+#if defined(_FLATPAK)
   // start in the flatpak sandbox home
-  if (getenv("XDG_DATA_HOME")) {
-    chdir(getenv("XDG_DATA_HOME"));
-  }
+  chdir(getenv("XDG_DATA_HOME"));
+
+  // for main.bas handling is_sandboxed_fs
+  setenv("SANDBOXED_FS", "true", 1);
+#endif
 
   // restore export settings
   if (!debug) {