[0736] ImGui 菜单排除白名单外 interactive 选项 (#3956)

Author: JimZhouZZY

TeXmacs/progs/kernel/gui/menu-widget.scm

@@ -579,15 +579,28 @@
 ) ;define
 
 (define (make-menu-entry-dots label action)
+  (if (menu-action-interactive? action) (menu-label-add-dots label) label)
+) ;define
+
+(define (menu-action-interactive? action)
   (with source
     (promise-source action)
-    (if (and source (pair? source) (property (car source) :interactive))
-      (menu-label-add-dots label)
-      label
-    ) ;if
+    (and source (pair? source) (property (car source) :interactive))
   ) ;with
 ) ;define
 
+(define (imgui-supported-action? action)
+  ;; action 是否为「ImGui 后端尚未支持的交互式命令」（点击会弹出 ImGui 未
+  ;; 实现的对话框/新窗口）。判定基准与 make-menu-entry-dots 一致（带
+  ;; :interactive 属性者，即标签会被加省略号 '...' 的菜单项），但排除已用
+  ;; :imgui-supported 显式标记为 ImGui 已实现的命令（如 choose-file → Save as）。
+  (with source
+    (promise-source action)
+    (and source (property (car source) :imgui-supported))
+  ) ;with
+) ;define
+
+
 (define (make-menu-entry-style style action)
   (with source
     (promise-source action)
@@ -1111,7 +1124,16 @@
   ;; (display* "Make items " p ", " style "\n")
   (if (pair? p)
     (cond ((match? p '(input :%1 :string? :%1 :string?)) (list (make-menu-input p style)))
-          ((translatable? (car p)) (list (make-menu-entry p style bar?)))
+          ((translatable? (car p))
+           ;; ImGui 前端不支持交互式命令弹出的对话框/新窗口，跳过这类叶子项
+           (if (and (not (qt-gui?))
+                 (menu-action-interactive? (cAr p))
+                 (not (imgui-supported-action? (cAr p)))
+               ) ;and
+             (list)
+             (list (make-menu-entry p style bar?))
+           ) ;if
+          ) ;
           ((symbol? (car p))
            (with result
              (ahash-ref make-menu-items-table (car p))
@@ -1121,7 +1143,15 @@
              ) ;if
            ) ;with
           ) ;
-          ((match? (car p) ':menu-wide-label) (list (make-menu-entry p style bar?)))
+          ((match? (car p) ':menu-wide-label)
+           (if (and (not (qt-gui?))
+                 (menu-action-interactive? (cAr p))
+                 (not (imgui-supported-action? (cAr p)))
+               ) ;and
+             (list)
+             (list (make-menu-entry p style bar?))
+           ) ;if
+          ) ;
           ((match? (car p) ':tab-page) (list (make-tab-page p style bar?)))
           (else (make-menu-items-list p style bar?))
     ) ;cond

TeXmacs/progs/kernel/texmacs/tm-define.scm

@@ -273,6 +273,10 @@
 (ahash-set! define-option-table :secure (define-property* :secure))
 (ahash-set! define-option-table :check-mark (define-property* :check-mark))
 (ahash-set! define-option-table :interactive (define-property* :interactive))
+(ahash-set! define-option-table
+  :imgui-supported
+  (define-property* :imgui-supported)
+) ;ahash-set!
 (ahash-set! define-option-table :balloon (define-property* :balloon))
 
 (define-public (procedure-sources about)

TeXmacs/progs/texmacs/menus/edit-menu.scm

@@ -98,12 +98,9 @@
       ("Other" (interactive clipboard-cut))
     ) ;->
   ) ;if
-  (if (qt-gui?)
-    ;; ImGui 前端精简：移除 Search recent documents / Preferences
-    ---
-    ("Search recent documents" (interactive docgrep-in-recent))
-    ---
-    (if (use-menus?) (-> "Preferences" (link preferences-menu)))
-    (if (use-popups?) ("Preferences" (open-preferences)))
-  ) ;if
+  ---
+  ("Search recent documents" (interactive docgrep-in-recent))
+  ---
+  (if (use-menus?) (-> "Preferences" (link preferences-menu)))
+  (if (use-popups?) ("Preferences" (open-preferences)))
 ) ;menu-bind

TeXmacs/progs/texmacs/texmacs/tm-files.scm

@@ -201,7 +201,10 @@
   ) ;with
 ) ;tm-define
 
-(tm-property (choose-file fun text type) (:interactive #t))
+(tm-property (choose-file fun text type)
+  (:interactive #t)
+  (:imgui-supported #t)
+) ;tm-property
 
 (tm-define (open-auxiliary aux body . opt-master)
   (let* ((name (aux-name aux))

TeXmacs/progs/text/text-menu.scm

@@ -28,65 +28,56 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (menu-bind full-text-format-menu
-  (if (qt-gui?)
-    ;; ImGui 前端精简：移除 Format 的 Font / Color
-    (group "Font")
-    (link text-font-menu)
-    (if (simple-menus?) (-> "Color" (link color-menu)))
-  ) ;if
+  (group "Font")
+  (link text-font-menu)
+  (if (simple-menus?) (-> "Color" (link color-menu)))
   (if (detailed-menus?) --- (group "Text") (link text-properties-menu))
-  (if (qt-gui?)
-    ;; ImGui 前端精简：移除 Format 的 Paragraph / Page
-    ---
-    (group "Paragraph")
-    (link paragraph-menu)
-    ---
-    (when (in-main-flow?)
-      (group "Page")
-      (link page-menu)
-    ) ;when
-  ) ;if
+  ---
+  (group "Paragraph")
+  (link paragraph-menu)
+  ---
+  (when (in-main-flow?)
+    (group "Page")
+    (link page-menu)
+  ) ;when
 ) ;menu-bind
 
 (menu-bind compressed-text-format-menu
-  (if (qt-gui?)
-    ;; ImGui 前端精简：移除 Format 的 Font / Paragraph / Page / Cell / Table
-    ("Font" (interactive open-font-selector))
-    ("Paragraph" (open-paragraph-format))
-    (when (in-main-flow?)
-      ("Page" (open-page-format))
-    ) ;when
-    (when (inside? 'table)
-      ("Cell" (open-cell-properties))
-      ("Table" (open-table-properties))
-    ) ;when
-    ---
-  ) ;if
-  ;; (-> "Whitespace" (link space-menu))
-  (-> "Indentation" (link indentation-menu))
-  (-> "Break" (link break-menu))
-  (when (and (selection-active-small?) (tm-atomic? (selection-tree)))
-    ("Hyphenate as" (interactive hyphenate-selection-as))
-  ) ;when
-  ---
-  (if (qt-gui?)
-    ;; ImGui 前端精简：移除 Format 的 Color
-    (-> "Color"
-      (if (== (get-preference "experimental alpha") "on")
-        (-> "Opacity" (link opacity-menu))
-        ---
-      ) ;if
-      (link color-menu)
-    ) ;->
-  ) ;if
-  (-> "Adjust" (link adjust-menu))
-  (-> "Transform" (link linear-transform-menu))
-  (-> "Specific" (link specific-menu))
-  (-> "Special" (link format-special-menu))
-  (-> "Font effects" (link text-font-effects-menu))
-  (assuming (== (get-preference "bitmap effects") "on")
-    (-> "Graphical effects" (link text-effects-menu))
-  ) ;assuming
+ ("Font" (interactive open-font-selector))
+ ("Paragraph" (open-paragraph-format))
+ (when (in-main-flow?)
+   ("Page" (open-page-format))
+ ) ;when
+ (when (inside? 'table)
+   ("Cell" (open-cell-properties))
+   ("Table" (open-table-properties))
+ ) ;when
+ ---
+ ;; (-> "Whitespace" (link space-menu))
+ (-> "Indentation" (link indentation-menu))
+ (-> "Break" (link break-menu))
+ (when (and (selection-active-small?) (tm-atomic? (selection-tree)))
+   ("Hyphenate as" (interactive hyphenate-selection-as))
+ ) ;when
+ ---
+ (if (qt-gui?)
+   ;; ImGui 前端精简：移除 Format 的 Color
+   (-> "Color"
+     (if (== (get-preference "experimental alpha") "on")
+       (-> "Opacity" (link opacity-menu))
+       ---
+     ) ;if
+     (link color-menu)
+   ) ;->
+ ) ;if
+ (-> "Adjust" (link adjust-menu))
+ (-> "Transform" (link linear-transform-menu))
+ (-> "Specific" (link specific-menu))
+ (-> "Special" (link format-special-menu))
+ (-> "Font effects" (link text-font-effects-menu))
+ (assuming (== (get-preference "bitmap effects") "on")
+   (-> "Graphical effects" (link text-effects-menu))
+ ) ;assuming
 ) ;menu-bind
 
 (menu-bind text-format-menu

devel/0736.md

@@ -0,0 +1,11 @@
+# [0736] ImGui 菜单排除白名单外 interactive 选项
+
+## What
+使用 `make-menu-entry-dots` 的代码片段创建了`menu-action-interactive?`。在构建 Scheme 菜单的时候判断是否为 interactive，如果是且非 qt 环境，则不添加此项。
+
+这个过滤拥有白名单机制，目前 “File-Save as” 菜单在白名单中。
+
+同时，去掉了先前的一些条件块，因为现在会在`make-menu-items`中处理。
+
+## Why？
+ImGui 现在没有支持 interactive 菜单的弹窗、tool widget 等功能。

src/Plugins/ImGui/im_menu.cpp

@@ -67,8 +67,21 @@ render_node (widget w) {
   case im_menu_rep::k_container: {
     // horizontal_menu / vertical_menu / …：逐项渲染子节点
     array<widget>& kids= m->menu_children ();
-    for (int i= 0; i < N (kids); ++i)
+    // 规整分隔符：去除首/末/连续的孤立分隔符。interactive 菜单项在
+    // scheme 层（menu-widget.scm）被过滤后会残留孤立 '---'，此处统一清理。
+    int last= -1;
+    for (int i= 0; i < N (kids); ++i) {
+      im_menu_rep* km= dynamic_cast<im_menu_rep*> (kids[i].rep);
+      if (km == nullptr || km->kind != im_menu_rep::k_separator) last= i;
+    }
+    bool prev_sep= true; // 跳过开头的分隔符
+    for (int i= 0; i <= last; ++i) {
+      im_menu_rep* km= dynamic_cast<im_menu_rep*> (kids[i].rep);
+      bool is_sep    = (km != nullptr && km->kind == im_menu_rep::k_separator);
+      if (is_sep && prev_sep) continue; // 连续或首分隔符：跳过
       render_node (kids[i]);
+      prev_sep= is_sep;
+    }
   } break;
   case im_menu_rep::k_submenu: {
     // pulldown / pullright：BeginMenu 展开惰性 promise 子菜单。