implement popup_menu (OpenDreamProject#1756)

Co-authored-by: amylizzle <[email protected]>
amylizzle · Apr 21, 2024 · 1fe1013 · 1fe1013
1 parent 44f69ef
commit 1fe1013
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/DMCompiler/DM/Builders/DMProcBuilder.cs b/DMCompiler/DM/Builders/DMProcBuilder.cs
@@ -286,8 +286,6 @@ public void ProcessStatementSet(DMASTProcStatementSet statementSet) {
                         proc.Attributes &= ~ProcAttributes.HidePopupMenu;
                     else
                         proc.Attributes |= ProcAttributes.HidePopupMenu;
-
-                    DMCompiler.UnimplementedWarning(statementSet.Location, "set popup_menu is not implemented");
                     break;
                 case "instant":
                     if (constant.IsTruthy())

diff --git a/OpenDreamClient/Input/ContextMenu/VerbMenuPopup.xaml.cs b/OpenDreamClient/Input/ContextMenu/VerbMenuPopup.xaml.cs
@@ -30,6 +30,8 @@ public VerbMenuPopup(ClientVerbSystem? verbSystem, sbyte seeInvisible, ClientObj
             foreach (var (verbId, verbSrc, verbInfo) in sorted) {
                 if (verbInfo.IsHidden(false, seeInvisible))
                     continue;
+                if(!verbInfo.ShowInPopupAttribute)
+                    continue;
 
                 AddVerb(verbId, verbSrc, verbInfo);
             }

diff --git a/OpenDreamRuntime/ServerVerbSystem.cs b/OpenDreamRuntime/ServerVerbSystem.cs
@@ -89,6 +89,7 @@ public void RegisterVerb(DreamProc verb) {
 
             Invisibility = verb.Invisibility,
             HiddenAttribute = (verb.Attributes & ProcAttributes.Hidden) == ProcAttributes.Hidden,
+            ShowInPopupAttribute = (verb.Attributes & ProcAttributes.HidePopupMenu) == 0,
             Accessibility = verbAccessibility.Value,
             Arguments = verbArguments
         };

diff --git a/OpenDreamShared/Dream/VerbSystem.cs b/OpenDreamShared/Dream/VerbSystem.cs
@@ -36,6 +36,12 @@ public struct VerbInfo {
         /// </summary>
         public bool HiddenAttribute;
 
+        /// <summary>
+        /// If this verb should be shown in the popup menu. Defaults to true.
+        /// <code>set popup_menu = TRUE</code>
+        /// </summary>
+        public bool ShowInPopupAttribute;
+
         /// <summary>
         /// Where the verb's src must be for the client to be able to execute it.
         /// <code>set src = usr</code>