feat: add set_pcxxheader

Author: zeromake

include/infra/filesystem.hpp

@@ -318,14 +318,14 @@ bool _FontInfo::isLineEmpty() {
 void _FontInfo::advanceCharInHankaku(int offset, int width, int height) {
     if (width > 0) {
         int offsetWidth = width - (offset * pitch_xy[0] / 2);
-        positionOffset.width = std::max(offsetWidth, positionOffset.width);
+        positionOffset.width = (std::max)(offsetWidth, positionOffset.width);
         if (tateyoko_mode == YOKO_MODE) {
             positionOffset.all_width += offsetWidth;
         }
     }
     if (height > 0) {
         int offsetHeight = height - pitch_xy[1];
-        positionOffset.height = std::max(offsetHeight, positionOffset.height);
+        positionOffset.height = (std::max)(offsetHeight, positionOffset.height);
         if (tateyoko_mode == TATE_MODE) {
             positionOffset.all_height += offsetHeight;
         }

src/FontInfo.cpp

@@ -27,10 +27,6 @@
 
 #include <SDL.h>
 
-#include <functional>
-#include <infra/Config.hpp>
-#include <map>
-
 #include "BaseReader.h"
 #include "FontConfig.h"
 #include "resize/scale_manager.hpp"

src/FontInfo.h

@@ -24,9 +24,7 @@
 #if !defined(__LUA_HANDLER_H__) && defined(USE_LUA)
 #define __LUA_HANDLER_H__
 
-#include <infra/Config.hpp>
 #include <lua.hpp>
-#include <memory>
 
 #include "resize/scale_manager.hpp"
 

src/LUAHandler.h

@@ -24,7 +24,6 @@
 
 #include "ScriptHandler.h"
 
-#include <infra/filesystem.hpp>
 #include <vector>
 
 #include "coding2utf16.h"
@@ -160,19 +159,19 @@ int ScriptHandler::fpath(const char *path, char *result, bool use_save_dir) {
     const char *prefix_dir =
         (use_save_dir && save_dir) ? save_dir : archive_path;
     const int prefix_dir_size = strlen(prefix_dir);
-    if (std::fs::path(path).is_absolute() || path[0] == '.') {
+    if (onscripter::fs::path(path).is_absolute() || path[0] == '.') {
         strcpy(result, path);
     } else if (strncmp(path, prefix_dir, prefix_dir_size) != 0) {
-        strcpy(result, (std::fs::path(prefix_dir) / path).string().c_str());
+        strcpy(result, (onscripter::fs::path(prefix_dir) / path).string().c_str());
     }
     char *buf = result;
     while (*buf != '\0') {
         if ((*buf == '/' || *buf == '\\') &&
-            *buf != std::fs::path::preferred_separator)
-            *buf = std::fs::path::preferred_separator;
+            *buf != onscripter::fs::path::preferred_separator)
+            *buf = onscripter::fs::path::preferred_separator;
         buf++;
     }
-    strcpy(result, std::fs::absolute(result).string().c_str());
+    strcpy(result, onscripter::fs::absolute(result).string().c_str());
     return 0;
 }
 
@@ -1100,7 +1099,7 @@ int ScriptHandler::readScript(char *path) {
     }
 
     onscripter::Vector<onscripter::String> unencrypt;
-    std::fs::path root_dir;
+    onscripter::fs::path root_dir;
     if (archive_path && *archive_path) {
         root_dir = archive_path;
     } else {
@@ -1110,7 +1109,7 @@ int ScriptHandler::readScript(char *path) {
         fclose(fp);
         estimated_buffer_length = 1;
 
-        for (auto f : std::fs::directory_iterator(root_dir)) {
+        for (auto f : onscripter::fs::directory_iterator(root_dir)) {
             auto _fp = f.path();
             if (f.is_regular_file() && _fp.extension() == ".txt") {
                 auto str = _fp.filename().string();

src/ScriptHandler.cpp

@@ -29,7 +29,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <infra/Config.hpp>
 #include <string>
 
 #include "BaseReader.h"

src/ScriptHandler.h

@@ -24,8 +24,6 @@
 
 #include "ScriptParser.h"
 
-#include <infra/filesystem.hpp>
-
 #include "private/utils.h"
 #ifdef USE_BUILTIN_LAYER_EFFECTS
 #include "builtin_layer.h"
@@ -507,13 +505,13 @@ int ScriptParser::saveFileIOBuf(const char *filename,
     bool use_save_dir = false;
     if (strcmp(filename, "envdata") != 0) use_save_dir = true;
     // check dir
-    std::fs::path pp(filename);
+    onscripter::fs::path pp(filename);
     auto parent_path = pp.parent_path().string();
     if (parent_path.length() > 0) {
         char dir[STRING_BUFFER_LENGTH] = {0};
         fpath(parent_path.c_str(), dir, use_save_dir);
-        if (!std::fs::exists(std::fs::status(dir))) {
-            std::fs::create_directory(dir);
+        if (!onscripter::fs::exists(onscripter::fs::status(dir))) {
+            onscripter::fs::create_directory(dir);
         }
     }
 

src/ScriptParser.cpp

@@ -31,8 +31,6 @@
 #include <string.h>
 #include <time.h>
 
-#include <map>
-
 #include "AnimationInfo.h"
 #include "DirectReader.h"
 #include "FontInfo.h"
@@ -512,7 +510,7 @@ class ScriptParser {
     } root_rmenu_link;
     unsigned int rmenu_link_num, rmenu_link_width;
 
-    std::map<int, char *> rmenu_calls;
+    onscripter::SmallUnorderedMap<int, char *> rmenu_calls;
     unsigned int rmenu_call_no = 1000;
 
     void deleteRMenuLink();

src/ScriptParser.h

@@ -0,0 +1,9 @@
+#include "config.hpp"
+
+namespace onscripter {
+    Defer::Defer(const std::function<void(void)>& act): action(act) {};
+    Defer::Defer(const std::function<void(void)>&& act): action(std::move(act)) {};
+    Defer::~Defer() {
+        action();
+    };
+}

src/config.cpp

@@ -1,7 +1,7 @@
 #pragma once
 
-#ifndef ONSCRIPTER_CONFIG_CONFIG_H
-#define ONSCRIPTER_CONFIG_CONFIG_H
+#ifndef ONSCRIPTER_CONFIG_H
+#define ONSCRIPTER_CONFIG_H
 
 #include <array>
 #include <functional>
@@ -14,6 +14,11 @@
 #include <unordered_set>
 #include <utility>
 #include <vector>
+#ifdef INFRA_FORCE_GHC_FS
+#include <ghc/filesystem.hpp>
+#else
+#include <filesystem>
+#endif
 
 namespace onscripter {
 template <typename T>
@@ -91,17 +96,21 @@ inline UniquePtr<T> MakeUnique(Args&&... args) {
 
 struct Defer {
     std::function<void(void)> action;
-    Defer(const std::function<void(void)>& act): action(act) {};
-    Defer(const std::function<void(void)>&& act): action(std::move(act)) {};
+    Defer(const std::function<void(void)>& act);
+    Defer(const std::function<void(void)>&& act);
     Defer(const Defer& act) = delete;
     Defer& operator=(const Defer& act) = delete;
     Defer(Defer&& act) = delete;
     Defer& operator=(Defer&& act) = delete;
-    ~Defer() {
-        action();
-    };
+    ~Defer();
 };
 
+#ifdef INFRA_FORCE_GHC_FS
+namespace fs = ghc::filesystem;
+#else
+namespace fs = std::filesystem;
+#endif
+
 };  // namespace onscripter
 
 #endif

include/infra/Config.hpp src/config.hpp

@@ -24,8 +24,6 @@
 
 #include <stdlib.h>
 
-#include <infra/filesystem.hpp>
-
 #include "ONScripter.h"
 #include "gbk2utf16.h"
 #include "private/utils.h"
@@ -277,7 +275,7 @@ void parseOption(int argc, char *argv[]) {
                        !strcmp(argv[0] + 1, "-root")) {
                 argc--;
                 argv++;
-                auto root = std::fs::absolute(argv[0]).string();
+                auto root = onscripter::fs::absolute(argv[0]).string();
                 ons.setArchivePath(root.data());
             } else if (!strcmp(argv[0] + 1, "-fullscreen")) {
                 ons.setFullscreenMode();
@@ -344,8 +342,8 @@ void parseOption(int argc, char *argv[]) {
                 utils::printInfo(" unknown option %s\n", argv[0]);
             }
         } else {
-            auto rootPath = std::fs::absolute(argv[0]);
-            if (std::fs::is_directory(rootPath)) {
+            auto rootPath = onscripter::fs::absolute(argv[0]);
+            if (onscripter::fs::is_directory(rootPath)) {
                 auto root = rootPath.string();
                 ons.setArchivePath(root.data());
             } else {

src/entry/onscripter_main.cpp

@@ -2,15 +2,9 @@
 #define __ONS_CACHE_H__
 #include <SDL.h>
 
-#include <infra/Config.hpp>
+#include <config.hpp>
 #include <infra/cache.hpp>
 #include <infra/lru_cache_policy.hpp>
-#include <list>
-#include <map>
-#include <memory>
-#include <optional>
-#include <string>
-#include <utility>
 
 namespace onscache {
 typedef caches::fixed_sized_cache<

src/ons_cache.h

@@ -29,7 +29,6 @@
 #elif defined(WIN32)
 #include <direct.h>
 #endif
-#include <infra/filesystem.hpp>
 #include <vector>
 
 #include "private/utils.h"
@@ -960,9 +959,9 @@ int ONScripter::savescreenshotCommand() {
     const char *buf = script_h.readStr();
     char capital_name[STRING_BUFFER_LENGTH] = {0};
     script_h.fpath(buf, capital_name);
-    auto dir = std::fs::path(capital_name).parent_path().string();
-    if (dir.length() > 0 && !std::fs::exists(std::fs::status(dir))) {
-        std::fs::create_directory(dir);
+    auto dir = onscripter::fs::path(capital_name).parent_path().string();
+    if (dir.length() > 0 && !onscripter::fs::exists(onscripter::fs::status(dir))) {
+        onscripter::fs::create_directory(dir);
     }
     SDL_RWops *rwops = SDL_RWFromFile(capital_name, "wb");
     if (rwops == nullptr || SDL_SaveBMP_RW(surface, rwops, 1) != 0)

src/onscripter/ONScripter_command.cpp

@@ -23,7 +23,6 @@
  */
 
 #include <chrono>
-#include <infra/filesystem.hpp>
 
 #include "ONScripter.h"
 #include "private/utils.h"
@@ -175,11 +174,11 @@ void ONScripter::searchSaveFile(SaveFileInfo &save_file_info, int no) {
     save_file_info.hour = buf.st_mtime.hour;
     save_file_info.minute = buf.st_mtime.minute;
 #else
-    if (!std::fs::exists(file_name)) {
+    if (!onscripter::fs::exists(file_name)) {
         save_file_info.valid = false;
         return;
     }
-    auto ftime = std::fs::last_write_time(file_name);
+    auto ftime = onscripter::fs::last_write_time(file_name);
     std::time_t tt = to_time_t(ftime);
     struct tm *ptm = localtime(&tt);
 

src/onscripter/ONScripter_file.cpp

@@ -22,7 +22,6 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <infra/filesystem.hpp>
 #include <new>
 
 #include "ONScripter.h"

src/onscripter/ONScripter_sound.cpp

@@ -22,7 +22,6 @@
 #ifndef __UTILS_H__
 #define __UTILS_H__
 #include <chrono>
-#include <infra/Config.hpp>
 #include <sstream>
 #include <string>
 #include <vector>

src/private/utils.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <infra/Config.hpp>
+#include <config.hpp>
 #include <memory>
 
 namespace onscripter {