SDL: updates for flatpak build

Chris Warren-Smith · Chris Warren-Smith · commit 51ad3c805929 · 2026-01-08T20:28:46.000+10:30
diff --git a/Makefile.am b/Makefile.am
@@ -73,20 +73,25 @@ appImage:
 # sudo apt install flatpak-builder
 # https://docs.flathub.org/docs/for-app-authors/submission
 #
-
-flatpak-build-all:
-	flatpak-builder --force-clean build-dir io.github.smallbasic.json
+# inspect build-dir/files (or /app from flatpack-shell) for additional "cleanup" items
+#
 
 flatpak-build:
-	flatpak-builder --build-only --force-clean --disable-download --disable-updates build-dir io.github.smallbasic.json && \
-	flatpak-builder --run build-dir io.github.smallbasic.json sbasicg
-
-flatpak-install:
-	flatpak-builder --user --install --force-clean build-dir io.github.smallbasic.json
+	flatpak-builder --force-clean --ccache build-dir io.github.smallbasic.json
 
 flatpak-run:
+	make -s -j$(nproc) && \
+  flatpak-builder --user --install --force-clean --ccache --disable-download build-dir io.github.smallbasic.json && \
 	flatpak run io.github.smallbasic
 
+flatpak-debug:
+	make -s -j$(nproc) && \
+	flatpak-builder --build-only --force-clean --ccache --disable-download --disable-updates build-dir io.github.smallbasic.json && \
+	flatpak-builder --run build-dir io.github.smallbasic.json gdb sbasicg
+
+flatpak-shell:
+	flatpak-builder --build-shell=sbasicg build-dir io.github.smallbasic.json
+
 EXTRA_DIST =                                                 \
 documentation/build_kwp.cpp                                  \
 documentation/sbasic_ref.csv                                 \
diff --git a/configure.ac b/configure.ac
@@ -187,6 +187,15 @@ function buildSDL() {
      AC_MSG_ERROR([xxd command not installed: configure failed.])
    fi
 
+   AC_ARG_WITH(flatpak,
+   [  --with-flatpak  Build the flatpak version default=no],
+       [with_flatpak=$withval],
+       [with_flatpak=no])
+   if test "$with_flatpak" = "yes" || test "$with_flatpak" = "full"
+   then
+     AC_DEFINE(_FLATPAK, 1, [flatpak build enabled])
+   fi
+
    case "${host_os}" in
      *mingw* | cygwin*)
      dnl avoid using MSCRT versions of printf for long double
diff --git a/io.github.smallbasic.json b/io.github.smallbasic.json
@@ -0,0 +1,104 @@
+{
+  "app-id": "io.github.smallbasic",
+  "runtime": "org.freedesktop.Platform",
+  "runtime-version": "25.08",
+  "sdk": "org.freedesktop.Sdk",
+  "command": "sbasicg",
+  "build-options": {
+    "env": {
+      "MAKEFLAGS": "-j$(nproc) -s"
+    }
+  },
+  "finish-args": [
+    "--socket=wayland",
+    "--socket=x11",
+    "--socket=pulseaudio",
+    "--device=dri",
+    "--share=ipc",
+    "--talk-name=org.freedesktop.portal.Desktop",
+    "--env=SBASICPATH=/app/lib/smallbasic/plugins"
+  ],
+  "cleanup": [
+    "/include",
+    "/lib/pkgconfig",
+    "/lib/cmake",
+    "/lib/debug"
+    /*"/bin/xxd"*/
+  ],
+  "modules": [
+    {
+      "name": "smallbasic-plugins",
+      "buildsystem": "simple",
+      "build-commands": [
+        "./autogen.sh",
+        "./configure --prefix=/app",
+        "make -s",
+        "mkdir -p ${FLATPAK_DEST}/lib/smallbasic/plugins",
+        "find . -name '*.so' -exec install -Dm755 {} ${FLATPAK_DEST}/lib/smallbasic/plugins/ \\;"
+      ],
+      "sources": [
+        {
+          "type": "git",
+          "url": "https://github.com/smallbasic/smallbasic.plugins.git",
+          "commit": "12_32"
+        }
+      ]
+    }, {
+      "name": "xxd",
+      "buildsystem": "simple",
+      "build-commands": [
+        "cd src/xxd && make CC=gcc CFLAGS='-O2'",
+        "install -Dm755 src/xxd/xxd /app/bin/xxd"
+      ],
+      "sources": [
+        {
+          "type": "git",
+          "url": "https://github.com/vim/vim.git",
+          "tag": "v9.1.0"
+        }
+      ]
+    }, {
+      "name": "SDL3",
+      "buildsystem": "cmake-ninja",
+      "config-opts": [
+        "-DCMAKE_BUILD_TYPE=Release"
+      ],
+      "sources": [
+        {
+          "type": "git",
+          "url": "https://github.com/libsdl-org/SDL.git",
+          "tag": "release-3.2.26"
+        }
+      ]
+    }, {
+      "name": "sbasic",
+      "buildsystem": "autotools",
+      "config-opts": [
+        "--prefix=/app"
+      ],
+      "sources": [
+        {
+          "type": "dir",
+          "path": "."
+        }
+      ],
+      "build-commands": [
+        "make install -s -j$(nproc)"
+      ]
+    }, {
+      "name": "sbasicg",
+      "buildsystem": "autotools",
+      "config-opts": [
+        "--prefix=/app",
+        "--enable-sdl",
+        "--with-flatpak"
+      ],
+      "sources": [
+        {
+          "type": "dir",
+          "path": "."
+        }
+      ]
+    }
+  ]
+}
diff --git a/src/common/brun.c b/src/common/brun.c
@@ -1643,6 +1643,7 @@ int sbasic_exec(const char *file) {
   opt_show_page = 0;
 
   // setup global values
+  gsb_err_mod_perm = 0;
   gsb_last_line = gsb_last_error = 0;
   strlcpy(gsb_last_file, file, sizeof(gsb_last_file));
   strcpy(gsb_last_errmsg, "");
@@ -1656,6 +1657,8 @@ int sbasic_exec(const char *file) {
   } else if (!success) {        // there was some errors; do not continue
     exec_rq = 0;
     gsb_last_error = 1;
+  } else if (gsb_err_mod_perm) {
+    exec_rq = 0;                // a module is not permitted to be run
   }
 
   if (exec_rq) {                // we will run it
diff --git a/src/common/plugins.c b/src/common/plugins.c
@@ -40,6 +40,7 @@ typedef int (*sblib_exec_fn)(int, int, slib_par_t *, var_t *);
 typedef int (*sblib_getname_fn) (int, char *);
 typedef int (*sblib_count_fn) (void);
 typedef int (*sblib_init_fn) (const char *);
+typedef int (*sblib_has_window_ui_fn) (void);
 typedef int (*sblib_free_fn) (int, int);
 typedef void (*sblib_close_fn) (void);
 
@@ -372,6 +373,13 @@ static void slib_import_routines(slib_t *lib, int comp) {
     }
   }
 
+#if !defined(_CONSOLE)
+  sblib_has_window_ui_fn has_window_ui = slib_getoptptr(lib, "sblib_has_window_ui");
+  if (has_window_ui && has_window_ui()) {
+    gsb_err_mod_perm = 1;
+  }
+#endif
+
   if (!total) {
     log_printf("LIB: module '%s' has no exports\n", lib->_name);
   }
diff --git a/src/common/smbas.h b/src/common/smbas.h
@@ -129,6 +129,7 @@ EXTERN int gsb_last_error; /**< error code, 0 = no error,  < 0 = local messages
 EXTERN char gsb_last_file[OS_PATHNAME_SIZE + 1]; /**< source code file-name of the last error     */
 EXTERN char gsb_bas_dir[OS_PATHNAME_SIZE + 1]; /**< source code home dir     */
 EXTERN char gsb_last_errmsg[SB_ERRMSG_SIZE + 1]; /**< last error message     */
+EXTERN byte gsb_err_mod_perm; /**< whether a module was not permitted to run */
 
 #include "common/units.h"
 #include "common/tasks.h"
diff --git a/src/include/module.h b/src/include/module.h
@@ -25,6 +25,15 @@ extern "C" {
  */
 int sblib_init(const char *sourceFile);
 
+/**
+ * @ingroup modstd
+ *
+ * Returns whether the module is compatible with IDE builds
+ *
+ * @return non-zero on success
+ */
+int sblib_has_window_ui(void);
+
 /**
  * @ingroup modstd
  *
diff --git a/src/platform/android/jni/runtime.cpp b/src/platform/android/jni/runtime.cpp
@@ -1013,13 +1013,15 @@ void Runtime::onResize(int width, int height, int imeState) {
 }
 
 void Runtime::onRunCompleted() {
-  const char *storage = getenv("EXTERNAL_DIR");
-  if (!storage) {
-    storage = getenv("INTERNAL_DIR");
-  }
-  if (storage) {
-    setenv("HOME_DIR", storage, 1);
-    chdir(storage);
+  if (!_mainBas) {
+    const char *storage = getenv("EXTERNAL_DIR");
+    if (!storage) {
+      storage = getenv("INTERNAL_DIR");
+    }
+    if (storage) {
+      setenv("HOME_DIR", storage, 1);
+      chdir(storage);
+    }
   }
 }
 
diff --git a/src/platform/sdl/editor.cpp b/src/platform/sdl/editor.cpp
@@ -183,10 +183,7 @@ void exportBuffer(const AnsiWidget *out, const char *text, const String &dest, c
 
 bool externalExec(const AnsiWidget *out, const TextEditInput *editWidget, const String &loadPath) {
   bool result;
-  if (editWidget->getTextLength() && !g_exportAddr.empty() && g_exportAddr.indexOf("sbasic", 0) != -1) {
-    launch(g_exportAddr, loadPath);
-    result = true;
-  } else if (editWidget->getTextLength() && !g_exportAddr.empty() && !g_exportToken.empty()) {
+  if (editWidget->getTextLength() && !g_exportAddr.empty() && !g_exportToken.empty()) {
     exportBuffer(out, editWidget->getText(), g_exportAddr, g_exportToken);
     result = true;
   } else {
@@ -203,6 +200,7 @@ void Runtime::editSource(String loadPath, bool restoreOnExit) {
   int charWidth = _output->getCharWidth();
   int charHeight = _output->getCharHeight();
   int prevScreenId = _output->selectScreen(FORM_SCREEN);
+
   TextEditInput *editWidget;
   if (_editor != nullptr) {
     editWidget = _editor;
@@ -211,10 +209,12 @@ void Runtime::editSource(String loadPath, bool restoreOnExit) {
   } else {
     editWidget = new TextEditInput(_programSrc, charWidth, charHeight, 0, 0, w, h);
   }
+
   auto *helpWidget = new TextEditHelpWidget(editWidget, charWidth, charHeight);
   TextEditInput *widget = editWidget;
   String recentFile;
   StatusMessage statusMessage(editWidget);
+
   enum InputMode {
     kInit, kExportAddr, kExportToken, kCommand
   } inputMode = kInit;
@@ -267,6 +267,10 @@ void Runtime::editSource(String loadPath, bool restoreOnExit) {
         _output->setStatus(!gsb_last_errmsg[0] ? "Error" : gsb_last_errmsg);
       }
     }
+  } else if (gsb_err_mod_perm) {
+    _output->setStatus("Running ...");
+    saveFile(editWidget, loadPath);
+    launchConsole(loadPath);
   } else {
     statusMessage.update(editWidget, _output, true);
   }
@@ -329,7 +333,7 @@ void Runtime::editSource(String loadPath, bool restoreOnExit) {
           helpWidget->hide();
           helpWidget->cancelMode();
           statusMessage.setDirty(editWidget);
-          Runtime::debugStop();
+          debugStop();
           break;
         case SB_KEY_CTRL('s'):
           saveFile(editWidget, loadPath);
@@ -364,7 +368,7 @@ void Runtime::editSource(String loadPath, bool restoreOnExit) {
           if (editWidget->getTextLength()) {
             saveFile(editWidget, loadPath);
             saveRecentPosition(loadPath, editWidget->getCursorPos());
-            _output->setStatus("Export to SmallBASIC. Enter <IP>:<Port> | <sbasic>");
+            _output->setStatus("Export to SmallBASIC. Enter <IP>:<Port>");
             widget = helpWidget;
             helpWidget->createLineEdit(g_exportAddr);
             showHelpLineInput(helpWidget, 60);
@@ -524,16 +528,9 @@ void Runtime::editSource(String loadPath, bool restoreOnExit) {
             switch (inputMode) {
             case kExportAddr:
               g_exportAddr = helpWidget->getText();
-              if (g_exportAddr.indexOf("sbasic", 0) == -1) {
-                inputMode = kExportToken;
-                helpWidget->createLineEdit(g_exportToken);
-                _output->setStatus("Enter token. Esc=Close");
-              } else {
-                inputMode = kInit;
-                widget = editWidget;
-                helpWidget->hide();
-                launch(g_exportAddr, loadPath);
-              }
+              inputMode = kExportToken;
+              helpWidget->createLineEdit(g_exportToken);
+              _output->setStatus("Enter token. Esc=Close");
               break;
             case kExportToken:
               g_exportToken = helpWidget->getText();
diff --git a/src/platform/sdl/io.github.smallbasic.json b/src/platform/sdl/io.github.smallbasic.json
@@ -11,13 +11,19 @@
   },
   "finish-args": [
     "--socket=wayland",
-    "--socket=fallback-x11",
     "--socket=pulseaudio",
     "--device=dri",
     "--share=ipc",
     "--talk-name=org.freedesktop.portal.Desktop",
     "--env=SBASICPATH=/app/lib/smallbasic/plugins"
   ],
+  "cleanup": [
+    "/include",
+    "/lib/pkgconfig",
+    "/lib/cmake",
+    "/lib/debug",
+    "/bin/xxd"
+  ],
   "modules": [
     {
       "name": "smallbasic-plugins",
@@ -63,6 +69,21 @@
           "tag": "release-3.2.26"
         }
       ]
+    }, {
+      "name": "sbasic",
+      "buildsystem": "autotools",
+      "config-opts": [
+        "--prefix=/app"
+      ],
+      "sources": [
+        {
+          "type": "dir",
+          "path": "."
+        }
+      ],
+      "build-commands": [
+        "make install -s -j$(nproc)"
+      ]
     }, {
       "name": "sbasicg",
       "buildsystem": "autotools",
diff --git a/src/platform/sdl/runtime.cpp b/src/platform/sdl/runtime.cpp
diff --git a/src/platform/sdl/settings.cpp b/src/platform/sdl/settings.cpp
diff --git a/src/platform/sdl/syswm.cpp b/src/platform/sdl/syswm.cpp
diff --git a/src/platform/sdl/syswm.h b/src/platform/sdl/syswm.h
diff --git a/src/ui/system.cpp b/src/ui/system.cpp

Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,7 @@ typedef int (sblib_exec_fn)(int, int, slib_par_t , var_t *);`
`40`	`40`	`typedef int (sblib_getname_fn) (int, char );`
`41`	`41`	`typedef int (*sblib_count_fn) (void);`
`42`	`42`	`typedef int (sblib_init_fn) (const char );`
	`43`	`+typedef int (*sblib_has_window_ui_fn) (void);`
`43`	`44`	`typedef int (*sblib_free_fn) (int, int);`
`44`	`45`	`typedef void (*sblib_close_fn) (void);`
`45`	`46`
`@@ -372,6 +373,13 @@ static void slib_import_routines(slib_t *lib, int comp) {`
`372`	`373`	`}`
`373`	`374`	`}`
`374`	`375`
	`376`	`+#if !defined(_CONSOLE)`
	`377`	`+ sblib_has_window_ui_fn has_window_ui = slib_getoptptr(lib, "sblib_has_window_ui");`
	`378`	`+ if (has_window_ui && has_window_ui()) {`
	`379`	`+ gsb_err_mod_perm = 1;`
	`380`	`+ }`
	`381`	`+#endif`
	`382`	`+`
`375`	`383`	`if (!total) {`
`376`	`384`	`log_printf("LIB: module '%s' has no exports\n", lib->_name);`
`377`	`385`	`}`