refactor: use C++23 "Deducing this" and modularize mini_gzip build

Bush2021 · Bush2021 · commit b18181d71b38 · 2025-12-07T18:38:15.000-05:00
We replace recursive `std::function` usage in `src/iaccessible.cc` with C++23's explicit object parameter ("Deducing `this`"), which eliminates type erasure overhead and heap allocations associated with `std::function`.

We change `find_hit_button(top)` to `TraversalAccessible(top, find_hit_button, false)`, since `top` cannot be `ROLE_SYSTEM_PUSHBUTTON` so that we can just skip that check.

We also remove direct inclusion of `.c` files in `src/pakfile.cc` to fix compilation issues with `clang-cl` under C++23. `mini_gzip` is now a static library compiled in C.
diff --git a/mini_gzip b/mini_gzip
@@ -1 +1 @@
-Subproject commit 1ef983991d7e479c5eb96eb9fa9ad238405af45e
+Subproject commit 2eee7df50ee8bda75070b5c40fe1e7022116503e
diff --git a/src/iaccessible.cc b/src/iaccessible.cc
@@ -4,12 +4,10 @@
 
 #include <oleacc.h>
 
-#include <functional>
 #include <memory>
 #include <optional>
 #include <string>
 #include <string_view>
-#include <thread>
 #include <vector>
 
 #include "config.h"
@@ -495,8 +493,8 @@ bool IsOnNewTab(const NodePtr& top) {
 // Whether the mouse is on a bookmark.
 bool IsOnBookmark(HWND hwnd, POINT pt) {
   bool flag = false;
-  std::function<bool(const NodePtr&)> LambdaEnumChild =
-      [&pt, &flag, &LambdaEnumChild](const NodePtr& child) -> bool {
+  auto find_bookmark = [&pt, &flag](this auto&& self,
+                                    const NodePtr& child) -> bool {
     auto role = GetAccessibleRole(child);
     if (role == ROLE_SYSTEM_PUSHBUTTON || role == ROLE_SYSTEM_MENUITEM) {
       bool is_in_rect = false;
@@ -517,19 +515,19 @@ bool IsOnBookmark(HWND hwnd, POINT pt) {
       }
     }
     // traverse the child nodes.
-    TraversalAccessible(child, LambdaEnumChild);
+    TraversalAccessible(child, self);
     return flag;
   };
   // Start traversing.
-  TraversalAccessible(GetChromeWidgetWin(hwnd), LambdaEnumChild);
+  TraversalAccessible(GetChromeWidgetWin(hwnd), find_bookmark);
   return flag;
 }
 
 // Expanded drop-down list in the address bar
 bool IsOnExpandedList(HWND hwnd, POINT pt) {
   bool flag = false;
-  std::function<bool(const NodePtr&)> LambdaEnumChild =
-      [&pt, &flag, &LambdaEnumChild](const NodePtr& child) -> bool {
+  auto find_drop_down_list = [&pt, &flag](this auto&& self,
+                                          const NodePtr& child) -> bool {
     if (GetAccessibleRole(child) == ROLE_SYSTEM_LIST &&
         (GetAccessibleState(child) & STATE_SYSTEM_EXPANDED)) {
       GetAccessibleSize(child, [&flag, &pt](RECT rect) {
@@ -541,10 +539,10 @@ bool IsOnExpandedList(HWND hwnd, POINT pt) {
         return true;
       }
     }
-    TraversalAccessible(child, LambdaEnumChild);
+    TraversalAccessible(child, self);
     return flag;
   };
-  TraversalAccessible(GetChromeWidgetWin(hwnd), LambdaEnumChild);
+  TraversalAccessible(GetChromeWidgetWin(hwnd), find_drop_down_list);
   return flag;
 }
 
@@ -554,27 +552,26 @@ bool IsOmniboxFocus(const NodePtr& top) {
   }
 
   bool is_focused = false;
-  std::function<bool(const NodePtr&)> find_focused =
-      [&is_focused, &find_focused](const NodePtr& node) -> bool {
+  auto find_focused = [&is_focused](this auto&& self,
+                                    const NodePtr& node) -> bool {
     if (GetAccessibleRole(node) == ROLE_SYSTEM_TEXT &&
         (GetAccessibleState(node) & STATE_SYSTEM_FOCUSED)) {
       is_focused = true;
       return true;
     }
-    TraversalAccessible(node, find_focused, false);
+    TraversalAccessible(node, self, false);
     return is_focused;
   };
 
-  std::function<bool(const NodePtr&)> find_toolbar =
-      [&](const NodePtr& node) -> bool {
+  auto find_toolbar = [&](this auto&& self, const NodePtr& node) -> bool {
     if (GetAccessibleRole(node) == ROLE_SYSTEM_TOOLBAR) {
       find_focused(node);
       if (is_focused) {
         return true;
       }
       return false;
     }
-    TraversalAccessible(node, find_toolbar, false);
+    TraversalAccessible(node, self, false);
 
     return is_focused;
   };
@@ -590,8 +587,7 @@ bool IsOnCloseButton(const NodePtr& top, POINT pt) {
   }
 
   bool found = false;
-  std::function<bool(const NodePtr&)> find_hit_button =
-      [&](const NodePtr& node) -> bool {
+  auto find_hit_button = [&](this auto&& self, const NodePtr& node) -> bool {
     if (GetAccessibleRole(node) == ROLE_SYSTEM_PUSHBUTTON) {
       GetAccessibleSize(node, [&](RECT rect) {
         if (PtInRect(&rect, pt)) {
@@ -602,10 +598,10 @@ bool IsOnCloseButton(const NodePtr& top, POINT pt) {
         return true;
       }
     }
-    TraversalAccessible(node, find_hit_button);
+    TraversalAccessible(node, self);
     return found;
   };
-  find_hit_button(top);
+  TraversalAccessible(top, find_hit_button, false);
   return found;
 }
 
@@ -625,14 +621,14 @@ bool IsOnFindBarPane(POINT pt) {
   //         └─ PANE
   //            └─ PANE
   //               └─ TEXT (focused, the input field of find-in-page bar)
-  std::function<bool(const NodePtr&)> find_focused =
-      [&text_element, &find_focused](const NodePtr& node) -> bool {
+  auto find_focused = [&text_element](this auto&& self,
+                                      const NodePtr& node) -> bool {
     if (GetAccessibleRole(node) == ROLE_SYSTEM_TEXT &&
         (GetAccessibleState(node) & STATE_SYSTEM_FOCUSED)) {
       text_element = node;
       return true;
     }
-    TraversalAccessible(node, find_focused, false);
+    TraversalAccessible(node, self, false);
     return text_element != nullptr;
   };
   TraversalAccessible(root, find_focused, false);
diff --git a/src/pakfile.cc b/src/pakfile.cc
@@ -15,10 +15,10 @@
 #pragma warning(disable : 4838)
 
 extern "C" {
-#include "..\mini_gzip\miniz.c"  // Must be included first
-
-#include "..\mini_gzip\mini_gzip.c"
 #include "..\mini_gzip\mini_gzip.h"
+void* gzip_compress(uint8_t* data, size_t len, size_t* out_len);
+int mini_gz_start(struct mini_gzip* gz_ptr, const void* mem, size_t mem_len);
+int mini_gz_unpack(struct mini_gzip* gz_ptr, void* mem_out, size_t mem_out_len);
 }
 
 namespace {
diff --git a/xmake.lua b/xmake.lua
@@ -4,7 +4,7 @@ set_warnings("more")
 
 add_defines("WIN32", "_WIN32", "UNICODE", "_UNICODE")
 set_encodings("source:utf-8")
-set_languages("c++20")
+set_languages("c++23")
 set_fpmodels("precise") -- Default
 if is_mode("release") then
     set_exceptions("none")
@@ -44,11 +44,17 @@ target("detours")
         add_files("detours/src/disolarm64.cpp")
     end
 
+target("mini_gzip")
+    set_kind("static")
+    add_includedirs("mini_gzip", {public = true})
+    add_files("mini_gzip/miniz.c", "mini_gzip/mini_gzip.c")
+
 target("chrome_plus")
     set_kind("shared")
     set_targetdir("$(builddir)/$(mode)")
     set_basename("version")
     add_deps("detours")
+    add_deps("mini_gzip")
     add_files("src/*.cc")
     add_files("src/*.rc")
     add_links("onecore", "propsys", "oleacc")
