fix(shell): improve menu construction performance

close #153

Author: std-microblock

src/shell/contextmenu/contextmenu.cc

@@ -13,6 +13,8 @@
 
 #include "../logger.h"
 
+#include "../entry.h"
+
 #include <consoleapi.h>
 #include <debugapi.h>
 #include <future>
@@ -34,8 +36,7 @@ owner_draw_menu_info getBitmapFromOwnerDraw(MENUITEMINFOW *menuItemInfo,
   measureItem.itemID = menuItemInfo->wID;
   measureItem.itemData = (ULONG_PTR)(menuItemInfo->dwItemData);
 
-  SendMessageW(hwnd, WM_MEASUREITEM, 0,
-                reinterpret_cast<LPARAM>(&measureItem));
+  SendMessageW(hwnd, WM_MEASUREITEM, 0, reinterpret_cast<LPARAM>(&measureItem));
 
   result.width = measureItem.itemWidth;
   result.height = measureItem.itemHeight;
@@ -70,7 +71,7 @@ owner_draw_menu_info getBitmapFromOwnerDraw(MENUITEMINFOW *menuItemInfo,
   drawItem.itemData = (ULONG_PTR)(menuItemInfo->dwItemData);
 
   SendMessageW(hwnd, WM_DRAWITEM, 0,
-                reinterpret_cast<LPARAM>(&drawItem)); // 发送绘制消息
+               reinterpret_cast<LPARAM>(&drawItem)); // 发送绘制消息
 
   result.bitmap = CreateCompatibleBitmap(hdc, result.width, result.height);
   if (!result.bitmap) {
@@ -130,7 +131,8 @@ menu menu::construct_with_hmenu(HMENU hMenu, HWND hWnd, bool is_top) {
       continue;
     }
 
-    if ((info.fType & MFT_OWNERDRAW) && config::current->context_menu.experimental_ownerdraw_support) {
+    if ((info.fType & MFT_OWNERDRAW) &&
+        config::current->context_menu.experimental_ownerdraw_support) {
       auto od = getBitmapFromOwnerDraw(&info, hWnd);
       if (od.width && od.height) {
         item.owner_draw = od;
@@ -149,9 +151,17 @@ menu menu::construct_with_hmenu(HMENU hMenu, HWND hWnd, bool is_top) {
     if (info.hSubMenu) {
       PostMessageW(hWnd, WM_INITMENUPOPUP,
                    reinterpret_cast<WPARAM>(info.hSubMenu), 0xFFFFFFFF);
-      item.submenu =
-          [data = menu::construct_with_hmenu(info.hSubMenu, hWnd, false)](
-              std::shared_ptr<menu_widget> mw) { mw->init_from_data(data); };
+      auto main_thread_id = GetCurrentThreadId();
+      item.submenu = [=](std::shared_ptr<menu_widget> mw) {
+        auto task = [&]() {
+          mw->init_from_data(
+              menu::construct_with_hmenu(info.hSubMenu, hWnd, false));
+        };
+        if (main_thread_id == GetCurrentThreadId())
+          task();
+        else
+          entry::main_window_loop_hook.add_task(task).wait();
+      };
     } else {
       item.action = [=]() mutable {
         menu_render::current.value()->selected_menu = info.wID;

src/shell/script/quickjspp.cc

@@ -2,4 +2,24 @@
 
 namespace qjs {
 thread_local Context *Context::current;
-}
+void wait_with_msgloop(std::function<void()> f) {
+    auto this_thread = GetCurrentThreadId();
+    bool completed_flag = false;
+    auto thread_wait = std::thread([=, &completed_flag]() {
+        f();
+        completed_flag = true;
+        PostThreadMessageW(this_thread, WM_NULL, 0, 0);
+    });
+
+    MSG msg;
+     while (GetMessageW(&msg, nullptr, 0, 0)) {
+        TranslateMessage(&msg);
+        DispatchMessageW(&msg);
+
+        if (completed_flag) {
+            break;
+        }
+    }
+    thread_wait.join();
+}
+} // namespace qjs

src/shell/script/quickjspp.hpp

@@ -45,6 +45,7 @@ inline void setCurrentContext(JSContext *);
 inline JSContext *getContextFromWrapped(Context *);
 inline std::weak_ptr<Context> weakFromContext(JSContext *);
 
+void wait_with_msgloop(std::function<void()> f);
 /** Exception type.
  * Indicates that exception has occured in JS context.
  */
@@ -1853,6 +1854,7 @@ struct js_traits<std::function<R(Args...)>, int> {
       auto &ctx = Context::get(jsfun_obj.ctx);
       std::promise<std::expected<JSValue, exception>> promise;
       auto future = promise.get_future();
+
       auto work = [&]() {
         const int argc = sizeof...(Args);
         JSValue argv[std::max(1, argc)];
@@ -1874,6 +1876,7 @@ struct js_traits<std::function<R(Args...)>, int> {
         work();
       }
 
+      wait_with_msgloop([&future]() { future.wait(); });
       auto result = future.get();
       if (!result)
         throw result.error();

src/shell/window_proc_hook.cc

@@ -46,4 +46,9 @@ window_proc_hook::~window_proc_hook() {
     uninstall();
   }
 }
+void window_proc_hook::send_null() {
+  if (hwnd) {
+    PostMessageW((HWND)hwnd, WM_NULL, 0, 0);
+  }
+}
 } // namespace mb_shell

src/shell/window_proc_hook.h

@@ -15,11 +15,13 @@ namespace mb_shell {
         std::vector<std::function<void(void*, void*, size_t, size_t, size_t)>> hooks;
         std::queue<std::function<void()>> tasks;
 
+        void send_null();
         auto add_task(auto&& f) -> std::future<std::invoke_result_t<decltype(f)>> {
             using return_type = std::invoke_result_t<decltype(f)>;
             auto task = std::make_shared<std::packaged_task<return_type()>>(std::forward<decltype(f)>(f));
             std::future<return_type> res = task->get_future();
             tasks.emplace([task]() { (*task)(); });
+            send_null();
             return res;
         }