WIP: Switch support

Submodules/UIKit/CMakeLists.txt

@@ -5,6 +5,7 @@ add_definitions(
 )
 
 add_library(UIKit
+        lib/tools/Logger.cpp
         lib/CABasicAnimation.cpp
         lib/CABasicAnimationPrototype.cpp
         lib/CABlurLayer.cpp
@@ -99,9 +100,10 @@ if (APPLE)
         )
     endif ()
 elseif (PLATFORM_SWITCH)
-        target_sources(UIKit PRIVATE
+        target_sources(UIKit PUBLIC
                 lib/platforms/SkiaCtx_sdlBase.cpp
                 lib/platforms/switch/SkiaCtx_switch.cpp
+                lib/platforms/switch/switch_wrapper.c
         )
 
         find_package(PkgConfig REQUIRED)
@@ -151,4 +153,4 @@ if (APPLE)
     list(APPEND platform_libs "-framework Foundation" "-framework VideoToolbox" "-framework AVKit" "-framework MetalKit" "-framework CoreText")
 endif ()
 
-target_link_libraries(UIKit PUBLIC ${platform_libs})
+target_link_libraries(UIKit PUBLIC fmt ${platform_libs})

Submodules/UIKit/include/UIKit.h

@@ -11,6 +11,7 @@
 #include <UIViewController.h>
 #include <UITapGestureRecognizer.h>
 #include <UIPanGestureRecognizer.h>
+#include <tools/Logger.hpp>
 #include <yoga/Yoga.h>
 
 using namespace NXKit::yoga::literals;

Submodules/UIKit/include/platforms/switch/SkiaCtx_switch.h

@@ -7,14 +7,16 @@
 
 namespace NXKit {
 
-class SkiaCtx_switch: public SkiaCtx_sdlBase {
+class SkiaCtx_switch: public SkiaCtx {
 public:
     SkiaCtx_switch();
+    ~SkiaCtx_switch();
 
     sk_sp<SkSurface> getBackbufferSurface() override;
 //    float getScaleFactor() override;
     sk_sp<GrDirectContext> directContext() override { return context; }
 
+    UIUserInterfaceStyle getThemeMode() override { return UIUserInterfaceStyle::light; }
 
     virtual void swapBuffers() override;
 

Submodules/UIKit/include/tools/Logger.hpp

@@ -0,0 +1,167 @@
+/*
+    Copyright 2019 natinusala
+    Copyright 2019 p-sam
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+#pragma once
+
+#include <fmt/core.h>
+#include <fmt/chrono.h>
+
+// #include <borealis/core/event.hpp>
+#include <mutex>
+#include <string>
+
+namespace NXKit
+{
+
+enum class LogLevel
+{
+    LOG_ERROR = 0,
+    LOG_WARNING,
+    LOG_INFO,
+    LOG_DEBUG,
+    LOG_VERBOSE
+};
+
+#ifdef PLATFORM_APPLE
+#define BRLS_ERROR_COLOR "🔴"
+#define BRLS_WARNING_COLOR "🟠"
+#define BRLS_INFO_COLOR "🔵"
+#define BRLS_DEBUG_COLOR "🟢"
+#define BRLS_VERBOSE_COLOR "⚪️"
+#else
+#define BRLS_ERROR_COLOR "[0;31m"
+#define BRLS_WARNING_COLOR "[0;33m"
+#define BRLS_INFO_COLOR "[0;34m"
+#define BRLS_DEBUG_COLOR "[0;32m"
+#define BRLS_VERBOSE_COLOR "[0;37m"
+#endif
+
+#define BRLS_LOG_ERROR(format, ...) brls::Logger::error("{}:{} " format, __FILE__, __LINE__, ##__VA_ARGS__)
+#define BRLS_LOG_WARNING(format, ...) brls::Logger::warning("{}:{} " format, __FILE__, __LINE__, ##__VA_ARGS__)
+#define BRLS_LOG_INFO(format, ...) brls::Logger::info("{}:{} " format, __FILE__, __LINE__, ##__VA_ARGS__)
+#define BRLS_LOG_DEBUG(format, ...) brls::Logger::debug("{}:{} " format, __FILE__, __LINE__, ##__VA_ARGS__)
+#define BRLS_LOG_VERBOSE(format, ...) brls::Logger::verbose("{}:{} " format, __FILE__, __LINE__, ##__VA_ARGS__)
+
+class Logger
+{
+  public:
+    using TimePoint = std::chrono::system_clock::time_point;
+
+    static void setLogLevel(LogLevel logLevel);
+
+    static LogLevel getLogLevel();
+
+    static void setLogOutput(std::FILE *logOut);
+
+    /**
+     * If sets to true, each log operation will lock a mutex, making the Logger thread-safe.
+     */
+    static void setThreadSafeLogging(bool threadSafeLogging);
+
+    template <typename... Args>
+    inline static void log(LogLevel level, std::string prefix, std::string color, fmt::format_string<Args...> format, Args&&... args)
+    {
+        if (Logger::logLevel < level)
+            return;
+
+        TimePoint now = std::chrono::system_clock::now();
+        uint64_t ms = std::chrono::duration_cast<std::chrono::milliseconds>(
+            now.time_since_epoch()).count() % 1000;
+#ifdef PS4
+        OrbisDateTime lt{};
+        if (sceRtcGetCurrentClockLocalTime)
+            sceRtcGetCurrentClockLocalTime(&lt);
+#else
+        std::tm time_tm = fmt::localtime(std::chrono::system_clock::to_time_t(now));
+#endif
+        std::string log = fmt::format(format, std::forward<Args>(args)...);
+
+        std::unique_lock<std::mutex> lock;
+        if (Logger::threadSafeLogging)
+            lock = std::unique_lock { logMtx };
+
+        try
+        {
+#ifdef PLATFORM_APPLE
+            fmt::print(logOut, "{:%H:%M:%S}.{:03d} {} {}\n", time_tm, (int)ms, color, log);
+#elif defined(ANDROID)
+            __android_log_print(6 - (int)level, "borealis", "%02d:%02d:%02d.%03d %s\n", time_tm.tm_hour, time_tm.tm_min, time_tm.tm_sec, (int)ms, log.c_str());
+#elif defined(__PSV__)
+            sceClibPrintf("%02d:%02d:%02d.%03d\033%s[%s]\033[0m %s\n", time_tm.tm_hour, time_tm.tm_min, time_tm.tm_sec, (int)ms, color.c_str(), prefix.c_str(), log.c_str());
+#elif defined(PS4)
+            sceKernelDebugOutText(0, fmt::format("{:02d}:{:02d}:{:02d}.{:03d}\033{}[{}]\033[0m {}\n", lt.hour, lt.minute, lt.second, (int)ms, color, prefix, log).c_str());
+#else
+            fmt::print(logOut, "{:%H:%M:%S}.{:03d}\033{}[{}]\033[0m {}\n", time_tm, (int)ms, color, prefix, log);
+#endif
+
+            // logEvent.fire(now, level, log);
+        }
+        catch (const std::exception& e)
+        {
+            // will be printed after the first fmt::print (so after the log tag)
+            printf("! Invalid log format string: \"%s\": %s\n", fmt::basic_string_view<char>(format).data(), e.what());
+        }
+
+#ifdef __MINGW32__
+        fflush(logOut);
+#endif
+    }
+
+    template <typename... Args>
+    inline static void error(fmt::format_string<Args...> format, Args&&... args)
+    {
+        Logger::log(LogLevel::LOG_ERROR, "ERROR", BRLS_ERROR_COLOR, format, std::forward<Args>(args)...);
+    }
+
+    template <typename... Args>
+    inline static void warning(fmt::format_string<Args...> format, Args&&... args)
+    {
+        Logger::log(LogLevel::LOG_WARNING, "WARNING", BRLS_WARNING_COLOR, format, std::forward<Args>(args)...);
+    }
+
+    template <typename... Args>
+    inline static void info(fmt::format_string<Args...> format, Args&&... args)
+    {
+        Logger::log(LogLevel::LOG_INFO, "INFO", BRLS_INFO_COLOR, format, std::forward<Args>(args)...);
+    }
+
+    template <typename... Args>
+    inline static void debug(fmt::format_string<Args...> format, Args&&... args)
+    {
+        Logger::log(LogLevel::LOG_DEBUG, "DEBUG", BRLS_DEBUG_COLOR, format, std::forward<Args>(args)...);
+    }
+
+    template <typename... Args>
+    inline static void verbose(fmt::format_string<Args...> format, Args&&... args)
+    {
+        Logger::log(LogLevel::LOG_VERBOSE, "VERBOSE", BRLS_VERBOSE_COLOR, format, std::forward<Args>(args)...);
+    }
+
+    // static Event<TimePoint, LogLevel, std::string>* getLogEvent()
+    // {
+    //     return &logEvent;
+    // }
+
+  private:
+    inline static std::mutex logMtx;
+    inline static bool threadSafeLogging = true;
+    // inline static Event<TimePoint, LogLevel, std::string> logEvent;
+    inline static std::FILE *logOut = stdout;
+    inline static LogLevel logLevel = LogLevel::LOG_INFO;
+};
+
+} // namespace brls

Submodules/UIKit/lib/UIApplicationMain.cpp

@@ -54,6 +54,7 @@ bool applicationRunLoop() {
         keyWindow->setFrame({ NXPoint::zero, SkiaCtx::_main->getSize() } );
 //    });
 
+    UITraitCollection::setCurrent(keyWindow->traitCollection());
     keyWindow->layer()->presentationOrSelf()->skiaRender(canvas);
     canvas->restore();
 

Submodules/UIKit/lib/platforms/SkiaCtx_sdlBase.cpp

@@ -34,7 +34,11 @@ SkiaCtx_sdlBase::SkiaCtx_sdlBase()
     flags |= SDL_WINDOW_OPENGL;
 #endif
 
-    window = SDL_CreateWindow("Window", 12, 12, 1280, 720, flags);
+    window = SDL_CreateWindow("Window", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, 1280, 720, flags);
+    if (!window) {
+        SDL_GetError();
+    }
+
     auto context = SDL_GL_CreateContext(window);
     SDL_GL_MakeCurrent(window, context);
 }