From e89d192ac966894626253075718609fcc9dd2847 Mon Sep 17 00:00:00 2001 From: Joel16 Date: Sat, 20 Jul 2019 00:07:19 -0400 Subject: [PATCH] Deprecate console version and update for libnx v2.3.0 --- .travis.yml | 7 +- .travis/.build.sh | 7 + {resources => .travis}/.travis-deps.sh | 2 +- Makefile | 195 ++++++- common/system.c | 12 +- common/wlan.c | 86 +-- common/wlan.h | 2 - console/LICENSE | 674 ----------------------- console/Makefile | 192 ------- console/README.md | 19 - console/source/main.c | 165 ------ gui/Makefile | 196 ------- gui/icon.jpg | Bin 11510 -> 0 bytes console/icon.jpg => icon.jpg | Bin {gui/include => include}/SDL_FontCache.h | 5 + {gui/include => include}/SDL_helper.h | 8 +- {gui/include => include}/menus.h | 0 resources/.build.sh | 9 - {gui/romfs => romfs}/Ubuntu-R.ttf | Bin {gui/romfs => romfs}/banner.png | Bin {gui/romfs => romfs}/drive.png | Bin {gui/source => source}/SDL_FontCache.c | 92 +++- {gui/source => source}/SDL_helper.c | 35 +- {gui/source => source}/main.c | 0 {gui/source => source}/menus.c | 0 25 files changed, 325 insertions(+), 1381 deletions(-) create mode 100644 .travis/.build.sh rename {resources => .travis}/.travis-deps.sh (90%) delete mode 100644 console/LICENSE delete mode 100644 console/Makefile delete mode 100644 console/README.md delete mode 100644 console/source/main.c delete mode 100644 gui/Makefile delete mode 100644 gui/icon.jpg rename console/icon.jpg => icon.jpg (100%) rename {gui/include => include}/SDL_FontCache.h (98%) rename {gui/include => include}/SDL_helper.h (90%) rename {gui/include => include}/menus.h (100%) delete mode 100644 resources/.build.sh rename {gui/romfs => romfs}/Ubuntu-R.ttf (100%) rename {gui/romfs => romfs}/banner.png (100%) rename {gui/romfs => romfs}/drive.png (100%) rename {gui/source => source}/SDL_FontCache.c (95%) rename {gui/source => source}/SDL_helper.c (83%) rename {gui/source => source}/main.c (100%) rename {gui/source => source}/menus.c (100%) diff --git a/.travis.yml b/.travis.yml index 2aae739..e9a7cb1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,20 +15,21 @@ install: - sudo dkp-pacman -Syu switch-dev --noconfirm --needed - sudo dkp-pacman -S switch-libpng --noconfirm - sudo dkp-pacman -S switch-libjpeg-turbo --noconfirm + - sudo dkp-pacman -S switch-libwebp --noconfirm - sudo dkp-pacman -S switch-sdl2 --noconfirm - sudo dkp-pacman -S switch-sdl2_gfx --noconfirm - sudo dkp-pacman -S switch-sdl2_image --noconfirm - sudo dkp-pacman -S switch-sdl2_ttf --noconfirm - source /etc/profile.d/devkit-env.sh - - sh resources/.travis-deps.sh + - sh .travis/.travis-deps.sh script: - cd $TRAVIS_BUILD_DIR - - sh resources/.build.sh + - sh .travis/.build.sh deploy: provider: pages skip_cleanup: true github_token: $GITHUB_TOKEN # Set in travis-ci.org dashboard on: - branch: master \ No newline at end of file + branch: master diff --git a/.travis/.build.sh b/.travis/.build.sh new file mode 100644 index 0000000..4353042 --- /dev/null +++ b/.travis/.build.sh @@ -0,0 +1,7 @@ +#!/bin/sh +set -e +set -x + +make clean && make +rm .gitattributes .travis.yml devkitpro-pacman.deb icon.jpg LICENSE Makefile README.md +rm -rf .travis build common include romfs source diff --git a/resources/.travis-deps.sh b/.travis/.travis-deps.sh similarity index 90% rename from resources/.travis-deps.sh rename to .travis/.travis-deps.sh index a2dd71e..aa217da 100644 --- a/resources/.travis-deps.sh +++ b/.travis/.travis-deps.sh @@ -9,4 +9,4 @@ cd libnx/ make sudo make install cd ../../ -rm -rf libnx-update/ \ No newline at end of file +rm -rf libnx-update/ diff --git a/Makefile b/Makefile index f37e2e4..3ef63d3 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,194 @@ -SUBDIRS = console gui +#--------------------------------------------------------------------------------- +.SUFFIXES: +#--------------------------------------------------------------------------------- -all: - @for dir in $(SUBDIRS); do $(MAKE) -C $$dir; done +ifeq ($(strip $(DEVKITPRO)),) +$(error "Please set DEVKITPRO in your environment. export DEVKITPRO=/devkitpro") +endif +TOPDIR ?= $(CURDIR) +include $(DEVKITPRO)/libnx/switch_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 +# EXEFS_SRC is the optional input directory containing data copied into exefs, if anything this normally should only contain "main.npdm". +# +# NO_ICON: if set to anything, do not use icon. +# NO_NACP: if set to anything, no .nacp file is generated. +# APP_TITLE is the name of the app stored in the .nacp file (Optional) +# APP_AUTHOR is the author of the app stored in the .nacp file (Optional) +# APP_VERSION is the version of the app stored in the .nacp file (Optional) +# APP_TITLEID is the titleID of the app stored in the .nacp file (Optional) +# ICON is the filename of the icon (.jpg), relative to the project folder. +# If not set, it attempts to use one of the following (in this order): +# - .jpg +# - icon.jpg +# - /default_icon.jpg +#--------------------------------------------------------------------------------- +TARGET := $(notdir $(CURDIR)) +BUILD := build +SOURCES := source common +DATA := data +INCLUDES := include common +EXEFS_SRC := exefs_src +ROMFS := romfs + +VERSION_MAJOR := 0 +VERSION_MINOR := 3 +VERSION_MICRO := 0 + +APP_TITLE := SwitchIdent +APP_AUTHOR := Joel16 +APP_VERSION := ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_MICRO} + +#--------------------------------------------------------------------------------- +# options for code generation +#--------------------------------------------------------------------------------- +ARCH := -march=armv8-a+crc+crypto -mtune=cortex-a57 -mtp=soft -fPIE + +CFLAGS := -g -Wall -O3 -ffunction-sections \ + -DVERSION_MAJOR=$(VERSION_MAJOR) -DVERSION_MINOR=$(VERSION_MINOR) -DVERSION_MICRO=$(VERSION_MICRO) \ + -DAPP_TITLE="\"$(APP_TITLE)\"" \ + -DGITVERSION="\"${GITVERSION}\"" \ + $(ARCH) $(DEFINES) + +CFLAGS += -D__SWITCH__ $(INCLUDE) `freetype-config --cflags` `sdl2-config --cflags` + +CXXFLAGS := $(CFLAGS) -fno-rtti -fno-exceptions + +ASFLAGS := -g $(ARCH) +LDFLAGS = -specs=$(DEVKITPRO)/libnx/switch.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map) -L$(PWD)/$(BUILD) + +LIBS := -lSDL2_ttf -lSDL2_image -lwebp -lpng -lturbojpeg `sdl2-config --libs` `freetype-config --libs` -lnx + +#--------------------------------------------------------------------------------- +# list of directories containing libraries, this must be the top level containing +# include and lib +#--------------------------------------------------------------------------------- +LIBDIRS := $(PORTLIBS) $(LIBNX) + + +#--------------------------------------------------------------------------------- +# no real need to edit anything past this point unless you need to add additional +# rules for different file extensions +#--------------------------------------------------------------------------------- +ifneq ($(BUILD),$(notdir $(CURDIR))) +#--------------------------------------------------------------------------------- + +export OUTPUT := $(CURDIR)/$(TARGET) +export TOPDIR := $(CURDIR) + +export VPATH := $(foreach dir,$(SOURCES),$(CURDIR)/$(dir)) \ + $(foreach dir,$(DATA),$(CURDIR)/$(dir)) + +export DEPSDIR := $(CURDIR)/$(BUILD) + +CFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.c))) +CPPFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.cpp))) +SFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.s))) +BINFILES := $(foreach dir,$(DATA),$(notdir $(wildcard $(dir)/*.*))) + +#--------------------------------------------------------------------------------- +# use CXX for linking C++ projects, CC for standard C +#--------------------------------------------------------------------------------- +export LD := $(CXX) + +export OFILES_BIN := $(addsuffix .o,$(BINFILES)) +export OFILES_SRC := $(CPPFILES:.cpp=.o) $(CFILES:.c=.o) $(SFILES:.s=.o) +export OFILES := $(OFILES_BIN) $(OFILES_SRC) +export HFILES_BIN := $(addsuffix .h,$(subst .,_,$(BINFILES))) + +export INCLUDE := $(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \ + $(foreach dir,$(LIBDIRS),-I$(dir)/include) \ + -I$(CURDIR)/$(BUILD) + +export LIBPATHS := $(foreach dir,$(LIBDIRS),-L$(dir)/lib) + +export BUILD_EXEFS_SRC := $(TOPDIR)/$(EXEFS_SRC) + +ifeq ($(strip $(ICON)),) + icons := $(wildcard *.jpg) + ifneq (,$(findstring $(TARGET).jpg,$(icons))) + export APP_ICON := $(TOPDIR)/$(TARGET).jpg + else + ifneq (,$(findstring icon.jpg,$(icons))) + export APP_ICON := $(TOPDIR)/icon.jpg + endif + endif +else + export APP_ICON := $(TOPDIR)/$(ICON) +endif + +ifeq ($(strip $(NO_ICON)),) + export NROFLAGS += --icon=$(APP_ICON) +endif + +ifeq ($(strip $(NO_NACP)),) + export NROFLAGS += --nacp=$(CURDIR)/$(TARGET).nacp +endif + +ifneq ($(APP_TITLEID),) + export NACPFLAGS += --titleid=$(APP_TITLEID) +endif + +ifneq ($(ROMFS),) + export NROFLAGS += --romfsdir=$(CURDIR)/$(ROMFS) +endif + +.PHONY: $(BUILD) clean all + +#--------------------------------------------------------------------------------- +all: $(BUILD) + +$(BUILD): + @[ -d $@ ] || mkdir -p $@ + @$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile + +#--------------------------------------------------------------------------------- clean: - @for dir in $(SUBDIRS); do $(MAKE) clean -C $$dir; done \ No newline at end of file + @echo clean ... + @rm -fr $(BUILD) $(TARGET).pfs0 $(TARGET).nso $(TARGET).nro $(TARGET).nacp $(TARGET).elf + + +#--------------------------------------------------------------------------------- +else +.PHONY: all + +DEPENDS := $(OFILES:.o=.d) + +#--------------------------------------------------------------------------------- +# main targets +#--------------------------------------------------------------------------------- +all : $(OUTPUT).pfs0 $(OUTPUT).nro + +$(OUTPUT).pfs0 : $(OUTPUT).nso + +$(OUTPUT).nso : $(OUTPUT).elf + +ifeq ($(strip $(NO_NACP)),) +$(OUTPUT).nro : $(OUTPUT).elf $(OUTPUT).nacp +else +$(OUTPUT).nro : $(OUTPUT).elf +endif + +$(OUTPUT).elf : $(OFILES) + +$(OFILES_SRC) : $(HFILES_BIN) + +#--------------------------------------------------------------------------------- +# you need a rule like this for each extension you use as binary data +#--------------------------------------------------------------------------------- +%.bin.o %_bin.h : %.bin +#--------------------------------------------------------------------------------- + @echo $(notdir $<) + @$(bin2o) + +-include $(DEPENDS) + +#--------------------------------------------------------------------------------------- +endif +#--------------------------------------------------------------------------------------- diff --git a/common/system.c b/common/system.c index ae5c84c..e38833a 100644 --- a/common/system.c +++ b/common/system.c @@ -41,8 +41,8 @@ u32 SwitchIdent_GetCPUClock(void) { Result ret = 0; u32 out = 0; - if (R_FAILED(ret = pcvGetClockRate(PcvModule_Cpu, &out))) - printf("pcvGetClockRate(PcvModule_Cpu) failed: 0x%x.\n\n", ret); + if (R_FAILED(ret = pcvGetClockRate(PcvModule_CpuBus, &out))) + printf("pcvGetClockRate(PcvModule_CpuBus) failed: 0x%x.\n\n", ret); return out/1000000; } @@ -51,8 +51,8 @@ u32 SwitchIdent_GetGPUClock(void) { Result ret = 0; u32 out = 0; - if (R_FAILED(ret = pcvGetClockRate(PcvModule_Gpu, &out))) - printf("pcvGetClockRate(PcvModule_Gpu) failed: 0x%x.\n\n", ret); + if (R_FAILED(ret = pcvGetClockRate(PcvModule_GPU, &out))) + printf("pcvGetClockRate(PcvModule_GPU) failed: 0x%x.\n\n", ret); return out/1000000; } @@ -61,8 +61,8 @@ u32 SwitchIdent_GetEMCClock(void) { Result ret = 0; u32 out = 0; - if (R_FAILED(ret = pcvGetClockRate(PcvModule_Emc, &out))) - printf("pcvGetClockRate(PcvModule_Emc) failed: 0x%x.\n\n", ret); + if (R_FAILED(ret = pcvGetClockRate(PcvModule_EMC , &out))) + printf("pcvGetClockRate(PcvModule_EMC ) failed: 0x%x.\n\n", ret); return out/1000000; } diff --git a/common/wlan.c b/common/wlan.c index cb196d2..c973edb 100644 --- a/common/wlan.c +++ b/common/wlan.c @@ -1,87 +1,5 @@ #include -static Service wlaninf_service; - -Result wlaninfInitialize(void) { - return smGetService(&wlaninf_service, "wlan:inf"); -} - -void wlaninfExit(void) { - serviceClose(&wlaninf_service); -} - -static Result wlaninfGetState(u32 *out) { - IpcCommand c; - ipcInitialize(&c); - - struct { - u64 magic; - u64 cmd_id; - } *raw; - - raw = ipcPrepareHeader(&c, sizeof(*raw)); - - raw->magic = SFCI_MAGIC; - raw->cmd_id = 10; - - Result rc = serviceIpcDispatch(&wlaninf_service); - - if(R_SUCCEEDED(rc)) { - IpcParsedCommand r; - ipcParse(&r); - - struct { - u64 magic; - u64 result; - u32 state; - } *resp = r.Raw; - - rc = resp->result; - - if (R_SUCCEEDED(rc)) { - *out = resp->state; - } - } - - return rc; -} - -static Result wlaninfGetRssi(u32 *out) { - IpcCommand c; - ipcInitialize(&c); - - struct { - u64 magic; - u64 cmd_id; - } *raw; - - raw = ipcPrepareHeader(&c, sizeof(*raw)); - - raw->magic = SFCI_MAGIC; - raw->cmd_id = 12; - - Result rc = serviceIpcDispatch(&wlaninf_service); - - if(R_SUCCEEDED(rc)) { - IpcParsedCommand r; - ipcParse(&r); - - struct { - u64 magic; - u64 result; - u32 rssi; - } *resp = r.Raw; - - rc = resp->result; - - if (R_SUCCEEDED(rc)) { - *out = resp->rssi; - } - } - - return rc; -} - u32 SwitchIdent_GetWlanState(void) { Result ret = 0; u32 out = 0; @@ -107,9 +25,9 @@ u32 SwitchIdent_GetWlanQuality(u32 dBm) { u32 SwitchIdent_GetWlanRSSI(void) { Result ret = 0; - u32 out = 0; + s32 out = 0; - if (R_FAILED(ret = wlaninfGetRssi(&out))) + if (R_FAILED(ret = wlaninfGetRSSI(&out))) return -1; return out; diff --git a/common/wlan.h b/common/wlan.h index ace91d9..c46aab7 100644 --- a/common/wlan.h +++ b/common/wlan.h @@ -1,8 +1,6 @@ #ifndef _SWITCHIDENT_WLAN_H_ #define _SWITCHIDENT_WLAN_H_ -Result wlaninfInitialize(void); -void wlaninfExit(void); u32 SwitchIdent_GetWlanState(void); u32 SwitchIdent_GetWlanQuality(u32 dBm); u32 SwitchIdent_GetWlanRSSI(void); diff --git a/console/LICENSE b/console/LICENSE deleted file mode 100644 index f47a530..0000000 --- a/console/LICENSE +++ /dev/null @@ -1,674 +0,0 @@ -GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) 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; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - {one line to give the program's name and a brief idea of what it does.} - Copyright (C) 2018 {name of author} - - 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 . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - SwitchIdent Copyright (C) 2018 Joel16 - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. \ No newline at end of file diff --git a/console/Makefile b/console/Makefile deleted file mode 100644 index d1c565a..0000000 --- a/console/Makefile +++ /dev/null @@ -1,192 +0,0 @@ -#--------------------------------------------------------------------------------- -.SUFFIXES: -#--------------------------------------------------------------------------------- - -ifeq ($(strip $(DEVKITPRO)),) -$(error "Please set DEVKITPRO in your environment. export DEVKITPRO=/devkitpro") -endif - -TOPDIR ?= $(CURDIR) -include $(DEVKITPRO)/libnx/switch_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 -# EXEFS_SRC is the optional input directory containing data copied into exefs, if anything this normally should only contain "main.npdm". -# -# NO_ICON: if set to anything, do not use icon. -# NO_NACP: if set to anything, no .nacp file is generated. -# APP_TITLE is the name of the app stored in the .nacp file (Optional) -# APP_AUTHOR is the author of the app stored in the .nacp file (Optional) -# APP_VERSION is the version of the app stored in the .nacp file (Optional) -# APP_TITLEID is the titleID of the app stored in the .nacp file (Optional) -# ICON is the filename of the icon (.jpg), relative to the project folder. -# If not set, it attempts to use one of the following (in this order): -# - .jpg -# - icon.jpg -# - /default_icon.jpg -#--------------------------------------------------------------------------------- -TARGET := $(notdir $(CURDIR)) -BUILD := build -SOURCES := source ../common -DATA := data -INCLUDES := include ../common -EXEFS_SRC := exefs_src - -VERSION_MAJOR := 0 -VERSION_MINOR := 3 -VERSION_MICRO := 0 - -APP_TITLE := SwitchIdent-console -APP_AUTHOR := Joel16 -APP_VERSION := ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_MICRO} - -#--------------------------------------------------------------------------------- -# options for code generation -#--------------------------------------------------------------------------------- -ARCH := -march=armv8-a -mtune=cortex-a57 -mtp=soft -fPIE - -CFLAGS := -g -Wall -O3 -ffunction-sections \ - -DVERSION_MAJOR=$(VERSION_MAJOR) -DVERSION_MINOR=$(VERSION_MINOR) \ - $(ARCH) $(DEFINES) - -CFLAGS += $(INCLUDE) -DSWITCH - -CXXFLAGS := $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++11 - -ASFLAGS := -g $(ARCH) -LDFLAGS = -specs=$(DEVKITPRO)/libnx/switch.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map) - -LIBS := -lnx - -#--------------------------------------------------------------------------------- -# list of directories containing libraries, this must be the top level containing -# include and lib -#--------------------------------------------------------------------------------- -LIBDIRS := $(PORTLIBS) $(LIBNX) - - -#--------------------------------------------------------------------------------- -# no real need to edit anything past this point unless you need to add additional -# rules for different file extensions -#--------------------------------------------------------------------------------- -ifneq ($(BUILD),$(notdir $(CURDIR))) -#--------------------------------------------------------------------------------- - -export OUTPUT := $(CURDIR)/$(TARGET) -export TOPDIR := $(CURDIR) - -export VPATH := $(foreach dir,$(SOURCES),$(CURDIR)/$(dir)) \ - $(foreach dir,$(DATA),$(CURDIR)/$(dir)) - -export DEPSDIR := $(CURDIR)/$(BUILD) - -CFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.c))) -CPPFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.cpp))) -SFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.s))) -BINFILES := $(foreach dir,$(DATA),$(notdir $(wildcard $(dir)/*.*))) - -#--------------------------------------------------------------------------------- -# use CXX for linking C++ projects, CC for standard C -#--------------------------------------------------------------------------------- -ifeq ($(strip $(CPPFILES)),) -#--------------------------------------------------------------------------------- - export LD := $(CC) -#--------------------------------------------------------------------------------- -else -#--------------------------------------------------------------------------------- - export LD := $(CXX) -#--------------------------------------------------------------------------------- -endif -#--------------------------------------------------------------------------------- - -export OFILES := $(addsuffix .o,$(BINFILES)) \ - $(CPPFILES:.cpp=.o) $(CFILES:.c=.o) $(SFILES:.s=.o) - -export INCLUDE := $(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \ - $(foreach dir,$(LIBDIRS),-I$(dir)/include) \ - -I$(CURDIR)/$(BUILD) - -export LIBPATHS := $(foreach dir,$(LIBDIRS),-L$(dir)/lib) - -export BUILD_EXEFS_SRC := $(TOPDIR)/$(EXEFS_SRC) - -ifeq ($(strip $(ICON)),) - icons := $(wildcard *.jpg) - ifneq (,$(findstring $(TARGET).jpg,$(icons))) - export APP_ICON := $(TOPDIR)/$(TARGET).jpg - else - ifneq (,$(findstring icon.jpg,$(icons))) - export APP_ICON := $(TOPDIR)/icon.jpg - endif - endif -else - export APP_ICON := $(TOPDIR)/$(ICON) -endif - -ifeq ($(strip $(NO_ICON)),) - export NROFLAGS += --icon=$(APP_ICON) -endif - -ifeq ($(strip $(NO_NACP)),) - export NROFLAGS += --nacp=$(CURDIR)/$(TARGET).nacp -endif - -ifneq ($(APP_TITLEID),) - export NACPFLAGS += --titleid=$(APP_TITLEID) -endif - -.PHONY: $(BUILD) clean all - -#--------------------------------------------------------------------------------- -all: $(BUILD) - -$(BUILD): - @[ -d $@ ] || mkdir -p $@ - @$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile - -#--------------------------------------------------------------------------------- -clean: - @echo clean ... - @rm -fr $(BUILD) $(TARGET).pfs0 $(TARGET).nso $(TARGET).nro $(TARGET).nacp $(TARGET).elf - - -#--------------------------------------------------------------------------------- -else -.PHONY: all - -DEPENDS := $(OFILES:.o=.d) - -#--------------------------------------------------------------------------------- -# main targets -#--------------------------------------------------------------------------------- -all : $(OUTPUT).pfs0 $(OUTPUT).nro - -$(OUTPUT).pfs0 : $(OUTPUT).nso - -$(OUTPUT).nso : $(OUTPUT).elf - -ifeq ($(strip $(NO_NACP)),) -$(OUTPUT).nro : $(OUTPUT).elf $(OUTPUT).nacp -else -$(OUTPUT).nro : $(OUTPUT).elf -endif - -$(OUTPUT).elf : $(OFILES) - -#--------------------------------------------------------------------------------- -# you need a rule like this for each extension you use as binary data -#--------------------------------------------------------------------------------- -%.bin.o : %.bin -#--------------------------------------------------------------------------------- - @echo $(notdir $<) - @$(bin2o) - --include $(DEPENDS) - -#--------------------------------------------------------------------------------------- -endif -#--------------------------------------------------------------------------------------- diff --git a/console/README.md b/console/README.md deleted file mode 100644 index 4d1c064..0000000 --- a/console/README.md +++ /dev/null @@ -1,19 +0,0 @@ -# SwitchIdent [![Travis](https://img.shields.io/travis/joel16/SwitchIdent.svg?style=flat-square)](https://github.com/joel16/SwitchIdent/tree/gh-pages) - -This program is still heavily a work in progress. Please use this at your own risk. (I have yet to own the device to make proper tests) - -Test builds can be found in the [gh-pages branch](https://github.com/joel16/SwitchIdent/tree/gh-pages). - -# Features: -- Displays system version. -- Displays hardware type and unit. -- Displays serial number. -- Displays region. (needs more testing) -- Displays CPU and GPU clocks based on the performance configuration returned by the APM service. -- Displays whether the switch is in docked/handheld state. - -# Credits: - -- Eve/Hikari/Junko: Beta testing -- Klodeckel: Beta testing -- hopperplaysmc: Beta testing diff --git a/console/source/main.c b/console/source/main.c deleted file mode 100644 index cd7aa43..0000000 --- a/console/source/main.c +++ /dev/null @@ -1,165 +0,0 @@ -#include -#include -#include -#include - -#include "kernel.h" -#include "misc.h" -#include "power.h" -#include "storage.h" -#include "setcal.h" -#include "system.h" -#include "utils.h" -#include "wlan.h" - -static bool isSDInserted = false, isGameCardInserted = false; - -static void SwitchIdent_InitServices(void) { - Result ret = 0; - - if (R_FAILED(ret = setInitialize())) - printf("setInitialize() failed: 0x%x.\n\n", ret); - - if (R_FAILED(ret = setsysInitialize())) - printf("setsysInitialize() failed: 0x%x.\n\n", ret); - - if (R_FAILED(ret = setcalInitialize())) - printf("setcalInitialize() failed: 0x%x.\n\n", ret); - - if (R_FAILED(ret = splInitialize())) - printf("splInitialize() failed: 0x%x.\n\n", ret); - - if (R_FAILED(ret = nifmInitialize())) - printf("nifmInitialize() failed: 0x%x.\n\n", ret); - - if (R_FAILED(ret = socketInitializeDefault())) - printf("socketInitializeDefault() failed: 0x%x.\n\n", ret); - - if (R_FAILED(ret = appletInitialize())) - printf("appletInitialize() failed: 0x%x.\n\n", ret); - - if (R_FAILED(ret = apmInitialize())) - printf("apmInitialize() failed: 0x%x.\n\n", ret); - - if (R_FAILED(ret = powerInitialize())) - printf("powerInitialize() failed: 0x%x.\n\n", ret); - - if (R_FAILED(ret = pcvInitialize())) - printf("pcvInitialize() failed: 0x%x.\n\n", ret); - - if (R_FAILED(ret = wlaninfInitialize())) - printf("wlaninfInitialize() failed: 0x%x.\n\n", ret); - - FsDeviceOperator fsDeviceOperator; - if (R_FAILED(ret = fsOpenDeviceOperator(&fsDeviceOperator))) - printf("fsOpenDeviceOperator() failed: 0x%x.\n\n", ret); - - isSDInserted = SwitchIdent_IsSDCardInserted(&fsDeviceOperator); - isGameCardInserted = SwitchIdent_IsGameCardInserted(&fsDeviceOperator); - - fsDeviceOperatorClose(&fsDeviceOperator); -} - -static void SwitchIdent_TermServices(void) { - wlaninfExit(); - pcvExit(); - powerExit(); - apmExit(); - appletExit(); - socketExit(); - nifmExit(); - splExit(); - setcalExit(); - setsysExit(); - setExit(); -} - -int main(int argc, char **argv) { - consoleInit(NULL); - - SwitchIdent_InitServices(); - - printf("\x1b[1;1H"); //Move the cursor to the top left corner of the screen - printf("\x1b[32;1mSwitchIdent v%d.%d %s\x1b[0m\n\n", VERSION_MAJOR, VERSION_MINOR, SwitchIdent_IsSafeMode()? "(SafeMode)" : ""); - - /* - Kernel/Hardware info: - */ - printf("\x1b[31;1m*\x1b[0m Firmware version: \x1b[31;1m%s\n", SwitchIdent_GetFirmwareVersion()); - printf("\x1b[31;1m*\x1b[0m Hardware: \x1b[31;1m%s\x1b[0m (\x1b[31;1m%s\x1b[0m) \x1b[0m\n", SwitchIdent_GetHardwareType(), SwitchIdent_GetUnit()); - printf("\x1b[31;1m*\x1b[0m Serial number: \x1b[31;1m%s\n", SwitchIdent_GetSerialNumber()); - printf("\x1b[31;1m*\x1b[0m Device ID: \x1b[31;1m%lu\n", SwitchIdent_GetDeviceID()); - printf("\x1b[31;1m*\x1b[0m DRAM ID: \x1b[31;1m%s\n\n", SwitchIdent_GetDramDesc()); - - /* - System info: - */ - printf("\x1b[33;1m*\x1b[0m Region: \x1b[33;1m%s\n", SwitchIdent_GetRegion()); - - printf("\x1b[14;0H"); - printf("\x1b[33;1m*\x1b[0m Bluetooth MAC address: \x1b[33;1m%s\n", SwitchIdent_GetBluetoothBdAddress()); - printf("\x1b[33;1m*\x1b[0m WLAN MAC address: \x1b[33;1m%s\n\n", SwitchIdent_GetWirelessLanMacAddress()); - - - printf("\x1b[22;0H"); - printf("\x1b[36;1m*\x1b[0m Battery lot number: \x1b[36;1m%s \n\n", SwitchIdent_GetBatteryLot()); - - /* - Misc info: - */ - char hostname[128]; - Result ret = gethostname(hostname, sizeof(hostname)); - - printf("\x1b[24;0H"); - printf("\x1b[35;1m*\x1b[0m IP: \x1b[35;1m%s\n", R_SUCCEEDED(ret)? hostname : NULL); - printf("\x1b[35;1m*\x1b[0m Wireless LAN: \x1b[35;1m%s\n", SwitchIdent_GetFlag(SetSysFlag_WirelessLanEnable)? "Enabled" : "Disabled"); - printf("\x1b[35;1m*\x1b[0m Bluetooth: \x1b[35;1m%s\n", SwitchIdent_GetFlag(SetSysFlag_BluetoothEnable)? "Enabled" : "Disabled"); - printf("\x1b[35;1m*\x1b[0m NFC: \x1b[35;1m%s\n", SwitchIdent_GetFlag(SetSysFlag_NfcEnable)? "Enabled" : "Disabled"); - printf("\x1b[35;1m*\x1b[0m Automatic update: \x1b[35;1m%s\n", SwitchIdent_GetFlag(SetSysFlag_AutoUpdateEnable)? "Enabled" : "Disabled"); - printf("\x1b[35;1m*\x1b[0m Console information upload: \x1b[35;1m%s\n", SwitchIdent_GetFlag(SetSysFlag_ConsoleInformationUpload)? "Enabled" : "Disabled"); - - printf("\x1b[34;0H"); - printf("\x1b[32;1m> Press the plus key to exit =)\x1b[0m"); - - while(appletMainLoop()) { - /* - System info (continued): - */ - printf("\x1b[10;0H"); - printf("\x1b[33;1m*\x1b[0m CPU clock: \x1b[33;1m%d\x1b[0m MHz \n", SwitchIdent_GetCPUClock()); - printf("\x1b[33;1m*\x1b[0m GPU clock: \x1b[33;1m%d\x1b[0m MHz \n", SwitchIdent_GetGPUClock()); - printf("\x1b[33;1m*\x1b[0m EMC clock: \x1b[33;1m%d\x1b[0m MHz \n", SwitchIdent_GetEMCClock()); - printf("\x1b[33;1m*\x1b[0m Wireless LAN: \x1b[33;1m%s\x1b[0m (RSSI: \x1b[33;1m%d\x1b[0m) (Quality: \x1b[33;1m%d\x1b[0m) \n", SwitchIdent_GetFlag(SetSysFlag_WirelessLanEnable)? "Enabled" : "Disabled", SwitchIdent_GetWlanRSSI(), SwitchIdent_GetWlanQuality(SwitchIdent_GetWlanRSSI())); - - /* - Battery info: - */ - printf("\x1b[17;0H"); - printf("\x1b[36;1m*\x1b[0m Battery percentage: \x1b[36;1m%d %%\x1b[0m (\x1b[36;1m%s\x1b[0m) \x1b[0m \n", SwitchIdent_GetBatteryPercent(), SwitchIdent_IsCharging()? "charging" : "not charging"); - printf("\x1b[36;1m*\x1b[0m Battery voltage state: \x1b[36;1m%s \n", SwitchIdent_GetVoltageState()); - printf("\x1b[36;1m*\x1b[0m Battery charger type: \x1b[36;1m%s \n", SwitchIdent_GetChargerType()); - printf("\x1b[36;1m*\x1b[0m Battery charging enabled: \x1b[36;1m%s \n", SwitchIdent_IsChargingEnabled()? "Yes" : "No"); - printf("\x1b[36;1m*\x1b[0m Battery ample power supplied: \x1b[36;1m%s \n", SwitchIdent_IsEnoughPowerSupplied()? "Yes" : "No"); - - printf("\x1b[30;0H"); - printf("\x1b[35;1m*\x1b[0m State: \x1b[35;1m%s \n", SwitchIdent_GetOperationMode()); - printf("\x1b[35;1m*\x1b[0m SD card status: \x1b[35;1m%s \n", isSDInserted? "Inserted" : "Not inserted"); - printf("\x1b[35;1m*\x1b[0m Game card status: \x1b[35;1m%s \n\n", isGameCardInserted? "Inserted" : "Not inserted"); - - //Scan all the inputs. This should be done once for each frame - hidScanInput(); - - //hidKeysDown returns information about which buttons have been just pressed (and they weren't in the previous frame) - u32 kDown = hidKeysDown(CONTROLLER_P1_AUTO); - - if (kDown & KEY_PLUS) - break; // break in order to return to hbmenu - - consoleUpdate(NULL); - } - - SwitchIdent_TermServices(); - - consoleExit(NULL); - return 0; -} diff --git a/gui/Makefile b/gui/Makefile deleted file mode 100644 index bda0c14..0000000 --- a/gui/Makefile +++ /dev/null @@ -1,196 +0,0 @@ -#--------------------------------------------------------------------------------- -.SUFFIXES: -#--------------------------------------------------------------------------------- - -ifeq ($(strip $(DEVKITPRO)),) -$(error "Please set DEVKITPRO in your environment. export DEVKITPRO=/devkitpro") -endif - -TOPDIR ?= $(CURDIR) -include $(DEVKITPRO)/libnx/switch_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 -# EXEFS_SRC is the optional input directory containing data copied into exefs, if anything this normally should only contain "main.npdm". -# -# NO_ICON: if set to anything, do not use icon. -# NO_NACP: if set to anything, no .nacp file is generated. -# APP_TITLE is the name of the app stored in the .nacp file (Optional) -# APP_AUTHOR is the author of the app stored in the .nacp file (Optional) -# APP_VERSION is the version of the app stored in the .nacp file (Optional) -# APP_TITLEID is the titleID of the app stored in the .nacp file (Optional) -# ICON is the filename of the icon (.jpg), relative to the project folder. -# If not set, it attempts to use one of the following (in this order): -# - .jpg -# - icon.jpg -# - /default_icon.jpg -#--------------------------------------------------------------------------------- -TARGET := $(notdir $(CURDIR)) -BUILD := build -SOURCES := source ../common -DATA := data -INCLUDES := include ../common -EXEFS_SRC := exefs_src -ROMFS := romfs - -VERSION_MAJOR := 0 -VERSION_MINOR := 3 -VERSION_MICRO := 0 - -APP_TITLE := SwitchIdent-gui -APP_AUTHOR := Joel16 -APP_VERSION := ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_MICRO} - -#--------------------------------------------------------------------------------- -# options for code generation -#--------------------------------------------------------------------------------- -ARCH := -march=armv8-a -mtune=cortex-a57 -mtp=soft -fPIE - -CFLAGS := -g -Wall -O3 -ffunction-sections `freetype-config --cflags` `sdl2-config --cflags` \ - -DVERSION_MAJOR=$(VERSION_MAJOR) -DVERSION_MINOR=$(VERSION_MINOR) -DVERSION_MICRO=$(VERSION_MICRO) \ - -DAPP_TITLE="\"$(APP_TITLE)\"" \ - -DGITVERSION="\"${GITVERSION}\"" \ - $(ARCH) $(DEFINES) - -CFLAGS += $(INCLUDE) -D__SWITCH__ - -CXXFLAGS := $(CFLAGS) -fno-rtti -fno-exceptions - -ASFLAGS := -g $(ARCH) -LDFLAGS = -specs=$(DEVKITPRO)/libnx/switch.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map) -L$(PWD)/$(BUILD) - -LIBS := -lSDL2_ttf -lSDL2_image -lSDL2 \ - -lpng -lz -ljpeg \ - -lfreetype -lbz2 -lEGL -lglapi -ldrm_nouveau -lnx \ - -#--------------------------------------------------------------------------------- -# list of directories containing libraries, this must be the top level containing -# include and lib -#--------------------------------------------------------------------------------- -LIBDIRS := $(PORTLIBS) $(LIBNX) - - -#--------------------------------------------------------------------------------- -# no real need to edit anything past this point unless you need to add additional -# rules for different file extensions -#--------------------------------------------------------------------------------- -ifneq ($(BUILD),$(notdir $(CURDIR))) -#--------------------------------------------------------------------------------- - -export OUTPUT := $(CURDIR)/$(TARGET) -export TOPDIR := $(CURDIR) - -export VPATH := $(foreach dir,$(SOURCES),$(CURDIR)/$(dir)) \ - $(foreach dir,$(DATA),$(CURDIR)/$(dir)) - -export DEPSDIR := $(CURDIR)/$(BUILD) - -CFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.c))) -CPPFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.cpp))) -SFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.s))) -BINFILES := $(foreach dir,$(DATA),$(notdir $(wildcard $(dir)/*.*))) - -#--------------------------------------------------------------------------------- -# use CXX for linking C++ projects, CC for standard C -#--------------------------------------------------------------------------------- -export LD := $(CXX) - -export OFILES_BIN := $(addsuffix .o,$(BINFILES)) -export OFILES_SRC := $(CPPFILES:.cpp=.o) $(CFILES:.c=.o) $(SFILES:.s=.o) -export OFILES := $(OFILES_BIN) $(OFILES_SRC) -export HFILES_BIN := $(addsuffix .h,$(subst .,_,$(BINFILES))) - -export INCLUDE := $(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \ - $(foreach dir,$(LIBDIRS),-I$(dir)/include) \ - -I$(CURDIR)/$(BUILD) - -export LIBPATHS := $(foreach dir,$(LIBDIRS),-L$(dir)/lib) - -export BUILD_EXEFS_SRC := $(TOPDIR)/$(EXEFS_SRC) - -ifeq ($(strip $(ICON)),) - icons := $(wildcard *.jpg) - ifneq (,$(findstring $(TARGET).jpg,$(icons))) - export APP_ICON := $(TOPDIR)/$(TARGET).jpg - else - ifneq (,$(findstring icon.jpg,$(icons))) - export APP_ICON := $(TOPDIR)/icon.jpg - endif - endif -else - export APP_ICON := $(TOPDIR)/$(ICON) -endif - -ifeq ($(strip $(NO_ICON)),) - export NROFLAGS += --icon=$(APP_ICON) -endif - -ifeq ($(strip $(NO_NACP)),) - export NROFLAGS += --nacp=$(CURDIR)/$(TARGET).nacp -endif - -ifneq ($(APP_TITLEID),) - export NACPFLAGS += --titleid=$(APP_TITLEID) -endif - -ifneq ($(ROMFS),) - export NROFLAGS += --romfsdir=$(CURDIR)/$(ROMFS) -endif - -.PHONY: $(BUILD) clean all - -#--------------------------------------------------------------------------------- -all: $(BUILD) - -$(BUILD): - @[ -d $@ ] || mkdir -p $@ - @$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile - -#--------------------------------------------------------------------------------- -clean: - @echo clean ... - @rm -fr $(BUILD) $(TARGET).pfs0 $(TARGET).nso $(TARGET).nro $(TARGET).nacp $(TARGET).elf - - -#--------------------------------------------------------------------------------- -else -.PHONY: all - -DEPENDS := $(OFILES:.o=.d) - -#--------------------------------------------------------------------------------- -# main targets -#--------------------------------------------------------------------------------- -all : $(OUTPUT).pfs0 $(OUTPUT).nro - -$(OUTPUT).pfs0 : $(OUTPUT).nso - -$(OUTPUT).nso : $(OUTPUT).elf - -ifeq ($(strip $(NO_NACP)),) -$(OUTPUT).nro : $(OUTPUT).elf $(OUTPUT).nacp -else -$(OUTPUT).nro : $(OUTPUT).elf -endif - -$(OUTPUT).elf : $(OFILES) - -$(OFILES_SRC) : $(HFILES_BIN) - -#--------------------------------------------------------------------------------- -# you need a rule like this for each extension you use as binary data -#--------------------------------------------------------------------------------- -%.bin.o %_bin.h : %.bin -#--------------------------------------------------------------------------------- - @echo $(notdir $<) - @$(bin2o) - --include $(DEPENDS) - -#--------------------------------------------------------------------------------------- -endif -#--------------------------------------------------------------------------------------- diff --git a/gui/icon.jpg b/gui/icon.jpg deleted file mode 100644 index 1ec8f6e005a3f403f48b4d5f9e4f4640e392ce28..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11510 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 JLqdsP{tssaDn9@K diff --git a/console/icon.jpg b/icon.jpg similarity index 100% rename from console/icon.jpg rename to icon.jpg diff --git a/gui/include/SDL_FontCache.h b/include/SDL_FontCache.h similarity index 98% rename from gui/include/SDL_FontCache.h rename to include/SDL_FontCache.h index 100972d..7ddd747 100644 --- a/gui/include/SDL_FontCache.h +++ b/include/SDL_FontCache.h @@ -143,6 +143,11 @@ Uint8 FC_LoadFontFromTTF(FC_Font* font, SDL_Renderer* renderer, TTF_Font* ttf, S Uint8 FC_LoadFont_RW(FC_Font* font, SDL_Renderer* renderer, SDL_RWops* file_rwops_ttf, Uint8 own_rwops, Uint32 pointSize, SDL_Color color, int style); #endif +#ifndef FC_USE_SDL_GPU +// note: handle SDL event types SDL_RENDER_TARGETS_RESET(>= SDL 2.0.2) and SDL_RENDER_DEVICE_RESET(>= SDL 2.0.4) +void FC_ResetFontFromRendererReset(FC_Font* font, SDL_Renderer* renderer, Uint32 evType); +#endif + void FC_ClearFont(FC_Font* font); void FC_FreeFont(FC_Font* font); diff --git a/gui/include/SDL_helper.h b/include/SDL_helper.h similarity index 90% rename from gui/include/SDL_helper.h rename to include/SDL_helper.h index 25660ee..e59c504 100644 --- a/gui/include/SDL_helper.h +++ b/include/SDL_helper.h @@ -1,9 +1,9 @@ -#ifndef NX_SHELL_SDL_HELPER_H -#define NX_SHELL_SDL_HELPER_H +#ifndef _SWITCHIDENT_SDL_HELPER_H_ +#define _SWITCHIDENT_SDL_HELPER_H_ #include #include -#include + #include "SDL_FontCache.h" #define BACKGROUND_COLOUR FC_MakeColor(242, 241, 240, 255) @@ -15,7 +15,7 @@ #define MENU_INFO_TITLE_COLOUR FC_MakeColor(144, 137, 129, 255) #define MENU_INFO_DESC_COLOUR FC_MakeColor(51, 51, 51, 255) -void SDL_HelperInit(void); +int SDL_HelperInit(void); void SDL_HelperTerm(void); void SDL_ClearScreen(SDL_Color colour); void SDL_DrawRect(int x, int y, int w, int h, SDL_Color colour); diff --git a/gui/include/menus.h b/include/menus.h similarity index 100% rename from gui/include/menus.h rename to include/menus.h diff --git a/resources/.build.sh b/resources/.build.sh deleted file mode 100644 index 9aa9573..0000000 --- a/resources/.build.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -set -e -set -x - -make clean && make -mv gui/gui.nro ./SwitchIdent_GUI.nro -mv console/console.nro ./SwitchIdent_Console.nro -rm .gitattributes .travis.yml devkitpro-pacman.deb LICENSE Makefile README.md -rm -rf common console gui resources source \ No newline at end of file diff --git a/gui/romfs/Ubuntu-R.ttf b/romfs/Ubuntu-R.ttf similarity index 100% rename from gui/romfs/Ubuntu-R.ttf rename to romfs/Ubuntu-R.ttf diff --git a/gui/romfs/banner.png b/romfs/banner.png similarity index 100% rename from gui/romfs/banner.png rename to romfs/banner.png diff --git a/gui/romfs/drive.png b/romfs/drive.png similarity index 100% rename from gui/romfs/drive.png rename to romfs/drive.png diff --git a/gui/source/SDL_FontCache.c b/source/SDL_FontCache.c similarity index 95% rename from gui/source/SDL_FontCache.c rename to source/SDL_FontCache.c index d47d2d6..dbb2c40 100644 --- a/gui/source/SDL_FontCache.c +++ b/source/SDL_FontCache.c @@ -549,10 +549,11 @@ const char* U8_next(const char* string) int U8_strinsert(char* string, int position, const char* source, int max_bytes) { - int pos_bytes; + int pos_u8char; int len; int add_len; int ulen; + const char* string_start = string; if(string == NULL || source == NULL) return 0; @@ -568,15 +569,15 @@ int U8_strinsert(char* string, int position, const char* source, int max_bytes) return 0; // Move string pointer to the proper position - pos_bytes = 0; - while(*string != '\0' && pos_bytes < position) + pos_u8char = 0; + while(*string != '\0' && pos_u8char < position) { string = (char*)U8_next(string); - ++pos_bytes; + ++pos_u8char; } // Move the rest of the string out of the way - memmove(string + add_len, string, len - pos_bytes + 1); + memmove(string + add_len, string, len - (string - string_start) + 1); // Copy in the new characters memcpy(string, source, add_len); @@ -907,6 +908,46 @@ static Uint8 FC_GrowGlyphCache(FC_Font* font) #endif return 0; } + // bug: we do not have the correct color here, this might be the wrong color! + // , most functions use set_color_for_all_caches() + // - for evading this bug, you must use FC_SetDefaultColor(), before using any draw functions + set_color(new_level, font->default_color.r, font->default_color.g, font->default_color.b, FC_GET_ALPHA(font->default_color)); +#ifndef FC_USE_SDL_GPU + { + Uint8 r, g, b, a; + SDL_Texture* prev_target = SDL_GetRenderTarget(font->renderer); + SDL_Rect prev_clip, prev_viewport; + int prev_logicalw, prev_logicalh; + Uint8 prev_clip_enabled; + float prev_scalex, prev_scaley; + // only backup if previous target existed (SDL will preserve them for the default target) + if (prev_target) { + prev_clip_enabled = has_clip(font->renderer); + if (prev_clip_enabled) + prev_clip = get_clip(font->renderer); + SDL_RenderGetViewport(font->renderer, &prev_viewport); + SDL_RenderGetScale(font->renderer, &prev_scalex, &prev_scaley); + SDL_RenderGetLogicalSize(font->renderer, &prev_logicalw, &prev_logicalh); + } + SDL_SetTextureBlendMode(new_level, SDL_BLENDMODE_BLEND); + SDL_SetRenderTarget(font->renderer, new_level); + SDL_GetRenderDrawColor(font->renderer, &r, &g, &b, &a); + SDL_SetRenderDrawColor(font->renderer, 0, 0, 0, 0); + SDL_RenderClear(font->renderer); + SDL_SetRenderDrawColor(font->renderer, r, g, b, a); + SDL_SetRenderTarget(font->renderer, prev_target); + if (prev_target) { + if (prev_clip_enabled) + set_clip(font->renderer, &prev_clip); + if (prev_logicalw && prev_logicalh) + SDL_RenderSetLogicalSize(font->renderer, prev_logicalw, prev_logicalh); + else { + SDL_RenderSetViewport(font->renderer, &prev_viewport); + SDL_RenderSetScale(font->renderer, prev_scalex, prev_scaley); + } + } + } +#endif return 1; } @@ -1160,10 +1201,10 @@ Uint8 FC_LoadFontFromTTF(FC_Font* font, SDL_Renderer* renderer, TTF_Font* ttf, S font->last_glyph.rect.w = 0; font->last_glyph.rect.h = font->height; - memset(buff, 0, 5); source_string = font->loading_string; for(; *source_string != '\0'; source_string = U8_next(source_string)) { + memset(buff, 0, 5); if(!U8_charcpy(buff, source_string, 5)) continue; glyph_surf = TTF_RenderUTF8_Blended(ttf, buff, white); @@ -1306,6 +1347,35 @@ Uint8 FC_LoadFont_RW(FC_Font* font, FC_Target* renderer, SDL_RWops* file_rwops_t } +#ifndef FC_USE_SDL_GPU +void FC_ResetFontFromRendererReset(FC_Font* font, SDL_Renderer* renderer, Uint32 evType) +{ + TTF_Font* ttf; + SDL_Color col; + Uint8 owns_ttf; + if (font == NULL) + return; + + // Destroy glyph cache + if (evType == SDL_RENDER_TARGETS_RESET) { + int i; + for (i = 0; i < font->glyph_cache_count; ++i) + SDL_DestroyTexture(font->glyph_cache[i]); + } + free(font->glyph_cache); + + ttf = font->ttf_source; + col = font->default_color; + owns_ttf = font->owns_ttf_source; + FC_Init(font); + + // Can only reload glyphs if we own the SDL_RWops. + if (owns_ttf) + FC_LoadFontFromTTF(font, renderer, ttf, col); + font->owns_ttf_source = owns_ttf; +} +#endif + void FC_ClearFont(FC_Font* font) { int i; @@ -2578,10 +2648,12 @@ FC_Rect FC_GetBounds(FC_Font* font, float x, float y, FC_AlignEnum align, FC_Sca if(formatted_text == NULL) return result; - FC_EXTRACT_VARARGS(fc_buffer, formatted_text); + // Create a temp buffer while GetWidth and GetHeight use fc_buffer. + char* temp = (char*)malloc(fc_buffer_size); + FC_EXTRACT_VARARGS(temp, formatted_text); - result.w = FC_GetWidth(font, "%s", fc_buffer) * scale.x; - result.h = FC_GetHeight(font, "%s", fc_buffer) * scale.y; + result.w = FC_GetWidth(font, "%s", temp) * scale.x; + result.h = FC_GetHeight(font, "%s", temp) * scale.y; switch(align) { @@ -2597,6 +2669,8 @@ FC_Rect FC_GetBounds(FC_Font* font, float x, float y, FC_AlignEnum align, FC_Sca break; } + free(temp); + return result; } diff --git a/gui/source/SDL_helper.c b/source/SDL_helper.c similarity index 83% rename from gui/source/SDL_helper.c rename to source/SDL_helper.c index 0fbe49a..21f40ad 100644 --- a/gui/source/SDL_helper.c +++ b/source/SDL_helper.c @@ -1,3 +1,5 @@ +#include + #include "SDL_helper.h" #define FC_USE_SDL_GPU 1 @@ -8,32 +10,39 @@ static FC_Font *font; static SDL_Texture *banner, *drive; static void SDL_LoadImage(SDL_Texture **texture, char *path) { - SDL_Surface *loaded_surface = NULL; - loaded_surface = IMG_Load(path); + SDL_Surface *image = NULL; - if (loaded_surface) { - Uint32 colorkey = SDL_MapRGB(loaded_surface->format, 0, 0, 0); - SDL_SetColorKey(loaded_surface, SDL_TRUE, colorkey); - *texture = SDL_CreateTextureFromSurface(RENDERER, loaded_surface); - } - - SDL_FreeSurface(loaded_surface); + image = IMG_Load(path); + if (!image) + return; + + SDL_ConvertSurfaceFormat(image, SDL_PIXELFORMAT_RGBA8888, 0); + *texture = SDL_CreateTextureFromSurface(RENDERER, image); + SDL_FreeSurface(image); } -void SDL_HelperInit(void) { - SDL_Init(SDL_INIT_VIDEO); +int SDL_HelperInit(void) { + if (SDL_Init(SDL_INIT_VIDEO) != 0) + return -1; + WINDOW = SDL_CreateWindow("SwitchIdent", 0, 0, 1280, 720, SDL_WINDOW_FULLSCREEN); + if (WINDOW == NULL) + return -1; + RENDERER = SDL_CreateRenderer(WINDOW, -1, SDL_RENDERER_ACCELERATED | SDL_RENDERER_PRESENTVSYNC); - SDL_SetRenderDrawBlendMode(RENDERER, SDL_BLENDMODE_BLEND); SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, "2"); - IMG_Init(IMG_INIT_PNG); + int flags = IMG_INIT_PNG; + if ((IMG_Init(flags) & flags) != flags) + return -1; SDL_LoadImage(&banner, "romfs:/banner.png"); SDL_LoadImage(&drive, "romfs:/drive.png"); font = FC_CreateFont(); FC_LoadFont(font, RENDERER, "romfs:/Ubuntu-R.ttf", 25, FC_MakeColor(0, 0, 0, 255), TTF_STYLE_NORMAL); + + return 0; } void SDL_HelperTerm(void) { diff --git a/gui/source/main.c b/source/main.c similarity index 100% rename from gui/source/main.c rename to source/main.c diff --git a/gui/source/menus.c b/source/menus.c similarity index 100% rename from gui/source/menus.c rename to source/menus.c