per-row command cells in watch windows when evaluating cfgs; table-drive per-collection commands

Author: ryanfleury

src/raddbg/generated/raddbg.meta.c

@@ -226,8 +226,8 @@ RD_VocabInfo rd_vocab_info_table[277] =
 {str8_lit_comp("set_columns"), str8_lit_comp(""), str8_lit_comp("Set Columns"), str8_lit_comp(""), RD_IconKind_Thumbnails},
 {str8_lit_comp("toggle_address_visibility"), str8_lit_comp(""), str8_lit_comp("Toggle Address Visibility"), str8_lit_comp(""), RD_IconKind_Thumbnails},
 {str8_lit_comp("toggle_code_bytes_visibility"), str8_lit_comp(""), str8_lit_comp("Toggle Code Bytes Visibility"), str8_lit_comp(""), RD_IconKind_Thumbnails},
-{str8_lit_comp("enable_cfg"), str8_lit_comp(""), str8_lit_comp("Enable Config Tree"), str8_lit_comp(""), RD_IconKind_Null},
-{str8_lit_comp("disable_cfg"), str8_lit_comp(""), str8_lit_comp("Disable Config Tree"), str8_lit_comp(""), RD_IconKind_Null},
+{str8_lit_comp("enable_cfg"), str8_lit_comp(""), str8_lit_comp("Enable Config Tree"), str8_lit_comp(""), RD_IconKind_CheckHollow},
+{str8_lit_comp("disable_cfg"), str8_lit_comp(""), str8_lit_comp("Disable Config Tree"), str8_lit_comp(""), RD_IconKind_CheckFilled},
 {str8_lit_comp("select_cfg"), str8_lit_comp(""), str8_lit_comp("Select Config Tree"), str8_lit_comp(""), RD_IconKind_CheckHollow},
 {str8_lit_comp("remove_cfg"), str8_lit_comp(""), str8_lit_comp("Remove Config Tree"), str8_lit_comp(""), RD_IconKind_Trash},
 {str8_lit_comp("name_cfg"), str8_lit_comp(""), str8_lit_comp("Name Config Tree"), str8_lit_comp(""), RD_IconKind_Null},
@@ -287,16 +287,16 @@ RD_VocabInfo rd_vocab_info_table[277] =
 
 RD_NameSchemaInfo rd_name_schema_info_table[10] =
 {
-{str8_lit_comp("settings"), str8_lit_comp("x:\n{\n  @default(1) 'hover_animations':     bool,\n  @default(1) 'press_animations':     bool,\n  @default(0) 'focus_animations':     bool,\n  @default(1) 'tooltip_animations':   bool,\n  @default(1) 'menu_animations':      bool,\n  @default(1) 'scrolling_animations': bool,\n  @default(1) 'background_blur':      bool,\n  @default(1) 'thread_lines':         bool,\n  @default(1) 'breakpoint_lines':     bool,\n  @default(1) 'thread_glow':          bool,\n  @default(1) 'breakpoint_glow':      bool,\n  @default(0) 'opaque_backgrounds':   bool,\n  @default(1) 'smooth_main_text':     bool,\n  @default(0) 'smooth_code_text':     bool,\n  @default(1) 'hint_main_text':       bool,\n  @default(1) 'hint_code_text':       bool,\n  @default(2) 'tab_width':      @range[1, 32] u64,\n  @can_be_per_window 'main_font_size': @range[6, 72] u64,\n  @can_be_per_window 'code_font_size': @range[1, 32] u64,\n}\n"), str8_lit_comp("")},
-{str8_lit_comp("target"), str8_lit_comp("x:\n{\n  'label':              code_string,\n  'executable':         path,\n  'arguments':          string,\n  'working_directory':  path,\n  'entry_point':        code_string,\n  'stdout_path':        path,\n  'stderr_path':        path,\n  'stdin_path':         path,\n  'debug_subprocesses': bool,\n}\n"), str8_lit_comp("launch_and_run,launch_and_init,select_cfg,remove_cfg")},
-{str8_lit_comp("breakpoint"), str8_lit_comp("x:\n{\n  'label':         code_string,\n  'condition':     code_string,\n  'location':      location,\n  'hit_count':     u64,\n  'disabled':      bool,\n}\n"), str8_lit_comp("enable_cfg,remove_cfg")},
-{str8_lit_comp("watch_pin"), str8_lit_comp("x:\n{\n  'expression': code_string,\n  'view_rule':  code_string,\n  'location':   location,\n}\n"), str8_lit_comp("remove_cfg")},
-{str8_lit_comp("file_path_map"), str8_lit_comp("x:{'source':path, 'dest':path}"), str8_lit_comp("remove_cfg")},
-{str8_lit_comp("auto_view_rule"), str8_lit_comp("x:{'source':code_string, 'dest':code_string}"), str8_lit_comp("remove_cfg")},
-{str8_lit_comp("machine"), str8_lit_comp("x:{'frozen':bool, 'label':code_string}"), str8_lit_comp("")},
-{str8_lit_comp("process"), str8_lit_comp("x:{'frozen':bool, 'label':code_string, 'id':u64}"), str8_lit_comp("")},
-{str8_lit_comp("module"), str8_lit_comp("x:{'exe':path, 'dbg':path, 'vaddr_range':vaddr_range}"), str8_lit_comp("")},
-{str8_lit_comp("thread"), str8_lit_comp("x:{'frozen':bool, 'label':code_string, 'id':u64}"), str8_lit_comp("")},
+{str8_lit_comp("settings"), str8_lit_comp("x:\n{\n  @default(1) 'hover_animations':     bool,\n  @default(1) 'press_animations':     bool,\n  @default(0) 'focus_animations':     bool,\n  @default(1) 'tooltip_animations':   bool,\n  @default(1) 'menu_animations':      bool,\n  @default(1) 'scrolling_animations': bool,\n  @default(1) 'background_blur':      bool,\n  @default(1) 'thread_lines':         bool,\n  @default(1) 'breakpoint_lines':     bool,\n  @default(1) 'thread_glow':          bool,\n  @default(1) 'breakpoint_glow':      bool,\n  @default(0) 'opaque_backgrounds':   bool,\n  @default(1) 'smooth_main_text':     bool,\n  @default(0) 'smooth_code_text':     bool,\n  @default(1) 'hint_main_text':       bool,\n  @default(1) 'hint_code_text':       bool,\n  @default(2) 'tab_width':      @range[1, 32] u64,\n  @can_be_per_window 'main_font_size': @range[6, 72] u64,\n  @can_be_per_window 'code_font_size': @range[1, 32] u64,\n}\n")},
+{str8_lit_comp("target"), str8_lit_comp("@commands(launch_and_run, launch_and_init, select_cfg, remove_cfg)\n@collection_commands(add_target)\nx:\n{\n  'label':              code_string,\n  'executable':         path,\n  'arguments':          string,\n  'working_directory':  path,\n  'entry_point':        code_string,\n  'stdout_path':        path,\n  'stderr_path':        path,\n  'stdin_path':         path,\n  'debug_subprocesses': bool,\n}\n")},
+{str8_lit_comp("breakpoint"), str8_lit_comp("@commands(enable_cfg, remove_cfg)\n@collection_commands(add_breakpoint, add_address_breakpoint, add_function_breakpoint)\nx:\n{\n  'label':         code_string,\n  'condition':     code_string,\n  'location':      location,\n  'hit_count':     u64,\n  'disabled':      bool,\n}\n")},
+{str8_lit_comp("watch_pin"), str8_lit_comp("@commands(remove_cfg)\n@collection_commands(add_watch_pin)\nx:\n{\n  'expression': code_string,\n  'view_rule':  code_string,\n  'location':   location,\n}\n")},
+{str8_lit_comp("file_path_map"), str8_lit_comp("@collection_commands(add_file_path_map) @commands(remove_cfg) x:{'source':path, 'dest':path}")},
+{str8_lit_comp("auto_view_rule"), str8_lit_comp("@collection_commands(add_auto_view_rule) @commands(remove_cfg) x:{'source':code_string, 'dest':code_string}")},
+{str8_lit_comp("machine"), str8_lit_comp("x:{'frozen':bool, 'label':code_string}")},
+{str8_lit_comp("process"), str8_lit_comp("x:{'frozen':bool, 'label':code_string, 'id':u64}")},
+{str8_lit_comp("module"), str8_lit_comp("x:{'exe':path, 'dbg':path, 'vaddr_range':vaddr_range}")},
+{str8_lit_comp("thread"), str8_lit_comp("x:{'frozen':bool, 'label':code_string, 'id':u64}")},
 };
 
 Rng1U64 rd_reg_slot_range_table[38] =

src/raddbg/generated/raddbg.meta.h

@@ -450,7 +450,6 @@ struct RD_NameSchemaInfo
 {
 String8 name;
 String8 schema;
-String8 cmd_names;
 };
 
 typedef struct RD_Regs RD_Regs;

src/raddbg/raddbg.mdesk

@@ -105,7 +105,7 @@ RD_VocabTable:
 ////////////////////////////////
 //~ rjf: Schemas
 
-@table(name schema cmd_names) RD_SchemaTable:
+@table(name schema) RD_SchemaTable:
 {
   //- rjf: settings
   {
@@ -138,7 +138,10 @@ RD_VocabTable:
   //- rjf: targets
   {
     target,
-    ```x:
+    ```
+      @commands(launch_and_run, launch_and_init, select_cfg, remove_cfg)
+      @collection_commands(add_target)
+      x:
     {
       'label':              code_string,
       'executable':         path,
@@ -151,13 +154,15 @@ RD_VocabTable:
       'debug_subprocesses': bool,
     }
     ```,
-    `launch_and_run,launch_and_init,select_cfg,remove_cfg`,
   }
 
   //- rjf: breakpoints
   {
     breakpoint,
-    ```x:
+    ```
+      @commands(enable_cfg, remove_cfg)
+      @collection_commands(add_breakpoint, add_address_breakpoint, add_function_breakpoint)
+      x:
     {
       'label':         code_string,
       'condition':     code_string,
@@ -166,34 +171,33 @@ RD_VocabTable:
       'disabled':      bool,
     }
     ```,
-    `enable_cfg,remove_cfg`,
   }
 
   //- rjf: watch pins
   {
     watch_pin,
-    ```x:
+    ```
+      @commands(remove_cfg)
+      @collection_commands(add_watch_pin)
+      x:
     {
       'expression': code_string,
       'view_rule':  code_string,
       'location':   location,
     }
     ```,
-    `remove_cfg`,
   }
 
   //- rjf: file path maps
   {
     file_path_map,
-    ```x:{'source':path, 'dest':path}```,
-    `remove_cfg`,
+    ```@collection_commands(add_file_path_map) @commands(remove_cfg) x:{'source':path, 'dest':path}```,
   }
 
   //- rjf: auto view rules
   {
     auto_view_rule,
-    ```x:{'source':code_string, 'dest':code_string}```,
-    `remove_cfg`,
+    ```@collection_commands(add_auto_view_rule) @commands(remove_cfg) x:{'source':code_string, 'dest':code_string}```,
   }
 
   //- rjf: machines
@@ -225,12 +229,11 @@ RD_VocabTable:
 {
   `String8 name`;
   `String8 schema`;
-  `String8 cmd_names`;
 }
 
 @data(RD_NameSchemaInfo) rd_name_schema_info_table:
 {
-  @expand(RD_SchemaTable a) `{str8_lit_comp("$(a.name)"), str8_lit_comp("$(a.schema)"), str8_lit_comp("$(a.cmd_names)")}`
+  @expand(RD_SchemaTable a) `{str8_lit_comp("$(a.name)"), str8_lit_comp("$(a.schema)")}`
 }
 
 ////////////////////////////////
@@ -501,8 +504,8 @@ RD_CmdTable:    //               |        |              |                  |
   {ToggleCodeBytesVisibility      1        1              Null               null              Nil                     Null       0  0  0  0  0  0                                                           Thumbnails            "toggle_code_bytes_visibility""Toggle Code Bytes Visibility"                "Toggles the visibility of machine code bytes in a disassembly view."                                              ""                               "$disasm,"                                                       }
 
   //- rjf: general config operations
-  {EnableCfg                      0        0              Null               null              Nil                     Null       0  0  0  0  0  0                                                           Null                  "enable_cfg"                  "Enable Config Tree"                          "Enables a config tree."                                                                                           ""                               ""                                                               }
-  {DisableCfg                     0        0              Null               null              Nil                     Null       0  0  0  0  0  0                                                           Null                  "disable_cfg"                 "Disable Config Tree"                         "Disables a config tree."                                                                                          ""                               ""                                                               }
+  {EnableCfg                      0        0              Null               null              Nil                     Null       0  0  0  0  0  0                                                           CheckHollow           "enable_cfg"                  "Enable Config Tree"                          "Enables a config tree."                                                                                           ""                               ""                                                               }
+  {DisableCfg                     0        0              Null               null              Nil                     Null       0  0  0  0  0  0                                                           CheckFilled           "disable_cfg"                 "Disable Config Tree"                         "Disables a config tree."                                                                                          ""                               ""                                                               }
   {SelectCfg                      0        0              Null               null              Nil                     Null       0  0  0  0  0  0                                                           CheckHollow           "select_cfg"                  "Select Config Tree"                          "Selects a config tree, disabling all others of the same kind."                                                    ""                               ""                                                               }
   {RemoveCfg                      0        0              Null               null              Nil                     Null       0  0  0  0  0  0                                                           Trash                 "remove_cfg"                  "Remove Config Tree"                          "Removes a config tree."                                                                                           ""                               ""                                                               }
   {NameCfg                        0        0              Null               null              Nil                     Null       0  0  0  0  0  0                                                           Null                  "name_cfg"                    "Name Config Tree"                            "Equips a config tree with a label."                                                                               ""                               ""                                                               }

src/raddbg/raddbg_core.c

@@ -1393,8 +1393,11 @@ rd_title_fstrs_from_cfg(Arena *arena, RD_Cfg *cfg, Vec4F32 secondary_color, F32
       if(condition.size != 0)
       {
         dr_fstrs_push_new(arena, &result, &params, str8_lit("if "), .font = rd_font_from_slot(RD_FontSlot_Code));
-        DR_FStrList fstrs = rd_fstrs_from_code_string(arena, 1.f, 0, params.color, condition);
-        dr_fstrs_concat_in_place(&result, &fstrs);
+        RD_Font(RD_FontSlot_Code)
+        {
+          DR_FStrList fstrs = rd_fstrs_from_code_string(arena, 1.f, 0, params.color, condition);
+          dr_fstrs_concat_in_place(&result, &fstrs);
+        }
         dr_fstrs_push_new(arena, &result, &params, str8_lit("  "));
       }
     }
@@ -5732,7 +5735,7 @@ rd_window_frame(void)
 
         //- rjf: center column
         UI_PrefWidth(ui_children_sum(1.f)) UI_Row
-          UI_PrefWidth(ui_em(2.25f, 1))
+          UI_PrefWidth(ui_em(2.5f, 1))
           RD_Font(RD_FontSlot_Icons)
           UI_FontSize(ui_top_font_size()*0.85f)
         {
@@ -8577,20 +8580,11 @@ E_LOOKUP_INFO_FUNCTION_DEF(top_level_cfg)
     String8 cfg_name = rd_singular_from_code_name_plural(lhs_type->name);
     RD_CfgList cfgs_list = rd_cfg_top_level_list_from_string(scratch.arena, cfg_name);\
     String8List cmds_list = {0};
-    // TODO(rjf): @cfg hack - probably want to table-drive this
-    if(str8_match(cfg_name, str8_lit("target"), 0))
-    {
-      str8_list_push(arena, &cmds_list, rd_cmd_kind_info_table[RD_CmdKind_AddTarget].string);
-    }
-    else if(str8_match(cfg_name, str8_lit("breakpoint"), 0))
+    MD_Node *schema = rd_schema_from_name(scratch.arena, cfg_name);
+    MD_Node *collection_cmds_root = md_tag_from_string(schema, str8_lit("collection_commands"), 0);
+    for MD_EachNode(cmd, collection_cmds_root->first)
     {
-      str8_list_push(arena, &cmds_list, rd_cmd_kind_info_table[RD_CmdKind_AddBreakpoint].string);
-      str8_list_push(arena, &cmds_list, rd_cmd_kind_info_table[RD_CmdKind_AddAddressBreakpoint].string);
-      str8_list_push(arena, &cmds_list, rd_cmd_kind_info_table[RD_CmdKind_AddFunctionBreakpoint].string);
-    }
-    else if(str8_match(cfg_name, str8_lit("watch_pin"), 0))
-    {
-      str8_list_push(arena, &cmds_list, rd_cmd_kind_info_table[RD_CmdKind_AddWatchPin].string);
+      str8_list_push(arena, &cmds_list, cmd->string);
     }
     RD_TopLevelCfgLookupAccel *accel = push_array(arena, RD_TopLevelCfgLookupAccel, 1);
     accel->cfgs = rd_cfg_array_from_list(arena, &cfgs_list);
@@ -11082,7 +11076,6 @@ rd_title_fstrs_from_code_name(Arena *arena, String8 code_name, Vec4F32 secondary
     //- rjf: push icon
     if(info->icon_kind != RD_IconKind_Null)
     {
-      dr_fstrs_push_new(arena, &result, &params, str8_lit("  "));
       dr_fstrs_push_new(arena, &result, &params, rd_icon_kind_text_table[info->icon_kind], .font = rd_font_from_slot(RD_FontSlot_Icons), .raster_flags = rd_raster_flags_from_slot(RD_FontSlot_Icons), .color = secondary_color);
       dr_fstrs_push_new(arena, &result, &params, str8_lit("  "));
     }
@@ -13163,27 +13156,6 @@ rd_frame(void)
                 rd_cfg_release(recent_projects.last->v);
               }
             }
-            
-            //- TODO(rjf): @cfg set up debugging config state
-            if(kind == RD_CmdKind_OpenUser)
-            {
-              RD_Cfg *user = rd_cfg_child_from_string(rd_state->root_cfg, str8_lit("user"));
-              {
-                RD_Cfg *watch = rd_cfg_new(user, str8_lit("watch"));
-                RD_Cfg *expr = rd_cfg_new(watch, str8_lit("expression"));
-                rd_cfg_new(expr, str8_lit("current_thread"));
-              }
-              {
-                RD_Cfg *watch = rd_cfg_new(user, str8_lit("watch"));
-                RD_Cfg *expr = rd_cfg_new(watch, str8_lit("expression"));
-                rd_cfg_new(expr, str8_lit("targets[0]"));
-              }
-              {
-                RD_Cfg *watch = rd_cfg_new(user, str8_lit("watch"));
-                RD_Cfg *expr = rd_cfg_new(watch, str8_lit("expression"));
-                rd_cfg_new(expr, str8_lit("basics"));
-              }
-            }
           }break;
 
           //- rjf: writing config changes

src/raddbg/raddbg_core.h

@@ -889,20 +889,6 @@ read_only global RD_ViewUIRule rd_nil_view_ui_rule =
   RD_VIEW_UI_FUNCTION_NAME(null),
 };
 
-#if 0 // TODO(rjf): @cfg
-read_only global RD_ViewRuleInfo rd_nil_view_rule_info =
-{
-  {0},
-  {0},
-  {0},
-  {0},
-  RD_IconKind_Null,
-  0,
-  EV_EXPAND_RULE_INFO_FUNCTION_NAME(nil),
-  RD_VIEW_RULE_UI_FUNCTION_NAME(null)
-};
-#endif
-
 read_only global RD_ViewState rd_nil_view_state =
 {
   &rd_nil_view_state,