diff --git a/project.raddbg b/project.raddbg index 39492b35..e1eae2e2 100755 --- a/project.raddbg +++ b/project.raddbg @@ -16,7 +16,7 @@ target: target: { executable: "build/mule_main.exe" - working_directory: build + working_directory: "build/" output_label: output_a enabled: 1 } diff --git a/src/raddbg/generated/raddbg.meta.c b/src/raddbg/generated/raddbg.meta.c index b597ea71..516a7fb9 100644 --- a/src/raddbg/generated/raddbg.meta.c +++ b/src/raddbg/generated/raddbg.meta.c @@ -467,7 +467,7 @@ RD_NameSchemaInfo rd_name_schema_info_table[39] = {str8_lit_comp("color"), 1, str8_lit_comp("@inherit(tab) x:\n{\n @display_name(\"Value\") @description(\"An expression to describe the value or location of the color.\")\n 'expression': expr_string,\n}\n")}, {str8_lit_comp("geo3d"), 1, str8_lit_comp("@inherit(tab) x:\n{\n @display_name(\"Expression\") @description(\"An expression to describe the base address of the index buffer.\")\n 'expression': expr_string,\n 'count': expr_string,\n 'vtx': expr_string,\n 'vtx_size': expr_string,\n 'yaw': @range[0, 1] f32,\n 'pitch': @range[-0.5, 0] f32,\n 'zoom': @range[0, 100] f32,\n}\n")}, {str8_lit_comp("getting_started"), 0, str8_lit_comp("@inherit(tab) x:\n{\n}\n")}, -{str8_lit_comp("target"), 0, str8_lit_comp("@row_commands(@cmd_line save_cfg_to_project, enable_cfg, launch_and_run, launch_and_step_into, duplicate_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': expr_string,\n @default(\"output\") 'output_label': code_string,\n 'stdout_path': @no_relativize path,\n 'stderr_path': @no_relativize path,\n 'stdin_path': @no_relativize path,\n 'environment': set,\n 'debug_subprocesses': bool,\n @no_revert @no_expand @default(0) 'enabled': bool,\n}\n")}, +{str8_lit_comp("target"), 0, str8_lit_comp("@row_commands(@cmd_line save_cfg_to_project, enable_cfg, launch_and_run, launch_and_step_into, duplicate_cfg, remove_cfg)\n@collection_commands(add_target)\nx:\n{\n 'label': code_string,\n 'executable': path,\n 'arguments': string,\n 'working_directory': @folder path,\n 'entry_point': expr_string,\n @default(\"output\") 'output_label': code_string,\n 'stdout_path': @no_relativize path,\n 'stderr_path': @no_relativize path,\n 'stdin_path': @no_relativize path,\n 'environment': set,\n 'debug_subprocesses': bool,\n @no_revert @no_expand @default(0) 'enabled': bool,\n}\n")}, {str8_lit_comp("breakpoint"), 0, str8_lit_comp("@row_commands(enable_cfg, duplicate_cfg, remove_cfg)\n@collection_commands(toggle_breakpoint, add_breakpoint, add_address_breakpoint, add_function_breakpoint, clear_breakpoints)\nx:\n{\n 'label': code_string,\n 'condition': expr_string,\n 'source_location': path_pt,\n 'address_location': expr_string,\n 'hit_count': u64,\n 'address_range_size': @or(0, 1, 2, 4, 8) u64,\n 'break_on_write': bool,\n 'break_on_read': bool,\n 'break_on_execute': bool,\n @no_revert @no_expand @default(1) 'enabled': bool,\n}\n")}, {str8_lit_comp("watch_pin"), 0, str8_lit_comp("@row_commands(duplicate_cfg, remove_cfg)\n@collection_commands(add_watch_pin, toggle_watch_pin)\nx:\n{\n 'expression': expr_string,\n 'source_location': path_pt,\n 'address_location': expr_string,\n}\n")}, {str8_lit_comp("debug_info"), 0, str8_lit_comp("@row_commands(enable_cfg, duplicate_cfg, remove_cfg)\n@collection_commands(load_debug_info)\nx:\n{\n 'path': @no_relativize path,\n @no_revert @no_expand @default(1) 'enabled': bool,\n @query 'guid': string,\n}\n")}, @@ -480,7 +480,7 @@ RD_NameSchemaInfo rd_name_schema_info_table[39] = {str8_lit_comp("thread"), 0, str8_lit_comp("x:{'label':code_string, 'id':u64, @no_expand 'active':bool, 'call_stack':set}")}, }; -String8 rd_reg_slot_code_name_table[55] = +String8 rd_reg_slot_code_name_table[56] = { {0}, str8_lit_comp("machine"), @@ -533,13 +533,14 @@ str8_lit_comp("activate_with_single_click"), str8_lit_comp("disable_addresses"), str8_lit_comp("small_size"), str8_lit_comp("auto_unwind"), +str8_lit_comp("pick_folder"), str8_lit_comp("dir2"), str8_lit_comp("string"), str8_lit_comp("cmd_name"), str8_lit_comp("wm_event"), }; -Rng1U64 rd_reg_slot_range_table[55] = +Rng1U64 rd_reg_slot_range_table[56] = { {0}, {OffsetOf(RD_Regs, machine), OffsetOf(RD_Regs, machine) + sizeof(D_Handle)}, @@ -592,6 +593,7 @@ Rng1U64 rd_reg_slot_range_table[55] = {OffsetOf(RD_Regs, disable_addresses), OffsetOf(RD_Regs, disable_addresses) + sizeof(B32)}, {OffsetOf(RD_Regs, small_size), OffsetOf(RD_Regs, small_size) + sizeof(B32)}, {OffsetOf(RD_Regs, auto_unwind), OffsetOf(RD_Regs, auto_unwind) + sizeof(B32)}, +{OffsetOf(RD_Regs, pick_folder), OffsetOf(RD_Regs, pick_folder) + sizeof(B32)}, {OffsetOf(RD_Regs, dir2), OffsetOf(RD_Regs, dir2) + sizeof(Dir2)}, {OffsetOf(RD_Regs, string), OffsetOf(RD_Regs, string) + sizeof(String8)}, {OffsetOf(RD_Regs, cmd_name), OffsetOf(RD_Regs, cmd_name) + sizeof(String8)}, diff --git a/src/raddbg/generated/raddbg.meta.h b/src/raddbg/generated/raddbg.meta.h index b24c64fb..51969988 100644 --- a/src/raddbg/generated/raddbg.meta.h +++ b/src/raddbg/generated/raddbg.meta.h @@ -59,6 +59,7 @@ RD_RegSlot_ActivateWithSingleClick, RD_RegSlot_DisableAddresses, RD_RegSlot_SmallSize, RD_RegSlot_AutoUnwind, +RD_RegSlot_PickFolder, RD_RegSlot_Dir2, RD_RegSlot_String, RD_RegSlot_CmdName, @@ -516,6 +517,7 @@ B32 activate_with_single_click; B32 disable_addresses; B32 small_size; B32 auto_unwind; +B32 pick_folder; Dir2 dir2; String8 string; String8 cmd_name; @@ -620,6 +622,7 @@ Z(getting_started)\ .disable_addresses = rd_regs()->disable_addresses,\ .small_size = rd_regs()->small_size,\ .auto_unwind = rd_regs()->auto_unwind,\ +.pick_folder = rd_regs()->pick_folder,\ .dir2 = rd_regs()->dir2,\ .string = rd_regs()->string,\ .cmd_name = rd_regs()->cmd_name,\ @@ -630,8 +633,8 @@ extern String8 rd_tab_fast_path_view_name_table[25]; extern String8 rd_tab_fast_path_query_name_table[25]; extern RD_VocabInfo rd_vocab_info_table[371]; extern RD_NameSchemaInfo rd_name_schema_info_table[39]; -extern String8 rd_reg_slot_code_name_table[55]; -extern Rng1U64 rd_reg_slot_range_table[55]; +extern String8 rd_reg_slot_code_name_table[56]; +extern Rng1U64 rd_reg_slot_range_table[56]; extern String8 rd_binding_version_remap_old_name_table[9]; extern String8 rd_binding_version_remap_new_name_table[9]; extern String8 rd_icon_kind_text_table[75]; diff --git a/src/raddbg/raddbg.mdesk b/src/raddbg/raddbg.mdesk index 3ce3ee7e..94933829 100644 --- a/src/raddbg/raddbg.mdesk +++ b/src/raddbg/raddbg.mdesk @@ -722,7 +722,7 @@ RD_VocabTable: 'label': code_string, 'executable': path, 'arguments': string, - 'working_directory': path, + 'working_directory': @folder path, 'entry_point': expr_string, @default("output") 'output_label': code_string, 'stdout_path': @no_relativize path, @@ -913,6 +913,7 @@ RD_RegTable: {B32 disable_addresses DisableAddresses } {B32 small_size SmallSize } {B32 auto_unwind AutoUnwind } + {B32 pick_folder PickFolder } {Dir2 dir2 Dir2 } {String8 string String } {String8 cmd_name CmdName } diff --git a/src/raddbg/raddbg_core.c b/src/raddbg/raddbg_core.c index b2decdd7..36b845a8 100644 --- a/src/raddbg/raddbg_core.c +++ b/src/raddbg/raddbg_core.c @@ -2362,10 +2362,12 @@ rd_view_ui(Rng2F32 rect) String8 cmd_name = cmd->first->string; // rjf: if we have no selection, just pick the first row + B32 default_selection = 0; EV_Row *row = 0; if(selection_tbl.min.y == 0 && selection_tbl.max.y == 0) { row = ev_row_from_num(scratch.arena, eval_view, &block_ranges, 1); + default_selection = 1; } // rjf: if we do have a selection, compute that row @@ -2374,8 +2376,14 @@ rd_view_ui(Rng2F32 rect) row = ev_row_from_num(scratch.arena, eval_view, &block_ranges, selection_tbl.min.y); } + // rjf: default selection, and we're picking folder? -> pick currently browsed folder + if(cfg_node_child_from_string(view, s("pick_folder")) != &cfg_nil_node && default_selection) + { + rd_cmd(RD_CmdKind_CompleteQuery, .file_path = current_input); + } + // rjf: use row to complete query - if(row->eval.expr != &e_expr_nil) + else if(row->eval.expr != &e_expr_nil) { taken = 1; E_Eval eval = row->eval; @@ -2428,9 +2436,9 @@ rd_view_ui(Rng2F32 rect) { E_Type *type = e_type_from_key(eval.irtree.type_key); String8 file = rd_file_path_from_eval(scratch.arena, eval); - if(str8_match(type->name, str8_lit("folder"), 0)) + if(str8_match(type->name, s("folder"), 0)) { - String8 new_input_string = push_str8f(scratch.arena, "%S/", file); + String8 new_input_string = str8f(scratch.arena, "%S/", file); rd_cmd(RD_CmdKind_UpdateQuery, .string = new_input_string); } else @@ -4007,6 +4015,7 @@ rd_view_ui(Rng2F32 rect) CFG_Node *cell_view = &cfg_nil_node; B32 revert_cell = 0; B32 browse_cell = 0; + B32 browse_folder = 0; UI_Signal sig = {0}; ProfScope("build cell contents") UI_Parent(cell_box) @@ -4203,6 +4212,7 @@ rd_view_ui(Rng2F32 rect) { cell_params.flags |= RD_CellFlag_BrowseButton; cell_params.browse_out = &browse_cell; + browse_folder = md_node_has_tag(schema_child->first, s("folder"), 0); } break; } @@ -4604,7 +4614,7 @@ rd_view_ui(Rng2F32 rect) rd_cmd(RD_CmdKind_Accept); } rd_cmd(RD_CmdKind_FocusPanel); - rd_cmd(RD_CmdKind_RunCommand, .cmd_name = rd_cmd_kind_info_table[RD_CmdKind_PickFilePath].string); + rd_cmd(RD_CmdKind_RunCommand, .cmd_name = rd_cmd_kind_info_table[RD_CmdKind_PickFilePath].string, .pick_folder = browse_folder); } } } @@ -16564,6 +16574,14 @@ rd_frame(void) { cfg_node_child_from_string_or_alloc(rd_state->cfg, view, s("prefer_new_tab")); } + if(!rd_regs()->pick_folder) + { + cfg_node_release(rd_state->cfg, cfg_node_child_from_string(view, s("pick_folder"))); + } + else + { + cfg_node_child_from_string_or_alloc(rd_state->cfg, view, s("pick_folder")); + } } // rjf: choose initial input string