diff --git a/overlay/rootfs/usr/lib/dwm/plugins/wallpapers.so b/overlay/rootfs/usr/lib/dwm/plugins/wallpapers.so index eaf7aed..147c381 100755 Binary files a/overlay/rootfs/usr/lib/dwm/plugins/wallpapers.so and b/overlay/rootfs/usr/lib/dwm/plugins/wallpapers.so differ diff --git a/overlay/rootfs/usr/share/wallpapers/bananarchy-240x240.png b/overlay/rootfs/usr/share/wallpapers/bananarchy-240x240.png deleted file mode 100644 index b312c98..0000000 Binary files a/overlay/rootfs/usr/share/wallpapers/bananarchy-240x240.png and /dev/null differ diff --git a/overlay/rootfs/usr/share/wallpapers/bananarchy-landscape.png b/overlay/rootfs/usr/share/wallpapers/bananarchy-landscape.png deleted file mode 100644 index deca3de..0000000 Binary files a/overlay/rootfs/usr/share/wallpapers/bananarchy-landscape.png and /dev/null differ diff --git a/overlay/rootfs/usr/share/wallpapers/bananarchy.jpg b/overlay/rootfs/usr/share/wallpapers/bananarchy.jpg deleted file mode 100644 index 4d5f7cb..0000000 Binary files a/overlay/rootfs/usr/share/wallpapers/bananarchy.jpg and /dev/null differ diff --git a/overlay/rootfs/usr/share/wallpapers/postmarketos.jpg b/overlay/rootfs/usr/share/wallpapers/postmarketos.jpg deleted file mode 100644 index 4d5f7cb..0000000 Binary files a/overlay/rootfs/usr/share/wallpapers/postmarketos.jpg and /dev/null differ diff --git a/prebuilt/sxmo-x11/usr/lib/dwm/plugins/wallpapers.so b/prebuilt/sxmo-x11/usr/lib/dwm/plugins/wallpapers.so index eaf7aed..147c381 100755 Binary files a/prebuilt/sxmo-x11/usr/lib/dwm/plugins/wallpapers.so and b/prebuilt/sxmo-x11/usr/lib/dwm/plugins/wallpapers.so differ diff --git a/scripts/apply-bananarchy-overlay.sh b/scripts/apply-bananarchy-overlay.sh index f1d3d81..dea7ae2 100755 --- a/scripts/apply-bananarchy-overlay.sh +++ b/scripts/apply-bananarchy-overlay.sh @@ -127,7 +127,12 @@ rm -rf \ "$TARGET_ROOTFS/etc/skel/.config/sxmo/sway" \ "$TARGET_ROOTFS/home/user/.bantam.cfg" \ "$TARGET_ROOTFS/etc/skel/.bantam.cfg" \ - "$TARGET_ROOTFS/root/.bantam.cfg" + "$TARGET_ROOTFS/root/.bantam.cfg" \ + "$TARGET_ROOTFS/usr/share/wallpapers/postmarketos" \ + "$TARGET_ROOTFS/usr/share/wallpapers/postmarketos.jpg" \ + "$TARGET_ROOTFS/usr/share/wallpapers/bananarchy.jpg" \ + "$TARGET_ROOTFS/usr/share/wallpapers/bananarchy-240x240.png" \ + "$TARGET_ROOTFS/usr/share/wallpapers/bananarchy-landscape.png" mkdir -p "$TARGET_ROOTFS/var/lib/tinydm" ln -sf /usr/share/xsessions/sxmo.desktop "$TARGET_ROOTFS/var/lib/tinydm/default-session.desktop" diff --git a/src/dwm-plugins/wallpapers_plugin.cpp b/src/dwm-plugins/wallpapers_plugin.cpp index 116d384..36cc9ac 100644 --- a/src/dwm-plugins/wallpapers_plugin.cpp +++ b/src/dwm-plugins/wallpapers_plugin.cpp @@ -93,12 +93,37 @@ void scanWallpaperDir(const std::string& dirPath, for (const auto& name : names) { if (!isWallpaperExt(name)) continue; + std::string lowerName = toLowerStr(name); + if (lowerName.rfind("postmarketos", 0) == 0 || + lowerName == "bananarchy-240x240.png" || + lowerName == "bananarchy-landscape.png") { + continue; + } std::string fullPath = dirPath + "/" + name; struct stat st {}; if (::stat(fullPath.c_str(), &st) != 0 || !S_ISREG(st.st_mode)) continue; + std::string disp = prettifyWallpaperName(name); + bool isPng = lowerName.size() >= 4 && + lowerName.substr(lowerName.size() - 4) == ".png"; + + bool replacedOrSkipped = false; + for (auto& existing : out) { + if (existing.sourceTag == sourceTag && + toLowerStr(existing.displayName) == toLowerStr(disp)) { + if (isPng) { + existing.path = fullPath; + existing.displayName = disp; + existing.sizeBytes = st.st_size; + } + replacedOrSkipped = true; + break; + } + } + if (replacedOrSkipped) continue; + WallpaperEntry e; e.path = fullPath; - e.displayName = prettifyWallpaperName(name); + e.displayName = disp; e.sourceTag = sourceTag; e.sizeBytes = st.st_size; out.push_back(e);