overlay: Import template

* Also move to dynamic cast

Author: Grarak

.github/workflows/nxcord.yml

@@ -33,6 +33,11 @@ jobs:
         with:
           name: client.nro
           path: build/client.nro
+      - name: Uploading overlay
+        uses: actions/[email protected]
+        with:
+          name: overlay.ovl
+          path: build/overlay.ovl
       - name: Building other flavors
         run: |
           export DEVKITPRO=/opt/devkitpro

.gitmodules

@@ -13,3 +13,6 @@
 [submodule "externals/wslay/wslay"]
 	path = externals/wslay/wslay
 	url = https://github.com/tatsuhiro-t/wslay.git
+[submodule "externals/libtesla/libtesla"]
+	path = externals/libtesla/libtesla
+	url = https://github.com/WerWolv/libtesla.git

CMakeLists.txt

@@ -4,6 +4,11 @@ project(nxcord-all)
 
 message(STATUS "Using toolchain file: ${CMAKE_TOOLCHAIN_FILE}.")
 
+string(TIMESTAMP TODAY "%Y%m%d")
+set(VERSION "0.3-${TODAY}")
+set_property(GLOBAL PROPERTY NXCORD_VERSION ${VERSION})
+add_definitions(-DNXCORD_VERSION="${VERSION}")
+
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/CMakeModules)
 
 include(SwitchTools)
@@ -15,11 +20,13 @@ find_package(Sodium REQUIRED)
 find_package(Zlib REQUIRED)
 
 include(externals/Atmosphere-libs/CMakeLists.txt)
+include(externals/libtesla/CMakeLists.txt)
 include(externals/Plutonium/CMakeLists.txt)
 include(externals/SimpleIniParser/CMakeLists.txt)
 include(externals/sleepy-discord/sleepy_discord/CMakeLists.txt)
 include(externals/wslay/CMakeLists.txt)
 include(common/CMakeLists.txt)
 include(nxcord/CMakeLists.txt)
 include(client/CMakeLists.txt)
+include(overlay/CMakeLists.txt)
 include(sysmodule/CMakeLists.txt)

CMakeModules/SwitchTools.cmake

@@ -312,6 +312,68 @@ function(add_nro_target target)
     set_target_properties(${target} PROPERTIES LINK_FLAGS "-specs=${LIBNX}/switch.specs")
 endfunction()
 
+function(add_ovl_target target)
+    get_filename_component(target_we ${target} NAME_WE)
+
+    # Extract metadata from the target.
+    get_target_property(icon ${target} "ICON")
+    get_target_property(romfs ${target} "ROMFS")
+
+    set_app_icon(${icon})
+
+    # Construct the `NROFLAGS` to invoke elf2nro with.
+    set(NROFLAGS "")
+
+    # Set icon for the NRO, if given.
+    if (__HOMEBREW_ICON)
+        string(APPEND ${NROFLAGS} "--icon=\"${__HOMEBREW_ICON}\"")
+    endif ()
+
+    # Add RomFS to the NRO, if given.
+    if (NOT "${romfs}" STREQUAL "romfs-NOTFOUND")
+        if (IS_DIRECTORY ${romfs})
+            # RomFS is a directory, pass --romfsdir to
+            # elf2nro and let it build an image for us.
+            string(APPEND ${NROFLAGS} " --romfsdir=\"${romfs}\"")
+        else ()
+            # A RomFS image was provided, which can be
+            # supplied to the --romfs flag.
+            if (EXISTS ${romfs})
+                string(APPEND ${NROFLAGS} " --romfs=\"${romfs}\"")
+            else ()
+                message(WARNING "The provided RomFS image at ${romfs} doesn't exist")
+            endif ()
+        endif ()
+    endif ()
+
+    # Build the NRO file.
+    if (NOT NO_NACP)
+        if (NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/${target_we}.nacp)
+            __generate_nacp(${target})
+        endif ()
+
+        add_custom_command(
+                OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${target_we}.ovl
+                COMMAND ${elf2nro} $<TARGET_FILE:${target}> ${CMAKE_CURRENT_BINARY_DIR}/${target_we}.ovl --nacp=${CMAKE_CURRENT_BINARY_DIR}/${target_we}.nacp ${NROFLAGS}
+                DEPENDS ${target} ${CMAKE_CURRENT_BINARY_DIR}/${target_we}.nacp
+                VERBATIM
+        )
+    else ()
+        message(STATUS "No .nacp file will be generated for ${target_we}.ovl")
+
+        add_custom_command(
+                OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${target_we}.ovl
+                COMMAND ${elf2nro} $<TARGET_FILE:${target}> ${CMAKE_CURRENT_BINARY_DIR}/${target_we}.ovl ${NROFLAGS}
+                DEPENDS ${target}
+                VERBATIM
+        )
+    endif ()
+
+    # Add the respective NRO target and set the required linker flags for the original target.
+    add_custom_target(${target_we}_ovl ALL SOURCES ${CMAKE_CURRENT_BINARY_DIR}/${target_we}.ovl)
+    set_target_properties(${target} PROPERTIES LINK_FLAGS "-specs=${LIBNX}/switch.specs")
+endfunction()
+
 ## Builds a .nso file from a given target.
 ##
 ## NSOs are the main executable format on the Switch, however

DevkitA64Libnx.cmake

@@ -93,7 +93,7 @@ add_definitions(-DSWITCH -D__SWITCH__)
 
 set(ARCH "-march=armv8-a+crc+crypto -mtune=cortex-a57 -mtp=soft -fPIE")
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -Wall -O2 -ffunction-sections ${ARCH}" CACHE STRING "C flags")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_C_FLAGS} -fno-rtti -fno-exceptions" CACHE STRING "C++ flags")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_C_FLAGS} -fno-exceptions" CACHE STRING "C++ flags")
 set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} -x assembler-with-cpp ${ARCH}" CACHE STRING "ASM flags")
 # These flags are purposefully empty to use the default flags when invoking the
 # devkitA64 linker. Otherwise the linker may complain about duplicate flags.

build_release.sh

@@ -9,11 +9,12 @@ cmake -DCMAKE_TOOLCHAIN_FILE=../DevkitA64Libnx.cmake ..
 make -j16
 cd ..
 mkdir -p release/atmosphere/contents/5600000000000000/flags
-mkdir -p release/switch
+mkdir -p release/switch/.overlays
 cp build/client.nro release/switch/nxcord.nro
 cp build/sysmodule.nsp release/atmosphere/contents/5600000000000000/exefs.nsp
 cp sysmodule/toolbox.json release/atmosphere/contents/5600000000000000/
 touch release/atmosphere/contents/5600000000000000/flags/boot2.flag
+cp build/overlay.ovl release/switch/.overlays/nxcord.ovl
 cd release
 zip -r release.zip *
 mv release.zip ../

client/CMakeLists.txt

@@ -18,11 +18,11 @@ if (ENABLE_CLIENT_STANDALONE)
     target_compile_definitions(client PRIVATE STANDALONE)
 endif ()
 
-string(TIMESTAMP TODAY "%Y%m%d")
+get_property(version GLOBAL PROPERTY NXCORD_VERSION)
 set_target_properties(client PROPERTIES
         APP_TITLE "NXCord"
         APP_AUTHOR "Grarak"
-        APP_VERSION "0.3-${TODAY}")
+        APP_VERSION "${version}")
 
 target_link_libraries(client plutonium nxcord)
 

externals/libtesla/CMakeLists.txt

@@ -0,0 +1,14 @@
+cmake_minimum_required(VERSION 3.1)
+
+project(libtesla)
+
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+add_library(libtesla STATIC ${CMAKE_CURRENT_LIST_DIR}/libtesla/include/tesla.hpp)
+set_target_properties(libtesla PROPERTIES LINKER_LANGUAGE CXX)
+
+target_include_directories(libtesla
+        PUBLIC
+        ${CMAKE_CURRENT_LIST_DIR}/libtesla/include)
+target_link_libraries(libtesla switch::libnx)

externals/libtesla/libtesla

@@ -141,12 +141,12 @@ void DiscordClient::onError(SleepyDiscord::ErrorCode errorCode,
 
 SleepyDiscord::Timer DiscordClient::schedule(SleepyDiscord::TimedTask code,
                                              const time_t milliseconds) {
-  return static_cast<DiscordScheduleHandler &>(getScheduleHandler())
+  return dynamic_cast<DiscordScheduleHandler &>(getScheduleHandler())
       .schedule(std::move(code), milliseconds);
 }
 
 void DiscordClient::stopClient() {
-  static_cast<DiscordScheduleHandler &>(getScheduleHandler()).clear();
+  dynamic_cast<DiscordScheduleHandler &>(getScheduleHandler()).clear();
 }
 
 bool DiscordClient::setLoginCredentials(const std::string &email,
@@ -286,5 +286,5 @@ void DiscordClient::tick() {
     }
   }
 
-  static_cast<DiscordScheduleHandler &>(getScheduleHandler()).tick();
+  dynamic_cast<DiscordScheduleHandler &>(getScheduleHandler()).tick();
 }

nxcord/src/discord_client.cpp

@@ -0,0 +1,20 @@
+cmake_minimum_required(VERSION 3.1)
+
+project(overlay)
+
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+file(GLOB overlay_src ${CMAKE_CURRENT_LIST_DIR}/src/*.cpp)
+
+add_executable(overlay ${overlay_src})
+
+target_link_libraries(overlay libtesla)
+
+get_property(version GLOBAL PROPERTY NXCORD_VERSION)
+set_target_properties(overlay PROPERTIES
+        APP_TITLE "NXCord"
+        APP_AUTHOR "Grarak"
+        APP_VERSION "${version}")
+
+add_ovl_target(overlay)

overlay/CMakeLists.txt

@@ -0,0 +1,31 @@
+#define TESLA_INIT_IMPL
+#include <tesla.hpp>
+
+class NXCordGui : public tsl::Gui {
+ public:
+  tsl::elm::Element* createUI() override {
+    auto rootFrame = new tsl::elm::OverlayFrame("NXCord", NXCORD_VERSION);
+    return rootFrame;
+  }
+
+  void update() override {}
+
+  bool handleInput(u64 keysDown, u64 keysHeld, touchPosition touchInput,
+                   JoystickPosition leftJoyStick,
+                   JoystickPosition rightJoyStick) override {
+    return false;
+  }
+};
+
+class NXCordOverlay : public tsl::Overlay<NXCordGui> {
+ public:
+  void initServices() override {}
+  void exitServices() override {}
+
+  void onShow() override {}
+  void onHide() override {}
+};
+
+int main(int argc, char* argv[]) {
+  return tsl::loop<NXCordOverlay>(argc, argv);
+}