Remove unused variables

Stopgap solution; TP does not want to expose approval status in headers for security reasons.

.flask/meta.json

@@ -1,5 +0,0 @@
-{
-	"user": "astronautlevel2",
-	"name": "Anemone3DS",
-	"description": "A theme and boot splash manager for the Nintendo 3DS console"
-}

.gitignore

@@ -58,6 +58,7 @@ dkms.conf
 # Build files
 build/
 out/
+romfs/
 
 # Sublime stuff
 .clang_complete

CONTRIBUTORS.md

@@ -4,7 +4,7 @@
 * Dawid Eckert ([@daedreth](https://github.com/daedreth))
 * Dylan G. ([@helloman892](https://github.com/helloman892))
 * Nils P. ([@ZetaDesigns](https://github.com/ZetaDesigns))
-* Matt Kenny ([@mattkenster](https://github.com/mattkenster))
+* Matt Kenny ([@8kenn](https://github.com/8kenn))
 
 # Minor Contributors
 * Nic ([@Wizzrobes](https://github.com/Wizzrobes))
@@ -16,3 +16,4 @@
 * Guillaume Gérard ([@GreatWizard](https://github.com/GreatWizard))
 * Joel ([@joel16](https://github.com/joel16))
 * [@thedax](https://github.com/thedax)
+* [@Wryyyong](https://github.com/Wryyyong)

Makefile

@@ -9,6 +9,29 @@ endif
 TOPDIR ?= $(CURDIR)
 include $(DEVKITARM)/3ds_rules
 
+#---------------------------------------------------------------------------------
+# TARGET is the name of the output
+# BUILD is the directory where object files & intermediate files will be placed
+# SOURCES is a list of directories containing source code
+# DATA is a list of directories containing data files
+# INCLUDES is a list of directories containing header files
+# GRAPHICS is a list of directories containing graphics files
+# GFXBUILD is the directory where converted graphics files will be placed
+#   If set to $(BUILD), it will statically link in the converted
+#   files as if they were data files.
+#
+# NO_SMDH: if set to anything, no SMDH file is generated.
+# ROMFS is the directory which contains the RomFS, relative to the Makefile (Optional)
+# APP_TITLE is the name of the app stored in the SMDH file (Optional)
+# APP_DESCRIPTION is the description of the app stored in the SMDH file (Optional)
+# APP_AUTHOR is the author of the app stored in the SMDH file (Optional)
+# ICON is the filename of the icon (.png), relative to the project folder.
+#   If not set, it attempts to use one of the following (in this order):
+#     - <Project name>.png
+#     - icon.png
+#     - <libctru folder>/default_icon.png
+#---------------------------------------------------------------------------------
+
 # Your values.
 APP_TITLE           :=	Anemone3DS
 APP_DESCRIPTION     :=	A complete theming tool for the 3DS
@@ -18,9 +41,11 @@ APP_AUTHOR          :=	Anemone3DS Team
 TARGET              :=	$(subst $e ,_,$(notdir $(APP_TITLE)))
 OUTDIR              :=	out
 BUILD               :=	build
-SOURCES             :=	source source/pp2d/pp2d source/quirc
+SOURCES             :=	source source/quirc
 INCLUDES            :=	include
 ROMFS               :=	romfs
+GRAPHICS            :=	assets
+GFXBUILD            :=	$(ROMFS)/gfx
 
 
 # Path to the files
@@ -38,12 +63,23 @@ LOGO                :=	meta/logo.bin
 
 # If left blank, makerom will use default values (0xff3ff and CTR-P-CTAP, respectively)
 # Be careful if UNIQUE_ID is the same as other apps: it will overwrite the previously installed one
-UNIQUE_ID           :=	0xAFEN
+UNIQUE_ID           :=	0xBAFE0
 PRODUCT_CODE        :=	CTR-P-ANEM
 
 # Don't really need to change this
 ICON_FLAGS          :=	nosavebackups,visible
 
+ifeq ($(strip $(NOGIT)),)
+    VERSION           :=  $(shell git describe --tags --match v[0-9]* --abbrev=7 | sed 's/-[0-9]*-g/-/')
+    VERSION_MAJOR     :=  $(shell echo $(VERSION) | cut -c2- | cut -f1 -d- | cut -f1 -d.)
+    VERSION_MINOR     :=  $(shell echo $(VERSION) | cut -c2- | cut -f1 -d- | cut -f2 -d.)
+    VERSION_BUILD     :=  $(shell echo $(VERSION) | cut -c2- | cut -f1 -d- | cut -f3 -d.)
+
+    ifeq ($(strip $(VERSION_BUILD)),)
+        VERSION_BUILD := 0
+    endif
+endif
+
 #---------------------------------------------------------------------------------
 # options for code generation
 #---------------------------------------------------------------------------------
@@ -53,9 +89,7 @@ CFLAGS	:=	-g -Wall -Wextra -O2 -mword-relocations \
 			-ffunction-sections \
 			$(ARCH)
 
-revision := $(shell git describe --tags --match v[0-9]* --abbrev=8 | sed 's/-[0-9]*-g/-/')
-
-CFLAGS	+=	$(INCLUDE) -DARM11 -D_3DS -D_GNU_SOURCE -DVERSION="\"$(revision)\"" -DUSER_AGENT="\"$(APP_TITLE)/$(revision)\"" -DAPP_TITLE="\"$(APP_TITLE)\""
+CFLAGS	+=	$(INCLUDE) -DARM11 -D_3DS -D_GNU_SOURCE -DVERSION="\"$(VERSION)\"" -DUSER_AGENT="\"$(APP_TITLE)/$(VERSION)\"" -DAPP_TITLE="\"$(APP_TITLE)\""
 ifneq ($(strip $(CITRA_MODE)),)
 	CFLAGS += -DCITRA_MODE
 endif
@@ -65,7 +99,7 @@ CXXFLAGS	:= $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++11
 ASFLAGS	:=	-g $(ARCH)
 LDFLAGS	=	-specs=3dsx.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)
 
-LIBS	:= -lvorbisidec -logg -larchive -ljansson -lcitro3d -lctrud -lm -lz
+LIBS	:= -lpng -lvorbisidec -logg -larchive -ljansson -lcitro2d -lcitro3d -lctrud -lm -lz
 
 #---------------------------------------------------------------------------------
 # list of directories containing libraries, this must be the top level containing
@@ -85,6 +119,7 @@ export OUTPUT	:=	$(CURDIR)/$(OUTDIR)/$(TARGET)
 export TOPDIR	:=	$(CURDIR)
 
 export VPATH	:=	$(foreach dir,$(SOURCES),$(CURDIR)/$(dir)) \
+			$(foreach dir,$(GRAPHICS),$(CURDIR)/$(dir)) \
 			$(foreach dir,$(DATA),$(CURDIR)/$(dir))
 
 export DEPSDIR	:=	$(CURDIR)/$(BUILD)
@@ -94,6 +129,7 @@ CPPFILES	:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.cpp)))
 SFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.s)))
 PICAFILES	:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.v.pica)))
 SHLISTFILES	:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.shlist)))
+GFXFILES	:=	$(foreach dir,$(GRAPHICS),$(notdir $(wildcard $(dir)/*.t3s)))
 BINFILES	:=	$(foreach dir,$(DATA),$(notdir $(wildcard $(dir)/*.*)))
 
 #---------------------------------------------------------------------------------
@@ -110,9 +146,19 @@ else
 endif
 #---------------------------------------------------------------------------------
 
-export OFILES	:=	$(addsuffix .o,$(BINFILES)) \
+export T3XFILES		:=	$(GFXFILES:.t3s=.t3x)
+
+export OFILES_SOURCES 	:=	$(CPPFILES:.cpp=.o) $(CFILES:.c=.o) $(SFILES:.s=.o)
+
+export OFILES_BIN	:=	$(addsuffix .o,$(BINFILES)) \
 			$(PICAFILES:.v.pica=.shbin.o) $(SHLISTFILES:.shlist=.shbin.o) \
-			$(CPPFILES:.cpp=.o) $(CFILES:.c=.o) $(SFILES:.s=.o)
+			$(if $(filter $(BUILD),$(GFXBUILD)),$(addsuffix .o,$(T3XFILES)))
+
+export OFILES := $(OFILES_BIN) $(OFILES_SOURCES)
+
+export HFILES	:=	$(PICAFILES:.v.pica=_shbin.h) $(SHLISTFILES:.shlist=_shbin.h) \
+			$(addsuffix .h,$(subst .,_,$(BINFILES))) \
+			$(GFXFILES:.t3s=.h)
 
 export INCLUDE	:=	$(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \
 			$(foreach dir,$(LIBDIRS),-I$(dir)/include) \
@@ -120,6 +166,8 @@ export INCLUDE	:=	$(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \
 
 export LIBPATHS	:=	$(foreach dir,$(LIBDIRS),-L$(dir)/lib)
 
+export _3DSXDEPS	:=	$(if $(NO_SMDH),,$(OUTPUT).smdh)
+
 ifeq ($(strip $(ICON)),)
 	icons := $(wildcard *.png)
 	ifneq (,$(findstring $(TARGET).png,$(icons)))
@@ -141,56 +189,24 @@ ifneq ($(ROMFS),)
 	export _3DSXFLAGS += --romfs=$(CURDIR)/$(ROMFS)
 endif
 
-.PHONY: $(BUILD) clean all
-
-#---------------------------------------------------------------------------------
-all: 3dsx cia
-
-3dsx: $(BUILD) $(OUTPUT).3dsx
-
-cia : $(BUILD) $(OUTPUT).cia
-
-citra: export CITRA_MODE = 1
-citra: 3dsx
-#---------------------------------------------------------------------------------
-$(BUILD):
-	@mkdir -p $(OUTDIR)
-	@[ -d "$@" ] || mkdir -p "$@"
-	@$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile
-
-#---------------------------------------------------------------------------------
-clean:
-	@echo clean ...
-	@rm -fr $(BUILD) $(OUTDIR)
-
-#---------------------------------------------------------------------------------
-ifeq ($(strip $(NO_SMDH)),)
-$(OUTPUT).3dsx	:	$(OUTPUT).elf $(OUTPUT).smdh
-else
-$(OUTPUT).3dsx	:	$(OUTPUT).elf
-endif
+.PHONY: all clean
 
 #---------------------------------------------------------------------------------
 MAKEROM		?=	makerom
 
 MAKEROM_ARGS		:=	-elf "$(OUTPUT).elf" -rsf "$(RSF_PATH)" -banner "$(BUILD)/banner.bnr" -icon "$(BUILD)/icon.icn" -DAPP_TITLE="$(APP_TITLE)" -DAPP_PRODUCT_CODE="$(PRODUCT_CODE)" -DAPP_UNIQUE_ID="$(UNIQUE_ID)"
 
-#ifneq ($(strip $(ROMFS)),)
-#	MAKEROM_ARGS	+=	 -romfs "$(BUILD)/romfs.bin"
-#endif
+ifeq ($(strip $(NOGIT)),)
+    MAKEROM_ARGS    +=  -major $(VERSION_MAJOR) -minor $(VERSION_MINOR) -micro $(VERSION_BUILD)
+endif
+
 ifneq ($(strip $(LOGO)),)
 	MAKEROM_ARGS	+=	 -logo "$(LOGO)"
 endif
-
-ifeq ($(strip $(ROMFS)),)
-$(OUTPUT).cia: $(OUTPUT).elf $(BUILD)/banner.bnr $(BUILD)/icon.icn
-	$(MAKEROM) -f cia -o "$@" -target t -exefslogo $(MAKEROM_ARGS)
-else
-$(OUTPUT).cia: $(OUTPUT).elf $(BUILD)/banner.bnr $(BUILD)/icon.icn
-	$(MAKEROM) -f cia -o "$@" -target t -exefslogo $(MAKEROM_ARGS)
+ifneq ($(strip $(ROMFS)),)
+	MAKEROM_ARGS	+=	 -DAPP_ROMFS="$(ROMFS)"
 endif
 
-
 BANNERTOOL	?=	bannertool
 
 ifeq ($(suffix $(BANNER_IMAGE)),.cgfx)
@@ -205,57 +221,78 @@ else
 	BANNER_AUDIO_ARG := -a
 endif
 
-$(BUILD)/banner.bnr	:	$(BANNER_IMAGE) $(BANNER_AUDIO)
-	$(BANNERTOOL) makebanner $(BANNER_IMAGE_ARG) "$(BANNER_IMAGE)" $(BANNER_AUDIO_ARG) "$(BANNER_AUDIO)" -o "$@"
-
-$(BUILD)/icon.icn	:	$(APP_ICON)
-	$(BANNERTOOL) makesmdh -s "$(APP_TITLE)" -l "$(APP_DESCRIPTION)" -p "$(APP_AUTHOR)" -i "$(APP_ICON)" -f "$(ICON_FLAGS)" -o "$@"
+#---------------------------------------------------------------------------------
+all:
+	@mkdir -p $(BUILD) $(GFXBUILD) $(OUTDIR)
+	@$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile
+	@$(BANNERTOOL) makebanner $(BANNER_IMAGE_ARG) "$(BANNER_IMAGE)" $(BANNER_AUDIO_ARG) "$(BANNER_AUDIO)" -o "$(BUILD)/banner.bnr"
+	@$(BANNERTOOL) makesmdh -s "$(APP_TITLE)" -l "$(APP_DESCRIPTION)" -p "$(APP_AUTHOR)" -i "$(APP_ICON)" -f "$(ICON_FLAGS)" -o "$(BUILD)/icon.icn"
+	$(MAKEROM) -f cia -o "$(OUTPUT).cia" -target t -exefslogo $(MAKEROM_ARGS)
 
+#---------------------------------------------------------------------------------
+clean:
+	@echo clean ...
+	@rm -fr $(BUILD) $(GFXBUILD) $(OUTDIR)
 
 #---------------------------------------------------------------------------------
 else
 
-DEPENDS	:=	$(OFILES:.o=.d)
-
 #---------------------------------------------------------------------------------
 # main targets
 #---------------------------------------------------------------------------------
+$(OUTPUT).3dsx	:	$(OUTPUT).elf $(_3DSXDEPS)
+
+$(OFILES_SOURCES) : $(HFILES)
 
 $(OUTPUT).elf	:	$(OFILES)
 
 #---------------------------------------------------------------------------------
 # you need a rule like this for each extension you use as binary data
 #---------------------------------------------------------------------------------
-%.bin.o	:	%.bin
+%.bin.o	%_bin.h :	%.bin
 #---------------------------------------------------------------------------------
 	@echo $(notdir $<)
 	@$(bin2o)
 
+#---------------------------------------------------------------------------------
+.PRECIOUS	:	%.t3x
+%.t3x.o	%_t3x.h :	%.t3x
+#---------------------------------------------------------------------------------
+	@$(bin2o)
+
 #---------------------------------------------------------------------------------
 # rules for assembling GPU shaders
 #---------------------------------------------------------------------------------
 define shader-as
-	$(eval CURBIN := $(patsubst %.shbin.o,%.shbin,$(notdir $@)))
-	picasso -o $(CURBIN) $1
-	bin2s $(CURBIN) | $(AS) -o $@
+	$(eval CURBIN := $*.shbin)
+	$(eval DEPSFILE := $(DEPSDIR)/$*.shbin.d)
+	echo "$(CURBIN).o: $< $1" > $(DEPSFILE)
 	echo "extern const u8" `(echo $(CURBIN) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`"_end[];" > `(echo $(CURBIN) | tr . _)`.h
 	echo "extern const u8" `(echo $(CURBIN) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`"[];" >> `(echo $(CURBIN) | tr . _)`.h
 	echo "extern const u32" `(echo $(CURBIN) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`_size";" >> `(echo $(CURBIN) | tr . _)`.h
+	picasso -o $(CURBIN) $1
+	bin2s $(CURBIN) | $(AS) -o $*.shbin.o
 endef
 
-%.shbin.o : %.v.pica %.g.pica
+%.shbin.o %_shbin.h : %.v.pica %.g.pica
 	@echo $(notdir $^)
 	@$(call shader-as,$^)
 
-%.shbin.o : %.v.pica
+%.shbin.o %_shbin.h : %.v.pica
 	@echo $(notdir $<)
 	@$(call shader-as,$<)
 
-%.shbin.o : %.shlist
+%.shbin.o %_shbin.h : %.shlist
 	@echo $(notdir $<)
-	@$(call shader-as,$(foreach file,$(shell cat $<),$(dir $<)/$(file)))
+	@$(call shader-as,$(foreach file,$(shell cat $<),$(dir $<)$(file)))
 
--include $(DEPENDS)
+#---------------------------------------------------------------------------------
+%.t3x	%.h	:	%.t3s
+#---------------------------------------------------------------------------------
+	@echo $(notdir $<)
+	@tex3ds -i $< -H $*.h -d $*.d -o $(TOPDIR)/$(GFXBUILD)/$*.t3x
+
+-include $(DEPSDIR)/*.d
 
 #---------------------------------------------------------------------------------------
 endif

README.md

@@ -1,23 +1,19 @@
 ![# Anemone3DS](https://github.com/astronautlevel2/Anemone3DS/blob/master/meta/banner.png)
 
 A Theme and Splashscreen Manager for the Nintendo 3DS, written in C.\
-To-do list here: https://trello.com/b/F1YSa1VK
 
 # Dependencies
- * devkitPro, which can be installed following the instructions [here](https://devkitpro.org/wiki/Getting_Started).
- * zlib, jansson, and libarchive, which can be retrieved from [devkitPro pacman](https://devkitpro.org/viewtopic.php?f=13&t=8702).
+ * devkitARM, which can be installed following the instructions [here](https://devkitpro.org/wiki/Getting_Started).
+ * jansson, libvorbisidec, libpng, and libarchive, which can be retrieved from [devkitPro pacman](https://devkitpro.org/viewtopic.php?f=13&t=8702).
  * A recent build of [makerom](https://github.com/profi200/Project_CTR) and the latest release of [bannertool](https://github.com/Steveice10/bannertool). These must be added to your PATH.
- A 64-bit Windows binary of makerom is available [here](https://hm892.s-ul.eu/U0Irkqih).
- * ~~[pp2d](https://github.com/BernardoGiordano/pp2d), which is included in the repo if you do a git clone --recursive.~~  
- Due to circumstances surrounding the privacy settings on the pp2d repo, the source files are now included directly within the repo.
- * Git needs to be on your PATH (this is usually only manual under Windows).
 
 # Building
-First of all, make sure devkitPro is properly installed and added to your PATH.  
+First of all, make sure devkitARM is properly installed - `$DEVKITPRO` and `$DEVKITARM` should be set to `/opt/devkitpro` and `$DEVKITPRO/devkitARM`, respectively.  
 After that, open the directory you want to clone the repo into, and execute  
 `git clone https://github.com/astronautlevel2/Anemone3DS` (or any other cloning method).  
-To install zlib, jansson and libarchive, begin by following the instructions found above ([here](https://devkitpro.org/viewtopic.php?f=13&t=8702)) on the devkitPro forums, and then install the dkP packages `3ds-zlib`, `3ds-jansson` and `3ds-libarchive`.  
-After also adding [makerom](https://github.com/profi200/Project_CTR) and [bannertool](https://github.com/Steveice10/buildtools) to your PATH, just enter your directory and run `make`. All built files will be in `/out/`.
+To install the prerequisite libraries, begin by ensuring devkitPro pacman (and the base install group, `3ds-dev`) is installed, and then install the dkP packages `3ds-jansson`, `3ds-libvorbisidec`, `3ds-libpng`, and `3ds-libarchive` using `[sudo] [dkp-]pacman -S <package-name>`.  
+
+After adding [makerom](https://github.com/profi200/Project_CTR) and [bannertool](https://github.com/Steveice10/buildtools) to your PATH, just enter your directory and run `make`. All built binaries will be in `/out/`.
 
 # License
 This project is licensed under the GNU GPLv3. See LICENSE.md for details. Additional terms 7b and 7c apply to this project.

assets/sprites.t3s

@@ -0,0 +1,23 @@
+--atlas -f rgba8888 -z auto
+arrow_up.png
+arrow_down.png
+arrow_left.png
+arrow_right.png
+battery0.png
+battery1.png
+battery2.png
+battery3.png
+battery4.png
+battery5.png
+browse.png
+charging.png
+download.png
+exit.png
+installed.png
+list.png
+preview.png
+select.png
+shuffle.png
+shuffle_no_bgm.png
+sort.png
+start.png

include/camera.h

@@ -1,6 +1,6 @@
 /*
 *   This file is part of Anemone3DS
-*   Copyright (C) 2016-2018 Contributors in CONTRIBUTORS.md
+*   Copyright (C) 2016-2020 Contributors in CONTRIBUTORS.md
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -30,19 +30,24 @@
 #include "common.h"
 
 typedef struct {
-    u16 *camera_buffer;
-    u32 *texture_buffer;
-    Handle mutex;
-    volatile bool finished;
-    volatile bool success;
-    Handle cancel;
+    u16* camera_buffer;
+
+    Handle event_stop;
+    Thread cam_thread, ui_thread;
+
+    LightEvent event_cam_info, event_ui_info;
+
+    CondVar cond;
+    LightLock mut;
+    u32 num_readers_active;
+    bool writer_waiting;
+    bool writer_active;
+
+    bool any_update;
 
-    bool capturing;
     struct quirc* context;
 } qr_data;
 
 bool init_qr(void);
-void exit_qr(qr_data *data);
-void take_picture(void);
 
 #endif

include/colors.h

@@ -1,6 +1,6 @@
 /*
 *   This file is part of Anemone3DS
-*   Copyright (C) 2016-2018 Contributors in CONTRIBUTORS.md
+*   Copyright (C) 2016-2020 Contributors in CONTRIBUTORS.md
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -27,17 +27,23 @@
 #ifndef COLORS_H
 #define COLORS_H
 
-#define ABGR8(a, b, g, r) ((((a)&0xFF)<<0) | (((b)&0xFF)<<8) | (((g)&0xFF)<<16) | (((r)&0xFF)<<24))
-#define RGBA8(r, g, b, a) ((((r)&0xFF)<<0) | (((g)&0xFF)<<8) | (((b)&0xFF)<<16) | (((a)&0xFF)<<24))
+#include "common.h"
+
+typedef u32 Color;
 
 typedef enum {
-    COLOR_BACKGROUND = ABGR8(255, 32, 28, 35), //silver-y black
-    COLOR_ACCENT = RGBA8(55, 122, 168, 255),
-    COLOR_WHITE = RGBA8(255, 255, 255, 255),
-    COLOR_CURSOR = RGBA8(200, 200, 200, 255),
-    COLOR_BLACK = RGBA8(0, 0, 0, 255),
-    COLOR_RED = RGBA8(200, 0, 0, 255),
-    COLOR_YELLOW = RGBA8(239, 220, 11, 255),
-} Color;
+    COLOR_BACKGROUND, //silver-y black
+    COLOR_ACCENT,
+    COLOR_WHITE,
+    COLOR_CURSOR,
+    COLOR_BLACK,
+    COLOR_RED,
+    COLOR_YELLOW,
+
+    COLOR_AMOUNT,
+} Colors_e;
+
+extern Color colors[COLOR_AMOUNT];
+void init_colors(void);
 
 #endif

include/common.h

@@ -1,6 +1,6 @@
 /*
 *   This file is part of Anemone3DS
-*   Copyright (C) 2016-2018 Contributors in CONTRIBUTORS.md
+*   Copyright (C) 2016-2020 Contributors in CONTRIBUTORS.md
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -28,6 +28,8 @@
 #define COMMON_H
 
 #include <3ds.h>
+#include <citro3d.h>
+#include <citro2d.h>
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -40,7 +42,7 @@
         POS(); \
         DEBUG(__VA_ARGS__)
 
-#define FASTSCROLL_WAIT 1.5e8
+#define FASTSCROLL_WAIT 1e8
 
 typedef enum {
     MODE_THEMES = 0,
@@ -54,36 +56,6 @@ extern const int entries_per_screen_v[MODE_AMOUNT];
 extern const int entries_per_screen_h[MODE_AMOUNT];
 extern const int entry_size[MODE_AMOUNT];
 extern bool quit;
-
-enum TextureID {
-    TEXTURE_FONT_RESERVED = 0, // used by pp2d for the font
-    TEXTURE_ARROW,
-    TEXTURE_ARROW_SIDE,
-    TEXTURE_SHUFFLE,
-    TEXTURE_SHUFFLE_NO_BGM,
-    TEXTURE_INSTALLED,
-    TEXTURE_PREVIEW_ICON,
-    TEXTURE_SORT,
-    TEXTURE_DOWNLOAD,
-    TEXTURE_BROWSE,
-    TEXTURE_LIST,
-    TEXTURE_EXIT,
-    TEXTURE_BATTERY_0,
-    TEXTURE_BATTERY_1,
-    TEXTURE_BATTERY_2,
-    TEXTURE_BATTERY_3,
-    TEXTURE_BATTERY_4,
-    TEXTURE_BATTERY_5,
-    TEXTURE_BATTERY_CHARGE,
-    TEXTURE_QR,
-    TEXTURE_PREVIEW,
-    TEXTURE_REMOTE_PREVIEW,
-    TEXTURE_SELECT_BUTTON,
-    TEXTURE_START_BUTTON,
-
-    // always the last
-    TEXTURE_REMOTE_ICONS,
-    TEXTURE_ICON = TEXTURE_REMOTE_ICONS + 24, 
-};
+extern bool dspfirm;
 
 #endif

include/draw.h

@@ -1,6 +1,6 @@
 /*
 *   This file is part of Anemone3DS
-*   Copyright (C) 2016-2018 Contributors in CONTRIBUTORS.md
+*   Copyright (C) 2016-2020 Contributors in CONTRIBUTORS.md
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -31,6 +31,8 @@
 #include "loading.h"
 #include "colors.h"
 
+#define MAX_LINES 10
+
 typedef enum {
     INSTALL_LOADING_THEMES,
     INSTALL_LOADING_SPLASHES,
@@ -53,9 +55,70 @@ typedef enum {
     INSTALL_LOADING_REMOTE_PREVIEW,
     INSTALL_LOADING_REMOTE_BGM,
 
+    INSTALL_DUMPING_THEME,
+
     INSTALL_NONE,
 } InstallType;
 
+typedef enum {
+    // InstallType text
+    TEXT_INSTALL_LOADING_THEMES,
+    TEXT_INSTALL_LOADING_SPLASHES,
+    TEXT_INSTALL_LOADING_ICONS,
+
+    TEXT_INSTALL_SPLASH,
+    TEXT_INSTALL_SPLASH_DELETE,
+
+    TEXT_INSTALL_SINGLE,
+    TEXT_INSTALL_SHUFFLE,
+    TEXT_INSTALL_BGM,
+    TEXT_INSTALL_NO_BGM,
+
+    TEXT_INSTALL_DOWNLOAD,
+    TEXT_INSTALL_CHECKING_DOWNLOAD,
+    TEXT_INSTALL_ENTRY_DELETE,
+
+    TEXT_INSTALL_LOADING_REMOTE_THEMES,
+    TEXT_INSTALL_LOADING_REMOTE_SPLASHES,
+    TEXT_INSTALL_LOADING_REMOTE_PREVIEW,
+    TEXT_INSTALL_LOADING_REMOTE_BGM,
+
+    TEXT_INSTALL_DUMPING_THEME,
+
+    // Other text
+    TEXT_VERSION,
+
+    TEXT_THEME_MODE,
+    TEXT_SPLASH_MODE,
+
+    TEXT_NO_THEME_FOUND,
+    TEXT_NO_SPLASH_FOUND,
+
+    TEXT_DOWNLOAD_FROM_QR,
+
+    TEXT_SWITCH_TO_SPLASHES,
+    TEXT_SWITCH_TO_THEMES,
+
+    TEXT_OR_START_TO_QUIT,
+
+    TEXT_BY_AUTHOR,
+    TEXT_SELECTED,
+    TEXT_SELECTED_SHORT,
+
+    TEXT_THEMEPLAZA_THEME_MODE,
+    TEXT_THEMEPLAZA_SPLASH_MODE,
+
+    TEXT_SEARCH,
+    TEXT_PAGE,
+
+    TEXT_ERROR_QUIT,
+    TEXT_ERROR_CONTINUE,
+
+    TEXT_CONFIRM_YES_NO,
+
+    TEXT_AMOUNT
+} Text;
+
 typedef enum {
     ERROR_LEVEL_ERROR,
     ERROR_LEVEL_WARNING,
@@ -66,7 +129,7 @@ typedef enum {
 #define BUTTONS_INFO_LINES 4
 #define BUTTONS_INFO_COLUNMNS 2
 
-enum {
+typedef enum {
     BUTTONS_Y_INFO = BUTTONS_START_Y+5,
 
     BUTTONS_Y_LINE_1 = BUTTONS_START_Y + BUTTONS_STEP*1,
@@ -76,25 +139,40 @@ enum {
 
     BUTTONS_X_LEFT = 20,
     BUTTONS_X_RIGHT = 200,
+    BUTTONS_X_MAX = 380,
 } ButtonPos;
 
 typedef struct {
-    const wchar_t * info_line;
-    Color info_line_color;
-    const wchar_t * instructions[BUTTONS_INFO_LINES][BUTTONS_INFO_COLUNMNS];
+    const char * info_line;
+    const char * instructions[BUTTONS_INFO_LINES][BUTTONS_INFO_COLUNMNS];
 } Instructions_s;
 
+extern C3D_RenderTarget* top;
+extern C3D_RenderTarget* bottom;
+extern C2D_TextBuf staticBuf, dynamicBuf;
+
+extern C2D_Text text[TEXT_AMOUNT];
+
 void init_screens(void);
 void exit_screens(void);
 
+void start_frame(void);
+void end_frame(void);
+void set_screen(C3D_RenderTarget * screen);
+
 void throw_error(char* error, ErrorLevel level);
 bool draw_confirm(const char* conf_msg, Entry_List_s* list);
 
-void draw_preview(ssize_t previewID, int preview_offset);
+void draw_preview(C2D_Image preview, int preview_offset);
 
 void draw_install(InstallType type);
 void draw_loading_bar(u32 current, u32 max, InstallType type);
 
+void draw_text(float x, float y, float z, float scaleX, float scaleY, Color color, const char * text);
+void draw_text_wrap(float x, float y, float z, float scaleX, float scaleY, Color color, const char * text, float max_width);
+void draw_text_wrap_scaled(float x, float y, float z, Color color, const char * text, float max_scale, float min_scale, float max_width);
+void draw_text_center(gfxScreen_t target, float y, float z, float scaleX, float scaleY, Color color, const char * text);
+
 void draw_base_interface(void);
 void draw_grid_interface(Entry_List_s* list, Instructions_s instructions);
 void draw_interface(Entry_List_s* list, Instructions_s instructions);

include/fs.h

@@ -1,6 +1,6 @@
 /*
 *   This file is part of Anemone3DS
-*   Copyright (C) 2016-2018 Contributors in CONTRIBUTORS.md
+*   Copyright (C) 2016-2020 Contributors in CONTRIBUTORS.md
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -29,9 +29,9 @@
 
 #include "common.h"
 
-FS_Archive ArchiveSD;
-FS_Archive ArchiveHomeExt;
-FS_Archive ArchiveThemeExt;
+extern FS_Archive ArchiveSD;
+extern FS_Archive ArchiveHomeExt;
+extern FS_Archive ArchiveThemeExt;
 
 Result open_archives(void);
 Result close_archives(void);
@@ -39,6 +39,8 @@ Result close_archives(void);
 u32 file_to_buf(FS_Path path, FS_Archive archive, char** buf);
 u32 zip_memory_to_buf(char *file_name, void * zip_memory, size_t zip_size, char ** buf);
 u32 zip_file_to_buf(char *file_name, u16 *zip_path, char **buf);
+u32 decompress_lz_file(FS_Path file_name, FS_Archive archive, char **buf);
+u32 compress_lz_file_fast(FS_Path path, FS_Archive archive, char *in_buf, u32 size);
 
 Result buf_to_file(u32 size, FS_Path path, FS_Archive archive, char *buf);
 void remake_file(FS_Path path, FS_Archive archive, u32 size);

include/instructions.h

@@ -1,6 +1,6 @@
 /*
 *   This file is part of Anemone3DS
-*   Copyright (C) 2016-2018 Contributors in CONTRIBUTORS.md
+*   Copyright (C) 2016-2020 Contributors in CONTRIBUTORS.md
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -35,20 +35,20 @@ Instructions_s normal_instructions[MODE_AMOUNT] = {
         .info_line = NULL,
         .instructions = {
             {
-                L"\uE000 Hold to install",
-                L"\uE001 Queue shuffle theme"
+                "\uE000 Hold to install",
+                "\uE001 Queue shuffle theme"
             },
             {
-                L"\uE002 Hold for more",
-                L"\uE003 Preview theme"
+                "\uE002 Hold for more",
+                "\uE003 Preview theme"
             },
             {
-                L"\uE004 Switch to splashes",
-                L"\uE005 Scan QR code"
+                "\uE004 Switch to splashes",
+                "\uE005 Scan QR code"
             },
             {
-                L"Exit",
-                L"Delete from SD"
+                "Exit",
+                "Delete from SD"
             }
         }
     },
@@ -56,43 +56,42 @@ Instructions_s normal_instructions[MODE_AMOUNT] = {
         .info_line = NULL,
         .instructions = {
             {
-                L"\uE000 Install splash",
-                L"\uE001 Delete installed splash"
+                "\uE000 Install splash",
+                "\uE001 Delete installed splash"
             },
             {
-                L"\uE002 Hold for more",
-                L"\uE003 Preview splash"
+                "\uE002 Hold for more",
+                "\uE003 Preview splash"
             },
             {
-                L"\uE004 Switch to themes",
-                L"\uE005 Scan QR code"
+                "\uE004 Switch to themes",
+                "\uE005 Scan QR code"
             },
             {
-                L"Exit",
-                L"Delete from SD"
+                "Exit",
+                "Delete from SD"
             }
         }
     }
 };
 
 Instructions_s install_instructions = {
-    .info_line = L"Release \uE000 to cancel or hold \uE006 and release \uE000 to install",
-    .info_line_color = COLOR_WHITE,
+    .info_line = "Release \uE000 to cancel or hold \uE006 and release \uE000 to install",
     .instructions = {
         {
-            L"\uE079 Normal install",
-            L"\uE07A Shuffle install"
+            "\uE079 Normal install",
+            "\uE07A Shuffle install"
         },
         {
-            L"\uE07B BGM-only install",
-            L"\uE07C No-BGM install"
+            "\uE07B BGM-only install",
+            "\uE07C No-BGM install"
         },
         {
             NULL,
             NULL
         },
         {
-            L"Exit",
+            "Exit",
             NULL
         }
     }
@@ -100,15 +99,14 @@ Instructions_s install_instructions = {
 
 Instructions_s extra_instructions[3] = {
     {
-        .info_line = L"Release \uE002 to cancel or hold \uE006 and release \uE002 to sort",
-        .info_line_color = COLOR_WHITE,
+        .info_line = "Release \uE002 to cancel or hold \uE006 and release \uE002 to sort",
         .instructions = {
             {
-                L"\uE079 Sort by name",
-                L"\uE07A Sort by author"
+                "\uE079 Sort by name",
+                "\uE07A Sort by author"
             },
             {
-                L"\uE07B Sort by filename",
+                "\uE07B Sort by filename",
                 NULL
             },
             {
@@ -116,29 +114,28 @@ Instructions_s extra_instructions[3] = {
                 NULL
             },
             {
-                L"Exit",
+                "Exit",
                 NULL
             }
         }
     },
     {
-        .info_line = L"Release \uE002 to cancel or hold \uE006 and release \uE002 to do stuff",
-        .info_line_color = COLOR_WHITE,
+        .info_line = "Release \uE002 to cancel or hold \uE006 and release \uE002 to do stuff",
         .instructions = {
             {
-                L"\uE079 Jump in the list",
-                L"\uE07A Reload broken icons"
+                "\uE079 Jump in the list",
+                "\uE07A Reload broken icons"
             },
             {
-                L"\uE07B Browse ThemePlaza",
-                NULL,
+                "\uE07B Browse ThemePlaza",
+                "\uE07C Dump Current Theme"
             },
             {
-                L"\uE004 Sorting menu",
+                "\uE004 Sorting menu",
                 NULL
             },
             {
-                L"Exit",
+                "Exit",
                 NULL
             }
         }

include/loading.h

@@ -1,6 +1,6 @@
 /*
 *   This file is part of Anemone3DS
-*   Copyright (C) 2016-2018 Contributors in CONTRIBUTORS.md
+*   Copyright (C) 2016-2020 Contributors in CONTRIBUTORS.md
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -81,8 +81,7 @@ typedef struct {
     Entry_s * entries;
     int entries_count;
 
-    ssize_t texture_id_offset;
-    ssize_t * icons_ids;
+    C2D_Image ** icons;
 
     int previous_scroll;
     int scroll;
@@ -110,13 +109,18 @@ typedef struct {
     volatile bool run_thread;
 } Thread_Arg_s;
 
+C2D_Image * loadTextureIcon(Icon_s *icon);
+void parse_smdh(Icon_s *icon, Entry_s * entry, const u16 * fallback_name);
+
 void sort_by_name(Entry_List_s * list);
 void sort_by_author(Entry_List_s * list);
 void sort_by_filename(Entry_List_s * list);
 
 void delete_entry(Entry_s * entry, bool is_file);
 Result load_entries(const char * loading_path, Entry_List_s * list);
-bool load_preview(Entry_List_s list, int * preview_offset);
+bool load_preview_from_buffer(void * buf, u32 size, C2D_Image * preview_image, int * preview_offset);
+bool load_preview(Entry_List_s list, C2D_Image * preview_image, int * preview_offset);
+void free_preview(C2D_Image preview_image);
 Result load_audio(Entry_s, audio_s *);
 void load_icons_first(Entry_List_s * current_list, bool silent);
 void handle_scrolling(Entry_List_s * list);

include/music.h

@@ -1,6 +1,6 @@
 /*
 *   This file is part of Anemone3DS
-*   Copyright (C) 2016-2018 Contributors in CONTRIBUTORS.md
+*   Copyright (C) 2016-2020 Contributors in CONTRIBUTORS.md
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by

include/remote.h

@@ -1,6 +1,6 @@
 /*
 *   This file is part of Anemone3DS
-*   Copyright (C) 2016-2018 Contributors in CONTRIBUTORS.md
+*   Copyright (C) 2016-2020 Contributors in CONTRIBUTORS.md
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -29,8 +29,9 @@
 
 #include "common.h"
 #include "draw.h"
+#include <ctype.h>
 
-#define THEMEPLAZA_BASE_URL "https://themeplaza.eu"
+#define THEMEPLAZA_BASE_URL "https://themeplaza.art"
 #define THEMEPLAZA_API_URL "/api/anemone/v1"
 #define THEMEPLAZA_BASE_API_URL THEMEPLAZA_BASE_URL  THEMEPLAZA_API_URL
 
@@ -51,6 +52,6 @@
 #define CACHE_PATH_FORMAT            "/3ds/"  APP_TITLE  "/cache/%"  JSON_INTEGER_FORMAT
 
 bool themeplaza_browser(EntryMode mode);
-u32 http_get(const char *url, char ** filename, char ** buf, InstallType install_type);
+Result http_get(const char *url, char ** filename, char ** buf, u32 * size, InstallType install_type, const char * acceptable_mime_types);
 
 #endif

include/splashes.h

@@ -1,6 +1,6 @@
 /*
 *   This file is part of Anemone3DS
-*   Copyright (C) 2016-2018 Contributors in CONTRIBUTORS.md
+*   Copyright (C) 2016-2020 Contributors in CONTRIBUTORS.md
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by

include/themes.h

@@ -1,6 +1,6 @@
 /*
 *   This file is part of Anemone3DS
-*   Copyright (C) 2016-2018 Contributors in CONTRIBUTORS.md
+*   Copyright (C) 2016-2020 Contributors in CONTRIBUTORS.md
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -75,6 +75,8 @@ Result bgm_install(Entry_s theme);
 
 Result shuffle_install(Entry_List_s themes);
 
+Result dump_theme(void);
+
 void themes_check_installed(void * void_arg);
 
 #endif

include/unicode.h

@@ -1,6 +1,6 @@
 /*
 *   This file is part of Anemone3DS
-*   Copyright (C) 2016-2018 Contributors in CONTRIBUTORS.md
+*   Copyright (C) 2016-2020 Contributors in CONTRIBUTORS.md
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by

meta/app.rsf

@@ -1,12 +1,13 @@
 BasicInfo:
-  Title                   : "Anemone3DS"
+  Title                   : $(APP_TITLE)
   CompanyCode             : "00"
-  ProductCode             : "CTR-P-ANEM"
+  ProductCode             : $(APP_PRODUCT_CODE)
   ContentType             : Application
   Logo                    : Homebrew # Nintendo / Licensed / Distributed / iQue / iQueForSystem
 
 TitleInfo:
-  UniqueId                : 0xAFEN
+  UniqueId                : $(APP_UNIQUE_ID)
+
   Category                : Application
   
 CardInfo:
@@ -34,7 +35,7 @@ SystemControlInfo:
   StackSize: 0x40000
   
 RomFs:
-    RootPath            : romfs
+    RootPath            : $(APP_ROMFS)
   
 # DO NOT EDIT BELOW HERE OR PROGRAMS WILL NOT LAUNCH (most likely)
 

source/camera.c

@@ -1,6 +1,6 @@
 /*
 *   This file is part of Anemone3DS
-*   Copyright (C) 2016-2018 Contributors in CONTRIBUTORS.md
+*   Copyright (C) 2016-2020 Contributors in CONTRIBUTORS.md
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -27,7 +27,6 @@
 #include "camera.h"
 
 #include "quirc/quirc.h"
-#include "pp2d/pp2d/pp2d.h"
 
 #include "draw.h"
 #include "fs.h"
@@ -37,35 +36,63 @@
 #include <archive.h>
 #include <archive_entry.h>
 
-/*
-static u32 transfer_size;
-static Handle event;
-static struct quirc* context;
-static u16 * camera_buf = NULL;
-*/
-
-void exit_qr(qr_data *data)
+static void start_read(qr_data *data)
 {
-    DEBUG("Exiting QR\n");
-    svcSignalEvent(data->cancel);
-    while(!data->finished)
-       svcSleepThread(1000000);
-    svcCloseHandle(data->cancel);
-    data->capturing = false;
+    LightLock_Lock(&data->mut);
+    while(data->writer_waiting || data->writer_active)
+    {
+        CondVar_WaitTimeout(&data->cond, &data->mut, 1000000);
+    }
 
-    free(data->camera_buffer);
-    free(data->texture_buffer);
-    quirc_destroy(data->context);
+    AtomicIncrement(&data->num_readers_active);
+    LightLock_Unlock(&data->mut);
+}
+static void stop_read(qr_data *data)
+{
+    LightLock_Lock(&data->mut);
+    AtomicDecrement(&data->num_readers_active);
+    if(data->num_readers_active == 0)
+    {
+        CondVar_Signal(&data->cond);
+    }
+    LightLock_Unlock(&data->mut);
+}
+static void start_write(qr_data *data)
+{
+    LightLock_Lock(&data->mut);
+    data->writer_waiting = true;
+
+    while(data->num_readers_active)
+    {
+        CondVar_WaitTimeout(&data->cond, &data->mut, 1000000);
+    }
+
+    data->writer_waiting = false;
+    data->writer_active = true;
+
+    LightLock_Unlock(&data->mut);
+}
+static void stop_write(qr_data *data)
+{
+    LightLock_Lock(&data->mut);
+
+    data->writer_active = false;
+    CondVar_Broadcast(&data->cond);
+
+    LightLock_Unlock(&data->mut);
 }
 
-void capture_cam_thread(void *arg) 
+static void capture_cam_thread(void *arg)
 {
     qr_data *data = (qr_data *) arg;
-    Handle events[3] = {0};
-    events[0] = data->cancel;
-    u32 transferUnit;
 
-    u16 *buffer = calloc(1, 400 * 240 * sizeof(u16));
+    Handle cam_events[3] = {0};
+    cam_events[0] = data->event_stop;
+
+    u32 transferUnit;
+    const u32 bufsz = 400 * 240 * sizeof(u16);
+    u16 *buffer = linearAlloc(bufsz);
+
     camInit();
     CAMU_SetSize(SELECT_OUT1, SIZE_CTR_TOP_LCD, CONTEXT_A);
     CAMU_SetOutputFormat(SELECT_OUT1, OUTPUT_RGB_565, CONTEXT_A);
@@ -74,37 +101,42 @@ void capture_cam_thread(void *arg)
     CAMU_SetAutoExposure(SELECT_OUT1, true);
     CAMU_SetAutoWhiteBalance(SELECT_OUT1, true);
     CAMU_Activate(SELECT_OUT1);
-    CAMU_GetBufferErrorInterruptEvent(&events[2], PORT_CAM1);
+    CAMU_GetBufferErrorInterruptEvent(&cam_events[2], PORT_CAM1);
     CAMU_SetTrimming(PORT_CAM1, false);
     CAMU_GetMaxBytes(&transferUnit, 400, 240);
     CAMU_SetTransferBytes(PORT_CAM1, transferUnit, 400, 240);
     CAMU_ClearBuffer(PORT_CAM1);
-    CAMU_SetReceiving(&events[1], buffer, PORT_CAM1, 400 * 240 * sizeof(u16), (s16) transferUnit);
+    CAMU_SetReceiving(&cam_events[1], buffer, PORT_CAM1, bufsz, transferUnit);
     CAMU_StartCapture(PORT_CAM1);
+
     bool cancel = false;
+
     while (!cancel)
     {
         s32 index = 0;
-        svcWaitSynchronizationN(&index, events, 3, false, U64_MAX);
+        svcWaitSynchronizationN(&index, cam_events, 3, false, U64_MAX);
         switch(index) {
             case 0:
                 DEBUG("Cancel event received\n");
                 cancel = true;
                 break;
             case 1:
-                svcCloseHandle(events[1]);
-                events[1] = 0;
-                svcWaitSynchronization(data->mutex, U64_MAX);
-                memcpy(data->camera_buffer, buffer, 400 * 240 * sizeof(u16));
-                GSPGPU_FlushDataCache(data->camera_buffer, 400 * 240 * sizeof(u16));
-                svcReleaseMutex(data->mutex);
-                CAMU_SetReceiving(&events[1], buffer, PORT_CAM1, 400 * 240 * sizeof(u16), transferUnit);
+                svcCloseHandle(cam_events[1]);
+                cam_events[1] = 0;
+
+                start_write(data);
+                memcpy(data->camera_buffer, buffer, bufsz);
+                data->any_update = true;
+                stop_write(data);
+
+                CAMU_SetReceiving(&cam_events[1], buffer, PORT_CAM1, bufsz, transferUnit);
                 break;
             case 2:
-                svcCloseHandle(events[1]);
-                events[1] = 0;
+                svcCloseHandle(cam_events[1]);
+                cam_events[1] = 0;
+
                 CAMU_ClearBuffer(PORT_CAM1);
-                CAMU_SetReceiving(&events[1], buffer, PORT_CAM1, 400 * 240 * sizeof(u16), transferUnit);
+                CAMU_SetReceiving(&cam_events[1], buffer, PORT_CAM1, bufsz, transferUnit);
                 CAMU_StartCapture(PORT_CAM1);
                 break;
             default:
@@ -122,89 +154,197 @@ void capture_cam_thread(void *arg)
     CAMU_ClearBuffer(PORT_CAM1);
     CAMU_Activate(SELECT_NONE);
     camExit();
-    free(buffer);
-    for(int i = 0; i < 3; i++) {
-        if(events[i] != 0) {
-            svcCloseHandle(events[i]);
-            events[i] = 0;
+
+    linearFree(buffer);
+    for(int i = 1; i < 3; i++)
+    {
+        if(cam_events[i] != 0) {
+            svcCloseHandle(cam_events[i]);
+            cam_events[i] = 0;
         }
     }
-    svcCloseHandle(data->mutex);
-    data->finished = true;
+
+    LightEvent_Signal(&data->event_cam_info);
 }
 
-bool start_capture_cam(qr_data *data) 
+static void update_ui(void *arg)
 {
-    data->mutex = 0;
-    data->cancel = 0;
-    svcCreateEvent(&data->cancel, RESET_STICKY);
-    svcCreateMutex(&data->mutex, false);
-    if(threadCreate(capture_cam_thread, data, 0x10000, 0x1A, 1, true) == NULL)
+    qr_data* data = (qr_data*) arg;
+    C3D_Tex tex;
+
+    static const Tex3DS_SubTexture subt3x = { 400, 240, 0.0f, 1.0f, 400.0f/512.0f, 1.0f - (240.0f/256.0f) };
+    C3D_TexInit(&tex, 512, 256, GPU_RGB565);
+
+    C3D_TexSetFilter(&tex, GPU_LINEAR, GPU_LINEAR);
+
+    while(svcWaitSynchronization(data->event_stop, 2 * 1000 * 1000ULL) == 0x09401BFE) // timeout of 2ms occured, still have 14 for copy and render
+    {
+        draw_base_interface();
+
+        // Untiled texture loading code adapted from FBI
+        start_read(data);
+        if(data->any_update)
+        {
+            for(u32 y = 0; y < 240; y++) {
+                const u32 srcPos = y * 400;
+                for(u32 x = 0; x < 400; x++) {
+                    const u32 dstPos = ((((y >> 3) * (512 >> 3) + (x >> 3)) << 6) + ((x & 1) | ((y & 1) << 1) | ((x & 2) << 1) | ((y & 2) << 2) | ((x & 4) << 2) | ((y & 4) << 3)));
+
+                    ((u16*)tex.data)[dstPos] = data->camera_buffer[srcPos + x];
+                }
+            }
+            data->any_update = false;
+        }
+        stop_read(data);
+
+        C2D_DrawImageAt((C2D_Image){ &tex, &subt3x }, 0.0f, 0.0f, 0.4f, NULL, 1.0f, 1.0f);
+
+        set_screen(bottom);
+        draw_text_center(GFX_BOTTOM, 4, 0.5, 0.5, 0.5, colors[COLOR_WHITE], "Press \uE005 To Quit");
+        end_frame();
+    }
+
+    C3D_TexDelete(&tex);
+    LightEvent_Signal(&data->event_ui_info);
+}
+
+static bool start_capture_cam(qr_data *data) 
+{
+    if((data->cam_thread = threadCreate(capture_cam_thread, data, 0x10000, 0x1A, 1, false)) == NULL)
+    {
+        throw_error("Capture cam thread creation failed\nPlease report this to the developers", ERROR_LEVEL_ERROR);
+        LightEvent_Signal(&data->event_cam_info);
+        LightEvent_Signal(&data->event_ui_info);
         return false;
+    }
+    if((data->ui_thread = threadCreate(update_ui, data, 0x10000, 0x1A, 1, false)) == NULL)
+    {
+        LightEvent_Signal(&data->event_ui_info);
+        return false;
+    }
     return true;
 }
 
-void update_qr(qr_data *data)
+static bool update_qr(qr_data *data, struct quirc_data* scan_data)
 {
-    hidScanInput();
-    if (hidKeysDown() & (KEY_R | KEY_B | KEY_TOUCH)) {
-        exit_qr(data);
-        return;
-    }
-
-    if (!data->capturing) {
-        if(start_capture_cam(data))
-            data->capturing = true;
-        else {
-            exit_qr(data);
-            return;
-        }
-
-    }
-
-    if (data->finished) {
-        exit_qr(data);
-        return;
-    }
-    for (int i = 0; i < 240 * 400; i++)
-    {
-        data->texture_buffer[i] = RGB565_TO_ABGR8(data->camera_buffer[i]);
-    }
-    draw_base_interface();
-    pp2d_free_texture(TEXTURE_QR);
-    pp2d_load_texture_memory(TEXTURE_QR, data->texture_buffer, 400, 240);
-
-    pp2d_draw_texture(TEXTURE_QR, 0, 0);
-
-    pp2d_draw_on(GFX_BOTTOM, GFX_LEFT);
-    pp2d_draw_text_center(GFX_BOTTOM, 4, 0.5, 0.5, RGBA8(255, 255, 255, 255), "Press \uE005 To Quit");
-    pp2d_end_draw();
-
     int w;
     int h;
     u8 *image = (u8*) quirc_begin(data->context, &w, &h);
-    svcWaitSynchronization(data->mutex, U64_MAX);
-    for (ssize_t x = 0; x < w; x++) {
-        for (ssize_t y = 0; y < h; y++) {
-            u16 px = data->camera_buffer[y * 400 + x];
-            image[y * w + x] = (u8)(((((px >> 11) & 0x1F) << 3) + (((px >> 5) & 0x3F) << 2) + ((px & 0x1F) << 3)) / 3);
+
+    start_read(data);
+    for (int y = 0; y < h; y++) {
+        const int actual_y = y * w;
+        for (int x = 0; x < w; x++) {
+            const int actual_off = actual_y + x;
+            const u16 px = data->camera_buffer[actual_off];
+            image[actual_off] = (u8)(((((px >> 11) & 0x1F) << 3) + (((px >> 5) & 0x3F) << 2) + ((px & 0x1F) << 3)) / 3);
         }
     }
-    svcReleaseMutex(data->mutex);
+    stop_read(data);
+
     quirc_end(data->context);
     if(quirc_count(data->context) > 0)
     {
         struct quirc_code code;
-        struct quirc_data scan_data;
         quirc_extract(data->context, 0, &code);
-        if (!quirc_decode(&code, &scan_data))
+        if (!quirc_decode(&code, scan_data))
         {
-            exit_qr(data);
+            return true;
+        }
+    }
 
+    return false;
+}
+
+static void start_qr(qr_data *data)
+{
+    svcCreateEvent(&data->event_stop, RESET_STICKY);
+    LightEvent_Init(&data->event_cam_info, RESET_STICKY);
+    LightEvent_Init(&data->event_ui_info, RESET_STICKY);
+    LightLock_Init(&data->mut);
+    CondVar_Init(&data->cond);
+
+    data->cam_thread = NULL;
+    data->ui_thread = NULL;
+    data->any_update = false;
+
+    data->context = quirc_new();
+    quirc_resize(data->context, 400, 240);
+    data->camera_buffer = calloc(1, 400 * 240 * sizeof(u16));
+}
+static void exit_qr(qr_data *data)
+{
+    svcSignalEvent(data->event_stop);
+
+    LightEvent_Wait(&data->event_ui_info);
+    LightEvent_Clear(&data->event_ui_info);
+    if(data->ui_thread != NULL)
+    {
+        threadJoin(data->ui_thread, U64_MAX);
+        threadFree(data->ui_thread);
+        data->ui_thread = NULL;
+    }
+
+    LightEvent_Wait(&data->event_cam_info);
+    LightEvent_Clear(&data->event_cam_info);
+    if(data->cam_thread != NULL)
+    {
+        threadJoin(data->cam_thread, U64_MAX);
+        threadFree(data->cam_thread);
+        data->cam_thread = NULL;
+    }
+
+    free(data->camera_buffer);
+    data->camera_buffer = NULL;
+    svcCloseHandle(data->event_stop);
+    data->event_stop = 0;
+}
+
+bool init_qr(void)
+{
+    qr_data data;
+
+    memset(&data, 0, sizeof(data));
+
+    start_qr(&data);
+
+    struct quirc_data* scan_data = calloc(1, sizeof(struct quirc_data)); 
+    const bool ready = start_capture_cam(&data);
+    bool finished = !ready;
+
+    while(!finished)
+    {
+        hidScanInput();
+        if (hidKeysDown() & (KEY_R | KEY_B | KEY_TOUCH))
+        {
+            break;
+        }
+
+        finished = update_qr(&data, scan_data);
+        svcSleepThread(50 * 1000 * 1000ULL); // only scan every 50ms
+    }
+
+    exit_qr(&data);
+
+    bool success = false;
+    if(finished && ready)
+    {
         draw_install(INSTALL_DOWNLOAD);
         char * zip_buf = NULL;
         char * filename = NULL;
-            u32 zip_size = http_get((char*)scan_data.payload, &filename, &zip_buf, INSTALL_DOWNLOAD);
+        u32 zip_size;
+        Result res = http_get((char*)scan_data->payload, &filename, &zip_buf, &zip_size, INSTALL_DOWNLOAD, "application/zip");
+        if (R_FAILED(res))
+        {
+            free(filename);
+            free(zip_buf);
+            return false;
+        }
+        else if (R_DESCRIPTION(res) == RD_CANCEL_REQUESTED)
+        {
+            free(filename);
+            return true;
+        }
 
         if(zip_size != 0)
         {
@@ -259,7 +399,7 @@ void update_qr(qr_data *data)
 
                     remake_file(fsMakePath(PATH_ASCII, path_to_file), ArchiveSD, zip_size);
                     buf_to_file(zip_size, fsMakePath(PATH_ASCII, path_to_file), ArchiveSD, zip_buf);
-                        data->success = true;
+                    success = true;
                 }
                 else
                 {
@@ -270,6 +410,7 @@ void update_qr(qr_data *data)
             {
                 throw_error("File downloaded isn't a zip.", ERROR_LEVEL_WARNING);
             }
+            free(zip_buf);
         }
         else
         {
@@ -277,26 +418,9 @@ void update_qr(qr_data *data)
         }
 
         free(filename);
-            free(zip_buf);
-        }   
     }
 
-}
-
-bool init_qr(void)
-{
-    qr_data *data = calloc(1, sizeof(qr_data));
-    data->capturing = false;
-    data->finished = false;
-    data->context = quirc_new();
-    quirc_resize(data->context, 400, 240);
-
-    data->camera_buffer = calloc(1, 400 * 240 * sizeof(u16));
-    data->texture_buffer = calloc(1, 400 * 240 * sizeof(u32));
-
-    while (!data->finished) update_qr(data);
-    bool success = data->success;
-    free(data);
-
+    free(scan_data);
+    quirc_destroy(data.context);
     return success;
 }

source/colors.c

@@ -0,0 +1,40 @@
+/*
+*   This file is part of Anemone3DS
+*   Copyright (C) 2016-2020 Contributors in CONTRIBUTORS.md
+*
+*   This program is free software: you can redistribute it and/or modify
+*   it under the terms of the GNU General Public License as published by
+*   the Free Software Foundation, either version 3 of the License, or
+*   (at your option) any later version.
+*
+*   This program is distributed in the hope that it will be useful,
+*   but WITHOUT ANY WARRANTY; without even the implied warranty of
+*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+*   GNU General Public License for more details.
+*
+*   You should have received a copy of the GNU General Public License
+*   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+*   Additional Terms 7.b and 7.c of GPLv3 apply to this file:
+*       * Requiring preservation of specified reasonable legal notices or
+*         author attributions in that material or in the Appropriate Legal
+*         Notices displayed by works containing it.
+*       * Prohibiting misrepresentation of the origin of that material,
+*         or requiring that modified versions of such material be marked in
+*         reasonable ways as different from the original version.
+*/
+
+#include "colors.h"
+
+Color colors[COLOR_AMOUNT] = {0};
+
+void init_colors(void)
+{
+    colors[COLOR_BACKGROUND] = C2D_Color32(35, 28, 32, 255); //silver-y black
+    colors[COLOR_ACCENT] = C2D_Color32(12, 58, 111, 255);
+    colors[COLOR_WHITE] = C2D_Color32(255, 255, 255, 255);
+    colors[COLOR_CURSOR] = C2D_Color32(200, 200, 200, 255);
+    colors[COLOR_BLACK] = C2D_Color32(0, 0, 0, 255);
+    colors[COLOR_RED] = C2D_Color32(229, 66, 66, 255);
+    colors[COLOR_YELLOW] = C2D_Color32(239, 220, 11, 255);
+}

source/draw.c

@@ -1,6 +1,6 @@
 /*
 *   This file is part of Anemone3DS
-*   Copyright (C) 2016-2018 Contributors in CONTRIBUTORS.md
+*   Copyright (C) 2016-2020 Contributors in CONTRIBUTORS.md
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -28,130 +28,284 @@
 #include "unicode.h"
 #include "colors.h"
 
-#include "pp2d/pp2d/pp2d.h"
+#include "sprites.h"
 
 #include <time.h>
 
+C3D_RenderTarget* top;
+C3D_RenderTarget* bottom;
+C2D_TextBuf staticBuf, dynamicBuf;
+static C2D_TextBuf widthBuf;
+
+static C2D_SpriteSheet spritesheet;
+static C2D_Sprite sprite_shuffle, sprite_shuffle_no_bgm, sprite_installed, sprite_start, sprite_select;
+
+C2D_Text text[TEXT_AMOUNT];
+static const char * mode_switch_char[MODE_AMOUNT] = {
+    "S",
+    "T",
+};
+
 void init_screens(void)
 {
-    pp2d_init();
+    init_colors();
+    gfxInitDefault();
+    C3D_Init(C3D_DEFAULT_CMDBUF_SIZE);
+    C2D_Init(C2D_DEFAULT_MAX_OBJECTS);
+    C2D_Prepare();
 
-    pp2d_set_screen_color(GFX_TOP, COLOR_BACKGROUND);
-    pp2d_set_screen_color(GFX_BOTTOM, COLOR_BACKGROUND);
+    top = C2D_CreateScreenTarget(GFX_TOP, GFX_LEFT);
+    bottom = C2D_CreateScreenTarget(GFX_BOTTOM, GFX_LEFT);
 
-    pp2d_load_texture_png(TEXTURE_ARROW, "romfs:/arrow.png");
-    pp2d_load_texture_png(TEXTURE_ARROW_SIDE, "romfs:/arrow_side.png");
-    pp2d_load_texture_png(TEXTURE_SHUFFLE, "romfs:/shuffle.png");
-    pp2d_load_texture_png(TEXTURE_SHUFFLE_NO_BGM, "romfs:/shuffle_no_bgm.png");
-    pp2d_load_texture_png(TEXTURE_INSTALLED, "romfs:/installed.png");
-    pp2d_load_texture_png(TEXTURE_PREVIEW_ICON, "romfs:/preview.png");
-    pp2d_load_texture_png(TEXTURE_SORT, "romfs:/sort.png");
-    pp2d_load_texture_png(TEXTURE_DOWNLOAD, "romfs:/download.png");
-    pp2d_load_texture_png(TEXTURE_BROWSE, "romfs:/browse.png");
-    pp2d_load_texture_png(TEXTURE_LIST, "romfs:/list.png");
-    pp2d_load_texture_png(TEXTURE_EXIT, "romfs:/exit.png");
-    pp2d_load_texture_png(TEXTURE_BATTERY_0, "romfs:/battery0.png");
-    pp2d_load_texture_png(TEXTURE_BATTERY_1, "romfs:/battery1.png");
-    pp2d_load_texture_png(TEXTURE_BATTERY_2, "romfs:/battery2.png");
-    pp2d_load_texture_png(TEXTURE_BATTERY_3, "romfs:/battery3.png");
-    pp2d_load_texture_png(TEXTURE_BATTERY_4, "romfs:/battery4.png");
-    pp2d_load_texture_png(TEXTURE_BATTERY_5, "romfs:/battery5.png");
-    pp2d_load_texture_png(TEXTURE_BATTERY_CHARGE, "romfs:/charging.png");
-    pp2d_load_texture_png(TEXTURE_SELECT_BUTTON, "romfs:/select.png");
-    pp2d_load_texture_png(TEXTURE_START_BUTTON, "romfs:/start.png");
+    spritesheet = C2D_SpriteSheetLoad("romfs:/gfx/sprites.t3x");
+    C2D_SpriteFromSheet(&sprite_shuffle, spritesheet, sprites_shuffle_idx);
+    C2D_SpriteSetDepth(&sprite_shuffle, 0.6f);
+    C2D_SpriteFromSheet(&sprite_shuffle_no_bgm, spritesheet, sprites_shuffle_no_bgm_idx);
+    C2D_SpriteSetDepth(&sprite_shuffle_no_bgm, 0.6f);
+
+    C2D_SpriteFromSheet(&sprite_installed, spritesheet, sprites_installed_idx);
+    C2D_SpriteSetDepth(&sprite_installed, 0.6f);
+
+    C2D_SpriteFromSheet(&sprite_start, spritesheet, sprites_start_idx);
+    C2D_SpriteSetDepth(&sprite_start, 0.5f);
+    C2D_SpriteFromSheet(&sprite_select, spritesheet, sprites_select_idx);
+    C2D_SpriteSetDepth(&sprite_select, 0.5f);
+
+    staticBuf = C2D_TextBufNew(4096);
+    dynamicBuf = C2D_TextBufNew(4096);
+    widthBuf = C2D_TextBufNew(4096);
+
+    C2D_TextParse(&text[TEXT_VERSION], staticBuf, VERSION);
+
+    C2D_TextParse(&text[TEXT_THEME_MODE], staticBuf, "Theme mode");
+    C2D_TextParse(&text[TEXT_SPLASH_MODE], staticBuf, "Splash mode");
+
+    C2D_TextParse(&text[TEXT_NO_THEME_FOUND], staticBuf, "No theme found");
+    C2D_TextParse(&text[TEXT_NO_SPLASH_FOUND], staticBuf, "No splash found");
+
+    C2D_TextParse(&text[TEXT_DOWNLOAD_FROM_QR], staticBuf, "Press \uE005 to download from QR");
+
+    C2D_TextParse(&text[TEXT_SWITCH_TO_SPLASHES], staticBuf, "Or \uE004 to switch to splashes");
+    C2D_TextParse(&text[TEXT_SWITCH_TO_THEMES], staticBuf, "Or \uE004 to switch to themes");
+
+    C2D_TextParse(&text[TEXT_OR_START_TO_QUIT], staticBuf, "Or        to quit");
+
+    C2D_TextParse(&text[TEXT_BY_AUTHOR], staticBuf, "By ");
+    C2D_TextParse(&text[TEXT_SELECTED], staticBuf, "Selected:");
+    C2D_TextParse(&text[TEXT_SELECTED_SHORT], staticBuf, "Sel.:");
+
+    C2D_TextParse(&text[TEXT_THEMEPLAZA_THEME_MODE], staticBuf, "ThemePlaza Theme mode");
+    C2D_TextParse(&text[TEXT_THEMEPLAZA_SPLASH_MODE], staticBuf, "ThemePlaza Splash mode");
+
+    C2D_TextParse(&text[TEXT_SEARCH], staticBuf, "Search...");
+    C2D_TextParse(&text[TEXT_PAGE], staticBuf, "Page:");
+
+    C2D_TextParse(&text[TEXT_ERROR_QUIT], staticBuf, "Press \uE000 to quit.");
+    C2D_TextParse(&text[TEXT_ERROR_CONTINUE], staticBuf, "Press \uE000 to continue.");
+
+    C2D_TextParse(&text[TEXT_CONFIRM_YES_NO], staticBuf, "\uE000 Yes   \uE001 No");
+
+    C2D_TextParse(&text[TEXT_INSTALL_LOADING_THEMES], staticBuf, "Loading themes, please wait...");
+    C2D_TextParse(&text[TEXT_INSTALL_LOADING_SPLASHES], staticBuf, "Loading splashes, please wait...");
+    C2D_TextParse(&text[TEXT_INSTALL_LOADING_ICONS], staticBuf, "Loading icons, please wait...");
+
+    C2D_TextParse(&text[TEXT_INSTALL_SPLASH], staticBuf, "Installing a splash...");
+    C2D_TextParse(&text[TEXT_INSTALL_SPLASH_DELETE], staticBuf, "Deleting installed splash...");
+
+    C2D_TextParse(&text[TEXT_INSTALL_SINGLE], staticBuf, "Installing a single theme...");
+    C2D_TextParse(&text[TEXT_INSTALL_SHUFFLE], staticBuf, "Installing shuffle themes...");
+    C2D_TextParse(&text[TEXT_INSTALL_BGM], staticBuf, "Installing BGM-only theme...");
+    C2D_TextParse(&text[TEXT_INSTALL_NO_BGM], staticBuf, "Installing theme without BGM...");
+
+    C2D_TextParse(&text[TEXT_INSTALL_DOWNLOAD], staticBuf, "Downloading...");
+    C2D_TextParse(&text[TEXT_INSTALL_CHECKING_DOWNLOAD], staticBuf, "Checking downloaded file...");
+    C2D_TextParse(&text[TEXT_INSTALL_ENTRY_DELETE], staticBuf, "Deleting from SD...");
+
+    C2D_TextParse(&text[TEXT_INSTALL_LOADING_REMOTE_THEMES], staticBuf, "Downloading theme list, please wait...");
+    C2D_TextParse(&text[TEXT_INSTALL_LOADING_REMOTE_SPLASHES], staticBuf, "Downloading splash list, please wait...");
+    C2D_TextParse(&text[TEXT_INSTALL_LOADING_REMOTE_PREVIEW], staticBuf, "Downloading preview, please wait...");
+    C2D_TextParse(&text[TEXT_INSTALL_LOADING_REMOTE_BGM], staticBuf, "Downloading BGM, please wait...");
+    C2D_TextParse(&text[TEXT_INSTALL_DUMPING_THEME], staticBuf, "Dumping theme, please wait...");
+
+    for(int i = 0; i < TEXT_AMOUNT; i++)
+        C2D_TextOptimize(&text[i]);
 }
 
 void exit_screens(void)
 {
-    pp2d_exit();
+    C2D_TextBufDelete(widthBuf);
+    C2D_TextBufDelete(dynamicBuf);
+    C2D_TextBufDelete(staticBuf);
+
+    C2D_Fini();
+    C3D_Fini();
+    gfxExit();
+}
+
+void set_screen(C3D_RenderTarget * screen)
+{
+    C2D_SceneBegin(screen);
+}
+
+void start_frame(void)
+{
+    C3D_FrameBegin(C3D_FRAME_SYNCDRAW);
+    C2D_TargetClear(top, colors[COLOR_BACKGROUND]);
+    C2D_TargetClear(bottom, colors[COLOR_BACKGROUND]);
+}
+
+void end_frame(void)
+{
+    C2D_TextBufClear(dynamicBuf);
+    C2D_TextBufClear(widthBuf);
+    C3D_FrameEnd(0);
+}
+
+static void draw_image(int image_id, float x, float y)
+{
+    C2D_DrawImageAt(C2D_SpriteSheetGetImage(spritesheet, image_id), x, y, 0.6f, NULL, 1.0f, 1.0f);
+}
+
+static void get_text_dimensions(const char * text, float scaleX, float scaleY, float * width, float * height)
+{
+    C2D_Text c2d_text;
+    C2D_TextParse(&c2d_text, widthBuf, text);
+    C2D_TextGetDimensions(&c2d_text, scaleX, scaleY, width, height);
+}
+
+static void draw_c2d_text(float x, float y, float z, float scaleX, float scaleY, Color color, C2D_Text * text)
+{
+    C2D_DrawText(text, C2D_WithColor, x, y, z, scaleX, scaleY, color);
+}
+
+void draw_text(float x, float y, float z, float scaleX, float scaleY, Color color, const char * text)
+{
+    C2D_Text c2d_text;
+    C2D_TextParse(&c2d_text, dynamicBuf, text);
+    C2D_TextOptimize(&c2d_text);
+    C2D_DrawText(&c2d_text, C2D_WithColor, x, y, z, scaleX, scaleY, color);
+}
+
+static void draw_c2d_text_center(gfxScreen_t target, float y, float z, float scaleX, float scaleY, Color color, C2D_Text * text)
+{
+    float width = 0;
+    C2D_TextGetDimensions(text, scaleX, scaleY, &width, NULL);
+    float offset = (target == GFX_TOP ? 400 : 320)/2 - width/2;
+
+    C2D_DrawText(text, C2D_WithColor, offset, y, z, scaleX, scaleY, color);
+}
+
+void draw_text_center(gfxScreen_t target, float y, float z, float scaleX, float scaleY, Color color, const char * text)
+{
+    C2D_Text text_arr[MAX_LINES];
+    float offsets_arr[MAX_LINES];
+    int actual_lines = 0;
+    const char * end = text - 1;
+
+    do {
+        end = C2D_TextParseLine(&text_arr[actual_lines], dynamicBuf, end + 1, actual_lines);
+        actual_lines++;
+    } while(*end == '\n');
+
+    for(int i = 0; i < actual_lines; i++)
+    {
+        C2D_TextOptimize(&text_arr[i]);
+        float width = 0;
+        C2D_TextGetDimensions(&text_arr[i], scaleX, scaleY, &width, NULL);
+        offsets_arr[i] = (target == GFX_TOP ? 400 : 320)/2 - width/2;
+    }
+
+    for(int i = 0; i < actual_lines; i++)
+    {
+        C2D_DrawText(&text_arr[i], C2D_WithColor, offsets_arr[i], y, z, scaleX, scaleY, color);
+    }
 }
 
 void draw_base_interface(void)
 {
-    pp2d_begin_draw(GFX_TOP, GFX_LEFT);
-    pp2d_draw_rectangle(0, 0, 400, 23, COLOR_ACCENT);
+    start_frame();
+    set_screen(top);
+
+    C2D_DrawRectSolid(0, 0, 0.5f, 400, 23, colors[COLOR_ACCENT]);
 
     time_t t = time(NULL);
     struct tm tm = *localtime(&t);
 
-    pp2d_draw_textf(7, 2, 0.6, 0.6, COLOR_WHITE, "%.2i", tm.tm_hour);
-    pp2d_draw_text(28, 1, 0.6, 0.6, COLOR_WHITE, (tm.tm_sec % 2 == 1) ? ":" : " ");
-    pp2d_draw_textf(34, 2, 0.6, 0.6, COLOR_WHITE, "%.2i", tm.tm_min);
+    char string_hours[3] = {0};
+    sprintf(string_hours, "%.2i", tm.tm_hour);
+
+    C2D_Text hours, separator, minutes;
+    C2D_TextParse(&hours, dynamicBuf, string_hours);
+    C2D_TextOptimize(&hours);
+
+    if(tm.tm_sec % 2 == 1)
+    {
+        C2D_TextParse(&separator, dynamicBuf, ":");
+        C2D_TextOptimize(&separator);
+    }
+
+    char string_minutes[3] = {0};
+    sprintf(string_minutes, "%.2i", tm.tm_min);
+
+    C2D_TextParse(&minutes, dynamicBuf, string_minutes);
+    C2D_TextOptimize(&minutes);
+
+    C2D_DrawText(&hours, C2D_WithColor, 7, 2, 0.5f, 0.6f, 0.6f, colors[COLOR_WHITE]);
+    if(tm.tm_sec % 2 == 1)
+        C2D_DrawText(&separator, C2D_WithColor, 28, 1, 0.5f, 0.6f, 0.6f, colors[COLOR_WHITE]);
+    C2D_DrawText(&minutes, C2D_WithColor, 34, 2, 0.5f, 0.6f, 0.6f, colors[COLOR_WHITE]);
 
     #ifndef CITRA_MODE
     u8 battery_charging = 0;
     PTMU_GetBatteryChargeState(&battery_charging);
     u8 battery_status = 0;
     PTMU_GetBatteryLevel(&battery_status);
-    pp2d_draw_texture(TEXTURE_BATTERY_0 + battery_status, 357, 2);
+    draw_image(sprites_battery0_idx + battery_status, 357, 2);
 
     if(battery_charging)
-        pp2d_draw_texture(TEXTURE_BATTERY_CHARGE, 357, 2);
+        draw_image(sprites_charging_idx, 357, 2);
     #endif
 
-    pp2d_draw_on(GFX_BOTTOM, GFX_LEFT);
-    pp2d_draw_rectangle(0, 0, 320, 24, COLOR_ACCENT);
-    pp2d_draw_rectangle(0, 216, 320, 24, COLOR_ACCENT);
-    pp2d_draw_text(7, 219, 0.6, 0.6, COLOR_WHITE, VERSION);
+    set_screen(bottom);
 
-    pp2d_draw_on(GFX_TOP, GFX_LEFT);
-}
+    C2D_DrawRectSolid(0, 0, 0.5f, 320, 24, colors[COLOR_ACCENT]);
+    C2D_DrawRectSolid(0, 216, 0.5f, 320, 24, colors[COLOR_ACCENT]);
+    C2D_DrawText(&text[TEXT_VERSION], C2D_WithColor, 7, 219, 0.5f, 0.6f, 0.6f, colors[COLOR_WHITE]);
 
-static void draw_text_center(gfxScreen_t target, float y, float scaleX, float scaleY, u32 color, const char* text)
-{
-    char * _text = strdup(text);
-    float prevY = y;
-    int offset = 0;
-    while(true)
-    {
-        char *nline = strchr(_text+offset, '\n');
-        int nlinepos = 0;
-        if(nline != NULL)
-        {
-            nlinepos = nline-_text;
-            _text[nlinepos] = '\0';
-        }
-        pp2d_draw_text_center(target, prevY, scaleX, scaleY, color, _text+offset);
-        if(nline == NULL) break;
-        else
-        {
-            prevY += pp2d_get_text_height(_text+offset, scaleX, scaleY);
-            _text[nlinepos] = '\n';
-            offset = nlinepos+1;
-        }
-    }
-    free(_text);
+    set_screen(top);
 }
 
 void throw_error(char* error, ErrorLevel level)
 {
+    Text bottom_text = TEXT_AMOUNT;
+    Color text_color = COLOR_WHITE;
+
     switch(level)
     {
         case ERROR_LEVEL_ERROR:
-            while(aptMainLoop())
-            {
-                hidScanInput();
-                u32 kDown = hidKeysDown();
-                draw_base_interface();
-                draw_text_center(GFX_TOP, 100, 0.6, 0.6, COLOR_RED, error);
-                pp2d_draw_wtext_center(GFX_TOP, 150, 0.6, 0.6, COLOR_WHITE, L"Press \uE000 to shut down.");
-                pp2d_end_draw();
-                if(kDown & KEY_A) break;
-            }
+            bottom_text = TEXT_ERROR_QUIT;
+            text_color = COLOR_RED;
             break;
         case ERROR_LEVEL_WARNING:
+            bottom_text = TEXT_ERROR_CONTINUE;
+            text_color = COLOR_YELLOW;
+            break;
+        default:
+            return;
+    }
+
     while(aptMainLoop())
     {
         hidScanInput();
         u32 kDown = hidKeysDown();
+
         draw_base_interface();
-                draw_text_center(GFX_TOP, 100, 0.6, 0.6, COLOR_YELLOW, error);
-                pp2d_draw_wtext_center(GFX_TOP, 150, 0.6, 0.6, COLOR_WHITE, L"Press \uE000 to continue.");
-                pp2d_end_draw();
+        draw_text_center(GFX_TOP, 100, 0.5f, 0.6f, 0.6f, colors[text_color], error);
+        draw_c2d_text_center(GFX_TOP, 150, 0.5f, 0.6f, 0.6f, colors[COLOR_WHITE], &text[bottom_text]);
+        end_frame();
+
         if(kDown & KEY_A) break;
     }
-            break;
-    }
 }
 
 bool draw_confirm(const char* conf_msg, Entry_List_s* list)
@@ -160,10 +314,10 @@ bool draw_confirm(const char* conf_msg, Entry_List_s* list)
     {
         Instructions_s instructions = {0};
         draw_interface(list, instructions);
-        pp2d_draw_on(GFX_TOP, GFX_LEFT);
-        draw_text_center(GFX_TOP, BUTTONS_Y_LINE_1, 0.7, 0.7, COLOR_YELLOW, conf_msg);
-        pp2d_draw_wtext_center(GFX_TOP, BUTTONS_Y_LINE_3, 0.6, 0.6, COLOR_WHITE, L"\uE000 Yes   \uE001 No");
-        pp2d_end_draw();
+        set_screen(top);
+        draw_text_center(GFX_TOP, BUTTONS_Y_LINE_1, 0.5f, 0.7f, 0.7f, colors[COLOR_YELLOW], conf_msg);
+        draw_c2d_text_center(GFX_TOP, BUTTONS_Y_LINE_3, 0.5f, 0.6f, 0.6f, colors[COLOR_WHITE], &text[TEXT_CONFIRM_YES_NO]);
+        end_frame();
 
         hidScanInput();
         u32 kDown = hidKeysDown();
@@ -174,68 +328,21 @@ bool draw_confirm(const char* conf_msg, Entry_List_s* list)
     return false;
 }
 
-void draw_preview(ssize_t previewID, int preview_offset)
+void draw_preview(C2D_Image preview, int preview_offset)
 {
-    pp2d_begin_draw(GFX_TOP, GFX_LEFT);
-    pp2d_draw_texture_part(previewID, 0, 0, preview_offset, 0, 400, 240);
-    pp2d_draw_on(GFX_BOTTOM, GFX_LEFT);
-    pp2d_draw_texture_part(previewID, 0, 0, 40 + preview_offset, 240, 320, 240);
+    start_frame();
+    set_screen(top);
+    C2D_DrawImageAt(preview, -preview_offset, 0, 0.5f, NULL, 1.0f, 1.0f);
+    set_screen(bottom);
+    C2D_DrawImageAt(preview, -(preview_offset+40), -240, 0.5f, NULL, 1.0f, 1.0f);
 }
 
 static void draw_install_handler(InstallType type)
 {
-    switch(type)
+    if(type != INSTALL_NONE)
     {
-        case INSTALL_LOADING_THEMES:
-            pp2d_draw_text_center(GFX_TOP, 120, 0.8, 0.8, COLOR_WHITE, "Loading themes, please wait...");
-            break;
-        case INSTALL_LOADING_SPLASHES:
-            pp2d_draw_text_center(GFX_TOP, 120, 0.8, 0.8, COLOR_WHITE, "Loading splashes, please wait...");
-            break;
-        case INSTALL_LOADING_ICONS:
-            pp2d_draw_text_center(GFX_TOP, 120, 0.8, 0.8, COLOR_WHITE, "Loading icons, please wait...");
-            break;
-        case INSTALL_LOADING_REMOTE_THEMES:
-            pp2d_draw_text_center(GFX_TOP, 120, 0.8, 0.8, COLOR_WHITE, "Downloading theme list, please wait...");
-            break;
-        case INSTALL_LOADING_REMOTE_SPLASHES:
-            pp2d_draw_text_center(GFX_TOP, 120, 0.8, 0.8, COLOR_WHITE, "Downloading splash list, please wait...");
-            break;
-        case INSTALL_LOADING_REMOTE_PREVIEW:
-            pp2d_draw_text_center(GFX_TOP, 120, 0.8, 0.8, COLOR_WHITE, "Downloading preview, please wait...");
-            break;
-        case INSTALL_LOADING_REMOTE_BGM:
-            pp2d_draw_text_center(GFX_TOP, 120, 0.8, 0.8, COLOR_WHITE, "Downloading BGM, please wait...");
-            break;
-        case INSTALL_SINGLE:
-            pp2d_draw_text_center(GFX_TOP, 120, 0.8, 0.8, COLOR_WHITE, "Installing a single theme...");
-            break;
-        case INSTALL_SHUFFLE:
-            pp2d_draw_text_center(GFX_TOP, 120, 0.8, 0.8, COLOR_WHITE, "Installing shuffle themes...");
-            break;
-        case INSTALL_BGM:
-            pp2d_draw_text_center(GFX_TOP, 120, 0.8, 0.8, COLOR_WHITE, "Installing BGM-only theme...");
-            break;
-        case INSTALL_DOWNLOAD:
-            pp2d_draw_text_center(GFX_TOP, 120, 0.8, 0.8, COLOR_WHITE, "Downloading...");
-            break;
-        case INSTALL_CHECKING_DOWNLOAD:
-            pp2d_draw_text_center(GFX_TOP, 120, 0.8, 0.8, COLOR_WHITE, "Checking downloaded file...");
-            break;
-        case INSTALL_SPLASH:
-            pp2d_draw_text_center(GFX_TOP, 120, 0.8, 0.8, COLOR_WHITE, "Installing a splash...");
-            break;
-        case INSTALL_SPLASH_DELETE:
-            pp2d_draw_text_center(GFX_TOP, 120, 0.8, 0.8, COLOR_WHITE, "Deleting installed splash...");
-            break;
-        case INSTALL_ENTRY_DELETE:
-            pp2d_draw_text_center(GFX_TOP, 120, 0.8, 0.8, COLOR_WHITE, "Deleting from SD...");
-            break;
-        case INSTALL_NO_BGM:
-            pp2d_draw_text_center(GFX_TOP, 120, 0.8, 0.8, COLOR_WHITE, "Installing theme without BGM...");
-            break;
-        default:
-            break;
+        C2D_Text * install_text = &text[type];
+        draw_c2d_text_center(GFX_TOP, 120.0f, 0.5f, 0.8f, 0.8f, colors[COLOR_WHITE], install_text);
     }
 }
 
@@ -243,28 +350,26 @@ void draw_install(InstallType type)
 {
     draw_base_interface();
     draw_install_handler(type);
-    pp2d_end_draw();
+    end_frame();
 }
 
 void draw_loading_bar(u32 current, u32 max, InstallType type)
 {
     draw_base_interface();
     draw_install_handler(type);
-    pp2d_draw_on(GFX_BOTTOM, GFX_LEFT);
+    set_screen(bottom);
     double percent = 100*((double)current/(double)max);
     u32 width = (u32)percent;
     width *= 2;
-    pp2d_draw_rectangle(60-1, 110-1, 200+2, 20+2, COLOR_CURSOR);
-    pp2d_draw_rectangle(60, 110, width, 20, COLOR_ACCENT);
-    pp2d_end_draw();
+    C2D_DrawRectSolid(60-1, 110-1, 0.5f, 200+2, 20+2, colors[COLOR_CURSOR]);
+    C2D_DrawRectSolid(60, 110, 0.5f, width, 20, colors[COLOR_ACCENT]);
+    end_frame();
 }
 
 static void draw_instructions(Instructions_s instructions)
 {
-    pp2d_draw_on(GFX_TOP, GFX_LEFT);
-
     if(instructions.info_line != NULL)
-        pp2d_draw_wtext_center(GFX_TOP, BUTTONS_Y_INFO, 0.55, 0.55, instructions.info_line_color, instructions.info_line);
+        draw_text_center(GFX_TOP, BUTTONS_Y_INFO, 0.5, 0.55, 0.55, colors[COLOR_WHITE], instructions.info_line);
 
     const int y_lines[BUTTONS_INFO_LINES-1] = {
         BUTTONS_Y_LINE_1,
@@ -275,46 +380,127 @@ static void draw_instructions(Instructions_s instructions)
     for(int i = 0; i < BUTTONS_INFO_LINES-1; i++)
     {
         if(instructions.instructions[i][0] != NULL)
-            pp2d_draw_wtext(BUTTONS_X_LEFT, y_lines[i], 0.6, 0.6, COLOR_WHITE, instructions.instructions[i][0]);
+            draw_text_wrap_scaled(BUTTONS_X_LEFT, y_lines[i], 0.5, colors[COLOR_WHITE], instructions.instructions[i][0], 0.6, 0, BUTTONS_X_RIGHT-2);
         if(instructions.instructions[i][1] != NULL)
-            pp2d_draw_wtext(BUTTONS_X_RIGHT, y_lines[i], 0.6, 0.6, COLOR_WHITE, instructions.instructions[i][1]);
+            draw_text_wrap_scaled(BUTTONS_X_RIGHT, y_lines[i], 0.5, colors[COLOR_WHITE], instructions.instructions[i][1], 0.6, 0, BUTTONS_X_MAX-2);
     }
 
-    const wchar_t * start_line = instructions.instructions[BUTTONS_INFO_LINES-1][0];
+    C2D_ImageTint white_tint;
+    C2D_PlainImageTint(&white_tint, colors[COLOR_WHITE], 1.0f);
+
+    const char * start_line = instructions.instructions[BUTTONS_INFO_LINES-1][0];
     if(start_line != NULL)
     {
-        pp2d_draw_texture(TEXTURE_START_BUTTON, BUTTONS_X_LEFT-10, BUTTONS_Y_LINE_4 + 3);
-        pp2d_draw_wtext(BUTTONS_X_LEFT+26, BUTTONS_Y_LINE_4, 0.6, 0.6, COLOR_WHITE, start_line);
+        C2D_SpriteSetPos(&sprite_start, BUTTONS_X_LEFT-10, BUTTONS_Y_LINE_4 + 3);
+        C2D_DrawSpriteTinted(&sprite_start, &white_tint);
+        draw_text_wrap_scaled(BUTTONS_X_LEFT+26, BUTTONS_Y_LINE_4, 0.5, colors[COLOR_WHITE], start_line, 0.6, 0, BUTTONS_X_RIGHT-2);
     }
 
-    const wchar_t * select_line = instructions.instructions[BUTTONS_INFO_LINES-1][1];
+    const char * select_line = instructions.instructions[BUTTONS_INFO_LINES-1][1];
     if(select_line != NULL)
     {
-        pp2d_draw_texture(TEXTURE_SELECT_BUTTON, BUTTONS_X_RIGHT-10, BUTTONS_Y_LINE_4 + 3);
-        pp2d_draw_wtext(BUTTONS_X_RIGHT+26, BUTTONS_Y_LINE_4, 0.6, 0.6, COLOR_WHITE, select_line);
+        C2D_SpriteSetPos(&sprite_select, BUTTONS_X_RIGHT-10, BUTTONS_Y_LINE_4 + 3);
+        C2D_DrawSpriteTinted(&sprite_select, &white_tint);
+        draw_text_wrap_scaled(BUTTONS_X_RIGHT+26, BUTTONS_Y_LINE_4, 0.5, colors[COLOR_WHITE], select_line, 0.6, 0, BUTTONS_X_MAX-2);
+    }
+}
+
+void draw_text_wrap(float x, float y, float z, float scaleX, float scaleY, Color color, const char * text, float max_width)
+{
+    // sanity check
+    if(max_width <= 0)
+        return;
+
+    int length = strlen(text) + 1;
+    char result[length]; // of note is that, if `text` has no spaces in it and needs to be wrapped, this can and will overflow (!!)
+    memset(result, 0, length);
+    int idx = 0;
+
+    float current_width = 0;
+
+    while(*text)
+    {
+        ssize_t consumed;
+        u32 codepoint;
+
+        if(*text == '\n')
+            current_width = 0;
+
+        if(*text == '\r')
+        {
+            text++;
+            continue;
+        }
+
+        if((consumed = decode_utf8(&codepoint, (unsigned char*)text)) == -1)
+            break;
+
+        float character_width = scaleX * (fontGetCharWidthInfo(NULL, fontGlyphIndexFromCodePoint(NULL, codepoint))->charWidth);
+        if((current_width += character_width) > max_width)
+        {
+            char* last_space = NULL;
+            for(int i = idx; i >= 0; i--)
+            {
+                if(result[i] == ' ')
+                {
+                    last_space = &result[i];
+                    break;
+                }
+            }
+            if(last_space != NULL)
+                *last_space = '\n';
+            else
+                result[idx++] = '\n';
+            current_width = 0;
+        }
+        memcpy(&result[idx], text, consumed);
+        idx += consumed;
+        text += consumed;
+    }
+
+    draw_text(x, y, z, scaleX, scaleY, color, result);
+}
+
+void draw_text_wrap_scaled(float x, float y, float z, Color color, const char * text, float max_scale, float min_scale, float max_width)
+{
+    // sanity check
+    if(max_scale < 0 || min_scale < 0)
+        return;
+
+    float width = 0;
+    get_text_dimensions(text, max_scale, max_scale, &width, NULL);
+    float scale = 0;
+
+    if(width < max_width)
+    {
+        draw_text(x, y, z, max_scale, max_scale, color, text);
+    }
+    else if((scale = max_width / width) >= min_scale)
+    {
+        draw_text(x, y, z, scale, scale, color, text);
+    }
+    else
+    {
+        draw_text_wrap(x, y, z, min_scale, min_scale, color, text, max_width);
     }
 }
 
 static void draw_entry_info(Entry_s * entry)
 {
-    float wrap = 363;
+    char author[0x41] = {0};
+    utf16_to_utf8((u8*)author, entry->author, 0x40);
+    draw_c2d_text(20, 35, 0.5, 0.5, 0.5, colors[COLOR_WHITE], &text[TEXT_BY_AUTHOR]);
+    float width = 0;
+    C2D_TextGetDimensions(&text[TEXT_BY_AUTHOR], 0.5, 0.5, &width, NULL);
+    draw_text(20+width, 35, 0.5, 0.5, 0.5, colors[COLOR_WHITE], author);
 
-    wchar_t author[0x41] = {0};
-    utf16_to_utf32((u32*)author, entry->author, 0x40);
-    pp2d_draw_text(20, 35, 0.5, 0.5, COLOR_WHITE, "By ");
-    pp2d_draw_wtext_wrap(40, 35, 0.5, 0.5, COLOR_WHITE, wrap, author);
+    char title[0x41] = {0};
+    utf16_to_utf8((u8*)title, entry->name, 0x40);
+    draw_text(20, 50, 0.5, 0.7, 0.7, colors[COLOR_WHITE], title);
 
-    wchar_t title[0x41] = {0};
-    utf16_to_utf32((u32*)title, entry->name, 0x40);
-    pp2d_draw_wtext_wrap(20, 50, 0.7, 0.7, COLOR_WHITE, wrap, title);
-
-    int width = (int)pp2d_get_wtext_width(title, 0.7, 0.7);
-    int height = (int)pp2d_get_wtext_height(title, 0.7, 0.7);
-    int count = ((width - (width % (int)wrap))/wrap) + 1;
-
-    wchar_t description[0x81] = {0};
-    utf16_to_utf32((u32*)description, entry->desc, 0x80);
-    pp2d_draw_wtext_wrap(20, 50+count*height, 0.5, 0.5, COLOR_WHITE, wrap, description);
+    char description[0x81] = {0};
+    utf16_to_utf8((u8*)description, entry->desc, 0x80);
+    draw_text_wrap(20, 70, 0.5, 0.5, 0.5, colors[COLOR_WHITE], description, 363);
 }
 
 void draw_grid_interface(Entry_List_s* list, Instructions_s instructions)
@@ -322,12 +508,12 @@ void draw_grid_interface(Entry_List_s* list, Instructions_s instructions)
     draw_base_interface();
     EntryMode current_mode = list->mode;
 
-    const char* mode_string[MODE_AMOUNT] = {
-        "ThemePlaza Theme mode",
-        "ThemePlaza Splash mode",
+    C2D_Text* mode_string[MODE_AMOUNT] = {
+        &text[TEXT_THEMEPLAZA_THEME_MODE],
+        &text[TEXT_THEMEPLAZA_SPLASH_MODE],
     };
 
-    pp2d_draw_text_center(GFX_TOP, 4, 0.5, 0.5, COLOR_WHITE, mode_string[current_mode]);
+    draw_c2d_text_center(GFX_TOP, 4, 0.5f, 0.5f, 0.5f, colors[COLOR_WHITE], mode_string[current_mode]);
 
     draw_instructions(instructions);
 
@@ -335,17 +521,18 @@ void draw_grid_interface(Entry_List_s* list, Instructions_s instructions)
     Entry_s * current_entry = &list->entries[selected_entry];
     draw_entry_info(current_entry);
 
-    pp2d_draw_on(GFX_BOTTOM, GFX_LEFT);
+    set_screen(bottom);
 
-    pp2d_draw_text(7, 3, 0.6, 0.6, COLOR_WHITE, "Search...");
+    draw_c2d_text(7, 3, 0.5f, 0.6f, 0.6f, colors[COLOR_WHITE], &text[TEXT_SEARCH]);
 
-    pp2d_draw_texture_blend(TEXTURE_LIST, 320-96, 0, COLOR_WHITE);
-    pp2d_draw_texture_blend(TEXTURE_EXIT, 320-72, 0, COLOR_WHITE);
-    pp2d_draw_texture_blend(TEXTURE_PREVIEW_ICON, 320-48, 0, COLOR_WHITE);
-    pp2d_draw_textf(320-24+2.5, -3, 1, 1, COLOR_WHITE, "%c", mode_string[!list->mode][11]);
+    draw_image(sprites_list_idx, 320-96, 0);
+    draw_image(sprites_exit_idx, 320-72, 0);
+    draw_image(sprites_preview_idx, 320-48, 0);
 
-    pp2d_draw_texture(TEXTURE_ARROW_SIDE, 3, 114);
-    pp2d_draw_texture_flip(TEXTURE_ARROW_SIDE, 308, 114, HORIZONTAL);
+    draw_text(320-24+2.5, -3, 0.6, 1.0f, 0.9f, colors[COLOR_WHITE], mode_switch_char[!current_mode]);
+
+    draw_image(sprites_arrow_left_idx, 3, 114);
+    draw_image(sprites_arrow_right_idx, 308, 114);
 
     for(int i = list->scroll; i < (list->entries_loaded + list->scroll); i++)
     {
@@ -353,8 +540,8 @@ void draw_grid_interface(Entry_List_s* list, Instructions_s instructions)
 
         current_entry = &list->entries[i];
 
-        wchar_t name[0x41] = {0};
-        utf16_to_utf32((u32*)name, current_entry->name, 0x40);
+        char name[0x41] = {0};
+        utf16_to_utf8((u8*)name, current_entry->name, 0x40);
 
         int vertical_offset = 0;
         int horizontal_offset = i - list->scroll;
@@ -366,36 +553,44 @@ void draw_grid_interface(Entry_List_s* list, Instructions_s instructions)
         vertical_offset += 24;
         horizontal_offset += 16;
 
+        // theoretically impossible to have no icon when from the api
+        /*
         if(!current_entry->placeholder_color)
         {
-            ssize_t id = list->icons_ids[i];
-            pp2d_draw_texture(id, horizontal_offset, vertical_offset);
+        */
+            C2D_Image * image = list->icons[i];
+            C2D_DrawImageAt(*image, horizontal_offset, vertical_offset, 0.5f, NULL, 1.0f, 1.0f);
+        /*
         }
         else
-            pp2d_draw_rectangle(horizontal_offset, vertical_offset, list->entry_size, list->entry_size, current_entry->placeholder_color);
+            C2D_DrawRectSolid(horizontal_offset, vertical_offset, 0.5f, list->entry_size, list->entry_size, current_entry->placeholder_color);
+        */
 
         if(i == selected_entry)
         {
             unsigned int border_width = 3;
-            pp2d_draw_rectangle(horizontal_offset, vertical_offset, border_width, list->entry_size, COLOR_CURSOR);
-            pp2d_draw_rectangle(horizontal_offset, vertical_offset, list->entry_size, border_width, COLOR_CURSOR);
-            pp2d_draw_rectangle(horizontal_offset, vertical_offset+list->entry_size-border_width, list->entry_size, border_width, COLOR_CURSOR);
-            pp2d_draw_rectangle(horizontal_offset+list->entry_size-border_width, vertical_offset, border_width, list->entry_size, COLOR_CURSOR);
+            C2D_DrawRectSolid(horizontal_offset, vertical_offset, 0.5f, border_width, list->entry_size, colors[COLOR_CURSOR]);
+            C2D_DrawRectSolid(horizontal_offset, vertical_offset, 0.5f, list->entry_size, border_width, colors[COLOR_CURSOR]);
+            C2D_DrawRectSolid(horizontal_offset, vertical_offset+list->entry_size-border_width, 0.5f, list->entry_size, border_width, colors[COLOR_CURSOR]);
+            C2D_DrawRectSolid(horizontal_offset+list->entry_size-border_width, vertical_offset, 0.5f, border_width, list->entry_size, colors[COLOR_CURSOR]);
         }
     }
 
     char entries_count_str[0x20] = {0};
     sprintf(entries_count_str, "/%"  JSON_INTEGER_FORMAT, list->tp_page_count);
     float x = 316;
-    x -= pp2d_get_text_width(entries_count_str, 0.6, 0.6);
-    pp2d_draw_text(x, 219, 0.6, 0.6, COLOR_WHITE, entries_count_str);
+    float width = 0;
+    get_text_dimensions(entries_count_str, 0.6, 0.6, &width, NULL);
+    x -= width;
+    draw_text(x, 219, 0.5, 0.6, 0.6, colors[COLOR_WHITE], entries_count_str);
 
     char selected_entry_str[0x20] = {0};
     sprintf(selected_entry_str, "%"  JSON_INTEGER_FORMAT, list->tp_current_page);
-    x -= pp2d_get_text_width(selected_entry_str, 0.6, 0.6);
-    pp2d_draw_text(x, 219, 0.6, 0.6, COLOR_WHITE, selected_entry_str);
+    get_text_dimensions(selected_entry_str, 0.6, 0.6, &width, NULL);
+    x -= width;
+    draw_text(x, 219, 0.5, 0.6, 0.6, colors[COLOR_WHITE], selected_entry_str);
 
-    pp2d_draw_text(176, 219, 0.6, 0.6, COLOR_WHITE, "Page:");
+    draw_c2d_text(176, 219, 0.5, 0.6, 0.6, colors[COLOR_WHITE], &text[TEXT_PAGE]);
 }
 
 void draw_interface(Entry_List_s* list, Instructions_s instructions)
@@ -403,40 +598,47 @@ void draw_interface(Entry_List_s* list, Instructions_s instructions)
     draw_base_interface();
     EntryMode current_mode = list->mode;
 
-    const char* mode_string[MODE_AMOUNT] = {
-        "Theme mode",
-        "Splash mode",
+    C2D_Text* mode_string[MODE_AMOUNT] = {
+        &text[TEXT_THEME_MODE],
+        &text[TEXT_SPLASH_MODE],
     };
 
-    pp2d_draw_text_center(GFX_TOP, 4, 0.5, 0.5, COLOR_WHITE, mode_string[current_mode]);
+    draw_c2d_text_center(GFX_TOP, 4, 0.5f, 0.5f, 0.5f, colors[COLOR_WHITE], mode_string[current_mode]);
 
     if(list->entries == NULL)
     {
-        const char* mode_found_string[MODE_AMOUNT] = {
-            "No themes found",
-            "No splashes found",
+        C2D_Text* mode_found_string[MODE_AMOUNT] = {
+            &text[TEXT_NO_THEME_FOUND],
+            &text[TEXT_NO_SPLASH_FOUND],
         };
-        pp2d_draw_text_center(GFX_TOP, 80, 0.7, 0.7, COLOR_YELLOW, mode_found_string[current_mode]);
-        pp2d_draw_text_center(GFX_TOP, 110, 0.7, 0.7, COLOR_YELLOW, "Press \uE005 to download from QR");
-        const char* mode_switch_string[MODE_AMOUNT] = {
-            "Or \uE004 to switch to splashes",
-            "Or \uE004 to switch to themes",
+
+        draw_c2d_text_center(GFX_TOP, 80, 0.5f, 0.7f, 0.7f, colors[COLOR_YELLOW], mode_found_string[current_mode]);
+        draw_c2d_text_center(GFX_TOP, 110, 0.5f, 0.7f, 0.7f, colors[COLOR_YELLOW], &text[TEXT_DOWNLOAD_FROM_QR]);
+
+        C2D_Text* mode_switch_string[MODE_AMOUNT] = {
+            &text[TEXT_SWITCH_TO_SPLASHES],
+            &text[TEXT_SWITCH_TO_THEMES],
         };
-        pp2d_draw_text_center(GFX_TOP, 140, 0.7, 0.7, COLOR_YELLOW, mode_switch_string[current_mode]);
-        pp2d_draw_text_center(GFX_TOP, 170, 0.7, 0.7, COLOR_YELLOW, "Or        to quit");
-        pp2d_texture_select(TEXTURE_START_BUTTON, 162, 173);
-        pp2d_texture_blend(COLOR_YELLOW);
-        pp2d_texture_scale(1.25, 1.4);
-        pp2d_texture_draw();
 
-        pp2d_draw_on(GFX_BOTTOM, GFX_LEFT);
+        draw_c2d_text_center(GFX_TOP, 140, 0.5f, 0.7f, 0.7f, colors[COLOR_YELLOW], mode_switch_string[current_mode]);
+        draw_c2d_text_center(GFX_TOP, 170, 0.5f, 0.7f, 0.7f, colors[COLOR_YELLOW], &text[TEXT_OR_START_TO_QUIT]);
 
-        pp2d_draw_texture_blend(TEXTURE_SORT, 320-144, 0, COLOR_WHITE);
-        pp2d_draw_texture_blend(TEXTURE_DOWNLOAD, 320-120, 0, COLOR_WHITE);
-        pp2d_draw_texture_blend(TEXTURE_BROWSE, 320-96, 0, COLOR_WHITE);
-        pp2d_draw_texture_blend(TEXTURE_EXIT, 320-72, 0, COLOR_WHITE);
-        pp2d_draw_texture_blend(TEXTURE_PREVIEW_ICON, 320-48, 0, COLOR_WHITE);
-        pp2d_draw_textf(320-24+2.5, -3, 1, 1, COLOR_WHITE, "%c", mode_string[!list->mode][0]);
+        C2D_ImageTint yellow_tint;
+        C2D_PlainImageTint(&yellow_tint, colors[COLOR_YELLOW], 1.0f);
+        C2D_SpriteSetPos(&sprite_start, 162, 173);
+        C2D_SpriteSetScale(&sprite_start, 1.25f, 1.4f);
+        C2D_DrawSpriteTinted(&sprite_start, &yellow_tint);
+        C2D_SpriteSetScale(&sprite_start, 1.0f, 1.0f);
+
+        set_screen(bottom);
+
+        draw_image(sprites_sort_idx, 320-144, 0);
+        draw_image(sprites_download_idx, 320-120, 0);
+        draw_image(sprites_browse_idx, 320-96, 0);
+        draw_image(sprites_exit_idx, 320-72, 0);
+        draw_image(sprites_preview_idx, 320-48, 0);
+
+        draw_text(320-24+2.5, -3, 0.6, 1.0f, 0.9f, colors[COLOR_WHITE], mode_switch_char[!current_mode]);
 
         return;
     }
@@ -447,30 +649,30 @@ void draw_interface(Entry_List_s* list, Instructions_s instructions)
     Entry_s * current_entry = &list->entries[selected_entry];
     draw_entry_info(current_entry);
 
-    pp2d_draw_on(GFX_BOTTOM, GFX_LEFT);
+    set_screen(bottom);
 
-    switch(current_mode)
+    if(current_mode == MODE_THEMES)
     {
-        case MODE_THEMES:
-            pp2d_draw_textf(7, 3, 0.6, 0.6, list->shuffle_count <= 10 && list->shuffle_count >= 2 ? COLOR_WHITE : COLOR_RED, "Shuffle: %i/10", list->shuffle_count);
-            break;
-        default:
-            break;
+        char * shuffle_count_string = NULL;
+        asprintf(&shuffle_count_string, "Shuffle: %i/10", list->shuffle_count);
+        draw_text(7, 3, 0.6, 0.6, 0.6f, list->shuffle_count <= 10 && list->shuffle_count >= 2 ? colors[COLOR_WHITE] : colors[COLOR_RED], shuffle_count_string);
+        free(shuffle_count_string);
     }
 
-    pp2d_draw_texture_blend(TEXTURE_SORT, 320-144, 0, COLOR_WHITE);
-    pp2d_draw_texture_blend(TEXTURE_DOWNLOAD, 320-120, 0, COLOR_WHITE);
-    pp2d_draw_texture_blend(TEXTURE_BROWSE, 320-96, 0, COLOR_WHITE);
-    pp2d_draw_texture_blend(TEXTURE_EXIT, 320-72, 0, COLOR_WHITE);
-    pp2d_draw_texture_blend(TEXTURE_PREVIEW_ICON, 320-48, 0, COLOR_WHITE);
-    pp2d_draw_textf(320-24+2.5, -3, 1, 1, COLOR_WHITE, "%c", mode_string[!list->mode][0]);
+    draw_image(sprites_sort_idx, 320-144, 0);
+    draw_image(sprites_download_idx, 320-120, 0);
+    draw_image(sprites_browse_idx, 320-96, 0);
+    draw_image(sprites_exit_idx, 320-72, 0);
+    draw_image(sprites_preview_idx, 320-48, 0);
+
+    draw_text(320-24+2.5, -3, 0.6, 1.0f, 0.9f, colors[COLOR_WHITE], mode_switch_char[!current_mode]);
 
     // Show arrows if there are themes out of bounds
     //----------------------------------------------------------------
     if(list->scroll > 0)
-        pp2d_draw_texture(TEXTURE_ARROW, 152, 4);
+        draw_image(sprites_arrow_up_idx, 152, 4);
     if(list->scroll + list->entries_loaded < list->entries_count)
-        pp2d_draw_texture_flip(TEXTURE_ARROW, 152, 220, VERTICAL);
+        draw_image(sprites_arrow_down_idx, 152, 220);
 
     for(int i = list->scroll; i < (list->entries_loaded + list->scroll); i++)
     {
@@ -478,8 +680,8 @@ void draw_interface(Entry_List_s* list, Instructions_s instructions)
 
         current_entry = &list->entries[i];
 
-        wchar_t name[0x41] = {0};
-        utf16_to_utf32((u32*)name, current_entry->name, 0x40);
+        char name[0x41] = {0};
+        utf16_to_utf8((u8*)name, current_entry->name, 0x40);
 
         int vertical_offset = i - list->scroll;
         int horizontal_offset = 0;
@@ -487,47 +689,67 @@ void draw_interface(Entry_List_s* list, Instructions_s instructions)
         vertical_offset *= list->entry_size;
         vertical_offset += 24;
 
-        u32 font_color = COLOR_WHITE;
+        u32 font_color = colors[COLOR_WHITE];
 
         if(i == selected_entry)
         {
-            font_color = COLOR_BLACK;
-            pp2d_draw_rectangle(0, vertical_offset, 320, list->entry_size, COLOR_CURSOR);
+            font_color = colors[COLOR_BLACK];
+            C2D_DrawRectSolid(0, vertical_offset, 0.5f, 320, list->entry_size, colors[COLOR_CURSOR]);
         }
 
-        pp2d_draw_wtext(list->entry_size+6, vertical_offset + 16, 0.55, 0.55, font_color, name);
+        draw_text(list->entry_size+6, vertical_offset + 16, 0.5f, 0.55, 0.55, font_color, name);
+
+        C2D_ImageTint tint;
+        C2D_PlainImageTint(&tint, font_color, 1.0f);
 
         if(current_entry->no_bgm_shuffle)
-            pp2d_draw_texture_blend(TEXTURE_SHUFFLE_NO_BGM, 320-24-4, vertical_offset, font_color);
+        {
+            C2D_SpriteSetPos(&sprite_shuffle_no_bgm, 320-24-4, vertical_offset);
+            C2D_DrawSpriteTinted(&sprite_shuffle_no_bgm, &tint);
+        }
         else if(current_entry->in_shuffle)
-            pp2d_draw_texture_blend(TEXTURE_SHUFFLE, 320-24-4, vertical_offset, font_color);
+        {
+            C2D_SpriteSetPos(&sprite_shuffle, 320-24-4, vertical_offset);
+            C2D_DrawSpriteTinted(&sprite_shuffle, &tint);
+        }
 
         if(current_entry->installed)
-            pp2d_draw_texture_blend(TEXTURE_INSTALLED, 320-24-4, vertical_offset + 22, font_color);
+        {
+            C2D_SpriteSetPos(&sprite_installed, 320-24-4, vertical_offset + 22);
+            C2D_DrawSpriteTinted(&sprite_installed, &tint);
+        }
 
         if(!current_entry->placeholder_color)
         {
-            ssize_t id = 0;
+            C2D_Image * image = NULL;
             if(list->entries_count > list->entries_loaded*ICONS_OFFSET_AMOUNT)
-                id = list->icons_ids[ICONS_VISIBLE*list->entries_loaded + (i - list->scroll)];
+                image = list->icons[ICONS_VISIBLE*list->entries_loaded + (i - list->scroll)];
             else
-                id = list->icons_ids[i];
-            pp2d_draw_texture(id, horizontal_offset, vertical_offset);
+                image = list->icons[i];
+            C2D_DrawImageAt(*image, horizontal_offset, vertical_offset, 0.5f, NULL, 1.0f, 1.0f);
         }
         else
-            pp2d_draw_rectangle(horizontal_offset, vertical_offset, list->entry_size, list->entry_size, current_entry->placeholder_color);
+        {
+            C2D_DrawRectSolid(horizontal_offset, vertical_offset, 0.5f, list->entry_size, list->entry_size, current_entry->placeholder_color);
+        }
     }
 
     char entries_count_str[0x20] = {0};
     sprintf(entries_count_str, "/%i", list->entries_count);
     float x = 316;
-    x -= pp2d_get_text_width(entries_count_str, 0.6, 0.6);
-    pp2d_draw_text(x, 219, 0.6, 0.6, COLOR_WHITE, entries_count_str);
+    float width = 0;
+    get_text_dimensions(entries_count_str, 0.6, 0.6, &width, NULL);
+    x -= width;
+    draw_text(x, 219, 0.5, 0.6, 0.6, colors[COLOR_WHITE], entries_count_str);
 
     char selected_entry_str[0x20] = {0};
     sprintf(selected_entry_str, "%i", selected_entry + 1);
-    x -= pp2d_get_text_width(selected_entry_str, 0.6, 0.6);
-    pp2d_draw_text(x, 219, 0.6, 0.6, COLOR_WHITE, selected_entry_str);
+    get_text_dimensions(selected_entry_str, 0.6, 0.6, &width, NULL);
+    x -= width;
+    draw_text(x, 219, 0.5, 0.6, 0.6, colors[COLOR_WHITE], selected_entry_str);
 
-    pp2d_draw_text(176, 219, 0.6, 0.6, COLOR_WHITE, list->entries_count < 1000 ? "Selected:" : "Sel.:");
+    if(list->entries_count < 10000)
+        draw_c2d_text(176, 219, 0.5, 0.6, 0.6, colors[COLOR_WHITE], &text[TEXT_SELECTED]);
+    else
+        draw_c2d_text(176, 219, 0.5, 0.6, 0.6, colors[COLOR_WHITE], &text[TEXT_SELECTED_SHORT]);
 }

source/fs.c

@@ -1,6 +1,6 @@
 /*
 *   This file is part of Anemone3DS
-*   Copyright (C) 2016-2018 Contributors in CONTRIBUTORS.md
+*   Copyright (C) 2016-2020 Contributors in CONTRIBUTORS.md
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -32,6 +32,10 @@
 #include <archive.h>
 #include <archive_entry.h>
 
+FS_Archive ArchiveSD;
+FS_Archive ArchiveHomeExt;
+FS_Archive ArchiveThemeExt;
+
 Result open_archives(void)
 {
     romfsInit();
@@ -172,6 +176,7 @@ u32 zip_file_to_buf(char *file_name, u16 *zip_path, char **buf)
     archive_read_support_format_zip(a);
 
     int r = archive_read_open_filename(a, path, 0x4000);
+    free(path);
     if(r != ARCHIVE_OK)
     {
         DEBUG("Invalid zip being opened\n");
@@ -191,6 +196,148 @@ Result buf_to_file(u32 size, FS_Path path, FS_Archive archive, char *buf)
     return 0;
 }
 
+u32 decompress_lz_file(FS_Path file_name, FS_Archive archive, char **buf)
+{
+    Handle handle;
+    Result res = 0;
+    if (R_FAILED(res = FSUSER_OpenFile(&handle, archive, file_name, FS_OPEN_READ, 0))) {
+        DEBUG("%lu\n", res);
+        return 0;
+    }
+    u64 size;
+    FSFILE_GetSize(handle, &size);
+
+    char *temp_buf = NULL;
+
+    if(size != 0)
+    {
+        temp_buf = calloc(1, size);
+        FSFILE_Read(handle, NULL, 0, temp_buf, size);
+    }
+    FSFILE_Close(handle);
+
+    if (temp_buf[0] != 0x11) {
+        free(temp_buf);
+        return 0;
+    }
+
+    u32 output_size = temp_buf[1] | ((temp_buf[2] << 8) & 0xFF00) | ((temp_buf[3] << 16) & 0xFF0000);
+    printf("%ld\n", output_size);
+
+
+    *buf = calloc(1, output_size);
+
+    u32 pos = 4;
+    u32 cur_written = 0;
+    u8 counter = 0;
+    u8 mask = 0;
+
+    while (cur_written < output_size)
+    {
+        if (counter == 0) // read mask
+        {
+            mask = temp_buf[pos++];
+            counter++;
+            continue;
+        }
+
+        if ((mask >> (8 - counter)) & 0x01) // compressed block
+        {
+            int len = 0;
+            int disp = 0;
+            switch (temp_buf[pos] >> 4)
+            {
+                case 0:
+                    len  = temp_buf[pos++] << 4;
+                    len |= temp_buf[pos] >> 4;
+                    len += 0x11;
+                    break;
+
+                case 1:
+                    len  = (temp_buf[pos++] & 0x0F) << 12;
+                    len |=  temp_buf[pos++] << 4;
+                    len |=  temp_buf[pos] >> 4;
+                    len += 0x111;
+                    break;
+
+                default:
+                    len  = (temp_buf[pos] >> 4) + 1;
+            }
+
+            disp  = (temp_buf[pos++] & 0x0F) << 8;
+            disp |=  temp_buf[pos++];
+
+            for (int i = 0; i < len; ++i)
+            {
+                *(*buf + cur_written + i) = *(*buf + cur_written - disp - 1 + i);
+            }
+
+            cur_written += len;
+        }
+        else // byte literal
+        {
+            *(*buf + cur_written) = temp_buf[pos++];
+            cur_written++;
+        }
+
+        if (++counter > 8) counter = 0;
+
+    }
+
+
+    free(temp_buf);
+
+    return cur_written;
+}
+
+// This is an awful algorithm to "compress" LZ11 data.
+// We do this instead of actual LZ11 compression because of time -
+// LZ11 requires a lot of mem searching which is painfully slow on 3DS.
+// This process is nearly instant but means the resulting file is actually larger
+// than the input file. I don't think this is a problem as the only file we compress like this
+// is the theme data installed to extdata in some rare cases, which means only 1 file at most
+// is ever compressed like this. I don't think 400 KB is that big a sacrifice for probably
+// half a minute or so of time save - I may change my mind on this in the future, especially
+// if i figure out a dynamic programming algorithm which ends up being significantly
+// faster. Otherwise, I think this is probably a fine implementation.
+
+u32 compress_lz_file_fast(FS_Path path, FS_Archive archive, char *in_buf, u32 size)
+{
+    char *output_buf = calloc(1, size * 2);
+    u32 output_size = 0;
+    u32 mask_pos = 0;
+    u32 bytes_processed = 0;
+    u8 counter = 0;
+
+    if (output_buf == NULL) return 0;
+
+    // Set header data for the LZ11 file - 0x11 is version (LZ11), next 3 bytes are size
+    output_buf[0] = 0x11;
+    output_buf[3] = (size & 0xFF0000) >> 16;
+    output_buf[2] = (size & 0xFF00) >> 8;
+    output_buf[1] = (size & 0xFF);
+
+    output_size += 4;
+
+    while (bytes_processed < size)
+    {
+        if (counter == 0)
+        {
+            mask_pos = output_size++;
+            output_buf[mask_pos] = 0;
+        }
+
+        output_buf[output_size++] = in_buf[bytes_processed++];
+
+        if (++counter == 8) counter = 0;
+    }
+
+    buf_to_file(output_size, path, archive, output_buf);
+    free(output_buf);
+
+    return output_size;
+}
+
 void remake_file(FS_Path path, FS_Archive archive, u32 size)
 {
     Handle handle;
@@ -200,4 +347,7 @@ void remake_file(FS_Path path, FS_Archive archive, u32 size)
         FSUSER_DeleteFile(archive, path);
     }
     FSUSER_CreateFile(archive, path, 0, size);
+    char *buf = calloc(size, 1);
+    buf_to_file(size, path, archive, buf);
+    free(buf);
 }

source/loading.c

@@ -1,6 +1,6 @@
 /*
 *   This file is part of Anemone3DS
-*   Copyright (C) 2016-2018 Contributors in CONTRIBUTORS.md
+*   Copyright (C) 2016-2020 Contributors in CONTRIBUTORS.md
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -25,12 +25,13 @@
 */
 
 #include "loading.h"
-#include "pp2d/pp2d/pp2d.h"
 #include "fs.h"
 #include "unicode.h"
 #include "music.h"
 #include "draw.h"
 
+#include <png.h>
+
 void delete_entry(Entry_s * entry, bool is_file)
 {
     if(is_file)
@@ -55,54 +56,59 @@ u32 load_data(char * filename, Entry_s entry, char ** buf)
     }
 }
 
-static void parse_smdh(Entry_s * entry, const u16 * fallback_name)
+// Function taken and adapted from https://github.com/BernardoGiordano/Checkpoint/blob/master/3ds/source/title.cpp
+C2D_Image * loadTextureIcon(Icon_s *icon)
 {
-    char *info_buffer = NULL;
-    u64 size = load_data("/info.smdh", *entry, &info_buffer);
-    Icon_s * smdh = (Icon_s *)info_buffer;
+    if(icon == NULL)
+        return NULL;
 
-    if(!size)
+    C2D_Image * image = calloc(1, sizeof(C2D_Image));
+    C3D_Tex* tex = malloc(sizeof(C3D_Tex));
+    static const Tex3DS_SubTexture subt3x = { 48, 48, 0.0f, 48/64.0f, 48/64.0f, 0.0f };
+    image->tex = tex;
+    image->subtex = &subt3x;
+    C3D_TexInit(image->tex, 64, 64, GPU_RGB565);
+
+    u16* dest = (u16*)image->tex->data + (64-48)*64;
+    u16* src = icon->big_icon;
+    for (int j = 0; j < 48; j += 8)
+    {
+        memcpy(dest, src, 48*8*sizeof(u16));
+        src += 48*8;
+        dest += 64*8;
+    }
+
+    return image;
+}
+
+void parse_smdh(Icon_s *icon, Entry_s * entry, const u16 * fallback_name)
+{
+ 
+    if(icon == NULL)
     {
-        free(info_buffer);
         memcpy(entry->name, fallback_name, 0x80);
         utf8_to_utf16(entry->desc, (u8*)"No description", 0x100);
         utf8_to_utf16(entry->author, (u8*)"Unknown author", 0x80);
-        entry->placeholder_color = RGBA8(rand() % 255, rand() % 255, rand() % 255, 255);
+        entry->placeholder_color = C2D_Color32(rand() % 255, rand() % 255, rand() % 255, 255);
         return;
     }
 
-    memcpy(entry->name, smdh->name, 0x40*sizeof(u16));
-    memcpy(entry->desc, smdh->desc, 0x80*sizeof(u16));
-    memcpy(entry->author, smdh->author, 0x40*sizeof(u16));
+
+    memcpy(entry->name, icon->name, 0x40*sizeof(u16));
+    memcpy(entry->desc, icon->desc, 0x80*sizeof(u16));
+    memcpy(entry->author, icon->author, 0x40*sizeof(u16));
 }
 
-static void load_smdh_icon(Entry_s entry, const ssize_t textureID)
+static C2D_Image * load_entry_icon(Entry_s entry)
 {
-    pp2d_free_texture(textureID);
-
     char *info_buffer = NULL;
     u64 size = load_data("/info.smdh", entry, &info_buffer);
-    if(!size) return;
+    if(!size) return NULL;
 
     Icon_s * smdh = (Icon_s *)info_buffer;
-
-    const u32 width = 48, height = 48;
-    u32 *image = malloc(width*height*sizeof(u32));
-
-    for(u32 x = 0; x < width; x++)
-    {
-        for(u32 y = 0; y < height; y++)
-        {
-            unsigned int dest_pixel = (x + y*width);
-            unsigned int source_pixel = (((y >> 3) * (width >> 3) + (x >> 3)) << 6) + ((x & 1) | ((y & 1) << 1) | ((x & 2) << 1) | ((y & 2) << 2) | ((x & 4) << 2) | ((y & 4) << 3));
-
-            image[dest_pixel] = RGB565_TO_ABGR8(smdh->big_icon[source_pixel]);
-        }
-    }
-
+    C2D_Image* out = loadTextureIcon(smdh);
     free(info_buffer);
-    pp2d_load_texture_memory(textureID, (u8*)image, (u32)width, (u32)height);
-    free(image);
+    return out;
 }
 
 typedef int (*sort_comparator)(const void *, const void *);
@@ -172,14 +178,31 @@ Result load_entries(const char * loading_path, Entry_List_s * list)
         if(!(dir_entry.attributes & FS_ATTRIBUTE_DIRECTORY) && strcmp(dir_entry.shortExt, "ZIP"))
             continue;
 
+        u16 path[0x106] = {0};
+        struacat(path, loading_path);
+        strucat(path, dir_entry.name);
+        char * buf = NULL;
+
+        if (!strcmp(dir_entry.shortExt, "ZIP"))
+        {
+            zip_file_to_buf("info.smdh", path, &buf);
+        }
+        else
+        {
+            const ssize_t len = strulen(path, 0x106);
+            struacat(path, "/info.smdh");
+            file_to_buf(fsMakePath(PATH_UTF16, path), ArchiveSD, &buf);
+            memset(&path[len], 0, (0x106 - len) * sizeof(u16));
+        }
+
         list->entries_count++;
         Entry_s * new_list = realloc(list->entries, list->entries_count * sizeof(Entry_s));
         if(new_list == NULL)
         {
-            free(list->entries);
-            list->entries = NULL;
-            res = -1;
-            DEBUG("break\n");
+            // out of memory: still allow use of currently loaded entries.
+            // Many things might die, depending on the heap layout after
+            list->entries_count--;
+            free(buf);
             break;
         }
         else
@@ -187,12 +210,11 @@ Result load_entries(const char * loading_path, Entry_List_s * list)
 
         Entry_s * current_entry = &(list->entries[list->entries_count-1]);
         memset(current_entry, 0, sizeof(Entry_s));
+        parse_smdh((Icon_s *)buf, current_entry, dir_entry.name);
+        free(buf);
 
-        struacat(current_entry->path, loading_path);
-        strucat(current_entry->path, dir_entry.name);
-
+        memcpy(current_entry->path, path, 0x106 * sizeof(u16));
         current_entry->is_zip = !strcmp(dir_entry.shortExt, "ZIP");
-        parse_smdh(current_entry, dir_entry.name);
     }
 
     FSDIR_Close(dir_handle);
@@ -223,12 +245,11 @@ void load_icons_first(Entry_List_s * list, bool silent)
         endi = starti + list->entries_loaded*ICONS_OFFSET_AMOUNT;
     }
 
-    list->icons_ids = calloc(endi-starti, sizeof(ssize_t));
+    list->icons = calloc(endi-starti, sizeof(C2D_Image*));
 
-    ssize_t * icons_ids = list->icons_ids;
-    ssize_t id = list->texture_id_offset;
+    C2D_Image ** icons = list->icons;
 
-    for(int i = starti; i < endi; i++, id++)
+    for(int i = starti; i < endi; i++)
     {
         if(!silent)
             draw_loading_bar(i - starti, endi-starti, INSTALL_LOADING_ICONS);
@@ -240,22 +261,20 @@ void load_icons_first(Entry_List_s * list, bool silent)
             offset -= list->entries_count;
 
         Entry_s current_entry = list->entries[offset];
-        load_smdh_icon(current_entry, id);
-
-        icons_ids[i-starti] = id;
+        icons[i-starti] = load_entry_icon(current_entry);
     }
 }
 
-static void reverse(ssize_t a[], int sz) {
+static void reverse(C2D_Image * a[], int sz) {
     int i, j;
     for (i = 0, j = sz; i < j; i++, j--) {
-        ssize_t tmp = a[i];
+        C2D_Image * tmp = a[i];
         a[i] = a[j];
         a[j] = tmp;
     }
 }
 
-static void rotate(ssize_t array[], int size, int amt) {
+static void rotate(C2D_Image * array[], int size, int amt) {
     if (amt < 0)
         amt = size + amt;
     reverse(array, size-amt-1);
@@ -314,15 +333,15 @@ void handle_scrolling(Entry_List_s * list)
     //----------------------------------------------------------------
 }
 
-static void load_icons(Entry_List_s * current_list)
+static bool load_icons(Entry_List_s * current_list, Handle mutex)
 {
     if(current_list == NULL || current_list->entries == NULL)
-        return;
+        return false;
 
     handle_scrolling(current_list);
 
     if(current_list->entries_count <= current_list->entries_loaded*ICONS_OFFSET_AMOUNT || current_list->previous_scroll == current_list->scroll)
-        return; // return if the list is one that doesnt need swapping, or if nothing changed
+        return false; // return if the list is one that doesnt need swapping, or if nothing changed
 
     #define SIGN(x) (x > 0 ? 1 : ((x < 0) ? -1 : 0))
 
@@ -341,28 +360,26 @@ static void load_icons(Entry_List_s * current_list)
 
     int ctr = 0;
     Entry_s ** entries = calloc(abs(delta), sizeof(Entry_s *));
-    ssize_t * ids = calloc(abs(delta), sizeof(ssize_t));
+    int * indexes = calloc(abs(delta), sizeof(int));
+    bool released = false;
 
-    #define FIRST(arr) arr[0]
-    #define LAST(arr) arr[current_list->entries_loaded*ICONS_OFFSET_AMOUNT - 1]
-
-    ssize_t * icons_ids = current_list->icons_ids;
+    C2D_Image ** icons = current_list->icons;
 
     for(int i = starti; i != endi; i++, ctr++)
     {
-        ssize_t id = 0;
+        int index = 0;
         int offset = i;
 
-        rotate(icons_ids, ICONS_OFFSET_AMOUNT*current_list->entries_loaded, -1*SIGN(delta));
+        rotate(icons, ICONS_OFFSET_AMOUNT*current_list->entries_loaded, -1*SIGN(delta));
 
         if(delta > 0)
         {
-            id = LAST(icons_ids);
+            index = current_list->entries_loaded*ICONS_OFFSET_AMOUNT - delta + i - starti;
             offset += current_list->entries_loaded*ICONS_UNDER - delta;
         }
         else
         {
-            id = FIRST(icons_ids);
+            index = 0 - delta - 1 + i - starti;
             offset -= current_list->entries_loaded*ICONS_VISIBLE;
             i -= 2; //i-- twice to counter the i++, needed only for this case
         }
@@ -373,43 +390,176 @@ static void load_icons(Entry_List_s * current_list)
             offset -= current_list->entries_count;
 
         entries[ctr] = &current_list->entries[offset];
-        ids[ctr] = id;
+        indexes[ctr] = index;
     }
 
-    #undef FIRST
-    #undef LAST
     #undef SIGN
 
-    svcSleepThread(1e6);
-    for(int i = 0; i < abs(delta); i++)
+    if(abs(delta) < 4)
     {
-        Entry_s current_entry = *entries[i];
-        ssize_t id = ids[i];
-        load_smdh_icon(current_entry, id);
+        svcReleaseMutex(mutex);
+        released = true;
+    }
+
+    svcSleepThread(1e7);
+    starti = 0;
+    endi = abs(delta);
+    for(int i = starti; i < endi; i++)
+    {
+        Entry_s * current_entry = entries[i];
+        int index = indexes[i];
+
+        C2D_Image * image = icons[index];
+        if (icons[index] != NULL)
+        {
+            C3D_TexDelete(image->tex);
+            free(image->tex);
+            free(image);
+        }
+
+        icons[index] = load_entry_icon(*current_entry);
+
+        if(!released && i > endi/2)
+        {
+            svcReleaseMutex(mutex);
+            released = true;
+        }
     }
 
     free(entries);
-    free(ids);
+    free(indexes);
 
     current_list->previous_scroll = current_list->scroll;
+
+    return released;
 }
 
 void load_icons_thread(void * void_arg)
 {
     Thread_Arg_s * arg = (Thread_Arg_s *)void_arg;
-    Handle update_request = *(Handle *)arg->thread_arg[1];
+    Handle mutex = *(Handle *)arg->thread_arg[1];
     do
     {
-        svcWaitSynchronization(update_request, U64_MAX);
-        svcClearEvent(update_request);
+        svcWaitSynchronization(mutex, U64_MAX);
         volatile Entry_List_s * current_list = *(volatile Entry_List_s **)arg->thread_arg[0];
-        load_icons((Entry_List_s *)current_list);
+        bool released = load_icons((Entry_List_s *)current_list, mutex);
+        if(!released)
+            svcReleaseMutex(mutex);
     }
     while(arg->run_thread);
 }
 
+bool load_preview_from_buffer(void * buf, u32 size, C2D_Image * preview_image, int * preview_offset)
+{
+    if(size < 8 || png_sig_cmp(buf, 0, 8))
+    {
+        throw_error("Invalid preview.png", ERROR_LEVEL_WARNING);
+        return false;
+    }
+
+    png_structp png = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
+
+    png_infop info = png_create_info_struct(png);
+
+    if(setjmp(png_jmpbuf(png)))
+    {
+        png_destroy_read_struct(&png, &info, NULL);
+        return false;
+    }
+
+    FILE * fp = fmemopen(buf, size, "rb");
+
+    png_init_io(png, fp);
+    png_read_info(png, info);
+
+    int width = png_get_image_width(png, info);
+    int height = png_get_image_height(png, info);
+
+    png_byte color_type = png_get_color_type(png, info);
+    png_byte bit_depth  = png_get_bit_depth(png, info);
+
+    // Read any color_type into 8bit depth, ABGR format.
+    // See http://www.libpng.org/pub/png/libpng-manual.txt
+
+    if(bit_depth == 16)
+        png_set_strip_16(png);
+
+    if(color_type == PNG_COLOR_TYPE_PALETTE)
+        png_set_palette_to_rgb(png);
+
+    // PNG_COLOR_TYPE_GRAY_ALPHA is always 8 or 16bit depth.
+    if(color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8)
+        png_set_expand_gray_1_2_4_to_8(png);
+
+    if(png_get_valid(png, info, PNG_INFO_tRNS))
+        png_set_tRNS_to_alpha(png);
+
+    // These color_type don't have an alpha channel then fill it with 0xff.
+    if(color_type == PNG_COLOR_TYPE_RGB ||
+       color_type == PNG_COLOR_TYPE_GRAY ||
+       color_type == PNG_COLOR_TYPE_PALETTE)
+        png_set_add_alpha(png, 0xFF, PNG_FILLER_BEFORE);
+
+    if(color_type == PNG_COLOR_TYPE_GRAY ||
+       color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
+        png_set_gray_to_rgb(png);
+
+    //output ABGR
+    png_set_bgr(png);
+    png_set_swap_alpha(png);
+
+    png_read_update_info(png, info);
+
+    png_bytep * row_pointers = malloc(sizeof(png_bytep) * height);
+    for(int y = 0; y < height; y++) {
+        row_pointers[y] = (png_byte*)malloc(png_get_rowbytes(png,info));
+    }
+
+    png_read_image(png, row_pointers);
+
+    fclose(fp);
+    png_destroy_read_struct(&png, &info, NULL);
+
+
+    free_preview(*preview_image);
+
+    C3D_Tex* tex = malloc(sizeof(C3D_Tex));
+    preview_image->tex = tex;
+
+    Tex3DS_SubTexture * subt3x = malloc(sizeof(Tex3DS_SubTexture));
+    subt3x->width = width;
+    subt3x->height = height;
+    subt3x->left = 0.0f;
+    subt3x->top = 1.0f;
+    subt3x->right = width/512.0f;
+    subt3x->bottom = 1.0-(height/512.0f);
+    preview_image->subtex = subt3x;
+
+    C3D_TexInit(preview_image->tex, 512, 512, GPU_RGBA8);
+
+    memset(preview_image->tex->data, 0, preview_image->tex->size);
+
+    for(int j = 0; j < height; j++) {
+        png_bytep row = row_pointers[j];
+        for(int i = 0; i < width; i++) {
+            png_bytep px = &(row[i * 4]);
+            u32 dst = ((((j >> 3) * (512 >> 3) + (i >> 3)) << 6) + ((i & 1) | ((j & 1) << 1) | ((i & 2) << 1) | ((j & 2) << 2) | ((i & 4) << 2) | ((j & 4) << 3))) * 4;
+
+            memcpy(preview_image->tex->data + dst, px, sizeof(u32));
+        }
+
+        free(row_pointers[j]);
+    }
+
+    free(row_pointers);
+
+    *preview_offset = (width-400)/2;
+
+    return true;
+}
+
 static u16 previous_path_preview[0x106] = {0};
-bool load_preview(Entry_List_s list, int * preview_offset)
+bool load_preview(Entry_List_s list, C2D_Image * preview_image, int * preview_offset)
 {
     if(list.entries == NULL) return false;
 
@@ -427,49 +577,33 @@ bool load_preview(Entry_List_s list, int * preview_offset)
         return false;
     }
 
-    bool ret = false;
-    u8 * image = NULL;
-    unsigned int width = 0, height = 0;
-
-    if((lodepng_decode32(&image, &width, &height, (u8*)preview_buffer, size)) == 0) // no error
-    {
-        for(u32 i = 0; i < width; i++)
-        {
-            for(u32 j = 0; j < height; j++)
-            {
-                u32* pixel = (u32*)(image + (i + j*width) * 4);
-                *pixel = __builtin_bswap32(*pixel); //swap from RGBA to ABGR, needed for pp2d
-            }
-        }
-
-        // mark the new preview as loaded for optimisation
-        memcpy(&previous_path_preview, &entry.path, 0x106*sizeof(u16));
-        // free the previously loaded preview. wont do anything if there wasnt one
-        pp2d_free_texture(TEXTURE_PREVIEW);
-
-        pp2d_load_texture_memory(TEXTURE_PREVIEW, image, (u32)width, (u32)height);
-
-        *preview_offset = (width-400)/2;
-        ret = true;
-    }
-    else
-    {
-        throw_error("Corrupted/invalid preview.png", ERROR_LEVEL_WARNING);
-    }
-
-    free(image);
+    bool ret = load_preview_from_buffer(preview_buffer, size, preview_image, preview_offset);
     free(preview_buffer);
 
+    if(ret)
+    {
+        // mark the new preview as loaded for optimisation
+        memcpy(&previous_path_preview, &entry.path, 0x106*sizeof(u16));
+    }
+
     return ret;
 }
 
+void free_preview(C2D_Image preview)
+{
+    if(preview.tex)
+        C3D_TexDelete(preview.tex);
+    free(preview.tex);
+    free((Tex3DS_SubTexture*)preview.subtex);
+}
+
 // Initialize the audio struct
 Result load_audio(Entry_s entry, audio_s *audio) 
 {
     audio->filesize = load_data("/bgm.ogg", entry, &audio->filebuf);
     if (audio->filesize == 0) {
         free(audio);
-        DEBUG("File not found!\n");
+        DEBUG("<load_audio> File not found!\n");
         return MAKERESULT(RL_FATAL, RS_NOTFOUND, RM_APPLICATION, RD_NOT_FOUND);
     }
 
@@ -480,13 +614,13 @@ Result load_audio(Entry_s entry, audio_s *audio)
     ndspChnSetMix(0, audio->mix); // See mix comment above
 
     FILE *file = fmemopen(audio->filebuf, audio->filesize, "rb");
-    DEBUG("Filesize: %lld\n", audio->filesize);
+    DEBUG("<load_audio> Filesize: %ld\n", audio->filesize);
     if(file != NULL) 
     {
         int e = ov_open(file, &audio->vf, NULL, 0);
         if (e < 0) 
         {
-            DEBUG("Vorbis: %d\n", e);
+            DEBUG("<load_audio> Vorbis: %d\n", e);
             free(audio->filebuf);
             free(audio);
             fclose(file);
@@ -496,10 +630,10 @@ Result load_audio(Entry_s entry, audio_s *audio)
         vorbis_info *vi = ov_info(&audio->vf, -1);
         ndspChnSetRate(0, vi->rate);// Set sample rate to what's read from the ogg file
         if (vi->channels == 2) {
-            DEBUG("Using stereo\n");
+            DEBUG("<load_audio> Using stereo\n");
             ndspChnSetFormat(0, NDSP_FORMAT_STEREO_PCM16); // 2 channels == Stereo
         } else {
-            DEBUG("Invalid number of channels\n");
+            DEBUG("<load_audio> Invalid number of channels\n");
             free(audio->filebuf);
             free(audio);
             fclose(file);
@@ -510,12 +644,12 @@ Result load_audio(Entry_s entry, audio_s *audio)
         audio->wave_buf[0].status = audio->wave_buf[1].status = NDSP_WBUF_DONE; // Used in play to stop from writing to current buffer
         audio->wave_buf[0].data_vaddr = linearAlloc(BUF_TO_READ); // Most vorbis packets should only be 4 KB at most (?) Possibly dangerous assumption
         audio->wave_buf[1].data_vaddr = linearAlloc(BUF_TO_READ);
-        DEBUG("Success!\n");
+        DEBUG("<load_audio> Success!\n");
         return MAKERESULT(RL_SUCCESS, RS_SUCCESS, RM_APPLICATION, RD_SUCCESS);
     } else {
         free(audio->filebuf);
         free(audio);
-        DEBUG("fmemopen failed!\n");
+        DEBUG("<load_audio> fmemopen failed!\n");
         return MAKERESULT(RL_FATAL, RS_NOTFOUND, RM_APPLICATION, RD_NOT_FOUND);
     }
 }

source/main.c

@@ -1,6 +1,6 @@
 /*
 *   This file is part of Anemone3DS
-*   Copyright (C) 2016-2018 Contributors in CONTRIBUTORS.md
+*   Copyright (C) 2016-2020 Contributors in CONTRIBUTORS.md
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -33,17 +33,18 @@
 #include "music.h"
 #include "remote.h"
 #include "instructions.h"
-#include "pp2d/pp2d/pp2d.h"
 #include <time.h>
 
 bool quit = false;
+bool dspfirm = false;
 audio_s * audio = NULL;
 static bool homebrew = false;
 static bool installed_themes = false;
 
 static Thread iconLoadingThread = {0};
 static Thread_Arg_s iconLoadingThread_arg = {0};
-static Handle update_icons_handle;
+static Handle update_icons_mutex;
+static bool released = false;
 
 static Thread installCheckThreads[MODE_AMOUNT] = {0};
 static Thread_Arg_s installCheckThreads_arg[MODE_AMOUNT] = {0};
@@ -77,9 +78,10 @@ static void init_services(void)
     cfguInit();
     ptmuInit();
     acInit();
-    ndspInit();
+    dspfirm = !ndspInit();
     APT_GetAppCpuTimeLimit(&old_time_limit);
     APT_SetAppCpuTimeLimit(30);
+    // aptSetHomeAllowed(false);
     httpcInit(0);
     archive_result = open_archives();
     if(envIsHomebrew())
@@ -115,20 +117,37 @@ static void exit_thread(void)
     {
         DEBUG("exiting thread\n");
         iconLoadingThread_arg.run_thread = false;
-        svcSignalEvent(update_icons_handle);
+        svcReleaseMutex(update_icons_mutex);
+        svcWaitSynchronization(update_icons_mutex, U64_MAX);
         threadJoin(iconLoadingThread, U64_MAX);
         threadFree(iconLoadingThread);
     }
 }
 
+static void free_icons(Entry_List_s * list)
+{
+    int amount = list->entries_count;
+    if(list->entries_count > list->entries_loaded*ICONS_OFFSET_AMOUNT)
+        amount = list->entries_loaded*ICONS_OFFSET_AMOUNT;
+
+    for(int i = 0; i < amount; i++)
+    {
+        if (list->icons[i] == NULL) continue;
+        C3D_TexDelete(list->icons[i]->tex);
+        free(list->icons[i]->tex);
+        free(list->icons[i]);
+    }
+    free(list->icons);
+}
+
 void free_lists(void)
 {
     stop_install_check();
     for(int i = 0; i < MODE_AMOUNT; i++)
     {
         Entry_List_s * current_list = &lists[i];
+        free_icons(current_list);
         free(current_list->entries);
-        free(current_list->icons_ids);
         memset(current_list, 0, sizeof(Entry_List_s));
     }
     exit_thread();
@@ -142,7 +161,7 @@ void exit_function(bool power_pressed)
         svcWaitSynchronization(audio->finished, U64_MAX);
     }
     free_lists();
-    svcCloseHandle(update_icons_handle);
+    svcCloseHandle(update_icons_mutex);
     exit_screens();
     exit_services();
 
@@ -170,8 +189,6 @@ static void start_thread(void)
 
 static void load_lists(Entry_List_s * lists)
 {
-    ssize_t texture_id_offset = TEXTURE_ICON;
-
     free_lists();
     for(int i = 0; i < MODE_AMOUNT; i++)
     {
@@ -182,7 +199,6 @@ static void load_lists(Entry_List_s * lists)
             loading_screen = INSTALL_LOADING_SPLASHES;
 
         draw_install(loading_screen);
-        draw_install(loading_screen);
 
         Entry_List_s * current_list = &lists[i];
         current_list->mode = i;
@@ -200,11 +216,8 @@ static void load_lists(Entry_List_s * lists)
 
             DEBUG("total: %i\n", current_list->entries_count);
 
-            current_list->texture_id_offset = texture_id_offset;
             load_icons_first(current_list, false);
 
-            texture_id_offset += current_list->entries_loaded*ICONS_OFFSET_AMOUNT;
-
             void (*install_check_function)(void*) = NULL;
             if(i == MODE_THEMES)
                 install_check_function = themes_check_installed;
@@ -227,6 +240,7 @@ static void load_lists(Entry_List_s * lists)
 
 static SwkbdCallbackResult jump_menu_callback(void* entries_count, const char** ppMessage, const char* text, size_t textlen)
 {
+    (void)textlen;
     int typed_value = atoi(text);
     if(typed_value > *(int*)entries_count)
     {
@@ -311,18 +325,25 @@ static void toggle_shuffle(Entry_List_s * list)
     }
 }
 
+static inline void wait_scroll(void)
+{
+    released = true;
+    svcReleaseMutex(update_icons_mutex);
+    svcSleepThread(FASTSCROLL_WAIT);
+}
+
 int main(void)
 {
     srand(time(NULL));
     init_services();
     init_screens();
 
-    svcCreateEvent(&update_icons_handle, RESET_ONESHOT);
+    svcCreateMutex(&update_icons_mutex, true);
 
     static Entry_List_s * current_list = NULL;
     void * iconLoadingThread_args_void[] = {
         &current_list,
-        &update_icons_handle,
+        &update_icons_mutex,
     };
     iconLoadingThread_arg.thread_arg = iconLoadingThread_args_void;
     iconLoadingThread_arg.run_thread = false;
@@ -339,14 +360,15 @@ int main(void)
     bool preview_mode = false;
     int preview_offset = 0;
 
-    bool qr_mode = false;
     bool install_mode = false;
     bool extra_mode = false;
+    C2D_Image preview = {0};
 
-    while(true)
+    while(aptMainLoop())
     {
         if(quit)
         {
+            free_preview(preview);
             exit_function(false);
             return 0;
         }
@@ -385,10 +407,9 @@ int main(void)
             instructions = extra_instructions[index];
         }
 
-        if(qr_mode) take_picture();
-        else if(preview_mode) 
+        if(preview_mode)
         {
-            draw_preview(TEXTURE_PREVIEW, preview_offset);
+            draw_preview(preview, preview_offset);
         }
         else {
             if(!iconLoadingThread_arg.run_thread)
@@ -398,30 +419,39 @@ int main(void)
             }
             else
             {
-                svcSignalEvent(update_icons_handle);
-                svcSleepThread(5e6);
+                if(!released)
+                {
+                    svcReleaseMutex(update_icons_mutex);
+                    released = true;
+                }
+                svcWaitSynchronization(update_icons_mutex, U64_MAX);
             }
 
             draw_interface(current_list, instructions);
+
             svcSleepThread(1e7);
+            released = false;
         }
 
-        pp2d_end_draw();
+        end_frame();
 
         if(kDown & KEY_START) quit = true;
 
         if(!install_mode && !extra_mode)
         {
-            if(!preview_mode && !qr_mode && kDown & KEY_L) //toggle between splashes and themes
+            if(!preview_mode && kDown & KEY_L) //toggle between splashes and themes
             {
                 switch_mode:
                 current_mode++;
                 current_mode %= MODE_AMOUNT;
                 continue;
             }
-            else if(!qr_mode && !preview_mode && kDown & KEY_R) //toggle QR mode
+            else if(!preview_mode && kDown & KEY_R) //toggle QR mode
             {
                 enable_qr:
+                draw_base_interface();
+                draw_text_center(GFX_TOP, 100, 0.5f, 0.6f, 0.6f, colors[COLOR_WHITE], "Loading QR Scanner...");
+                end_frame();
                 if(R_SUCCEEDED(camInit()))
                 {
                     camExit();
@@ -449,13 +479,18 @@ int main(void)
 
                 continue;
             }
-            else if(!qr_mode && kDown & KEY_Y) //toggle preview mode
+            else if(kDown & KEY_Y && current_list->entries != NULL) //toggle preview mode
             {
                 toggle_preview:
                 if(!preview_mode)
                 {
-                    preview_mode = load_preview(*current_list, &preview_offset);
-                    if(current_mode == MODE_THEMES)
+                    preview_mode = load_preview(*current_list, &preview, &preview_offset);
+                    if(preview_mode)
+                    {
+                        end_frame();
+                        draw_preview(preview, preview_offset);
+                        end_frame();
+                        if(current_mode == MODE_THEMES && dspfirm)
                         {
                             audio = calloc(1, sizeof(audio_s));
                             Result r = load_audio(current_list->entries[current_list->selected_entry], audio);
@@ -463,6 +498,7 @@ int main(void)
                             else audio = NULL;
                         }
                     }
+                }
                 else
                 {
                     preview_mode = false;
@@ -488,7 +524,7 @@ int main(void)
             }
         }
 
-        if(qr_mode || preview_mode || current_list->entries == NULL)
+        if(preview_mode || current_list->entries == NULL)
             goto touch;
 
         int selected_entry = current_list->selected_entry;
@@ -612,6 +648,13 @@ int main(void)
                     {
                         load_icons_first(current_list, false);
                     }
+                    else if((kDown | kHeld) & KEY_DRIGHT)
+                    {
+                        draw_install(INSTALL_DUMPING_THEME);
+                        Result res = dump_theme();
+                        if (R_FAILED(res)) DEBUG("Dump theme result: %lx\n", res);
+                        else load_lists(lists);
+                    }
                 }
                 else if(key_l)
                 {
@@ -650,6 +693,14 @@ int main(void)
                 case MODE_SPLASHES:
                     draw_install(INSTALL_SPLASH);
                     splash_install(*current_entry);
+                    for(int i = 0; i < current_list->entries_count; i++)
+                    {
+                        Entry_s * splash = &current_list->entries[i];
+                        if(splash == current_entry)
+                            splash->installed = true;
+                        else
+                            splash->installed = false;
+                    }
                     break;
                 default:
                     break;
@@ -710,22 +761,22 @@ int main(void)
         else if(kHeld & KEY_CPAD_UP)
         {
             change_selected(current_list, -1);
-            svcSleepThread(FASTSCROLL_WAIT);
+            wait_scroll();
         }
         else if(kHeld & KEY_CPAD_DOWN)
         {
             change_selected(current_list, 1);
-            svcSleepThread(FASTSCROLL_WAIT);
+            wait_scroll();
         }
         else if(kHeld & KEY_CPAD_LEFT)
         {
             change_selected(current_list, -current_list->entries_per_screen_v);
-            svcSleepThread(FASTSCROLL_WAIT);
+            wait_scroll();
         }
         else if(kHeld & KEY_CPAD_RIGHT)
         {
             change_selected(current_list, current_list->entries_per_screen_v);
-            svcSleepThread(FASTSCROLL_WAIT);
+            wait_scroll();
         }
 
         // Movement using the touchscreen
@@ -820,6 +871,9 @@ int main(void)
         }
     }
 
+    free_preview(preview);
+    // aptSetHomeAllowed(true);
     exit_function(true);
+
     return 0;
 }

source/music.c

@@ -1,6 +1,6 @@
 /*
 *   This file is part of Anemone3DS
-*   Copyright (C) 2016-2018 Contributors in CONTRIBUTORS.md
+*   Copyright (C) 2016-2020 Contributors in CONTRIBUTORS.md
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -30,14 +30,14 @@
 // Play a given audio struct
 Result update_audio(audio_s *audio) 
 {
-    long size = BUF_TO_READ - audio->data_read;
-    DEBUG("Audio Size: %ld\n", size);
+    u32 size = audio->wave_buf[audio->buf_pos].nsamples * 4 - audio->data_read;
+    DEBUG("<update_audio> Audio Size: %ld\n", size);
     if (audio->wave_buf[audio->buf_pos].status == NDSP_WBUF_DONE) // only run if the current selected buffer has already finished playing
     { 
-        DEBUG("Attempting ov_read\n");
+        DEBUG("<update_audio> Attempting ov_read\n");
         int bitstream;
-        size_t read = ov_read(&audio->vf, (char*)audio->wave_buf[audio->buf_pos].data_vaddr + audio->data_read, size, &bitstream); // read 1 vorbis packet into wave buffer
-        DEBUG("ov_read successful\n");
+        u32 read = ov_read(&audio->vf, (char*)audio->wave_buf[audio->buf_pos].data_vaddr + audio->data_read, size, &bitstream); // read 1 vorbis packet into wave buffer
+        DEBUG("<update_audio> ov_read successful\n");
 
         if (read <= 0) // EoF or error
         { 
@@ -47,7 +47,7 @@ Result update_audio(audio_s *audio)
                 ov_open(fmemopen(audio->filebuf, audio->filesize, "rb"), &audio->vf, NULL, 0); // Reopen file. Don't need to reinit channel stuff since it's all the same as before
             } else // Error :(
             { 
-                DEBUG("Vorbis play error: %d\n", read);
+                DEBUG("<update_audio> Vorbis play error: %ld\n", read);
                 ndspChnReset(0);
                 return MAKERESULT(RL_FATAL, RS_INVALIDARG, RM_APPLICATION, RD_NO_DATA);
             }
@@ -71,8 +71,8 @@ void thread_audio(void* data) {
     }
     free(audio->filebuf);
     ov_clear(&audio->vf);
-    linearFree(audio->wave_buf[0].data_vaddr);
-    linearFree(audio->wave_buf[1].data_vaddr);
+    linearFree((void*)audio->wave_buf[0].data_vaddr);
+    linearFree((void*)audio->wave_buf[1].data_vaddr);
     while (audio->wave_buf[0].status != NDSP_WBUF_DONE || audio->wave_buf[1].status != NDSP_WBUF_DONE) svcSleepThread(1e7);
     svcSignalEvent(audio->finished);
     svcSleepThread(1e8);

source/pp2d/README.md

@@ -1,14 +0,0 @@
-# [pp2d](https://discord.gg/zqXWgsH)
-
-Plug & Play 2D (unofficial) wrapper for Citro3D. 
-
-## License
-
-pp2d is licensed under the MIT License.
-
-## Changes
-
-* depth parameter (Ryuzaki-MrL)
-* standalone pp2d_free_texture (LiquidFenrir)
-* 3d support (Robz8)
-* load png from memory (ErmanSayin)

source/pp2d/pp2d/pp2d.c

@@ -1,789 +0,0 @@
-/* MIT License
- *
- * Copyright (c) 2017 Bernardo Giordano
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
-
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
-
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * https://discord.gg/zqXWgsH
- */
- 
-/**
- * Plug & Play 2D
- * @file pp2d.c
- * @author Bernardo Giordano
- * @date 26 October 2017
- * @brief pp2d implementation
- */
-
-#include "pp2d.h"
-
-static DVLB_s* vshader_dvlb;
-static shaderProgram_s program;
-static int uLoc_projection;
-static C3D_Mtx projectionTopLeft;
-static C3D_Mtx projectionTopRight;
-static C3D_Mtx projectionBot;
-static C3D_Tex* glyphSheets;
-static textVertex_s* textVtxArray;
-static int textVtxArrayPos;
-static C3D_RenderTarget* topLeft;
-static C3D_RenderTarget* topRight;
-static C3D_RenderTarget* bot;
-
-static struct {
-	GPU_TEXTURE_FILTER_PARAM magFilter;
-	GPU_TEXTURE_FILTER_PARAM minFilter;
-} textureFilters;
-
-static struct {
-	size_t id;
-	int x;
-	int y;
-	int xbegin;
-	int ybegin;
-	int width;
-	int height;
-	u32 color;
-	flipType fliptype;
-	float scaleX;
-	float scaleY;
-	float angle;
-	float depth;
-	bool initialized;
-} textureData;
-
-static struct {
-	C3D_Tex tex;
-	u32 width;
-	u32 height;
-	bool allocated;
-} textures[MAX_TEXTURES];
-
-static void pp2d_add_text_vertex(float vx, float vy, float vz, float tx, float ty);
-static bool pp2d_fast_draw_vbo(int x, int y, int height, int width, float left, float right, float top, float bottom, float depth);
-static u32 pp2d_get_next_pow2(u32 n);
-static void pp2d_get_text_size_internal(float* width, float* height, float scaleX, float scaleY, int wrapX, const char* text);
-static void pp2d_set_text_color(u32 color);
-
-static void pp2d_add_text_vertex(float vx, float vy, float vz, float tx, float ty)
-{
-	textVertex_s* vtx = &textVtxArray[textVtxArrayPos++];
-	vtx->position[0] = vx;
-	vtx->position[1] = vy;
-	vtx->position[2] = vz;
-	vtx->texcoord[0] = tx;
-	vtx->texcoord[1] = ty;
-}
-
-void pp2d_begin_draw(gfxScreen_t target, gfx3dSide_t side)
-{
-	C3D_FrameBegin(C3D_FRAME_SYNCDRAW);
-	textVtxArrayPos = 0;
-	pp2d_draw_on(target, side);
-}
-
-void pp2d_draw_on(gfxScreen_t target, gfx3dSide_t side)
-{
-	if(target == GFX_TOP) {
-		C3D_FrameDrawOn(side == GFX_LEFT ? topLeft : topRight);
-		C3D_FVUnifMtx4x4(GPU_VERTEX_SHADER, uLoc_projection, side == GFX_LEFT ? &projectionTopLeft : &projectionTopRight);
-	} else {
-		C3D_FrameDrawOn(bot);
-		C3D_FVUnifMtx4x4(GPU_VERTEX_SHADER, uLoc_projection, &projectionBot);
-	}
-}
-
-void pp2d_draw_rectangle(int x, int y, int width, int height, u32 color)
-{
-	C3D_TexEnv* env = C3D_GetTexEnv(0);
-	C3D_TexEnvSrc(env, C3D_Both, GPU_CONSTANT, GPU_CONSTANT, 0);
-	C3D_TexEnvOp(env, C3D_Both, 0, 0, 0);
-	C3D_TexEnvFunc(env, C3D_Both, GPU_MODULATE);
-	C3D_TexEnvColor(env, color);
-	
-	if (pp2d_fast_draw_vbo(x, y, height, width, 0, 0, 0, 0, DEFAULT_DEPTH))
-	{
-		C3D_DrawArrays(GPU_TRIANGLE_STRIP, textVtxArrayPos - 4, 4);
-	}
-}
-
-void pp2d_draw_text(float x, float y, float scaleX, float scaleY, u32 color, const char* text)
-{
-	pp2d_draw_text_wrap(x, y, scaleX, scaleY, color, -1, text);
-}
-
-void pp2d_draw_text_center(gfxScreen_t target, float y, float scaleX, float scaleY, u32 color, const char* text)
-{
-	float width = pp2d_get_text_width(text, scaleX, scaleY);
-	float x = ((target == GFX_TOP ? TOP_WIDTH : BOTTOM_WIDTH) - width) / 2;
-	pp2d_draw_text(x, y, scaleX, scaleY, color, text);
-}
-
-void pp2d_draw_textf(float x, float y, float scaleX, float scaleY, u32 color, const char* text, ...) 
-{
-	char buffer[256];
-	va_list args;
-	va_start(args, text);
-	vsnprintf(buffer, 256, text, args);
-	pp2d_draw_text(x, y, scaleX, scaleY, color, buffer);
-	va_end(args);
-}
-
-void pp2d_draw_text_wrap(float x, float y, float scaleX, float scaleY, u32 color, float wrapX, const char* text)
-{
-	if (text == NULL)
-		return;
-	
-	pp2d_set_text_color(color);
-
-	ssize_t  units;
-	uint32_t code;
-	const uint8_t* p = (const uint8_t*)text;
-	float firstX = x;
-	int lastSheet = -1;
-	
-	do
-	{
-		if (!*p) break;
-		units = decode_utf8(&code, p);
-		if (units == -1)
-			break;
-		p += units;
-		if (code == '\n' || (wrapX != -1 && x + scaleX * fontGetCharWidthInfo(fontGlyphIndexFromCodePoint(code))->charWidth >= firstX + wrapX))
-		{
-			x = firstX;
-			y += scaleY*fontGetInfo()->lineFeed;
-			p -= code == '\n' ? 0 : 1;
-		}
-		else if (code > 0)
-		{
-			int glyphIdx = fontGlyphIndexFromCodePoint(code);
-			fontGlyphPos_s data;
-			fontCalcGlyphPos(&data, glyphIdx, GLYPH_POS_CALC_VTXCOORD, scaleX, scaleY);
-
-			if (data.sheetIndex != lastSheet)
-			{
-				lastSheet = data.sheetIndex;
-				C3D_TexBind(0, &glyphSheets[lastSheet]);
-			}
-
-			if ((textVtxArrayPos+4) >= TEXT_VTX_ARRAY_COUNT)
-				break;
-
-			pp2d_add_text_vertex(x+data.vtxcoord.left,  y+data.vtxcoord.bottom, DEFAULT_DEPTH, data.texcoord.left,  data.texcoord.bottom);
-			pp2d_add_text_vertex(x+data.vtxcoord.right, y+data.vtxcoord.bottom, DEFAULT_DEPTH, data.texcoord.right, data.texcoord.bottom);
-			pp2d_add_text_vertex(x+data.vtxcoord.left,  y+data.vtxcoord.top,    DEFAULT_DEPTH, data.texcoord.left,  data.texcoord.top);
-			pp2d_add_text_vertex(x+data.vtxcoord.right, y+data.vtxcoord.top,    DEFAULT_DEPTH, data.texcoord.right, data.texcoord.top);
-
-			C3D_DrawArrays(GPU_TRIANGLE_STRIP, textVtxArrayPos - 4, 4);
-
-			x += data.xAdvance;
-		}
-	} while (code > 0);
-}
-
-void pp2d_draw_texture(size_t id, int x, int y)
-{
-	pp2d_texture_select(id, x, y);
-	pp2d_texture_draw();
-}
-
-void pp2d_draw_texture_blend(size_t id, int x, int y, u32 color)
-{
-	pp2d_texture_select(id, x, y);
-	pp2d_texture_blend(color);
-	pp2d_texture_draw();
-}
-
-void pp2d_draw_texture_flip(size_t id, int x, int y, flipType fliptype)
-{
-	pp2d_texture_select(id, x, y);
-	pp2d_texture_flip(fliptype);
-	pp2d_texture_draw();
-}
-
-void pp2d_draw_texture_rotate(size_t id, int x, int y, float angle)
-{
-	pp2d_texture_select(id, x, y);
-	pp2d_texture_rotate(angle);
-	pp2d_texture_draw();		
-}
-
-void pp2d_draw_texture_scale(size_t id, int x, int y, float scaleX, float scaleY)
-{
-	pp2d_texture_select(id, x, y);
-	pp2d_texture_scale(scaleX, scaleY);
-	pp2d_texture_draw();
-}
-
-void pp2d_draw_texture_part(size_t id, int x, int y, int xbegin, int ybegin, int width, int height)
-{
-	pp2d_texture_select_part(id, x, y, xbegin, ybegin, width, height);
-	pp2d_texture_draw();
-}
-
-void pp2d_draw_wtext(float x, float y, float scaleX, float scaleY, u32 color, const wchar_t* text) 
-{
-	pp2d_draw_wtext_wrap(x, y, scaleX, scaleY, color, -1, text);
-}
-
-void pp2d_draw_wtext_center(gfxScreen_t target, float y, float scaleX, float scaleY, u32 color, const wchar_t* text)
-{
-	float width = pp2d_get_wtext_width(text, scaleX, scaleY);
-	float x = ((target == GFX_TOP ? TOP_WIDTH : BOTTOM_WIDTH) - width) / 2;
-	pp2d_draw_wtext(x, y, scaleX, scaleY, color, text);
-}
-
-void pp2d_draw_wtext_wrap(float x, float y, float scaleX, float scaleY, u32 color, float wrapX, const wchar_t* text) 
-{
-	if (text == NULL)
-		return;
-	
-	u32 size = wcslen(text) * sizeof(wchar_t);
-	char buf[size];
-	memset(buf, 0, size);
-	utf32_to_utf8((uint8_t*)buf, (uint32_t*)text, size);
-	buf[size - 1] = '\0';	
-	
-	pp2d_draw_text_wrap(x, y, scaleX, scaleY, color, wrapX, buf);
-}
-
-void pp2d_draw_wtextf(float x, float y, float scaleX, float scaleY, u32 color, const wchar_t* text, ...) 
-{
-	wchar_t buffer[256];
-	va_list args;
-	va_start(args, text);
-	vswprintf(buffer, 256, text, args);
-	pp2d_draw_wtext(x, y, scaleX, scaleY, color, buffer);
-	va_end(args);
-}
-
-void pp2d_end_draw(void)
-{
-	C3D_FrameEnd(0);
-}
-
-void pp2d_exit(void)
-{
-	for (size_t id = 0; id < MAX_TEXTURES; id++)
-	{
-		pp2d_free_texture(id);
-	}
-	
-	linearFree(textVtxArray);
-	free(glyphSheets);
-	
-	shaderProgramFree(&program);
-	DVLB_Free(vshader_dvlb);
-	
-	C3D_Fini();
-	gfxExit();
-}
-
-static bool pp2d_fast_draw_vbo(int x, int y, int height, int width, float left, float right, float top, float bottom, float depth)
-{
-	if ((textVtxArrayPos+4) >= TEXT_VTX_ARRAY_COUNT)
-		return false;
-	
-	pp2d_add_text_vertex(        x, y + height, depth,  left, bottom);
-	pp2d_add_text_vertex(x + width, y + height, depth, right, bottom);
-	pp2d_add_text_vertex(        x,          y, depth,  left,    top);
-	pp2d_add_text_vertex(x + width,          y, depth, right,    top);
-	
-	return true;
-}
-
-void pp2d_free_texture(size_t id)
-{
-	if (id >= MAX_TEXTURES)
-		return;
-	
-	if (!textures[id].allocated)
-		return;
-	
-	C3D_TexDelete(&textures[id].tex);
-	textures[id].width = 0;
-	textures[id].height = 0;
-	textures[id].allocated = false;
-}
-
-Result pp2d_init(void)
-{
-	Result res = 0;
-	
-	gfxInitDefault();
-	C3D_Init(C3D_DEFAULT_CMDBUF_SIZE);
-	
-	topLeft = C3D_RenderTargetCreate(SCREEN_HEIGHT, TOP_WIDTH, GPU_RB_RGBA8, GPU_RB_DEPTH24_STENCIL8);
-	C3D_RenderTargetSetClear(topLeft, C3D_CLEAR_ALL, BACKGROUND_COLOR, 0);
-	C3D_RenderTargetSetOutput(topLeft, GFX_TOP, GFX_LEFT, DISPLAY_TRANSFER_FLAGS);
-	
-	topRight = C3D_RenderTargetCreate(SCREEN_HEIGHT, TOP_WIDTH, GPU_RB_RGBA8, GPU_RB_DEPTH24_STENCIL8);
-	C3D_RenderTargetSetClear(topRight, C3D_CLEAR_ALL, BACKGROUND_COLOR, 0);
-	C3D_RenderTargetSetOutput(topRight, GFX_TOP, GFX_RIGHT, DISPLAY_TRANSFER_FLAGS);
-	
-	bot = C3D_RenderTargetCreate(SCREEN_HEIGHT, BOTTOM_WIDTH, GPU_RB_RGBA8, GPU_RB_DEPTH24_STENCIL8);
-	C3D_RenderTargetSetClear(bot, C3D_CLEAR_ALL, BACKGROUND_COLOR, 0);
-	C3D_RenderTargetSetOutput(bot, GFX_BOTTOM, GFX_LEFT, DISPLAY_TRANSFER_FLAGS);
-	
-	res = fontEnsureMapped();
-	if (R_FAILED(res))
-		return res;
-	
-	pp2d_set_texture_filter(GPU_NEAREST, GPU_NEAREST);
-
-#ifdef BUILDTOOLS
-	vshader_dvlb = DVLB_ParseFile((u32*)vshader_shbin, vshader_shbin_len);
-#else
-	vshader_dvlb = DVLB_ParseFile((u32*)vshader_shbin, vshader_shbin_size);
-#endif
-
-	shaderProgramInit(&program);
-	shaderProgramSetVsh(&program, &vshader_dvlb->DVLE[0]);
-	C3D_BindProgram(&program);
-
-	uLoc_projection = shaderInstanceGetUniformLocation(program.vertexShader, "projection");
-	
-	C3D_AttrInfo* attrInfo = C3D_GetAttrInfo();
-	AttrInfo_Init(attrInfo);
-	AttrInfo_AddLoader(attrInfo, 0, GPU_FLOAT, 3);
-	AttrInfo_AddLoader(attrInfo, 1, GPU_FLOAT, 2);
-
-	Mtx_OrthoTilt(&projectionTopLeft, 0, TOP_WIDTH, SCREEN_HEIGHT, 0.0f, 0.0f, 1.0f, true);
-	Mtx_OrthoTilt(&projectionTopRight, 0, TOP_WIDTH, SCREEN_HEIGHT, 0.0f, 0.0f, 1.0f, true);
-	Mtx_OrthoTilt(&projectionBot, 0, BOTTOM_WIDTH, SCREEN_HEIGHT, 0.0f, 0.0f, 1.0f, true);
-	
-	C3D_DepthTest(true, GPU_GEQUAL, GPU_WRITE_ALL);
-
-	int i;
-	TGLP_s* glyphInfo = fontGetGlyphInfo();
-	glyphSheets = malloc(sizeof(C3D_Tex)*glyphInfo->nSheets);
-	for (i = 0; i < glyphInfo->nSheets; i ++)
-	{
-		C3D_Tex* tex = &glyphSheets[i];
-		tex->data = fontGetGlyphSheetTex(i);
-		tex->fmt = glyphInfo->sheetFmt;
-		tex->size = glyphInfo->sheetSize;
-		tex->width = glyphInfo->sheetWidth;
-		tex->height = glyphInfo->sheetHeight;
-		tex->param = GPU_TEXTURE_MAG_FILTER(GPU_LINEAR) | GPU_TEXTURE_MIN_FILTER(GPU_LINEAR)
-			| GPU_TEXTURE_WRAP_S(GPU_CLAMP_TO_EDGE) | GPU_TEXTURE_WRAP_T(GPU_CLAMP_TO_EDGE);
-		tex->border = 0;
-		tex->lodParam = 0;
-	}
-	
-	textVtxArray = (textVertex_s*)linearAlloc(sizeof(textVertex_s)*TEXT_VTX_ARRAY_COUNT);
-	C3D_BufInfo* bufInfo = C3D_GetBufInfo();
-	BufInfo_Init(bufInfo);
-	BufInfo_Add(bufInfo, textVtxArray, sizeof(textVertex_s), 2, 0x10);
-	
-	return 0;
-}
-
-static u32 pp2d_get_next_pow2(u32 v)
-{
-	v--;
-	v |= v >> 1;
-	v |= v >> 2;
-	v |= v >> 4;
-	v |= v >> 8;
-	v |= v >> 16;
-	v++;
-	return v >= 64 ? v : 64;
-}
-
-float pp2d_get_text_height(const char* text, float scaleX, float scaleY)
-{
-	float height;
-	pp2d_get_text_size_internal(NULL, &height, scaleX, scaleY, -1, text);
-	return height;
-}
-
-float pp2d_get_text_height_wrap(const char* text, float scaleX, float scaleY, int wrapX)
-{
-	float height;
-	pp2d_get_text_size_internal(NULL, &height, scaleX, scaleY, wrapX, text);
-	return height;
-}
-
-void pp2d_get_text_size(float* width, float* height, float scaleX, float scaleY, const char* text)
-{
-	pp2d_get_text_size_internal(width, height, scaleX, scaleY, -1, text);
-}
-
-static void pp2d_get_text_size_internal(float* width, float* height, float scaleX, float scaleY, int wrapX, const char* text)
-{
-	float w = 0.0f;
-	float h = 0.0f;
-	
-	ssize_t  units;
-	uint32_t code;
-	float x = 0;
-	float firstX = x;
-	const uint8_t* p = (const uint8_t*)text;
-	
-	do
-	{
-		if (!*p) break;
-		units = decode_utf8(&code, p);
-		if (units == -1)
-			break;
-		p += units;
-		if (code == '\n' || (wrapX != -1 && x + scaleX * fontGetCharWidthInfo(fontGlyphIndexFromCodePoint(code))->charWidth >= firstX + wrapX))
-		{
-			x = firstX;
-			h += scaleY*fontGetInfo()->lineFeed;
-			p -= code == '\n' ? 0 : 1;
-		}
-		else if (code > 0)
-		{
-			float len = (scaleX * fontGetCharWidthInfo(fontGlyphIndexFromCodePoint(code))->charWidth);
-			w += len;
-			x += len;
-		}
-	} while (code > 0);
-	
-	if (width)
-	{
-		*width = w;
-	}
-	
-	if (height)
-	{
-		h += scaleY*fontGetInfo()->lineFeed;
-		*height = h;
-	}
-}
-
-float pp2d_get_text_width(const char* text, float scaleX, float scaleY)
-{
-	float width;
-	pp2d_get_text_size_internal(&width, NULL, scaleX, scaleY, -1, text);
-	return width;
-}
-
-float pp2d_get_wtext_height(const wchar_t* text, float scaleX, float scaleY)
-{
-	u32 size = wcslen(text) * sizeof(wchar_t);
-	char buf[size];
-	memset(buf, 0, size);
-	utf32_to_utf8((uint8_t*)buf, (uint32_t*)text, size);
-	buf[size - 1] = '\0';
-	
-	float height;
-	pp2d_get_text_size_internal(NULL, &height, scaleX, scaleY, -1, buf);
-	return height;
-}
-
-float pp2d_get_wtext_width(const wchar_t* text, float scaleX, float scaleY)
-{
-	u32 size = wcslen(text) * sizeof(wchar_t);
-	char buf[size];
-	memset(buf, 0, size);
-	utf32_to_utf8((uint8_t*)buf, (uint32_t*)text, size);
-	buf[size - 1] = '\0';
-	
-	float width;
-	pp2d_get_text_size_internal(&width, NULL, scaleX, scaleY, -1, buf);
-	return width;
-}
-
-void pp2d_load_texture_memory(size_t id, void* buf, u32 width, u32 height)
-{
-	u32 w_pow2 = pp2d_get_next_pow2(width);
-	u32 h_pow2 = pp2d_get_next_pow2(height);
-	
-	C3D_TexInit(&textures[id].tex, (u16)w_pow2, (u16)h_pow2, GPU_RGBA8);
-	C3D_TexSetFilter(&textures[id].tex, textureFilters.magFilter, textureFilters.minFilter);
-	
-	textures[id].allocated = true;
-	textures[id].width = width;
-	textures[id].height = height;
-
-	memset(textures[id].tex.data, 0, textures[id].tex.size);
-	for (u32 i = 0; i < width; i++) 
-	{
-		for (u32 j = 0; j < height; j++) 
-		{
-			u32 dst = ((((j >> 3) * (w_pow2 >> 3) + (i >> 3)) << 6) + ((i & 1) | ((j & 1) << 1) | ((i & 2) << 1) | ((j & 2) << 2) | ((i & 4) << 2) | ((j & 4) << 3))) * 4;
-			u32 src = (j * width + i) * 4;
-
-			memcpy(textures[id].tex.data + dst, buf + src, 4);
-		}
-	}
-
-	C3D_TexFlush(&textures[id].tex);	
-}
-
-void pp2d_load_texture_png(size_t id, const char* path)
-{
-	if (id >= MAX_TEXTURES)
-		return;
-	
-	u8* image;
-	unsigned width;
-	unsigned height;
-
-	lodepng_decode32_file(&image, &width, &height, path);
-
-	for (u32 i = 0; i < width; i++) 
-	{
-		for (u32 j = 0; j < height; j++) 
-		{
-			u32 p = (i + j*width) * 4;
-
-			u8 r = *(u8*)(image + p);
-			u8 g = *(u8*)(image + p + 1);
-			u8 b = *(u8*)(image + p + 2);
-			u8 a = *(u8*)(image + p + 3);
-
-			*(image + p) = a;
-			*(image + p + 1) = b;
-			*(image + p + 2) = g;
-			*(image + p + 3) = r;
-		}
-	}
-	
-	pp2d_load_texture_memory(id, image, width, height);
-	free(image);
-}
-
-void pp2d_load_texture_png_memory(size_t id, void* buf, size_t buf_size)
-{
-	if (id >= MAX_TEXTURES)
-		return;
-
-	u8* image;
-	unsigned width;
-	unsigned height;
-
-	lodepng_decode32(&image, &width, &height, buf, buf_size);
-
-	for (u32 i = 0; i < width; i++)
-	{
-		for (u32 j = 0; j < height; j++)
-		{
-			u32 p = (i + j*width) * 4;
-
-			u8 r = *(u8*)(image + p);
-			u8 g = *(u8*)(image + p + 1);
-			u8 b = *(u8*)(image + p + 2);
-			u8 a = *(u8*)(image + p + 3);
-
-			*(image + p) = a;
-			*(image + p + 1) = b;
-			*(image + p + 2) = g;
-			*(image + p + 3) = r;
-		}
-	}
-
-	pp2d_load_texture_memory(id, image, width, height);
-	free(image);
-}
-
-void pp2d_set_3D(int enable)
-{
-	gfxSet3D(enable);
-}
-
-void pp2d_set_screen_color(gfxScreen_t target, u32 color)
-{
-	if (target == GFX_TOP)
-	{
-		C3D_RenderTargetSetClear(topLeft, C3D_CLEAR_ALL, color, 0);
-		C3D_RenderTargetSetClear(topRight, C3D_CLEAR_ALL, color, 0);
-	}
-	else
-	{
-		C3D_RenderTargetSetClear(bot, C3D_CLEAR_ALL, color, 0);
-	}
-}
-
-void pp2d_set_texture_filter(GPU_TEXTURE_FILTER_PARAM magFilter, GPU_TEXTURE_FILTER_PARAM minFilter)
-{
-	textureFilters.magFilter = magFilter;
-	textureFilters.minFilter = minFilter;
-}
-
-static void pp2d_set_text_color(u32 color)
-{
-	C3D_TexEnv* env = C3D_GetTexEnv(0);
-	C3D_TexEnvSrc(env, C3D_RGB, GPU_CONSTANT, 0, 0);
-	C3D_TexEnvSrc(env, C3D_Alpha, GPU_TEXTURE0, GPU_CONSTANT, 0);
-	C3D_TexEnvOp(env, C3D_Both, 0, 0, 0);
-	C3D_TexEnvFunc(env, C3D_RGB, GPU_REPLACE);
-	C3D_TexEnvFunc(env, C3D_Alpha, GPU_MODULATE);
-	C3D_TexEnvColor(env, color);
-}
-
-void pp2d_texture_select(size_t id, int x, int y)
-{
-	if (id >= MAX_TEXTURES)
-	{
-		textureData.initialized = false;
-		return;
-	}
-	
-	textureData.id = id;
-	textureData.x = x;
-	textureData.y = y;
-	textureData.xbegin = 0;
-	textureData.ybegin = 0;
-	textureData.width = textures[id].width;
-	textureData.height = textures[id].height;
-	textureData.color = PP2D_NEUTRAL;
-	textureData.fliptype = NONE;
-	textureData.scaleX = 1;
-	textureData.scaleY = 1;
-	textureData.angle = 0;
-	textureData.depth = DEFAULT_DEPTH;
-	textureData.initialized = true;
-}
-
-void pp2d_texture_select_part(size_t id, int x, int y, int xbegin, int ybegin, int width, int height)
-{
-	if (id >= MAX_TEXTURES)
-	{
-		textureData.initialized = false;
-		return;
-	}
-	
-	textureData.id = id;
-	textureData.x = x;
-	textureData.y = y;
-	textureData.xbegin = xbegin;
-	textureData.ybegin = ybegin;
-	textureData.width = width;
-	textureData.height = height;
-	textureData.color = PP2D_NEUTRAL;
-	textureData.fliptype = NONE;
-	textureData.scaleX = 1;
-	textureData.scaleY = 1;
-	textureData.angle = 0;
-	textureData.depth = DEFAULT_DEPTH;
-	textureData.initialized = true;
-}
-
-void pp2d_texture_blend(u32 color)
-{
-	textureData.color = color;
-}
-
-void pp2d_texture_scale(float scaleX, float scaleY)
-{
-	textureData.scaleX = scaleX;
-	textureData.scaleY = scaleY;
-}
-
-void pp2d_texture_flip(flipType fliptype)
-{
-	textureData.fliptype = fliptype;
-}
-
-void pp2d_texture_rotate(float angle)
-{
-	textureData.angle = angle;
-}
-
-void pp2d_texture_depth(float depth)
-{
-	textureData.depth = depth;
-}
-
-void pp2d_texture_draw(void)
-{
-	if (!textureData.initialized)
-		return;
-
-	if ((textVtxArrayPos+4) >= TEXT_VTX_ARRAY_COUNT)
-		return;
-	
-	size_t id = textureData.id;
-	
-	float left = (float)textureData.xbegin / (float)textures[id].tex.width;
-	float right = (float)(textureData.xbegin + textureData.width) / (float)textures[id].tex.width;
-	float top = (float)(textures[id].tex.height - textureData.ybegin) / (float)textures[id].tex.height;
-	float bottom = (float)(textures[id].tex.height - textureData.ybegin - textureData.height) / (float)textures[id].tex.height;
-	
-	// scaling
-	textureData.height *= textureData.scaleY;
-	textureData.width *= textureData.scaleX;
-	
-	float vert[4][2] = {
-		{                    textureData.x, textureData.height + textureData.y},
-		{textureData.width + textureData.x, textureData.height + textureData.y},
-		{                    textureData.x,                      textureData.y},
-		{textureData.width + textureData.x,                      textureData.y},
-	};
-
-	// flipping
-	if (textureData.fliptype == BOTH || textureData.fliptype == HORIZONTAL)
-	{
-		float tmp = left;
-		left = right;
-		right = tmp;
-	}
-	
-	if (textureData.fliptype == BOTH || textureData.fliptype == VERTICAL)
-	{
-		float tmp = top;
-		top = bottom;
-		bottom = tmp;
-	}
-	
-	// rotating
-	textureData.angle = fmod(textureData.angle, 360);
-	if (textureData.angle != 0)
-	{
-		const float rad = textureData.angle/(180/M_PI);
-		const float c = cosf(rad);
-		const float s = sinf(rad);
-		
-		const float xcenter = textureData.x + textureData.width/2.0f;
-		const float ycenter = textureData.y + textureData.height/2.0f;
-		
-		for (int i = 0; i < 4; i++)
-		{
-			float oldx = vert[i][0];
-			float oldy = vert[i][1];
-			
-			float newx = c * (oldx - xcenter) - s * (oldy - ycenter) + xcenter;
-			float newy = s * (oldx - xcenter) + c * (oldy - ycenter) + ycenter;
-			
-			vert[i][0] = newx;
-			vert[i][1] = newy;
-		}
-	}
-
-	// blending
-	C3D_TexBind(0, &textures[id].tex);
-	C3D_TexEnv* env = C3D_GetTexEnv(0);
-	C3D_TexEnvSrc(env, C3D_Both, GPU_TEXTURE0, GPU_CONSTANT, 0);
-	C3D_TexEnvOp(env, C3D_Both, 0, 0, 0);
-	C3D_TexEnvFunc(env, C3D_Both, GPU_MODULATE);
-	C3D_TexEnvColor(env, textureData.color);
-
-	// rendering
-	pp2d_add_text_vertex(vert[0][0], vert[0][1], textureData.depth, left, bottom);
-	pp2d_add_text_vertex(vert[1][0], vert[1][1], textureData.depth, right, bottom);
-	pp2d_add_text_vertex(vert[2][0], vert[2][1], textureData.depth, left, top);
-	pp2d_add_text_vertex(vert[3][0], vert[3][1], textureData.depth, right, top);
-
-	C3D_DrawArrays(GPU_TRIANGLE_STRIP, textVtxArrayPos - 4, 4);
-}

source/pp2d/pp2d/pp2d.h

@@ -1,472 +0,0 @@
-/* MIT License
- *
- * Copyright (c) 2017 Bernardo Giordano
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
-
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
-
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * https://discord.gg/zqXWgsH
- */
-
-/**
- * Plug & Play 2D
- * @file pp2d.h
- * @author Bernardo Giordano
- * @date 26 October 2017
- * @brief pp2d header
- */
-
-#ifndef PP2D_H
-#define PP2D_H
-
-#include "lodepng.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <3ds.h>
-#include <citro3d.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <wchar.h>
-#include "vshader_shbin.h"
-
-#define TOP_WIDTH 400
-#define BOTTOM_WIDTH 320
-#define SCREEN_HEIGHT 240
-
-/**
- * @brief Used to transfer the final rendered display to the framebuffer
- */
-#define DISPLAY_TRANSFER_FLAGS \
-	(GX_TRANSFER_FLIP_VERT(0) | GX_TRANSFER_OUT_TILED(0) | GX_TRANSFER_RAW_COPY(0) | \
-	GX_TRANSFER_IN_FORMAT(GX_TRANSFER_FMT_RGBA8) | GX_TRANSFER_OUT_FORMAT(GX_TRANSFER_FMT_RGB8) | \
-	GX_TRANSFER_SCALING(GX_TRANSFER_SCALE_NO))
-
-/**
- * @brief Creates a 8 byte RGBA color
- * @param r red component of the color
- * @param g green component of the color
- * @param b blue component of the color
- * @param a alpha component of the color
- */
-#define RGBA8(r, g, b, a) ((((r)&0xFF)<<0) | (((g)&0xFF)<<8) | (((b)&0xFF)<<16) | (((a)&0xFF)<<24))
-
-/**
- * @brief Creates a 8 byte ABGR color
- * @param a alpha component of the color
- * @param b blue component of the color
- * @param g green component of the color
- * @param r red component of the color
- */
-#define ABGR8(a, b, g, r) ((((a)&0xFF)<<0) | (((b)&0xFF)<<8) | (((g)&0xFF)<<16) | (((r)&0xFF)<<24))
-
-/**
- * @brief Converts a RGB565 color to RGBA8 color (adds maximum alpha)
- * @param rgb 565 to be converted
- */
-#define RGB565_TO_RGBA8(rgb) \
-	(RGBA8(((rgb>>11)&0x1F)*0xFF/0x1F, ((rgb>>5)&0x3F)*0xFF/0x3F, (rgb&0x1F)*0xFF/0x1F, 255))
-	
-/**
- * @brief Converts a RGB565 color to ABGR8 color (adds maximum alpha)
- * @param rgb 565 to be converted
- */
-#define RGB565_TO_ABGR8(rgb) \
-	(RGBA8(255, (rgb&0x1F)*0xFF/0x1F, ((rgb>>5)&0x3F)*0xFF/0x3F, ((rgb>>11)&0x1F)*0xFF/0x1F))
-
-#define BACKGROUND_COLOR ABGR8(255, 0, 0, 0)
-#define PP2D_NEUTRAL RGBA8(255, 255, 255, 255)
-
-#define DEFAULT_DEPTH 0.5f
-
-#define MAX_TEXTURES 1024
-
-#define TEXT_VTX_ARRAY_COUNT (4*1024)
-
-typedef enum {
-	NONE,
-	HORIZONTAL,
-	VERTICAL,
-	BOTH
-} flipType;
-
-typedef struct { 
-	float position[3]; 
-	float texcoord[2]; 
-} textVertex_s;
-
-/**
- * @brief Starts a new frame on the specified screen
- * @param target GFX_TOP or GFX_BOTTOM
- */
-void pp2d_begin_draw(gfxScreen_t target, gfx3dSide_t side);
-
-/**
- * @brief Changes target screen to the specified target
- * @param target GFX_TOP or GFX_BOTTOM
- */
-void pp2d_draw_on(gfxScreen_t target, gfx3dSide_t side);
-
-/**
- * @brief Draw a rectangle
- * @param x of the top left corner
- * @param y of the top left corner
- * @param width on the rectangle
- * @param height of the rectangle
- * @param color RGBA8 to fill the rectangle
- */
-void pp2d_draw_rectangle(int x, int y, int width, int height, u32 color);
-
-/**
- * @brief Prints a char pointer
- * @param x position to start drawing
- * @param y position to start drawing
- * @param scaleX multiplier for the text width
- * @param scaleY multiplier for the text height
- * @param color RGBA8 the text will be drawn
- * @param text to be printed on the screen
- */
-void pp2d_draw_text(float x, float y, float scaleX, float scaleY, u32 color, const char* text);
-
-/**
- * @brief Prints a char pointer in the middle of the target screen
- * @param target screen to draw the text to
- * @param y position to start drawing
- * @param scaleX multiplier for the text width
- * @param scaleY multiplier for the text height
- * @param color RGBA8 the text will be drawn
- * @param text to be printed on the screen
- */
-void pp2d_draw_text_center(gfxScreen_t target, float y, float scaleX, float scaleY, u32 color, const char* text);
-
-/**
- * @brief Prints a char pointer in the middle of the target screen
- * @param x position to start drawing
- * @param y position to start drawing
- * @param scaleX multiplier for the text width
- * @param scaleY multiplier for the text height
- * @param color RGBA8 the text will be drawn
- * @param wrapX wrap width
- * @param text to be printed on the screen
- */
-void pp2d_draw_text_wrap(float x, float y, float scaleX, float scaleY, u32 color, float wrapX, const char* text);
-
-/**
- * @brief Prints a char pointer with arguments
- * @param x position to start drawing
- * @param y position to start drawing
- * @param scaleX multiplier for the text width
- * @param scaleY multiplier for the text height
- * @param color RGBA8 the text will be drawn
- * @param text to be printed on the screen
- * @param ... arguments
- */
-void pp2d_draw_textf(float x, float y, float scaleX, float scaleY, u32 color, const char* text, ...); 
-
-/**
- * @brief Prints a texture
- * @param id of the texture 
- * @param x position on the screen to draw the texture
- * @param y position on the screen to draw the texture
- */
-void pp2d_draw_texture(size_t id, int x, int y);
-
-/**
- * @brief Prints a texture with color modulation
- * @param id of the texture 
- * @param x position on the screen to draw the texture
- * @param y position on the screen to draw the texture
- * @param color RGBA8 to modulate the texture with
- */
-void pp2d_draw_texture_blend(size_t id, int x, int y, u32 color);
-
-/**
- * @brief Prints a flipped texture
- * @param id of the texture 
- * @param x position on the screen to draw the texture
- * @param y position on the screen to draw the texture
- * @param fliptype HORIZONTAL, VERTICAL or BOTH
- */
-
-void pp2d_draw_texture_flip(size_t id, int x, int y, flipType fliptype);
-
-/**
- * @brief Prints a rotated texture
- * @param id of the texture 
- * @param x position on the screen to draw the texture
- * @param y position on the screen to draw the texture
- * @param angle in degrees to rotate the texture
- */
-void pp2d_draw_texture_rotate(size_t id, int x, int y, float angle);
-
-/**
- * @brief Prints a texture with a scale factor
- * @param id of the texture 
- * @param x position on the screen to draw the texture
- * @param y position on the screen to draw the texture
- * @param scaleX width scale factor
- * @param scaleY height scale factor
- */
-void pp2d_draw_texture_scale(size_t id, int x, int y, float scaleX, float scaleY);
-
-/**
- * @brief Prints a portion of a texture
- * @param id of the texture 
- * @param x position on the screen to draw the texture
- * @param y position on the screen to draw the texture
- * @param xbegin position to start drawing
- * @param ybegin position to start drawing
- * @param width to draw from the xbegin position 
- * @param height to draw from the ybegin position
- */
-void pp2d_draw_texture_part(size_t id, int x, int y, int xbegin, int ybegin, int width, int height);
-
-/**
- * @brief Prints a wchar_t pointer
- * @param x position to start drawing
- * @param y position to start drawing
- * @param scaleX multiplier for the text width
- * @param scaleY multiplier for the text height
- * @param color RGBA8 the text will be drawn
- * @param text to be printed on the screen
- */
-void pp2d_draw_wtext(float x, float y, float scaleX, float scaleY, u32 color, const wchar_t* text); 
-
-/**
- * @brief Prints a wchar_t pointer in the middle of the target screen
- * @param target screen to draw the text to
- * @param y position to start drawing
- * @param scaleX multiplier for the text width
- * @param scaleY multiplier for the text height
- * @param color RGBA8 the text will be drawn
- * @param text to be printed on the screen
- */
-void pp2d_draw_wtext_center(gfxScreen_t target, float y, float scaleX, float scaleY, u32 color, const wchar_t* text);
-
-/**
- * @brief Prints a wchar_t pointer
- * @param x position to start drawing
- * @param y position to start drawing
- * @param scaleX multiplier for the text width
- * @param scaleY multiplier for the text height
- * @param color RGBA8 the text will be drawn
- * @param wrapX wrap width
- * @param text to be printed on the screen
- */
-void pp2d_draw_wtext_wrap(float x, float y, float scaleX, float scaleY, u32 color, float wrapX, const wchar_t* text);
-
-/**
- * @brief Prints a wchar_t pointer with arguments
- * @param x position to start drawing
- * @param y position to start drawing
- * @param scaleX multiplier for the text width
- * @param scaleY multiplier for the text height
- * @param color RGBA8 the text will be drawn
- * @param text to be printed on the screen
- * @param ... arguments
- */
-void pp2d_draw_wtextf(float x, float y, float scaleX, float scaleY, u32 color, const wchar_t* text, ...);
-
-/**
- * @brief Ends a frame
- */
-void pp2d_end_draw(void);
-
-/**
- * @brief Frees the pp2d environment
- */
-void pp2d_exit(void);
-
-/**
- * @brief Inits the pp2d environment
- * @return 0 if everything went correctly, otherwise returns Result code
- * @note This will trigger gfxInitDefault by default 
- */
-Result pp2d_init(void);
-
-/**
- * @brief Calculates a char pointer height
- * @param text char pointer to calculate the height of
- * @param scaleX multiplier for the text width 
- * @param scaleY multiplier for the text height
- * @return height the text will have if rendered in the supplied conditions
- */
-float pp2d_get_text_height(const char* text, float scaleX, float scaleY);
-
-/**
- * @brief Calculates a char pointer height
- * @param text char pointer to calculate the height of
- * @param scaleX multiplier for the text width 
- * @param scaleY multiplier for the text height
- * @param wrapX wrap width
- * @return height the text will have if rendered in the supplied conditions
- */
-float pp2d_get_text_height_wrap(const char* text, float scaleX, float scaleY, int wrapX);
-
-/**
- * @brief Calculates width and height for a char pointer
- * @param width pointer to the width to return
- * @param height pointer to the height to return
- * @param scaleX multiplier for the text width 
- * @param scaleY multiplier for the text height
- * @param text to calculate dimensions of
- */
-void pp2d_get_text_size(float* width, float* height, float scaleX, float scaleY, const char* text);
-
-/**
- * @brief Calculates a char pointer width
- * @param text char pointer to calculate the width of
- * @param scaleX multiplier for the text width 
- * @param scaleY multiplier for the text height
- * @return width the text will have if rendered in the supplied conditions
- */
-float pp2d_get_text_width(const char* text, float scaleX, float scaleY);
-
-/**
- * @brief Calculates a wchar_t pointer height
- * @param text wchar_t pointer to calculate the height of
- * @param scaleX multiplier for the text width 
- * @param scaleY multiplier for the text height
- * @return height the text will have if rendered in the supplied conditions
- */
-float pp2d_get_wtext_height(const wchar_t* text, float scaleX, float scaleY);
-
-/**
- * @brief Calculates a wchar_t pointer width
- * @param text wchar_t pointer to calculate the width of
- * @param scaleX multiplier for the text width 
- * @param scaleY multiplier for the text height
- * @return width the text will have if rendered in the supplied conditions
- */
-float pp2d_get_wtext_width(const wchar_t* text, float scaleX, float scaleY);
-
-/**
- * @brief Frees a texture
- * @param id of the texture to free
- */
-void pp2d_free_texture(size_t id);
-
-/**
- * @brief Loads a texture from a a buffer in memory
- * @param id of the texture 
- * @param buf buffer where the texture is stored
- * @param width of the texture
- * @param height of the texture
- */
-void pp2d_load_texture_memory(size_t id, void* buf, u32 width, u32 height);
-
-/**
- * @brief Loads a texture from a png file
- * @param id of the texture 
- * @param path where the png file is located 
- */
-void pp2d_load_texture_png(size_t id, const char* path);
-
-/**
- * @brief Loads a texture from a buffer in memory
- * @param id of the texture
- * @param buf buffer where the png is stored
- * @param buf_size size of buffer
- */
-void pp2d_load_texture_png_memory(size_t id, void* buf, size_t buf_size);
-
-/**
- * @brief Enables 3D service
- * @param enable integer
- */
-void pp2d_set_3D(int enable);
-
-/**
- * @brief Sets a background color for the specified screen
- * @param target GFX_TOP or GFX_BOTTOM
- * @param color ABGR8 which will be the background one
- */
-void pp2d_set_screen_color(gfxScreen_t target, u32 color);
-
-/**
- * @brief Sets filters to load texture with
- * @param magFilter GPU_NEAREST or GPU_LINEAR
- * @param minFilter GPU_NEAREST or GPU_LINEAR
- */
-void pp2d_set_texture_filter(GPU_TEXTURE_FILTER_PARAM magFilter, GPU_TEXTURE_FILTER_PARAM minFilter);
-
-/**
- * @brief Inits a texture to be drawn
- * @param id of the texture
- * @param x to draw the texture at
- * @param y to draw the texture at
- */
-void pp2d_texture_select(size_t id, int x, int y);
-
-/**
- * @brief Inits a portion of a texture to be drawn
- * @param id of the texture 
- * @param x position on the screen to draw the texture
- * @param y position on the screen to draw the texture
- * @param xbegin position to start drawing
- * @param ybegin position to start drawing
- * @param width to draw from the xbegin position 
- * @param height to draw from the ybegin position
- */
-void pp2d_texture_select_part(size_t id, int x, int y, int xbegin, int ybegin, int width, int height);
-
-/**
- * @brief Modulates a texture with a color
- * @param color to modulate the texture
- */
-void pp2d_texture_blend(u32 color);
-
-/**
- * @brief Scales a texture
- * @param scaleX width scale factor
- * @param scaleY height scale factor
- */
-void pp2d_texture_scale(float scaleX, float scaleY);
-
-/**
- * @brief Flips a texture
- * @param fliptype HORIZONTAL, VERTICAL or BOTH
- */
-void pp2d_texture_flip(flipType fliptype);
-
-/**
- * @brief Rotates a texture
- * @param angle in degrees to rotate the texture
- */
-void pp2d_texture_rotate(float angle);
-
-/**
- * @brief Sets the depth of a texture
- * @param depth factor of the texture
- */
-void pp2d_texture_depth(float depth);
-
-/**
- * @brief Renders a texture
- */
-void pp2d_texture_draw(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /*PP2D_H*/

source/pp2d/pp2d/vshader.v.pica

@@ -1,39 +0,0 @@
-; Uniforms
-.fvec projection[4]
-
-; Constants
-.constf myconst(0.0, 1.0, -1.0, 0.1)
-.constf RGBA_TO_FLOAT4(0.00392156862, 0, 0, 0)
-.alias  zeros myconst.xxxx ; Vector full of zeros
-.alias  ones  myconst.yyyy ; Vector full of ones
-
-; Outputs
-.out outpos position
-.out outclr color
-.out outtc0 texcoord0
-
-; Inputs (defined as aliases for convenience)
-.alias inpos v0
-.alias intex v1
-
-.bool test
-
-.proc main
-	; Force the w component of inpos to be 1.0
-	mov r0.xyz, inpos
-	mov r0.w,   ones
-
-	; outpos = projectionMatrix * inpos
-	dp4 outpos.x, projection[0], r0
-	dp4 outpos.y, projection[1], r0
-	dp4 outpos.z, projection[2], r0
-	dp4 outpos.w, projection[3], r0
-
-	;outtc0 = intexcoord
-	mov outtc0, intex
-
-	;outclr
-	mul outclr, RGBA_TO_FLOAT4.xxxx, intex
-
-	end
-.end

source/quirc/decode.c

@@ -117,7 +117,7 @@ static const uint8_t gf256_log[256] = {
 	0x74, 0xd6, 0xf4, 0xea, 0xa8, 0x50, 0x58, 0xaf
 };
 
-const static struct galois_field gf256 = {
+static const struct galois_field gf256 = {
 	.p = 255,
 	.log = gf256_log,
 	.exp = gf256_exp
@@ -576,10 +576,11 @@ static quirc_decode_error_t codestream_ecc(struct quirc_data *data,
 		&quirc_version_db[data->version];
 	const struct quirc_rs_params *sb_ecc = &ver->ecc[data->ecc_level];
 	struct quirc_rs_params lb_ecc;
-	int bc = ver->data_bytes / sb_ecc->bs;
+	const int lb_count =
+	    (ver->data_bytes - sb_ecc->bs * sb_ecc->ns) / (sb_ecc->bs + 1);
+	const int bc = lb_count + sb_ecc->ns;
+	const int ecc_offset = sb_ecc->dw * bc + lb_count;
 	int dst_offset = 0;
-	int lb_count = ver->data_bytes - bc * sb_ecc->bs;
-	int small_dw_total = bc * sb_ecc->dw;
 	int i;
 
 	memcpy(&lb_ecc, sb_ecc, sizeof(lb_ecc));
@@ -588,22 +589,16 @@ static quirc_decode_error_t codestream_ecc(struct quirc_data *data,
 
 	for (i = 0; i < bc; i++) {
 		uint8_t *dst = ds->data + dst_offset;
-		const struct quirc_rs_params *ecc = sb_ecc;
+		const struct quirc_rs_params *ecc =
+		    (i < sb_ecc->ns) ? sb_ecc : &lb_ecc;
+		const int num_ec = ecc->bs - ecc->dw;
 		quirc_decode_error_t err;
-		int j = 0;
-		int k;
+		int j;
 
-		for (k = 0; k < sb_ecc->dw; k++)
-			dst[j++] = ds->raw[k * bc + i];
-
-		if (i + lb_count >= bc) {
-			dst[j++] = ds->raw[small_dw_total + i - lb_count];
-			ecc = &lb_ecc;
-		}
-
-		for (k = 0; k < sb_ecc->bs - sb_ecc->dw; k++)
-			dst[j++] = ds->raw[small_dw_total + lb_count + i +
-					   k * bc];
+		for (j = 0; j < ecc->dw; j++)
+			dst[j] = ds->raw[j * bc + i];
+		for (j = 0; j < num_ec; j++)
+			dst[ecc->dw + j] = ds->raw[ecc_offset + j * bc + i];
 
 		err = correct_block(dst, ecc);
 		if (err)
@@ -729,10 +724,10 @@ static quirc_decode_error_t decode_alpha(struct quirc_data *data,
 	int bits = 13;
 	int count;
 
-	if (data->version < 7)
+	if (data->version < 10)
 		bits = 9;
-	else if (data->version < 11)
-		bits = 10;
+	else if (data->version < 27)
+		bits = 11;
 
 	count = take_bits(ds, bits);
 	if (data->payload_len + count + 1 > QUIRC_MAX_PAYLOAD)
@@ -795,12 +790,18 @@ static quirc_decode_error_t decode_kanji(struct quirc_data *data,
 
 	for (i = 0; i < count; i++) {
 		int d = take_bits(ds, 13);
+		int msB = d / 0xc0;
+		int lsB = d % 0xc0;
+		int intermediate = (msB << 8) | lsB;
 		uint16_t sjw;
 
-		if (d + 0x8140 >= 0x9ffc)
-			sjw = d + 0x8140;
-		else
-			sjw = d + 0xc140;
+		if (intermediate + 0x8140 <= 0x9ffc) {
+			/* bytes are in the range 0x8140 to 0x9FFC */
+			sjw = intermediate + 0x8140;
+		} else {
+			/* bytes are in the range 0xE040 to 0xEBBF */
+			sjw = intermediate + 0xc140;
+		}
 
 		data->payload[data->payload_len++] = sjw >> 8;
 		data->payload[data->payload_len++] = sjw & 0xff;
@@ -873,7 +874,7 @@ static quirc_decode_error_t decode_payload(struct quirc_data *data,
 done:
 
 	/* Add nul terminator to all payloads */
-	if (data->payload_len >= sizeof(data->payload))
+	if (data->payload_len >= (int) sizeof(data->payload))
 		data->payload_len--;
 	data->payload[data->payload_len] = 0;
 

source/quirc/identify.c

@@ -14,6 +14,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include <limits.h>
 #include <string.h>
 #include <stdlib.h>
 #include <math.h>
@@ -98,8 +99,8 @@ static void perspective_map(const double *c,
 	double x = (c[0]*u + c[1]*v + c[2]) / den;
 	double y = (c[3]*u + c[4]*v + c[5]) / den;
 
-	ret->x = rint(x);
-	ret->y = rint(y);
+	ret->x = (int) rint(x);
+	ret->y = (int) rint(y);
 }
 
 static void perspective_unmap(const double *c,
@@ -121,146 +122,22 @@ static void perspective_unmap(const double *c,
  * Span-based floodfill routine
  */
 
+#define FLOOD_FILL_MAX_DEPTH		128
+
 typedef void (*span_func_t)(void *user_data, int y, int left, int right);
 
-#if 0 // recursive flood fill
-
-#define FLOOD_FILL_MAX_DEPTH	4096
-
-struct flood_fill_params{
-	struct quirc *q;
-	int from;
-	int to;
-	span_func_t func;
-	void *user_data;
-};
-
-static struct flood_fill_params ffp;
-
-static void flood_fill_rec(int x, int y, int depth)
+static void flood_fill_seed(struct quirc *q, int x, int y, int from, int to,
+			    span_func_t func, void *user_data,
+			    int depth)
 {
 	int left = x;
 	int right = x;
 	int i;
-	quirc_pixel_t *row = ffp.q->pixels + y * ffp.q->w;
-
-	if (!depth)
-		return;
-
-	while (left > 0 && row[left - 1] == ffp.from)
-		left--;
-
-	while (right < ffp.q->w - 1 && row[right + 1] == ffp.from)
-		right++;
-
-	/* Fill the extent */
-	for (i = left; i <= right; i++)
-		row[i] = ffp.to;
-
-	if (ffp.func)
-		ffp.func(ffp.user_data, y, left, right);
-
-	/* Seed new flood-fills */
-	if (y > 0) {
-		row = ffp.q->pixels + (y - 1) * ffp.q->w;
-
-		for (i = left; i <= right; i++)
-			if (row[i] == ffp.from)
-				flood_fill_rec(i, y - 1, depth - 1);
-	}
-
-	if (y < ffp.q->h - 1) {
-		row = ffp.q->pixels + (y + 1) * ffp.q->w;
-
-		for (i = left; i <= right; i++)
-			if (row[i] == ffp.from)
-				flood_fill_rec(i, y + 1, depth - 1);
-	}
-}
-
-static void flood_fill_seed(struct quirc *q, int x, int y, int from, int to,
-				span_func_t func, void *user_data)
-{
-	ffp.q = q;
-	ffp.from = from;
-	ffp.to = to;
-	ffp.func = func;
-	ffp.user_data = user_data;
-
-	flood_fill_rec(x, y, FLOOD_FILL_MAX_DEPTH);
-}
-
-#else // stacked flood fill
-
-#define FILL_STACK_CHUNK_SIZE 0x400
-
-struct fill_stack_chunk{
-	int x[FILL_STACK_CHUNK_SIZE];
-	int y[FILL_STACK_CHUNK_SIZE];
-	struct fill_stack_chunk *prev;
-};
-
-struct fill_stack{
-	struct fill_stack_chunk *last_chunk;
-	int index;
-};
-
-static void fill_stack_init(struct fill_stack *s){
-	s->last_chunk = NULL;
-}
-
-static int fill_stack_is_empty(struct fill_stack *s){
-	return s->last_chunk == NULL;
-}
-
-static void fill_stack_push(struct fill_stack *s, int x, int y){
-	struct fill_stack_chunk *c;
-	if(s->last_chunk != NULL && s->index < FILL_STACK_CHUNK_SIZE - 1){
-		c = s->last_chunk;
-		s->index++;
-	}else{
-		c = (struct fill_stack_chunk*)malloc(sizeof(struct fill_stack_chunk));
-		if(c == NULL){
-			return;
-		}
-		c->prev = s->last_chunk;
-		s->last_chunk = c;
-		s->index = 0;
-	}
-	c->x[s->index] = x;
-	c->y[s->index] = y;
-}
-
-static void fill_stack_pop(struct fill_stack *s, int *px, int *py){
-	struct fill_stack_chunk *c = s->last_chunk;
-	if(c == NULL){
-		return;
-	}
-	*px = c->x[s->index];
-	*py = c->y[s->index];
-	if(s->index > 0){
-		s->index--;
-	}else{
-		s->last_chunk = c->prev;
-		s->index = FILL_STACK_CHUNK_SIZE - 1;
-		free(c);
-	}
-}
-
-static void flood_fill_seed(struct quirc *q, int start_x, int start_y, int from, int to,
-				span_func_t func, void *user_data)
-{
-	struct fill_stack s;
-	fill_stack_init(&s);
-	fill_stack_push(&s, start_x, start_y);
-
-	do{
-		int x = 0, y = 0;
-		fill_stack_pop(&s, &x, &y);
-
-		int left = x, right = x, i;
 	quirc_pixel_t *row = q->pixels + y * q->w;
 
+	if (depth >= FLOOD_FILL_MAX_DEPTH)
+		return;
+
 	while (left > 0 && row[left - 1] == from)
 		left--;
 
@@ -280,7 +157,8 @@ static void flood_fill_seed(struct quirc *q, int start_x, int start_y, int from,
 
 		for (i = left; i <= right; i++)
 			if (row[i] == from)
-					fill_stack_push(&s, i, y - 1);
+				flood_fill_seed(q, i, y - 1, from, to,
+						func, user_data, depth + 1);
 	}
 
 	if (y < q->h - 1) {
@@ -288,66 +166,69 @@ static void flood_fill_seed(struct quirc *q, int start_x, int start_y, int from,
 
 		for (i = left; i <= right; i++)
 			if (row[i] == from)
-					fill_stack_push(&s, i, y + 1);
+				flood_fill_seed(q, i, y + 1, from, to,
+						func, user_data, depth + 1);
 	}
-	}while(!fill_stack_is_empty(&s));
 }
-#endif
 
 /************************************************************************
  * Adaptive thresholding
  */
 
-#define THRESHOLD_S_DEN		8
-#define THRESHOLD_T		5
-
-static void threshold(struct quirc *q)
+static uint8_t otsu(const struct quirc *q)
 {
-	int x, y;
-	int avg_w = 0;
-	int avg_u = 0;
-	int threshold_s = q->w / THRESHOLD_S_DEN;
-	quirc_pixel_t *row = q->pixels;
+	int numPixels = q->w * q->h;
 
-	for (y = 0; y < q->h; y++) {
-		int row_average[q->w];
-
-		memset(row_average, 0, sizeof(row_average));
-
-		for (x = 0; x < q->w; x++) {
-			int w, u;
-
-			if (y & 1) {
-				w = x;
-				u = q->w - 1 - x;
-			} else {
-				w = q->w - 1 - x;
-				u = x;
+	// Calculate histogram
+	const int HISTOGRAM_SIZE = 256;
+	unsigned int histogram[HISTOGRAM_SIZE];
+	memset(histogram, 0, (HISTOGRAM_SIZE) * sizeof(unsigned int));
+	uint8_t* ptr = q->image;
+	int length = numPixels;
+	while (length--) {
+		uint8_t value = *ptr++;
+		histogram[value]++;
 	}
 
-			avg_w = (avg_w * (threshold_s - 1)) /
-				threshold_s + row[w];
-			avg_u = (avg_u * (threshold_s - 1)) /
-				threshold_s + row[u];
-
-			row_average[w] += avg_w;
-			row_average[u] += avg_u;
+	// Calculate weighted sum of histogram values
+	int sum = 0;
+	for (int i = 0; i < HISTOGRAM_SIZE; ++i) {
+		sum += i * histogram[i];
 	}
 
-		for (x = 0; x < q->w; x++) {
-			if (row[x] < row_average[x] *
-			    (100 - THRESHOLD_T) / (200 * threshold_s))
-				row[x] = QUIRC_PIXEL_BLACK;
-			else
-				row[x] = QUIRC_PIXEL_WHITE;
+	// Compute threshold
+	int sumB = 0;
+	int q1 = 0;
+	double max = 0;
+	uint8_t threshold = 0;
+	for (int i = 0; i < HISTOGRAM_SIZE; ++i) {
+		// Weighted background
+		q1 += histogram[i];
+		if (q1 == 0)
+			continue;
+
+		// Weighted foreground
+		const int q2 = numPixels - q1;
+		if (q2 == 0)
+			break;
+
+		sumB += i * histogram[i];
+		const double m1 = (double)sumB / q1;
+		const double m2 = ((double)sum - sumB) / q2;
+		const double m1m2 = m1 - m2;
+		const double variance = m1m2 * m1m2 * q1 * q2;
+		if (variance >= max) {
+			threshold = i;
+			max = variance;
+		}
 	}
 
-		row += q->w;
-	}
+	return threshold;
 }
 
 static void area_count(void *user_data, int y, int left, int right)
 {
+    (void)y;
 	((struct quirc_region *)user_data)->count += right - left + 1;
 }
 
@@ -380,7 +261,7 @@ static int region_code(struct quirc *q, int x, int y)
 	box->seed.y = y;
 	box->capstone = -1;
 
-	flood_fill_seed(q, x, y, pixel, region, area_count, box);
+	flood_fill_seed(q, x, y, pixel, region, area_count, box, 0);
 
 	return region;
 }
@@ -450,7 +331,7 @@ static void find_region_corners(struct quirc *q,
 	psd.scores[0] = -1;
 	flood_fill_seed(q, region->seed.x, region->seed.y,
 			rcode, QUIRC_PIXEL_BLACK,
-			find_one_corner, &psd);
+			find_one_corner, &psd, 0);
 
 	psd.ref.x = psd.corners[0].x - psd.ref.x;
 	psd.ref.y = psd.corners[0].y - psd.ref.y;
@@ -468,7 +349,7 @@ static void find_region_corners(struct quirc *q,
 
 	flood_fill_seed(q, region->seed.x, region->seed.y,
 			QUIRC_PIXEL_BLACK, rcode,
-			find_other_corners, &psd);
+			find_other_corners, &psd, 0);
 }
 
 static void record_capstone(struct quirc *q, int ring, int stone)
@@ -541,7 +422,7 @@ static void finder_scan(struct quirc *q, int y)
 {
 	quirc_pixel_t *row = q->pixels + y * q->w;
 	int x;
-	int last_color;
+	int last_color = 0;
 	int run_length = 0;
 	int run_count = 0;
 	int pb[5];
@@ -887,7 +768,7 @@ static int fitness_all(const struct quirc *q, int index)
 
 	/* Check alignment patterns */
 	ap_count = 0;
-	while (info->apat[ap_count])
+	while ((ap_count < QUIRC_MAX_ALIGNMENT) && info->apat[ap_count])
 		ap_count++;
 
 	for (i = 1; i + 1 < ap_count; i++) {
@@ -973,7 +854,7 @@ static void rotate_capstone(struct quirc_capstone *cap,
 	struct quirc_point copy[4];
 	int j;
 	int best = 0;
-	int best_score = 0;
+	int best_score = INT_MAX;
 
 	for (j = 0; j < 4; j++) {
 		struct quirc_point *p = &cap->corners[j];
@@ -1081,10 +962,10 @@ static void record_qr_grid(struct quirc *q, int a, int b, int c)
 
 			flood_fill_seed(q, reg->seed.x, reg->seed.y,
 					qr->align_region, QUIRC_PIXEL_BLACK,
-					NULL, NULL);
+					NULL, NULL, 0);
 			flood_fill_seed(q, reg->seed.x, reg->seed.y,
 					QUIRC_PIXEL_BLACK, qr->align_region,
-					find_leftmost_to_line, &psd);
+					find_leftmost_to_line, &psd, 0);
 		}
 	}
 
@@ -1190,17 +1071,18 @@ static void test_grouping(struct quirc *q, int i)
 	test_neighbours(q, i, &hlist, &vlist);
 }
 
-static void pixels_setup(struct quirc *q)
+static void pixels_setup(struct quirc *q, uint8_t threshold)
 {
-	if (sizeof(*q->image) == sizeof(*q->pixels)) {
+	if (QUIRC_PIXEL_ALIAS_IMAGE) {
 		q->pixels = (quirc_pixel_t *)q->image;
-	} else {
-		int x, y;
-		for (y = 0; y < q->h; y++) {
-			for (x = 0; x < q->w; x++) {
-				q->pixels[y * q->w + x] = q->image[y * q->w + x];
-			}
 	}
+
+	uint8_t* source = q->image;
+	quirc_pixel_t* dest = q->pixels;
+	int length = q->w * q->h;
+	while (length--) {
+		uint8_t value = *source++;
+		*dest++ = (value < threshold) ? QUIRC_PIXEL_BLACK : QUIRC_PIXEL_WHITE;
 	}
 }
 
@@ -1222,8 +1104,8 @@ void quirc_end(struct quirc *q)
 {
 	int i;
 
-	pixels_setup(q);
-	threshold(q);
+	uint8_t threshold = otsu(q);
+	pixels_setup(q, threshold);
 
 	for (i = 0; i < q->h; i++)
 		finder_scan(q, i);

source/quirc/quirc.c

@@ -36,34 +36,73 @@ struct quirc *quirc_new(void)
 
 void quirc_destroy(struct quirc *q)
 {
-	if (q->image)
 	free(q->image);
-	if (sizeof(*q->image) != sizeof(*q->pixels))
+	/* q->pixels may alias q->image when their type representation is of the
+	   same size, so we need to be careful here to avoid a double free */
+	if (!QUIRC_PIXEL_ALIAS_IMAGE)
 		free(q->pixels);
-
 	free(q);
 }
 
 int quirc_resize(struct quirc *q, int w, int h)
 {
-	uint8_t *new_image = realloc(q->image, w * h);
+	uint8_t		*image  = NULL;
+	quirc_pixel_t	*pixels = NULL;
 
-	if (!new_image)
-		return -1;
+	/*
+	 * XXX: w and h should be size_t (or at least unsigned) as negatives
+	 * values would not make much sense. The downside is that it would break
+	 * both the API and ABI. Thus, at the moment, let's just do a sanity
+	 * check.
+	 */
+	if (w < 0 || h < 0)
+		goto fail;
 
-	if (sizeof(*q->image) != sizeof(*q->pixels)) {
-		size_t new_size = w * h * sizeof(quirc_pixel_t);
-		quirc_pixel_t *new_pixels = realloc(q->pixels, new_size);
-		if (!new_pixels)
-			return -1;
-		q->pixels = new_pixels;
+	/*
+	 * alloc a new buffer for q->image. We avoid realloc(3) because we want
+	 * on failure to be leave `q` in a consistant, unmodified state.
+	 */
+	image = calloc(w, h);
+	if (!image)
+		goto fail;
+
+	/* compute the "old" (i.e. currently allocated) and the "new"
+	   (i.e. requested) image dimensions */
+	size_t olddim = q->w * q->h;
+	size_t newdim = w * h;
+	size_t min = (olddim < newdim ? olddim : newdim);
+
+	/*
+	 * copy the data into the new buffer, avoiding (a) to read beyond the
+	 * old buffer when the new size is greater and (b) to write beyond the
+	 * new buffer when the new size is smaller, hence the min computation.
+	 */
+	(void)memcpy(image, q->image, min);
+
+	/* alloc a new buffer for q->pixels if needed */
+	if (!QUIRC_PIXEL_ALIAS_IMAGE) {
+		pixels = calloc(newdim, sizeof(quirc_pixel_t));
+		if (!pixels)
+			goto fail;
 	}
 
-	q->image = new_image;
+	/* alloc succeeded, update `q` with the new size and buffers */
 	q->w = w;
 	q->h = h;
+	free(q->image);
+	q->image = image;
+	if (!QUIRC_PIXEL_ALIAS_IMAGE) {
+		free(q->pixels);
+		q->pixels = pixels;
+	}
 
 	return 0;
+	/* NOTREACHED */
+fail:
+	free(image);
+	free(pixels);
+
+	return -1;
 }
 
 int quirc_count(const struct quirc *q)
@@ -84,7 +123,7 @@ static const char *const error_table[] = {
 
 const char *quirc_strerror(quirc_decode_error_t err)
 {
-	if (err >= 0 && err < sizeof(error_table) / sizeof(error_table[0]))
+	if (err < sizeof(error_table) / sizeof(error_table[0]))
 		return error_table[err];
 
 	return "Unknown error";

source/quirc/quirc.h

@@ -19,6 +19,10 @@
 
 #include <stdint.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct quirc;
 
 /* Obtain the library version string. */
@@ -117,7 +121,7 @@ struct quirc_code {
 	 * is a bitmask giving the actual values of cells. If the cell
 	 * at (x, y) is black, then the following bit is set:
 	 *
-	 *     cell_bitmap[i << 3] & (1 << (i & 7))
+	 *     cell_bitmap[i >> 3] & (1 << (i & 7))
 	 *
 	 * where i = (y * size) + x.
 	 */
@@ -162,4 +166,8 @@ void quirc_extract(const struct quirc *q, int index,
 quirc_decode_error_t quirc_decode(const struct quirc_code *code,
 				  struct quirc_data *data);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif

source/quirc/quirc_internal.h

@@ -32,8 +32,10 @@
 #define QUIRC_PERSPECTIVE_PARAMS	8
 
 #if QUIRC_MAX_REGIONS < UINT8_MAX
+#define QUIRC_PIXEL_ALIAS_IMAGE	1
 typedef uint8_t quirc_pixel_t;
 #elif QUIRC_MAX_REGIONS < UINT16_MAX
+#define QUIRC_PIXEL_ALIAS_IMAGE	0
 typedef uint16_t quirc_pixel_t;
 #else
 #error "QUIRC_MAX_REGIONS > 65534 is not supported"
@@ -98,9 +100,9 @@ struct quirc {
 #define QUIRC_MAX_ALIGNMENT   7
 
 struct quirc_rs_params {
-	int             bs; /* Block size */
-	int             dw; /* Data words */
-	int             ce; /* Correctable errors */
+	int             bs; /* Small block size */
+	int             dw; /* Small data words */
+	int		ns; /* Number of small blocks */
 };
 
 struct quirc_version_info {

source/quirc/version_db.c

@@ -22,400 +22,400 @@ const struct quirc_version_info quirc_version_db[QUIRC_MAX_VERSION + 1] = {
 		    .data_bytes = 26,
 		    .apat = {0},
 		    .ecc = {
-			    {.bs = 26, .dw = 16, .ce = 4},
-			    {.bs = 26, .dw = 19, .ce = 2},
-			    {.bs = 26, .dw = 9, .ce = 8},
-			    {.bs = 26, .dw = 13, .ce = 6}
+			    {.bs = 26, .dw = 16, .ns = 1},
+			    {.bs = 26, .dw = 19, .ns = 1},
+			    {.bs = 26, .dw = 9, .ns = 1},
+			    {.bs = 26, .dw = 13, .ns = 1}
 		    }
 	    },
 	    { /* Version 2 */
 		    .data_bytes = 44,
 		    .apat = {6, 18, 0},
 		    .ecc = {
-			    {.bs = 44, .dw = 28, .ce = 8},
-			    {.bs = 44, .dw = 34, .ce = 4},
-			    {.bs = 44, .dw = 16, .ce = 14},
-			    {.bs = 44, .dw = 22, .ce = 11}
+			    {.bs = 44, .dw = 28, .ns = 1},
+			    {.bs = 44, .dw = 34, .ns = 1},
+			    {.bs = 44, .dw = 16, .ns = 1},
+			    {.bs = 44, .dw = 22, .ns = 1}
 		    }
 	    },
 	    { /* Version 3 */
 		    .data_bytes = 70,
 		    .apat = {6, 22, 0},
 		    .ecc = {
-			    {.bs = 70, .dw = 44, .ce = 13},
-			    {.bs = 70, .dw = 55, .ce = 7},
-			    {.bs = 35, .dw = 13, .ce = 11},
-			    {.bs = 35, .dw = 17, .ce = 9}
+			    {.bs = 70, .dw = 44, .ns = 1},
+			    {.bs = 70, .dw = 55, .ns = 1},
+			    {.bs = 35, .dw = 13, .ns = 2},
+			    {.bs = 35, .dw = 17, .ns = 2}
 		    }
 	    },
 	    { /* Version 4 */
 		    .data_bytes = 100,
 		    .apat = {6, 26, 0},
 		    .ecc = {
-			    {.bs = 50, .dw = 32, .ce = 9},
-			    {.bs = 100, .dw = 80, .ce = 10},
-			    {.bs = 25, .dw = 9, .ce = 8},
-			    {.bs = 50, .dw = 24, .ce = 13}
+			    {.bs = 50, .dw = 32, .ns = 2},
+			    {.bs = 100, .dw = 80, .ns = 1},
+			    {.bs = 25, .dw = 9, .ns = 4},
+			    {.bs = 50, .dw = 24, .ns = 2}
 		    }
 	    },
 	    { /* Version 5 */
 		    .data_bytes = 134,
 		    .apat = {6, 30, 0},
 		    .ecc = {
-			    {.bs = 67, .dw = 43, .ce = 12},
-			    {.bs = 134, .dw = 108, .ce = 13},
-			    {.bs = 33, .dw = 11, .ce = 11},
-			    {.bs = 33, .dw = 15, .ce = 9}
+			    {.bs = 67, .dw = 43, .ns = 2},
+			    {.bs = 134, .dw = 108, .ns = 1},
+			    {.bs = 33, .dw = 11, .ns = 2},
+			    {.bs = 33, .dw = 15, .ns = 2}
 		    }
 	    },
 	    { /* Version 6 */
 		    .data_bytes = 172,
 		    .apat = {6, 34, 0},
 		    .ecc = {
-			    {.bs = 43, .dw = 27, .ce = 8},
-			    {.bs = 86, .dw = 68, .ce = 9},
-			    {.bs = 43, .dw = 15, .ce = 14},
-			    {.bs = 43, .dw = 19, .ce = 12}
+			    {.bs = 43, .dw = 27, .ns = 4},
+			    {.bs = 86, .dw = 68, .ns = 2},
+			    {.bs = 43, .dw = 15, .ns = 4},
+			    {.bs = 43, .dw = 19, .ns = 4}
 		    }
 	    },
 	    { /* Version 7 */
 		    .data_bytes = 196,
 		    .apat = {6, 22, 38, 0},
 		    .ecc = {
-			    {.bs = 49, .dw = 31, .ce = 9},
-			    {.bs = 98, .dw = 78, .ce = 10},
-			    {.bs = 39, .dw = 13, .ce = 13},
-			    {.bs = 32, .dw = 14, .ce = 9}
+			    {.bs = 49, .dw = 31, .ns = 4},
+			    {.bs = 98, .dw = 78, .ns = 2},
+			    {.bs = 39, .dw = 13, .ns = 4},
+			    {.bs = 32, .dw = 14, .ns = 2}
 		    }
 	    },
 	    { /* Version 8 */
 		    .data_bytes = 242,
 		    .apat = {6, 24, 42, 0},
 		    .ecc = {
-			    {.bs = 60, .dw = 38, .ce = 11},
-			    {.bs = 121, .dw = 97, .ce = 12},
-			    {.bs = 40, .dw = 14, .ce = 13},
-			    {.bs = 40, .dw = 18, .ce = 11}
+			    {.bs = 60, .dw = 38, .ns = 2},
+			    {.bs = 121, .dw = 97, .ns = 2},
+			    {.bs = 40, .dw = 14, .ns = 4},
+			    {.bs = 40, .dw = 18, .ns = 4}
 		    }
 	    },
 	    { /* Version 9 */
 		    .data_bytes = 292,
 		    .apat = {6, 26, 46, 0},
 		    .ecc = {
-			    {.bs = 58, .dw = 36, .ce = 11},
-			    {.bs = 146, .dw = 116, .ce = 15},
-			    {.bs = 36, .dw = 12, .ce = 12},
-			    {.bs = 36, .dw = 16, .ce = 10}
+			    {.bs = 58, .dw = 36, .ns = 3},
+			    {.bs = 146, .dw = 116, .ns = 2},
+			    {.bs = 36, .dw = 12, .ns = 4},
+			    {.bs = 36, .dw = 16, .ns = 4}
 		    }
 	    },
 	    { /* Version 10 */
 		    .data_bytes = 346,
 		    .apat = {6, 28, 50, 0},
 		    .ecc = {
-			    {.bs = 69, .dw = 43, .ce = 13},
-			    {.bs = 86, .dw = 68, .ce = 9},
-			    {.bs = 43, .dw = 15, .ce = 14},
-			    {.bs = 43, .dw = 19, .ce = 12}
+			    {.bs = 69, .dw = 43, .ns = 4},
+			    {.bs = 86, .dw = 68, .ns = 2},
+			    {.bs = 43, .dw = 15, .ns = 6},
+			    {.bs = 43, .dw = 19, .ns = 6}
 		    }
 	    },
 	    { /* Version 11 */
 		    .data_bytes = 404,
 		    .apat = {6, 30, 54, 0},
 		    .ecc = {
-			    {.bs = 80, .dw = 50, .ce = 15},
-			    {.bs = 101, .dw = 81, .ce = 10},
-			    {.bs = 36, .dw = 12, .ce = 12},
-			    {.bs = 50, .dw = 22, .ce = 14}
+			    {.bs = 80, .dw = 50, .ns = 1},
+			    {.bs = 101, .dw = 81, .ns = 4},
+			    {.bs = 36, .dw = 12, .ns = 3},
+			    {.bs = 50, .dw = 22, .ns = 4}
 		    }
 	    },
 	    { /* Version 12 */
 		    .data_bytes = 466,
 		    .apat = {6, 32, 58, 0},
 		    .ecc = {
-			    {.bs = 58, .dw = 36, .ce = 11},
-			    {.bs = 116, .dw = 92, .ce = 12},
-			    {.bs = 42, .dw = 14, .ce = 14},
-			    {.bs = 46, .dw = 20, .ce = 14}
+			    {.bs = 58, .dw = 36, .ns = 6},
+			    {.bs = 116, .dw = 92, .ns = 2},
+			    {.bs = 42, .dw = 14, .ns = 7},
+			    {.bs = 46, .dw = 20, .ns = 4}
 		    }
 	    },
 	    { /* Version 13 */
 		    .data_bytes = 532,
 		    .apat = {6, 34, 62, 0},
 		    .ecc = {
-			    {.bs = 59, .dw = 37, .ce = 11},
-			    {.bs = 133, .dw = 107, .ce = 13},
-			    {.bs = 33, .dw = 11, .ce = 11},
-			    {.bs = 44, .dw = 20, .ce = 12}
+			    {.bs = 59, .dw = 37, .ns = 8},
+			    {.bs = 133, .dw = 107, .ns = 4},
+			    {.bs = 33, .dw = 11, .ns = 12},
+			    {.bs = 44, .dw = 20, .ns = 8}
 		    }
 	    },
 	    { /* Version 14 */
 		    .data_bytes = 581,
 		    .apat = {6, 26, 46, 66, 0},
 		    .ecc = {
-			    {.bs = 65, .dw = 41, .ce = 12},
-			    {.bs = 109, .dw = 87, .ce = 11},
-			    {.bs = 36, .dw = 12, .ce = 12},
-			    {.bs = 54, .dw = 24, .ce = 15}
+			    {.bs = 64, .dw = 40, .ns = 4},
+			    {.bs = 145, .dw = 115, .ns = 3},
+			    {.bs = 36, .dw = 12, .ns = 11},
+			    {.bs = 36, .dw = 16, .ns = 11}
 		    }
 	    },
 	    { /* Version 15 */
 		    .data_bytes = 655,
 		    .apat = {6, 26, 48, 70, 0},
 		    .ecc = {
-			    {.bs = 65, .dw = 41, .ce = 12},
-			    {.bs = 109, .dw = 87, .ce = 11},
-			    {.bs = 36, .dw = 12, .ce = 12},
-			    {.bs = 54, .dw = 24, .ce = 15}
+			    {.bs = 65, .dw = 41, .ns = 5},
+			    {.bs = 109, .dw = 87, .ns = 5},
+			    {.bs = 36, .dw = 12, .ns = 11},
+			    {.bs = 54, .dw = 24, .ns = 5}
 		    }
 	    },
 	    { /* Version 16 */
 		    .data_bytes = 733,
 		    .apat = {6, 26, 50, 74, 0},
 		    .ecc = {
-			    {.bs = 73, .dw = 45, .ce = 14},
-			    {.bs = 122, .dw = 98, .ce = 12},
-			    {.bs = 45, .dw = 15, .ce = 15},
-			    {.bs = 43, .dw = 19, .ce = 12}
+			    {.bs = 73, .dw = 45, .ns = 7},
+			    {.bs = 122, .dw = 98, .ns = 5},
+			    {.bs = 45, .dw = 15, .ns = 3},
+			    {.bs = 43, .dw = 19, .ns = 15}
 		    }
 	    },
 	    { /* Version 17 */
 		    .data_bytes = 815,
 		    .apat = {6, 30, 54, 78, 0},
 		    .ecc = {
-			    {.bs = 74, .dw = 46, .ce = 14},
-			    {.bs = 135, .dw = 107, .ce = 14},
-			    {.bs = 42, .dw = 14, .ce = 14},
-			    {.bs = 50, .dw = 22, .ce = 14}
+			    {.bs = 74, .dw = 46, .ns = 10},
+			    {.bs = 135, .dw = 107, .ns = 1},
+			    {.bs = 42, .dw = 14, .ns = 2},
+			    {.bs = 50, .dw = 22, .ns = 1}
 		    }
 	    },
 	    { /* Version 18 */
 		    .data_bytes = 901,
 		    .apat = {6, 30, 56, 82, 0},
 		    .ecc = {
-			    {.bs = 69, .dw = 43, .ce = 13},
-			    {.bs = 150, .dw = 120, .ce = 15},
-			    {.bs = 42, .dw = 14, .ce = 14},
-			    {.bs = 50, .dw = 22, .ce = 14}
+			    {.bs = 69, .dw = 43, .ns = 9},
+			    {.bs = 150, .dw = 120, .ns = 5},
+			    {.bs = 42, .dw = 14, .ns = 2},
+			    {.bs = 50, .dw = 22, .ns = 17}
 		    }
 	    },
 	    { /* Version 19 */
 		    .data_bytes = 991,
 		    .apat = {6, 30, 58, 86, 0},
 		    .ecc = {
-			    {.bs = 70, .dw = 44, .ce = 13},
-			    {.bs = 141, .dw = 113, .ce = 14},
-			    {.bs = 39, .dw = 13, .ce = 13},
-			    {.bs = 47, .dw = 21, .ce = 13}
+			    {.bs = 70, .dw = 44, .ns = 3},
+			    {.bs = 141, .dw = 113, .ns = 3},
+			    {.bs = 39, .dw = 13, .ns = 9},
+			    {.bs = 47, .dw = 21, .ns = 17}
 		    }
 	    },
 	    { /* Version 20 */
 		    .data_bytes = 1085,
 		    .apat = {6, 34, 62, 90, 0},
 		    .ecc = {
-			    {.bs = 67, .dw = 41, .ce = 13},
-			    {.bs = 135, .dw = 107, .ce = 14},
-			    {.bs = 43, .dw = 15, .ce = 14},
-			    {.bs = 54, .dw = 24, .ce = 15}
+			    {.bs = 67, .dw = 41, .ns = 3},
+			    {.bs = 135, .dw = 107, .ns = 3},
+			    {.bs = 43, .dw = 15, .ns = 15},
+			    {.bs = 54, .dw = 24, .ns = 15}
 		    }
 	    },
 	    { /* Version 21 */
 		    .data_bytes = 1156,
 		    .apat = {6, 28, 50, 72, 92, 0},
 		    .ecc = {
-			    {.bs = 68, .dw = 42, .ce = 13},
-			    {.bs = 144, .dw = 116, .ce = 14},
-			    {.bs = 46, .dw = 16, .ce = 15},
-			    {.bs = 50, .dw = 22, .ce = 14}
+			    {.bs = 68, .dw = 42, .ns = 17},
+			    {.bs = 144, .dw = 116, .ns = 4},
+			    {.bs = 46, .dw = 16, .ns = 19},
+			    {.bs = 50, .dw = 22, .ns = 17}
 		    }
 	    },
 	    { /* Version 22 */
 		    .data_bytes = 1258,
 		    .apat = {6, 26, 50, 74, 98, 0},
 		    .ecc = {
-			    {.bs = 74, .dw = 46, .ce = 14},
-			    {.bs = 139, .dw = 111, .ce = 14},
-			    {.bs = 37, .dw = 13, .ce = 12},
-			    {.bs = 54, .dw = 24, .ce = 15}
+			    {.bs = 74, .dw = 46, .ns = 17},
+			    {.bs = 139, .dw = 111, .ns = 2},
+			    {.bs = 37, .dw = 13, .ns = 34},
+			    {.bs = 54, .dw = 24, .ns = 7}
 		    }
 	    },
 	    { /* Version 23 */
 		    .data_bytes = 1364,
 		    .apat = {6, 30, 54, 78, 102, 0},
 		    .ecc = {
-			    {.bs = 75, .dw = 47, .ce = 14},
-			    {.bs = 151, .dw = 121, .ce = 15},
-			    {.bs = 45, .dw = 15, .ce = 15},
-			    {.bs = 54, .dw = 24, .ce = 15}
+			    {.bs = 75, .dw = 47, .ns = 4},
+			    {.bs = 151, .dw = 121, .ns = 4},
+			    {.bs = 45, .dw = 15, .ns = 16},
+			    {.bs = 54, .dw = 24, .ns = 11}
 		    }
 	    },
 	    { /* Version 24 */
 		    .data_bytes = 1474,
 		    .apat = {6, 28, 54, 80, 106, 0},
 		    .ecc = {
-			    {.bs = 73, .dw = 45, .ce = 14},
-			    {.bs = 147, .dw = 117, .ce = 15},
-			    {.bs = 46, .dw = 16, .ce = 15},
-			    {.bs = 54, .dw = 24, .ce = 15}
+			    {.bs = 73, .dw = 45, .ns = 6},
+			    {.bs = 147, .dw = 117, .ns = 6},
+			    {.bs = 46, .dw = 16, .ns = 30},
+			    {.bs = 54, .dw = 24, .ns = 11}
 		    }
 	    },
 	    { /* Version 25 */
 		    .data_bytes = 1588,
 		    .apat = {6, 32, 58, 84, 110, 0},
 		    .ecc = {
-			    {.bs = 75, .dw = 47, .ce = 14},
-			    {.bs = 132, .dw = 106, .ce = 13},
-			    {.bs = 45, .dw = 15, .ce = 15},
-			    {.bs = 54, .dw = 24, .ce = 15}
+			    {.bs = 75, .dw = 47, .ns = 8},
+			    {.bs = 132, .dw = 106, .ns = 8},
+			    {.bs = 45, .dw = 15, .ns = 22},
+			    {.bs = 54, .dw = 24, .ns = 7}
 		    }
 	    },
 	    { /* Version 26 */
 		    .data_bytes = 1706,
 		    .apat = {6, 30, 58, 86, 114, 0},
 		    .ecc = {
-			    {.bs = 74, .dw = 46, .ce = 14},
-			    {.bs = 142, .dw = 114, .ce = 14},
-			    {.bs = 46, .dw = 16, .ce = 15},
-			    {.bs = 50, .dw = 22, .ce = 14}
+			    {.bs = 74, .dw = 46, .ns = 19},
+			    {.bs = 142, .dw = 114, .ns = 10},
+			    {.bs = 46, .dw = 16, .ns = 33},
+			    {.bs = 50, .dw = 22, .ns = 28}
 		    }
 	    },
 	    { /* Version 27 */
 		    .data_bytes = 1828,
 		    .apat = {6, 34, 62, 90, 118, 0},
 		    .ecc = {
-			    {.bs = 73, .dw = 45, .ce = 14},
-			    {.bs = 152, .dw = 122, .ce = 15},
-			    {.bs = 45, .dw = 15, .ce = 15},
-			    {.bs = 53, .dw = 23, .ce = 15}
+			    {.bs = 73, .dw = 45, .ns = 22},
+			    {.bs = 152, .dw = 122, .ns = 8},
+			    {.bs = 45, .dw = 15, .ns = 12},
+			    {.bs = 53, .dw = 23, .ns = 8}
 		    }
 	    },
 	    { /* Version 28 */
 		    .data_bytes = 1921,
 		    .apat = {6, 26, 50, 74, 98, 122, 0},
 		    .ecc = {
-			    {.bs = 73, .dw = 45, .ce = 14},
-			    {.bs = 147, .dw = 117, .ce = 15},
-			    {.bs = 45, .dw = 15, .ce = 15},
-			    {.bs = 54, .dw = 24, .ce = 15}
+			    {.bs = 73, .dw = 45, .ns = 3},
+			    {.bs = 147, .dw = 117, .ns = 3},
+			    {.bs = 45, .dw = 15, .ns = 11},
+			    {.bs = 54, .dw = 24, .ns = 4}
 		    }
 	    },
 	    { /* Version 29 */
 		    .data_bytes = 2051,
 		    .apat = {6, 30, 54, 78, 102, 126, 0},
 		    .ecc = {
-			    {.bs = 73, .dw = 45, .ce = 14},
-			    {.bs = 146, .dw = 116, .ce = 15},
-			    {.bs = 45, .dw = 15, .ce = 15},
-			    {.bs = 73, .dw = 45, .ce = 14}
+			    {.bs = 73, .dw = 45, .ns = 21},
+			    {.bs = 146, .dw = 116, .ns = 7},
+			    {.bs = 45, .dw = 15, .ns = 19},
+			    {.bs = 53, .dw = 23, .ns = 1}
 		    }
 	    },
 	    { /* Version 30 */
 		    .data_bytes = 2185,
 		    .apat = {6, 26, 52, 78, 104, 130, 0},
 		    .ecc = {
-			    {.bs = 75, .dw = 47, .ce = 14},
-			    {.bs = 145, .dw = 115, .ce = 15},
-			    {.bs = 45, .dw = 15, .ce = 15},
-			    {.bs = 54, .dw = 24, .ce = 15}
+			    {.bs = 75, .dw = 47, .ns = 19},
+			    {.bs = 145, .dw = 115, .ns = 5},
+			    {.bs = 45, .dw = 15, .ns = 23},
+			    {.bs = 54, .dw = 24, .ns = 15}
 		    }
 	    },
 	    { /* Version 31 */
 		    .data_bytes = 2323,
 		    .apat = {6, 30, 56, 82, 108, 134, 0},
 		    .ecc = {
-			    {.bs = 74, .dw = 46, .ce = 14},
-			    {.bs = 145, .dw = 115, .ce = 15},
-			    {.bs = 45, .dw = 15, .ce = 15},
-			    {.bs = 54, .dw = 24, .ce = 15}
+			    {.bs = 74, .dw = 46, .ns = 2},
+			    {.bs = 145, .dw = 115, .ns = 13},
+			    {.bs = 45, .dw = 15, .ns = 23},
+			    {.bs = 54, .dw = 24, .ns = 42}
 		    }
 	    },
 	    { /* Version 32 */
 		    .data_bytes = 2465,
 		    .apat = {6, 34, 60, 86, 112, 138, 0},
 		    .ecc = {
-			    {.bs = 74, .dw = 46, .ce = 14},
-			    {.bs = 145, .dw = 115, .ce = 15},
-			    {.bs = 45, .dw = 15, .ce = 15},
-			    {.bs = 54, .dw = 24, .ce = 15}
+			    {.bs = 74, .dw = 46, .ns = 10},
+			    {.bs = 145, .dw = 115, .ns = 17},
+			    {.bs = 45, .dw = 15, .ns = 19},
+			    {.bs = 54, .dw = 24, .ns = 10}
 		    }
 	    },
 	    { /* Version 33 */
 		    .data_bytes = 2611,
-		    .apat = {6, 30, 58, 96, 114, 142, 0},
+		    .apat = {6, 30, 58, 86, 114, 142, 0},
 		    .ecc = {
-			    {.bs = 74, .dw = 46, .ce = 14},
-			    {.bs = 145, .dw = 115, .ce = 15},
-			    {.bs = 45, .dw = 15, .ce = 15},
-			    {.bs = 54, .dw = 24, .ce = 15}
+			    {.bs = 74, .dw = 46, .ns = 14},
+			    {.bs = 145, .dw = 115, .ns = 17},
+			    {.bs = 45, .dw = 15, .ns = 11},
+			    {.bs = 54, .dw = 24, .ns = 29}
 		    }
 	    },
 	    { /* Version 34 */
 		    .data_bytes = 2761,
 		    .apat = {6, 34, 62, 90, 118, 146, 0},
 		    .ecc = {
-			    {.bs = 74, .dw = 46, .ce = 14},
-			    {.bs = 145, .dw = 115, .ce = 15},
-			    {.bs = 46, .dw = 16, .ce = 15},
-			    {.bs = 54, .dw = 24, .ce = 15}
+			    {.bs = 74, .dw = 46, .ns = 14},
+			    {.bs = 145, .dw = 115, .ns = 13},
+			    {.bs = 46, .dw = 16, .ns = 59},
+			    {.bs = 54, .dw = 24, .ns = 44}
 		    }
 	    },
 	    { /* Version 35 */
 		    .data_bytes = 2876,
 		    .apat = {6, 30, 54, 78, 102, 126, 150},
 		    .ecc = {
-			    {.bs = 75, .dw = 47, .ce = 14},
-			    {.bs = 151, .dw = 121, .ce = 15},
-			    {.bs = 45, .dw = 15, .ce = 15},
-			    {.bs = 54, .dw = 24, .ce = 15}
+			    {.bs = 75, .dw = 47, .ns = 12},
+			    {.bs = 151, .dw = 121, .ns = 12},
+			    {.bs = 45, .dw = 15, .ns = 22},
+			    {.bs = 54, .dw = 24, .ns = 39}
 		    }
 	    },
 	    { /* Version 36 */
 		    .data_bytes = 3034,
 		    .apat = {6, 24, 50, 76, 102, 128, 154},
 		    .ecc = {
-			    {.bs = 75, .dw = 47, .ce = 14},
-			    {.bs = 151, .dw = 121, .ce = 15},
-			    {.bs = 45, .dw = 15, .ce = 15},
-			    {.bs = 54, .dw = 24, .ce = 15}
+			    {.bs = 75, .dw = 47, .ns = 6},
+			    {.bs = 151, .dw = 121, .ns = 6},
+			    {.bs = 45, .dw = 15, .ns = 2},
+			    {.bs = 54, .dw = 24, .ns = 46}
 		    }
 	    },
 	    { /* Version 37 */
 		    .data_bytes = 3196,
 		    .apat = {6, 28, 54, 80, 106, 132, 158},
 		    .ecc = {
-			    {.bs = 74, .dw = 46, .ce = 14},
-			    {.bs = 152, .dw = 122, .ce = 15},
-			    {.bs = 45, .dw = 15, .ce = 15},
-			    {.bs = 54, .dw = 24, .ce = 15}
+			    {.bs = 74, .dw = 46, .ns = 29},
+			    {.bs = 152, .dw = 122, .ns = 17},
+			    {.bs = 45, .dw = 15, .ns = 24},
+			    {.bs = 54, .dw = 24, .ns = 49}
 		    }
 	    },
 	    { /* Version 38 */
 		    .data_bytes = 3362,
 		    .apat = {6, 32, 58, 84, 110, 136, 162},
 		    .ecc = {
-			    {.bs = 74, .dw = 46, .ce = 14},
-			    {.bs = 152, .dw = 122, .ce = 15},
-			    {.bs = 45, .dw = 15, .ce = 15},
-			    {.bs = 54, .dw = 24, .ce = 15}
+			    {.bs = 74, .dw = 46, .ns = 13},
+			    {.bs = 152, .dw = 122, .ns = 4},
+			    {.bs = 45, .dw = 15, .ns = 42},
+			    {.bs = 54, .dw = 24, .ns = 48}
 		    }
 	    },
 	    { /* Version 39 */
 		    .data_bytes = 3532,
 		    .apat = {6, 26, 54, 82, 110, 138, 166},
 		    .ecc = {
-			    {.bs = 75, .dw = 47, .ce = 14},
-			    {.bs = 147, .dw = 117, .ce = 15},
-			    {.bs = 45, .dw = 15, .ce = 15},
-			    {.bs = 54, .dw = 24, .ce = 15}
+			    {.bs = 75, .dw = 47, .ns = 40},
+			    {.bs = 147, .dw = 117, .ns = 20},
+			    {.bs = 45, .dw = 15, .ns = 10},
+			    {.bs = 54, .dw = 24, .ns = 43}
 		    }
 	    },
 	    { /* Version 40 */
 		    .data_bytes = 3706,
 		    .apat = {6, 30, 58, 86, 114, 142, 170},
 		    .ecc = {
-			    {.bs = 75, .dw = 47, .ce = 14},
-			    {.bs = 148, .dw = 118, .ce = 15},
-			    {.bs = 45, .dw = 15, .ce = 15},
-			    {.bs = 54, .dw = 24, .ce = 15}
+			    {.bs = 75, .dw = 47, .ns = 18},
+			    {.bs = 148, .dw = 118, .ns = 19},
+			    {.bs = 45, .dw = 15, .ns = 20},
+			    {.bs = 54, .dw = 24, .ns = 34}
 		    }
 	    }
 };

source/splashes.c

@@ -1,6 +1,6 @@
 /*
 *   This file is part of Anemone3DS
-*   Copyright (C) 2016-2018 Contributors in CONTRIBUTORS.md
+*   Copyright (C) 2016-2020 Contributors in CONTRIBUTORS.md
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by

source/themes.c

@@ -1,6 +1,6 @@
 /*
 *   This file is part of Anemone3DS
-*   Copyright (C) 2016-2018 Contributors in CONTRIBUTORS.md
+*   Copyright (C) 2016-2020 Contributors in CONTRIBUTORS.md
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -125,7 +125,7 @@ static Result install_theme_internal(Entry_List_s themes, int installmode)
                     FSUSER_OpenFile(&bgm_cache_handle, ArchiveThemeExt, fsMakePath(PATH_ASCII, bgm_cache_path), FS_OPEN_WRITE, 0);
 
                     padded = calloc(BGM_MAX_SIZE, sizeof(char));
-                    if(!current_theme->no_bgm_shuffle)
+                    if(!current_theme->no_bgm_shuffle && music_size)
                     {
                         memcpy(padded, music, music_size);
                         free(music);
@@ -184,16 +184,31 @@ static Result install_theme_internal(Entry_List_s themes, int installmode)
         if(installmode & THEME_INSTALL_BGM)
         {
             music_size = load_data("/bgm.bcstm", current_theme, &music);
-            if(music_size > BGM_MAX_SIZE)
+            if (music_size > BGM_MAX_SIZE)
             {
                 free(music);
                 DEBUG("bgm too big\n");
                 return MAKERESULT(RL_PERMANENT, RS_CANCELED, RM_APPLICATION, RD_TOO_LARGE);
             }
 
+            if (music_size != 0)
+            {
+                remake_file(fsMakePath(PATH_ASCII, "/BgmCache.bin"), ArchiveThemeExt, BGM_MAX_SIZE);
                 res = buf_to_file(music_size, fsMakePath(PATH_ASCII, "/BgmCache.bin"), ArchiveThemeExt, music);
                 free(music);
 
+                char *body_buf = NULL;
+                u32 uncompressed_size = decompress_lz_file(fsMakePath(PATH_ASCII, "/BodyCache.bin"), ArchiveThemeExt, &body_buf);
+                if (body_buf[5] != 1)
+                {
+                    installmode |= THEME_INSTALL_BODY;
+                    body_buf[5] = 1;
+                    body_size = compress_lz_file_fast(fsMakePath(PATH_ASCII, "/BodyCache.bin"), ArchiveThemeExt, body_buf, uncompressed_size);
+                }
+                    
+                free(body_buf);
+            }
+
             if(R_FAILED(res)) return res;
         } else
         {
@@ -300,6 +315,106 @@ inline Result shuffle_install(Entry_List_s themes)
     return install_theme_internal(themes, THEME_INSTALL_SHUFFLE | THEME_INSTALL_BODY | THEME_INSTALL_BGM);
 }
 
+static SwkbdCallbackResult
+dir_name_callback(void *data, const char ** ppMessage, const char * text, size_t textlen)
+{
+    (void)textlen;
+    (void)data;
+    if(strpbrk(text, "><\"?;:/\\+,.|[=]"))
+    {
+        *ppMessage = "Illegal character used.";
+        return SWKBD_CALLBACK_CONTINUE;
+    }
+    return SWKBD_CALLBACK_OK;
+}
+
+Result dump_theme(void)
+{
+    const int max_chars = 255;
+    char * output_dir = calloc(max_chars + 1, sizeof(char));
+
+    SwkbdState swkbd;
+
+    swkbdInit(&swkbd, SWKBD_TYPE_WESTERN, 2, max_chars);
+    swkbdSetHintText(&swkbd, "Name of output folder");
+
+    swkbdSetButton(&swkbd, SWKBD_BUTTON_LEFT, "Cancel", false);
+    swkbdSetButton(&swkbd, SWKBD_BUTTON_RIGHT, "Done", true);
+    swkbdSetValidation(&swkbd, SWKBD_NOTEMPTY_NOTBLANK, 0, max_chars);
+    swkbdSetFilterCallback(&swkbd, dir_name_callback, NULL);
+
+    SwkbdButton button = swkbdInputText(&swkbd, output_dir, max_chars);
+
+    if (button != SWKBD_BUTTON_CONFIRM)
+    {
+        DEBUG("<dump_theme> Something went wrong with getting swkbd\n");
+        return MAKERESULT(RL_FATAL, RS_CANCELED, RM_UTIL, RD_CANCEL_REQUESTED);
+    }
+
+    u16 path[0x107] = { 0 };
+    struacat(path, "/themes/");
+    struacat(path, output_dir);
+    FSUSER_CreateDirectory(ArchiveSD, fsMakePath(PATH_UTF16, path), FS_ATTRIBUTE_DIRECTORY);
+
+    char *thememanage_buf = NULL;
+    file_to_buf(fsMakePath(PATH_ASCII, "/ThemeManage.bin"), ArchiveThemeExt, &thememanage_buf);
+    ThemeManage_bin_s * theme_manage = (ThemeManage_bin_s *)thememanage_buf;
+    u32 theme_size = theme_manage->body_size;
+    u32 bgm_size = theme_manage->music_size;
+    free(thememanage_buf);
+
+    char *temp_buf = NULL;
+    file_to_buf(fsMakePath(PATH_ASCII, "/BodyCache.bin"), ArchiveThemeExt, &temp_buf);
+    u16 path_output[0x107] = { 0 };
+    memcpy(path_output, path, 0x107);
+    struacat(path_output, "/body_LZ.bin");
+    remake_file(fsMakePath(PATH_UTF16, path_output), ArchiveSD, theme_size);
+    buf_to_file(theme_size, fsMakePath(PATH_UTF16, path_output), ArchiveSD, temp_buf);
+    free(temp_buf);
+    temp_buf = NULL;
+
+    file_to_buf(fsMakePath(PATH_ASCII, "/BgmCache.bin"), ArchiveThemeExt, &temp_buf);
+    memcpy(path_output, path, 0x107);
+    struacat(path_output, "/bgm.bcstm");
+    remake_file(fsMakePath(PATH_UTF16, path_output), ArchiveSD, bgm_size);
+    buf_to_file(bgm_size, fsMakePath(PATH_UTF16, path_output), ArchiveSD, temp_buf);
+    free(temp_buf);
+    temp_buf = NULL;
+
+    char *smdh_file = calloc(1, 0x36c0);
+    smdh_file[0] = 0x53; // SMDH magic
+    smdh_file[1] = 0x4d;
+    smdh_file[2] = 0x44;
+    smdh_file[3] = 0x48;
+
+    struacat((u16 *) (smdh_file + 0x8), output_dir);
+    struacat((u16 *) (smdh_file + 0x88), "No description");
+    struacat((u16 *) (smdh_file + 0x188), "Unknown Author");
+
+    free(output_dir);
+
+    u8 r = rand() % 255;
+    u8 g = rand() % 255;
+    u8 b = rand() % 255;
+
+    u16 color = ((r & 0b11111000) << 8) | ((g & 0b11111100) << 3) | (b >> 3);
+
+    for (int i = 0x2040; i < 0x36c0; i += 2)
+    {
+        *(smdh_file + i) = (color & 0xFF00) >> 8;
+        *(smdh_file + i + 1) = color & 0x00FF;
+    }
+    
+    memcpy(path_output, path, 0x107);
+    struacat(path_output, "/info.smdh");
+    remake_file(fsMakePath(PATH_UTF16, path_output), ArchiveSD, 0x36c0);
+    buf_to_file(0x36c0, fsMakePath(PATH_UTF16, path_output), ArchiveSD, smdh_file);
+
+    free(smdh_file);
+
+    return 0;
+}
+
 void themes_check_installed(void * void_arg)
 {
     Thread_Arg_s * arg = (Thread_Arg_s *)void_arg;

source/unicode.c

@@ -1,6 +1,6 @@
 /*
 *   This file is part of Anemone3DS
-*   Copyright (C) 2016-2018 Contributors in CONTRIBUTORS.md
+*   Copyright (C) 2016-2020 Contributors in CONTRIBUTORS.md
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by