Standalone engine

.editorconfig

@@ -0,0 +1,23 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+indent_style = space
+indent_size = 4
+
+# shell scripts, command files and translations
+[{mod/**,*.sh}]
+indent_size = 2
+
+[*.{yml,yaml,json}]
+indent_size = 2
+
+[{Makefile,*.mk}]
+indent_style = tab
+
+# two trailing spaces are a line break
+[*.md]
+trim_trailing_whitespace = false

.gitattributes

@@ -0,0 +1,8 @@
+# Force LF regardless of platform checkout settings (core.autocrlf, etc.) -
+# GitHub Actions workflow YAML and shell here don't want a stray \r.
+* text=auto eol=lf
+
+*.ttf binary
+*.png binary
+*.lua binary
+*.wav binary

.github/check_style.sh

@@ -0,0 +1,30 @@
+#!/bin/sh
+# check_style.sh <base>: the lines added since <base> follow .editorconfig
+base="${1:-origin/master}"
+failed=0
+
+error() {
+  echo "::error file=$1::$2"
+  echo "$1: $2"
+  failed=1
+}
+
+git diff --check "$base...HEAD" -- . ':!*.md' || failed=1
+
+files=$(git diff --name-only --diff-filter=ACMR "$base...HEAD")
+for file in $files; do
+  [ -f "$file" ] || continue
+  case "$file" in
+  *.png | *.ttf | *.hmod | *.xz | *.pem) continue ;;
+  esac
+  added=$(git diff -U0 "$base...HEAD" -- "$file" | grep '^+' | grep -v '^+++' || true)
+  [ -n "$added" ] || continue
+  printf '%s\n' "$added" | grep -q "$(printf '\r')" && error "$file" "CRLF line endings; use LF"
+  case "$file" in
+  Makefile | *.mk | *.md | .gitmodules) ;;
+  *) printf '%s\n' "$added" | grep -q "^+$(printf '\t')" && error "$file" "indented with tabs; use spaces (see .editorconfig)" ;;
+  esac
+  [ -n "$(tail -c1 "$file")" ] && error "$file" "missing newline at the end of the file"
+done
+
+exit "$failed"

.github/workflows/build.yml

@@ -0,0 +1,17 @@
+name: Build
+
+on:
+    push:
+        branches: ["**"]
+        tags: ["v*"]
+    pull_request:
+
+jobs:
+    hmod:
+        uses: DefKorns/hmod-build/.github/workflows/hmod.yml@v1.5.0
+        with:
+            release-name: Theme Selector
+            docker: true
+        secrets: inherit
+        permissions:
+            contents: write

.github/workflows/lint.yml

@@ -0,0 +1,22 @@
+name: Lint
+
+on:
+  push:
+    branches: ['**']
+  pull_request:
+
+jobs:
+  shellcheck:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v7
+
+      # om_chmenu_og / om_fontfix_og are frozen copies of base-OS files, only used by uninstall
+      - name: shellcheck
+        run: |
+          files=$(
+            { echo mod/install; echo mod/uninstall; find mod -type f -name 'om_*'; } |
+              grep -v -e om_chmenu_og -e om_fontfix_og |
+              sort -u | xargs grep -lE '^#!/bin/(sh|bash)'
+          )
+          shellcheck -x -e SC3046,SC3051,SC3014 $files

.github/workflows/style.yml

@@ -0,0 +1,17 @@
+name: Style
+
+# checks only the lines a pull request adds, so older files never fail a PR they didn't touch
+on:
+  pull_request:
+
+jobs:
+  changed-lines:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Trailing whitespace, line endings and indentation
+        env:
+          BASE: origin/${{ github.base_ref }}
+        run: sh .github/check_style.sh "$BASE"

.gitignore

@@ -46,6 +46,7 @@
 *.o
 [Dd]ebug*/
 [Rr]elease*/
+!release-notes/
 *.mode*
 *.app/
 *.pyc
@@ -498,27 +499,9 @@ out/
 default-strings.lng
 default/
 temp/
-mod/etc/options_menu/themes/scripts/b8024_themeselector
-mod-/
-out--/
-mod/etc/options_menu/themes-old/
-modules/
-mod/etc/options_menu/themes/scripts/scripts/*
-mod/etc/options_menu/themes/scripts/80s_neon*
-mod/etc/options_menu/themes/scripts/ghost*
-
-mod/etc/options_menu/themes/scripts/images/
-mod/etc/options_menu/themes/scripts/commands/c0009_*
-mod/etc/options_menu/themes/scripts/commands/c0010_*
-mod/etc/options_menu/themes/settings/commandss/
-mod/etc/options_menu/images/retro_gaming.zip
-Makefile
-mod/etc/options_menu/themes/downloads/scripts/getAll
-retro_gaming.zip
-mod/etc/options_menu/b8025_fontfix
-mod/etc/options_menu/p8025_fontfix
-old.themescript.sh
-out---backup/
-BACKUP.gpg
-out---/
 
+mod/etc/options_menu/lib/
+.deps/
+
+# local-only files (console dumps, test hmods)
+local/

.gitmodules

@@ -0,0 +1,10 @@
+[submodule "vendor/OptionsMenu"]
+	path = vendor/OptionsMenu
+	url = https://github.com/DefKorns/OptionsMenu
+	branch = master
+[submodule "hmod-build"]
+	path = vendor/hmod-build
+	url = https://github.com/DefKorns/hmod-build.git
+[submodule "vendor/pngpack"]
+	path = vendor/pngpack
+	url = https://github.com/DefKorns/pngpack.git

.vscode/extensions.json

@@ -0,0 +1,8 @@
+{
+    "recommendations": [
+        "timonwong.shellcheck",
+        "foxundermoon.shell-format",
+        "mads-hartmann.bash-ide-vscode",
+        "designbyajay.bash-cli-snippets",
+    ]
+}

.vscode/settings.json

@@ -1,13 +1,5 @@
 {
     "files.autoSave": "off",
-    // PowerShell
-    //"terminal.integrated.shell.windows": "C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe",
-    // Git Bash
-    // "terminal.integrated.shell.windows": "C:\\Program Files\\Git\\bin\\bash.exe",
-    // Command Prompt
-    //"terminal.integrated.shell.windows": "C:\\Windows\\System32\\cmd.exe",
-    // Git Bash
-    "terminal.integrated.shell.windows": "C:\\Program Files\\Git\\bin\\bash.exe",
     "git.autofetch": true,
     "editor.tabSize": 4,
     "editor.insertSpaces": true,
@@ -29,4 +21,6 @@
         "editor.tabSize": 2,
     },
     "diffEditor.ignoreTrimWhitespace": false,
-}
+    "shellcheck.useWorkspaceRootAsCwd": true,
+    "cmake.sourceDirectory": "E:/Documents/_projects/hmods/om_theme-selector/vendor/pngpack/jsoncpp",
+}

Makefile

@@ -1,105 +1,64 @@
-SHELL = /bin/sh
-UNAME = $(shell uname)
-MOD_NAME := Options Menu - Theme Selector
-MOD_CREATOR := DefKorns
-MOD_CATEGORY := User Interface
-
-LAST_TAG_COMMIT = $(shell git rev-list --tags --max-count=1)
-LAST_TAG = $(shell git describe --tags $(LAST_TAG_COMMIT) )
-TAG_PREFIX = "v"
-CURRENT_BRANCH = $(shell git rev-parse --abbrev-ref HEAD)
-GIT_REMOTES    = $(shell git remote | xargs echo )
-GIT_DIRTY      = $(shell git diff --shortstat 2> /dev/null | tail -n1 )
-GET_VER    = $(shell  git describe --tags $(LAST_TAG_COMMIT) | sed "s/^$(TAG_PREFIX)//")
-#MOD_VER  = $(shell [ -f VERSION ] && head VERSION || echo "0.0.1")
-MOD_VER    = $(shell [ -f VERSION ] && head VERSION || echo $(GET_VER))
-MAJOR      = $(shell echo $(MOD_VER) | sed "s/^\([0-9]*\).*/\1/")
-MINOR      = $(shell echo $(MOD_VER) | sed "s/[0-9]*\.\([0-9]*\).*/\1/")
-PATCH      = $(shell echo $(MOD_VER) | sed "s/[0-9]*\.[0-9]*\.\([0-9]*\).*/\1/")
-RC		   = $(shell echo $(MOD_VER) | grep -oP '(?<=rc)[0-9]+')
-
-# total number of commits
-BUILD      = $(shell git log --oneline | wc -l | sed -e "s/[ \t]*//g")
-NEXT_MAJOR_VERSION = $(shell expr $(MAJOR) + 1).0.0
-NEXT_MINOR_VERSION = $(MAJOR).$(shell expr $(MINOR) + 1).0-b$(BUILD)
-NEXT_PATCH_VERSION = $(MAJOR).$(MINOR).$(shell expr $(PATCH) + 1)-b$(BUILD)
-NEXT_RC_VERSION = $(MAJOR).$(MINOR).$(PATCH)-rc$(shell expr $(RC) + 1)
-
-MOD_URL=`git config --get remote.origin.url`
-GIT_COMMIT := $(shell echo "`git rev-parse --short HEAD``git diff-index --quiet HEAD --`")
-GIT_DIRTY      = $(shell git diff --shortstat 2> /dev/null | tail -n1 )
-RSYNC = $(shell rsync -a --exclude-from=exclude-file.txt mod/etc/options_menu/ temp/ --links --delete)
-MOD_FILENAME   = $(shell basename `pwd`)
-DEV_DIR = $(shell realpath .)
-#DEV_DIR=/d/om_theme-selectorv2
-# DEV_DIR=/i/om_theme-selectorv2
-OUT=$(DEV_DIR)/out
-
-
-all: hmod tar zip
-	rm -r temp/
-
-deploy: customlang localization patches upload
-
-hmod: clean
-
-	mkdir -p out/ temp/
-	rsync -a --exclude-from=exclude-file.txt mod/ temp/ --links --delete
-
-	printf "%s\n" \
-	"---" \
-	"Name: $(MOD_NAME)" \
-	"Creator: $(MOD_CREATOR)" \
-	"Category: $(MOD_CATEGORY)" \
-	"Version: $(MOD_VER)" \
-	"Built on: $(shell date +"%A, %d %b %Y - %T")" \
-	"Git commit: $(GIT_COMMIT)" \
-	"---" > temp/readme.md
-
-	sed 1d mod/readme.md >> temp/readme.md
-
-	cd temp/; tar -czf $(OUT)/$(MOD_FILENAME)-$(MOD_VER).hmod *
-	rm -r temp/
-
-tar:
-	mkdir -p out/ temp/
-	$(RSYNC)
-	cd temp/; tar -czf $(OUT)/$(MOD_FILENAME)-$(MOD_VER).tar.gz *
-	rm -r temp/
-
-zip:
-	mkdir -p out/ temp/
-	#$(RSYNC)
-	cd temp/; zip -r $(OUT)/$(MOD_FILENAME)-$(MOD_VER).zip *
-
-fix: hmod
-	@echo $(NEXT_PATCH_VERSION) > VERSION
-
-rc: hmod
-	@echo $(NEXT_RC_VERSION) > VERSION
-
-update: all
-	@echo $(NEXT_MINOR_VERSION) > VERSION
-
-upgrade: all
-	@echo $(NEXT_MAJOR_VERSION) > VERSION
-
-upload:
-	rm -f $(OUT)/$(MOD_FILENAME).*
-	rsync -e ssh --progress --exclude 'rsync*' --exclude 'src' -avzzp out/* defkorns@hakchicloud.com:/var/www/html/Hakchi_Themes/options_menu
-
-info:
-	@echo "Mod Dir: $(MOD_FILENAME)"
-	@echo "Current version: $(MOD_VER)"
-	@echo "Last tag: $(LAST_TAG)"
-	@echo "$(shell git rev-list $(LAST_TAG).. --count) commit(s) since last tag"
-	@echo "Build: $(BUILD) (total number of commits)"
-	@echo "next major version: $(NEXT_MAJOR_VERSION)"
-	@echo "next minor version: $(NEXT_MINOR_VERSION)"
-	@echo "next patch version: $(NEXT_PATCH_VERSION)"
+MOD_ID       := om_theme-selector
+MOD_NAME     := Options Menu - Theme Selector
+MOD_CATEGORY := Options Menu - Addons
+MOD_EXCLUDE  := exclude-file.txt
+MOD_DEPS     := mod/etc/options_menu/lib/theme_manager mod/bin/sprite_crop
+
+# Set CROSS_PREFIX=arm-linux-gnueabihf- to cross-compile for the console
+# (build.sh does this inside the Docker toolchain); leave unset to build natively.
+FRAMEWORK_DIR = vendor/OptionsMenu/src/framework
+CXX = g++
+STRIP = strip
+ifdef CROSS_PREFIX
+PKG_CONFIG_LIBDIR = /usr/lib/arm-linux-gnueabihf/pkgconfig
+SDL_CFLAGS = -I/usr/include/arm-linux-gnueabihf $(shell PKG_CONFIG_LIBDIR=$(PKG_CONFIG_LIBDIR) pkg-config --cflags sdl2 SDL2_ttf libpng)
+SDL_LIBS = $(shell PKG_CONFIG_LIBDIR=$(PKG_CONFIG_LIBDIR) pkg-config --libs sdl2 SDL2_ttf libpng)
+LDFLAGS = -Wl,--allow-shlib-undefined
+else
+SDL_CFLAGS = $(shell sdl2-config --cflags) $(shell pkg-config --cflags SDL2_ttf)
+SDL_LIBS = $(shell sdl2-config --libs) $(shell pkg-config --libs SDL2_ttf) -lpng
+LDFLAGS =
+endif
+CXXFLAGS = -std=c++14 -Os -Ivendor/OptionsMenu/src $(SDL_CFLAGS) -DMOD_VERSION=\"v$(MOD_VER)\"
+LDLIBS = $(SDL_LIBS)
+VENDOR_SRC_DIR = vendor/OptionsMenu/src
+SOURCES = src/main.cpp src/single_instance_lock.cpp src/command_loader.cpp src/texture_utils.cpp src/theme_manager_app.cpp src/folder_theme_model.cpp src/folder_themes_layout.cpp src/storage_indicator.cpp $(VENDOR_SRC_DIR)/command.cpp $(VENDOR_SRC_DIR)/download_screen.cpp $(VENDOR_SRC_DIR)/localization.cpp $(FRAMEWORK_DIR)/sdl_context.cpp $(FRAMEWORK_DIR)/texture.cpp $(FRAMEWORK_DIR)/controller.cpp $(FRAMEWORK_DIR)/powerwatch.cpp $(FRAMEWORK_DIR)/draw_helpers.cpp $(FRAMEWORK_DIR)/utf8.cpp $(FRAMEWORK_DIR)/font8x8_lookup.cpp $(FRAMEWORK_DIR)/uitheme.cpp $(FRAMEWORK_DIR)/badge.cpp $(FRAMEWORK_DIR)/dialog.cpp $(FRAMEWORK_DIR)/list_screen.cpp $(FRAMEWORK_DIR)/text_layout.cpp $(FRAMEWORK_DIR)/close_on_exec.cpp
+OBJECTS = $(SOURCES:.cpp=.o)
+
+all: hmod
+
+compile: $(MOD_DEPS)
+
+mod/etc/options_menu/lib/theme_manager: $(OBJECTS)
+	mkdir -p $(@D)
+	$(CROSS_PREFIX)$(CXX) $(OBJECTS) $(LDLIBS) $(LDFLAGS) -Wl,-rpath,/etc/options_menu/lib -o $@
+	$(CROSS_PREFIX)$(STRIP) $@
+
+DEPDIR = .deps
+
+%.o: %.cpp
+	@mkdir -p $(DEPDIR)
+	$(CROSS_PREFIX)$(CXX) $(CXXFLAGS) -MMD -MP -MF $(DEPDIR)/$(subst /,_,$*).d -c $< -o $@
+
+-include $(wildcard $(DEPDIR)/*.d)
+
+# DIY sprite previews (om_vars). Built by pngpack's own Makefile; its default
+# LDFLAGS (-dead_strip) is macOS-only. The rpath picks up options_menu_compat's
+# private libstdc++ when another hmod has replaced the system one.
+mod/bin/sprite_crop: vendor/pngpack/pngpacker/sprite_crop.cpp vendor/pngpack/pngpacker/pixeltools.cpp
+	mkdir -p $(@D)
+	$(MAKE) -C vendor/pngpack build/sprite_crop CROSS=$(CROSS_PREFIX) LDFLAGS='-Wl,--gc-sections -Wl,-rpath,/etc/options_menu/lib'
+	cp vendor/pngpack/build/sprite_crop $@
+
+update-headers:
+	sh tools/update-license-headers.sh $(YEAR)
 
 clean:
-	rm -rf out/ temp/
+	find . -name "*.o" -type f -not -path "./vendor/*" -delete
+	rm -rf $(DEPDIR)
+	rm -f $(MOD_DEPS)
+	rm -rf out/
 
+include vendor/hmod-build/hmod.mk
 
-.PHONY: clean
+.PHONY: all compile update-headers clean