ed/raddebugger
1
0
Fork 0
mirror of https://github.com/Ed94/raddebugger.git synced 2026-08-06 13:58:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

switch to simplified debug engine command interface; rely on interact registers, rather than explicit pass-down, for contextually-obvious parameters

Browse Source
This commit is contained in:
Ryan Fleury
2024-08-28 16:47:05 -07:00
parent e3dc29d7ae
commit 269abf661f
8 changed files with 316 additions and 592 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/dbg_engine/dbg_engine.mdesk
-1
View File
@@ -684,7 +684,6 @@ DF_DevToggleTable:
@struct D_CmdParams: @struct D_CmdParams:
{ {
`U64 slot_props[(D_CmdParamSlot_COUNT + 63) / 64]`;
@expand(D_CmdParamSlotTable a) `$(a.c_type) $(a.name_lower)`; @expand(D_CmdParamSlotTable a) `$(a.c_type) $(a.name_lower)`;
} }
src/dbg_engine/dbg_engine_core.c
+28 -27
View File
@@ -1270,8 +1270,7 @@ d_entity_notify_mutation(D_Entity *entity)
D_EntityKindFlags flags = d_entity_kind_flags_table[entity->kind]; D_EntityKindFlags flags = d_entity_kind_flags_table[entity->kind];
if(e == entity && flags & D_EntityKindFlag_LeafMutProjectConfig) if(e == entity && flags & D_EntityKindFlag_LeafMutProjectConfig)
{ {
D_CmdParams p = {0}; d_cmd(D_CmdKind_WriteProjectData);
d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_WriteProjectData));
} }
if(e == entity && flags & D_EntityKindFlag_LeafMutSoftHalt && d_ctrl_targets_running()) if(e == entity && flags & D_EntityKindFlag_LeafMutSoftHalt && d_ctrl_targets_running())
{ {
@@ -6077,7 +6076,7 @@ d_query_cached_member_map_from_dbgi_key_voff(DI_Key *dbgi_key, U64 voff)
//- rjf: top-level command dispatch //- rjf: top-level command dispatch
internal void internal void
d_push_cmd(D_CmdParams *params, D_CmdSpec *spec) d_push_cmd(D_CmdSpec *spec, D_CmdParams *params)
{ {
// rjf: log // rjf: log
if(params->os_event == 0 || params->os_event->kind != OS_EventKind_MouseMove) if(params->os_event == 0 || params->os_event->kind != OS_EventKind_MouseMove)
@@ -6145,6 +6144,23 @@ d_push_cmd(D_CmdParams *params, D_CmdSpec *spec)
d_cmd_list_push(d_state->root_cmd_arena, &d_state->root_cmds, params, spec); d_cmd_list_push(d_state->root_cmd_arena, &d_state->root_cmds, params, spec);
} }
internal void
d_error(String8 string)
{
d_cmd(D_CmdKind_Error, .string = string);
}
internal void
d_errorf(char *fmt, ...)
{
Temp scratch = scratch_begin(0, 0);
va_list args;
va_start(args, fmt);
String8 string = push_str8fv(scratch.arena, fmt, args);
d_error(string);
scratch_end(scratch);
}
//////////////////////////////// ////////////////////////////////
//~ rjf: Main Layer Top-Level Calls //~ rjf: Main Layer Top-Level Calls
@@ -6174,6 +6190,7 @@ d_init(CmdLine *cmdln, D_StateDeltaHistory *hist)
d_state->view_rule_spec_table = push_array(arena, D_ViewRuleSpec *, d_state->view_rule_spec_table_size); d_state->view_rule_spec_table = push_array(arena, D_ViewRuleSpec *, d_state->view_rule_spec_table_size);
d_state->seconds_til_autosave = 0.5f; d_state->seconds_til_autosave = 0.5f;
d_state->hist = hist; d_state->hist = hist;
d_state->top_interact_regs = &d_state->base_interact_regs;
// rjf: set up initial exception filtering rules // rjf: set up initial exception filtering rules
for(CTRL_ExceptionCodeKind k = (CTRL_ExceptionCodeKind)0; k < CTRL_ExceptionCodeKind_COUNT; k = (CTRL_ExceptionCodeKind)(k+1)) for(CTRL_ExceptionCodeKind k = (CTRL_ExceptionCodeKind)0; k < CTRL_ExceptionCodeKind_COUNT; k = (CTRL_ExceptionCodeKind)(k+1))
@@ -6256,9 +6273,7 @@ d_init(CmdLine *cmdln, D_StateDeltaHistory *hist)
for(D_CfgSrc src = (D_CfgSrc)0; src < D_CfgSrc_COUNT; src = (D_CfgSrc)(src+1)) for(D_CfgSrc src = (D_CfgSrc)0; src < D_CfgSrc_COUNT; src = (D_CfgSrc)(src+1))
{ {
d_state->cfg_path_arenas[src] = arena_alloc(); d_state->cfg_path_arenas[src] = arena_alloc();
D_CmdParams params = d_cmd_params_zero(); d_cmd(d_cfg_src_load_cmd_kind_table[src], .file_path = path_normalized_from_string(scratch.arena, cfg_src_paths[src]));
params.file_path = path_normalized_from_string(scratch.arena, cfg_src_paths[src]);
d_push_cmd(&params, d_cmd_spec_from_kind(d_cfg_src_load_cmd_kind_table[src]));
} }
// rjf: set up config table arena // rjf: set up config table arena
@@ -8170,16 +8185,11 @@ d_begin_frame(Arena *arena, D_CmdList *cmds, F32 dt)
String8 file_path = d_interact_regs()->file_path; String8 file_path = d_interact_regs()->file_path;
if(file_path.size != 0) if(file_path.size != 0)
{ {
D_CmdParams p = d_cmd_params_zero(); d_cmd(D_CmdKind_RunToLine, .file_path = file_path, .text_point = d_interact_regs()->cursor);
p.file_path = file_path;
p.text_point = d_interact_regs()->cursor;
d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_RunToLine));
} }
else else
{ {
D_CmdParams p = d_cmd_params_zero(); d_cmd(D_CmdKind_RunToAddress, .vaddr = d_interact_regs()->vaddr_range.min);
p.vaddr = d_interact_regs()->vaddr_range.min;
d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_RunToAddress));
} }
}break; }break;
case D_CmdKind_SetNextStatement: case D_CmdKind_SetNextStatement:
@@ -8261,21 +8271,15 @@ d_begin_frame(Arena *arena, D_CmdList *cmds, F32 dt)
D_Entity *target = d_entity_from_handle(ended_process->entity_handle); D_Entity *target = d_entity_from_handle(ended_process->entity_handle);
if(target->kind == D_EntityKind_Target) if(target->kind == D_EntityKind_Target)
{ {
D_CmdParams p = params; d_cmd(D_CmdKind_LaunchAndRun, .entity = d_handle_from_entity(target));
p.entity = d_handle_from_entity(target);
d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_LaunchAndRun));
} }
else if(d_entity_is_nil(target)) else if(d_entity_is_nil(target))
{ {
D_CmdParams p = params; d_cmd(D_CmdKind_Error, .string = str8_lit("The ended process' corresponding target is missing."));
p.string = str8_lit("The ended process' corresponding target is missing.");
d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_Error));
} }
else if(d_entity_is_nil(ended_process)) else if(d_entity_is_nil(ended_process))
{ {
D_CmdParams p = params; d_cmd(D_CmdKind_Error, .string = str8_lit("Invalid ended process."));
p.string = str8_lit("Invalid ended process.");
d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_Error));
} }
}break; }break;
@@ -8322,9 +8326,7 @@ d_begin_frame(Arena *arena, D_CmdList *cmds, F32 dt)
} }
if(likely_not_in_admin_mode) if(likely_not_in_admin_mode)
{ {
D_CmdParams p = params; d_cmd(D_CmdKind_Error, .string = str8_lit("Could not register as the just-in-time debugger, access was denied; try running the debugger as administrator."));
p.string = str8_lit("Could not register as the just-in-time debugger, access was denied; try running the debugger as administrator.");
d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_Error));
} }
#else #else
D_CmdParams p = params; D_CmdParams p = params;
@@ -8540,8 +8542,7 @@ d_end_frame(void)
if(d_state->entities_mut_soft_halt) if(d_state->entities_mut_soft_halt)
{ {
d_state->entities_mut_soft_halt = 0; d_state->entities_mut_soft_halt = 0;
D_CmdParams params = d_cmd_params_zero(); d_cmd(D_CmdKind_SoftHaltRefresh);
d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_SoftHaltRefresh));
} }
//- rjf: entity mutation -> send refreshed debug info map //- rjf: entity mutation -> send refreshed debug info map
src/dbg_engine/dbg_engine_core.h
+11 -1
View File
@@ -1583,7 +1583,17 @@ internal E_String2NumMap *d_query_cached_locals_map_from_dbgi_key_voff(DI_Key *d
internal E_String2NumMap *d_query_cached_member_map_from_dbgi_key_voff(DI_Key *dbgi_key, U64 voff); internal E_String2NumMap *d_query_cached_member_map_from_dbgi_key_voff(DI_Key *dbgi_key, U64 voff);
//- rjf: top-level command dispatch //- rjf: top-level command dispatch
internal void d_push_cmd(D_CmdParams *params, D_CmdSpec *spec); internal void d_push_cmd(D_CmdSpec *spec, D_CmdParams *params);
internal void d_error(String8 string);
internal void d_errorf(char *fmt, ...);
#define d_cmd(kind, ...) d_push_cmd(d_cmd_spec_from_kind(kind),\
&(D_CmdParams)\
{\
.window = d_interact_regs()->window, \
.panel = d_interact_regs()->panel, \
.view = d_interact_regs()->view, \
__VA_ARGS__\
})
//////////////////////////////// ////////////////////////////////
//~ rjf: Main Layer Top-Level Calls //~ rjf: Main Layer Top-Level Calls
src/dbg_engine/generated/dbg_engine.meta.h
-1
View File
@@ -406,7 +406,6 @@ D_CmdParamSlot_COUNT,
typedef struct D_CmdParams D_CmdParams; typedef struct D_CmdParams D_CmdParams;
struct D_CmdParams struct D_CmdParams
{ {
U64 slot_props[(D_CmdParamSlot_COUNT + 63) / 64];
D_Handle window; D_Handle window;
D_Handle panel; D_Handle panel;
D_Handle dest_panel; D_Handle dest_panel;
src/dbg_gfx/dbg_gfx_core.c
+155 -328
View File
File diff suppressed because it is too large Load Diff
src/dbg_gfx/dbg_gfx_views.c
+108 -208
View File
@@ -437,9 +437,7 @@ df_code_view_build(Arena *arena, DF_Window *ws, DF_Panel *panel, DF_View *view,
cv->center_cursor = found; cv->center_cursor = found;
if(found == 0) if(found == 0)
{ {
D_CmdParams params = df_cmd_params_from_view(ws, panel, view); d_errorf("Could not find \"%S\"", cv->find_text_fwd);
params.string = push_str8f(scratch.arena, "Could not find \"%S\"", cv->find_text_fwd);
d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_Error));
} }
scratch_end(scratch); scratch_end(scratch);
} }
@@ -500,9 +498,7 @@ df_code_view_build(Arena *arena, DF_Window *ws, DF_Panel *panel, DF_View *view,
cv->center_cursor = found; cv->center_cursor = found;
if(found == 0) if(found == 0)
{ {
D_CmdParams params = df_cmd_params_from_view(ws, panel, view); d_errorf("Could not find \"%S\"", cv->find_text_bwd);
params.string = push_str8f(scratch.arena, "Could not find \"%S\"", cv->find_text_bwd);
d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_Error));
} }
scratch_end(scratch); scratch_end(scratch);
} }
@@ -555,8 +551,7 @@ df_code_view_build(Arena *arena, DF_Window *ws, DF_Panel *panel, DF_View *view,
//- rjf: press code slice? -> focus panel //- rjf: press code slice? -> focus panel
if(ui_pressed(sig.base)) if(ui_pressed(sig.base))
{ {
D_CmdParams p = df_cmd_params_from_panel(ws, panel); d_cmd(D_CmdKind_FocusPanel, .panel = df_handle_from_panel(panel));
d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_FocusPanel));
} }
//- rjf: dragging & outside region? -> contain cursor //- rjf: dragging & outside region? -> contain cursor
@@ -576,18 +571,14 @@ df_code_view_build(Arena *arena, DF_Window *ws, DF_Panel *panel, DF_View *view,
if(ui_pressed(sig.base) && sig.base.event_flags & OS_EventFlag_Ctrl) if(ui_pressed(sig.base) && sig.base.event_flags & OS_EventFlag_Ctrl)
{ {
ui_kill_action(); ui_kill_action();
D_CmdParams params = df_cmd_params_from_view(ws, panel, view); d_cmd(D_CmdKind_GoToName, .string = txt_string_from_info_data_txt_rng(text_info, text_data, sig.mouse_expr_rng));
params.string = txt_string_from_info_data_txt_rng(text_info, text_data, sig.mouse_expr_rng);
d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_GoToName));
} }
//- rjf: watch expr at mouse //- rjf: watch expr at mouse
if(cv->watch_expr_at_mouse) if(cv->watch_expr_at_mouse)
{ {
cv->watch_expr_at_mouse = 0; cv->watch_expr_at_mouse = 0;
D_CmdParams params = df_cmd_params_from_view(ws, panel, view); d_cmd(D_CmdKind_ToggleWatchExpression, .string = txt_string_from_info_data_txt_rng(text_info, text_data, sig.mouse_expr_rng));
params.string = txt_string_from_info_data_txt_rng(text_info, text_data, sig.mouse_expr_rng);
d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_ToggleWatchExpression));
} }
//- rjf: selected text on single line, no query? -> set search text //- rjf: selected text on single line, no query? -> set search text
@@ -732,13 +723,11 @@ df_code_view_build(Arena *arena, DF_Window *ws, DF_Panel *panel, DF_View *view,
ui_eat_event(evt); ui_eat_event(evt);
if(evt->delta_2f32.y < 0) if(evt->delta_2f32.y < 0)
{ {
D_CmdParams params = df_cmd_params_from_window(ws); d_cmd(D_CmdKind_IncCodeFontScale, .window = df_handle_from_window(ws));
d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_IncCodeFontScale));
} }
else if(evt->delta_2f32.y > 0) else if(evt->delta_2f32.y > 0)
{ {
D_CmdParams params = df_cmd_params_from_window(ws); d_cmd(D_CmdKind_DecCodeFontScale, .window = df_handle_from_window(ws));
d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_DecCodeFontScale));
} }
} }
} }
@@ -1649,11 +1638,10 @@ df_watch_view_build(DF_Window *ws, DF_Panel *panel, DF_View *view, DF_WatchViewS
} }
if(row->expand_ui_rule_spec != &df_g_nil_gfx_view_rule_spec && row->expand_ui_rule_spec != 0) if(row->expand_ui_rule_spec != &df_g_nil_gfx_view_rule_spec && row->expand_ui_rule_spec != 0)
{ {
D_CmdParams p = df_cmd_params_from_view(ws, panel, view); d_cmd(D_CmdKind_OpenTab,
p.string = e_string_from_expr(scratch.arena, row->expr); .string = e_string_from_expr(scratch.arena, row->expr),
p.view_spec = df_view_spec_from_string(row->expand_ui_rule_spec->info.string); .view_spec = df_view_spec_from_string(row->expand_ui_rule_spec->info.string),
p.params_tree = row->expand_ui_rule_params; .params_tree = row->expand_ui_rule_params);
d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_OpenTab));
} }
} }
} }
@@ -1679,24 +1667,26 @@ df_watch_view_build(DF_Window *ws, DF_Panel *panel, DF_View *view, DF_WatchViewS
DI_Key dbgi_key = d_dbgi_key_from_module(module); DI_Key dbgi_key = d_dbgi_key_from_module(module);
U64 voff = d_voff_from_vaddr(module, vaddr); U64 voff = d_voff_from_vaddr(module, vaddr);
D_LineList lines = d_lines_from_dbgi_key_voff(scratch.arena, &dbgi_key, voff); D_LineList lines = d_lines_from_dbgi_key_voff(scratch.arena, &dbgi_key, voff);
D_CmdParams p = df_cmd_params_from_view(ws, panel, view); String8 file_path = {0};
p.entity = d_handle_from_entity(process); TxtPt pt = {0};
p.vaddr = vaddr;
if(lines.first != 0) if(lines.first != 0)
{ {
p.file_path = lines.first->v.file_path; file_path = lines.first->v.file_path;
p.text_point = lines.first->v.pt; pt = lines.first->v.pt;
} }
d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_FindCodeLocation)); d_cmd(D_CmdKind_FindCodeLocation,
.entity = d_handle_from_entity(process),
.vaddr = vaddr,
.file_path = file_path,
.text_point= pt);
} }
if(1 <= selection_tbl.min.y && selection_tbl.min.y <= frame_rows_count) if(1 <= selection_tbl.min.y && selection_tbl.min.y <= frame_rows_count)
{ {
FrameRow *frame_row = &frame_rows[selection_tbl.min.y-1]; FrameRow *frame_row = &frame_rows[selection_tbl.min.y-1];
D_CmdParams p = df_cmd_params_from_view(ws, panel, view); d_cmd(D_CmdKind_SelectUnwind,
p.entity = d_interact_regs()->thread; .entity = d_interact_regs()->thread,
p.unwind_index = frame_row->unwind_idx; .unwind_index = frame_row->unwind_idx,
p.inline_depth = frame_row->inline_depth; .inline_depth = frame_row->inline_depth);
d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_SelectUnwind));
} }
} }
@@ -1812,9 +1802,7 @@ df_watch_view_build(DF_Window *ws, DF_Panel *panel, DF_View *view, DF_WatchViewS
} }
if(!success) if(!success)
{ {
D_CmdParams params = df_cmd_params_from_view(ws, panel, view); d_error(str8_lit("Could not commit value successfully."));
params.string = str8_lit("Could not commit value successfully.");
d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_Error));
} }
}break; }break;
case DF_WatchViewColumnKind_Type:{}break; case DF_WatchViewColumnKind_Type:{}break;
@@ -2357,11 +2345,10 @@ df_watch_view_build(DF_Window *ws, DF_Panel *panel, DF_View *view, DF_WatchViewS
if(ui_clicked(sig)) if(ui_clicked(sig))
{ {
DF_ViewSpec *canvas_view_spec = df_view_spec_from_string(row->expand_ui_rule_spec->info.string); DF_ViewSpec *canvas_view_spec = df_view_spec_from_string(row->expand_ui_rule_spec->info.string);
D_CmdParams p = df_cmd_params_from_view(ws, panel, view); d_cmd(D_CmdKind_OpenTab,
p.string = e_string_from_expr(scratch.arena, row->expr); .string = e_string_from_expr(scratch.arena, row->expr),
p.view_spec = canvas_view_spec; .view_spec = canvas_view_spec,
p.params_tree = row->expand_ui_rule_params; .params_tree = row->expand_ui_rule_params);
d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_OpenTab));
} }
} }
@@ -2378,6 +2365,7 @@ df_watch_view_build(DF_Window *ws, DF_Panel *panel, DF_View *view, DF_WatchViewS
//- rjf: push interaction registers, fill with per-view states //- rjf: push interaction registers, fill with per-view states
d_push_interact_regs(); d_push_interact_regs();
{ {
d_interact_regs()->view = df_handle_from_view(canvas_view);
d_interact_regs()->file_path = d_file_path_from_eval_string(d_frame_arena(), str8(canvas_view->query_buffer, canvas_view->query_string_size)); d_interact_regs()->file_path = d_file_path_from_eval_string(d_frame_arena(), str8(canvas_view->query_buffer, canvas_view->query_string_size));
} }
@@ -2666,8 +2654,7 @@ df_watch_view_build(DF_Window *ws, DF_Panel *panel, DF_View *view, DF_WatchViewS
if(ui_double_clicked(sig) && cell_can_edit) if(ui_double_clicked(sig) && cell_can_edit)
{ {
ui_kill_action(); ui_kill_action();
D_CmdParams p = df_cmd_params_from_view(ws, panel, view); d_cmd(D_CmdKind_Edit);
d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_Edit));
} }
// rjf: double-click, not editable -> go-to-location // rjf: double-click, not editable -> go-to-location
@@ -2678,26 +2665,28 @@ df_watch_view_build(DF_Window *ws, DF_Panel *panel, DF_View *view, DF_WatchViewS
DI_Key dbgi_key = d_dbgi_key_from_module(module); DI_Key dbgi_key = d_dbgi_key_from_module(module);
U64 voff = d_voff_from_vaddr(module, vaddr); U64 voff = d_voff_from_vaddr(module, vaddr);
D_LineList lines = d_lines_from_dbgi_key_voff(scratch.arena, &dbgi_key, voff); D_LineList lines = d_lines_from_dbgi_key_voff(scratch.arena, &dbgi_key, voff);
D_CmdParams p = df_cmd_params_from_view(ws, panel, view); String8 file_path = {0};
p.entity = d_handle_from_entity(process); TxtPt pt = {0};
p.vaddr = vaddr;
if(lines.first != 0) if(lines.first != 0)
{ {
p.file_path = lines.first->v.file_path; file_path = lines.first->v.file_path;
p.text_point = lines.first->v.pt; pt = lines.first->v.pt;
} }
d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_FindCodeLocation)); d_cmd(D_CmdKind_FindCodeLocation,
.entity = d_handle_from_entity(process),
.vaddr = vaddr,
.file_path = file_path,
.text_point = pt);
} }
// rjf: double-click, not editable, callstack frame -> select frame // rjf: double-click, not editable, callstack frame -> select frame
if(ui_double_clicked(sig) && !cell_can_edit && semantic_idx < frame_rows_count) if(ui_double_clicked(sig) && !cell_can_edit && semantic_idx < frame_rows_count)
{ {
FrameRow *frame_row = &frame_rows[semantic_idx]; FrameRow *frame_row = &frame_rows[semantic_idx];
D_CmdParams p = df_cmd_params_from_view(ws, panel, view); d_cmd(D_CmdKind_SelectUnwind,
p.entity = d_interact_regs()->thread; .entity = d_interact_regs()->thread,
p.unwind_index = frame_row->unwind_idx; .unwind_index = frame_row->unwind_idx,
p.inline_depth = frame_row->inline_depth; .inline_depth = frame_row->inline_depth);
d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_SelectUnwind));
} }
// rjf: hovering with inheritance string -> show tooltip // rjf: hovering with inheritance string -> show tooltip
@@ -2881,8 +2870,7 @@ df_watch_view_build(DF_Window *ws, DF_Panel *panel, DF_View *view, DF_WatchViewS
// //
if(pressed) if(pressed)
{ {
D_CmdParams p = df_cmd_params_from_panel(ws, panel); d_cmd(D_CmdKind_FocusPanel);
d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_FocusPanel));
} }
scratch_end(scratch); scratch_end(scratch);
@@ -2919,8 +2907,7 @@ DF_VIEW_UI_FUNCTION_DEF(empty)
{ {
if(ui_clicked(df_icon_buttonf(ws, DF_IconKind_X, 0, "Close Panel"))) if(ui_clicked(df_icon_buttonf(ws, DF_IconKind_X, 0, "Close Panel")))
{ {
D_CmdParams p = df_cmd_params_from_panel(ws, panel); d_cmd(D_CmdKind_ClosePanel);
d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_ClosePanel));
} }
} }
} }
@@ -2991,9 +2978,7 @@ DF_VIEW_UI_FUNCTION_DEF(getting_started)
DF_Palette(ws, DF_PaletteCode_NeutralPopButton) DF_Palette(ws, DF_PaletteCode_NeutralPopButton)
if(ui_clicked(df_icon_buttonf(ws, DF_IconKind_Add, 0, "Add Target"))) if(ui_clicked(df_icon_buttonf(ws, DF_IconKind_Add, 0, "Add Target")))
{ {
D_CmdParams params = df_cmd_params_from_view(ws, panel, view); d_cmd(D_CmdKind_RunCommand, .cmd_spec = d_cmd_spec_from_kind(D_CmdKind_AddTarget));
params.cmd_spec = d_cmd_spec_from_kind(D_CmdKind_AddTarget);
d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_RunCommand));
} }
}break; }break;
@@ -3013,16 +2998,12 @@ DF_VIEW_UI_FUNCTION_DEF(getting_started)
{ {
if(ui_clicked(df_icon_buttonf(ws, DF_IconKind_Play, 0, "Launch %S", target_name))) if(ui_clicked(df_icon_buttonf(ws, DF_IconKind_Play, 0, "Launch %S", target_name)))
{ {
D_CmdParams params = df_cmd_params_from_view(ws, panel, view); d_cmd(D_CmdKind_LaunchAndRun, .entity = d_handle_from_entity(target));
params.entity = d_handle_from_entity(target);
d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_LaunchAndRun));
} }
ui_spacer(ui_em(1.5f, 1)); ui_spacer(ui_em(1.5f, 1));
if(ui_clicked(df_icon_buttonf(ws, DF_IconKind_Play, 0, "Step Into %S", target_name))) if(ui_clicked(df_icon_buttonf(ws, DF_IconKind_Play, 0, "Step Into %S", target_name)))
{ {
D_CmdParams params = df_cmd_params_from_view(ws, panel, view); d_cmd(D_CmdKind_LaunchAndInit, .entity = d_handle_from_entity(target));
params.entity = d_handle_from_entity(target);
d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_LaunchAndInit));
} }
} }
}break; }break;
@@ -3226,13 +3207,7 @@ DF_VIEW_UI_FUNCTION_DEF(commands)
//- rjf: submit best match when hitting enter w/ no selection //- rjf: submit best match when hitting enter w/ no selection
if(cv->selected_cmd_spec == &d_nil_cmd_spec && ui_slot_press(UI_EventActionSlot_Accept)) if(cv->selected_cmd_spec == &d_nil_cmd_spec && ui_slot_press(UI_EventActionSlot_Accept))
{ {
D_CmdParams params = df_cmd_params_from_view(ws, panel, view); d_cmd(D_CmdKind_CompleteQuery, .cmd_spec = (cmd_array.count > 0 ? cmd_array.v[0].cmd_spec : &d_nil_cmd_spec));
if(cmd_array.count > 0)
{
DF_CmdListerItem *item = &cmd_array.v[0];
params.cmd_spec = item->cmd_spec;
}
d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_CompleteQuery));
} }
//- rjf: selected kind -> cursor //- rjf: selected kind -> cursor
@@ -3344,9 +3319,7 @@ DF_VIEW_UI_FUNCTION_DEF(commands)
UI_Signal sig = ui_signal_from_box(box); UI_Signal sig = ui_signal_from_box(box);
if(ui_clicked(sig)) if(ui_clicked(sig))
{ {
D_CmdParams params = df_cmd_params_from_view(ws, panel, view); d_cmd(D_CmdKind_CompleteQuery, .cmd_spec = item->cmd_spec);
params.cmd_spec = item->cmd_spec;
d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_CompleteQuery));
} }
} }
} }
@@ -3545,9 +3518,7 @@ DF_VIEW_UI_FUNCTION_DEF(file_system)
// choose the most recent change to a file browser path, and live with the // choose the most recent change to a file browser path, and live with the
// consequences). // consequences).
{ {
D_CmdParams p = d_cmd_params_zero(); d_cmd(D_CmdKind_SetCurrentPath, .file_path = path_query.path);
p.file_path = path_query.path;
d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_SetCurrentPath));
} }
//- rjf: get files, filtered //- rjf: get files, filtered
@@ -3635,9 +3606,7 @@ DF_VIEW_UI_FUNCTION_DEF(file_system)
// rjf: command search part is empty, but directory matches some file: // rjf: command search part is empty, but directory matches some file:
if(path_query_path_props.created != 0 && path_query.search.size == 0) if(path_query_path_props.created != 0 && path_query.search.size == 0)
{ {
D_CmdParams params = df_cmd_params_from_view(ws, panel, view); d_cmd(D_CmdKind_CompleteQuery, .file_path = query_normalized_with_opt_slash);
params.file_path = query_normalized_with_opt_slash;
d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_CompleteQuery));
} }
// rjf: command argument exactly matches some file: // rjf: command argument exactly matches some file:
@@ -3653,18 +3622,14 @@ DF_VIEW_UI_FUNCTION_DEF(file_system)
// rjf: is a file -> complete view // rjf: is a file -> complete view
else else
{ {
D_CmdParams params = df_cmd_params_from_view(ws, panel, view); d_cmd(D_CmdKind_CompleteQuery, .file_path = query_normalized_with_opt_slash);
params.file_path = query_normalized_with_opt_slash;
d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_CompleteQuery));
} }
} }
// rjf: command argument is empty, picking folders -> use current folder // rjf: command argument is empty, picking folders -> use current folder
else if(path_query.search.size == 0 && dir_selection) else if(path_query.search.size == 0 && dir_selection)
{ {
D_CmdParams params = df_cmd_params_from_view(ws, panel, view); d_cmd(D_CmdKind_CompleteQuery, .file_path = path_query.path);
params.file_path = path_query.path;
d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_CompleteQuery));
} }
// rjf: command argument does not exactly match any file, but lister results are in: // rjf: command argument does not exactly match any file, but lister results are in:
@@ -3679,18 +3644,15 @@ DF_VIEW_UI_FUNCTION_DEF(file_system)
} }
else else
{ {
D_CmdParams params = df_cmd_params_from_view(ws, panel, view); String8 file_path = push_str8f(scratch.arena, "%S%S", path_query.path, filename);
params.file_path = push_str8f(scratch.arena, "%S%S", path_query.path, filename); d_cmd(D_CmdKind_CompleteQuery, .file_path = file_path);
d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_CompleteQuery));
} }
} }
// rjf: command argument does not match any file, and lister is empty (new file) // rjf: command argument does not match any file, and lister is empty (new file)
else else
{ {
D_CmdParams params = df_cmd_params_from_view(ws, panel, view); d_cmd(D_CmdKind_CompleteQuery, .file_path = query);
params.file_path = query;
d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_CompleteQuery));
} }
} }
@@ -3889,9 +3851,7 @@ DF_VIEW_UI_FUNCTION_DEF(file_system)
} }
else else
{ {
D_CmdParams params = df_cmd_params_from_view(ws, panel, view); d_cmd(D_CmdKind_CompleteQuery, .file_path = new_path);
params.file_path = new_path;
d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_CompleteQuery));
} }
} }
} }
@@ -4112,9 +4072,7 @@ DF_VIEW_UI_FUNCTION_DEF(system_processes)
if(sp->selected_pid == 0 && process_info_array.count > 0 && ui_slot_press(UI_EventActionSlot_Accept)) if(sp->selected_pid == 0 && process_info_array.count > 0 && ui_slot_press(UI_EventActionSlot_Accept))
{ {
DF_ProcessInfo *info = &process_info_array.v[0]; DF_ProcessInfo *info = &process_info_array.v[0];
D_CmdParams params = df_cmd_params_from_view(ws, panel, view); d_cmd(D_CmdKind_CompleteQuery, .id = info->info.pid);
params.id = info->info.pid;
d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_CompleteQuery));
} }
//- rjf: selected PID -> cursor //- rjf: selected PID -> cursor
@@ -4202,9 +4160,7 @@ DF_VIEW_UI_FUNCTION_DEF(system_processes)
// rjf: click => activate this specific process // rjf: click => activate this specific process
if(ui_clicked(sig)) if(ui_clicked(sig))
{ {
D_CmdParams params = df_cmd_params_from_view(ws, panel, view); d_cmd(D_CmdKind_CompleteQuery, .id = info->info.pid);
params.id = info->info.pid;
d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_CompleteQuery));
} }
} }
} }
@@ -4353,10 +4309,7 @@ DF_VIEW_UI_FUNCTION_DEF(entity_lister)
if(d_entity_is_nil(d_entity_from_handle(fev->selected_entity_handle)) && ent_arr.count != 0 && ui_slot_press(UI_EventActionSlot_Accept)) if(d_entity_is_nil(d_entity_from_handle(fev->selected_entity_handle)) && ent_arr.count != 0 && ui_slot_press(UI_EventActionSlot_Accept))
{ {
D_Entity *ent = ent_arr.v[0].entity; D_Entity *ent = ent_arr.v[0].entity;
D_CmdParams params = df_cmd_params_from_view(ws, panel, view); d_cmd(D_CmdKind_CompleteQuery, .entity = d_handle_from_entity(ent));
params.entity = d_handle_from_entity(ent);
d_handle_list_push(scratch.arena, &params.entity_list, params.entity);
d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_CompleteQuery));
} }
//- rjf: selected entity -> cursor //- rjf: selected entity -> cursor
@@ -4435,10 +4388,7 @@ DF_VIEW_UI_FUNCTION_DEF(entity_lister)
} }
if(ui_clicked(ui_signal_from_box(box))) if(ui_clicked(ui_signal_from_box(box)))
{ {
D_CmdParams params = df_cmd_params_from_view(ws, panel, view); d_cmd(D_CmdKind_CompleteQuery, .entity = d_handle_from_entity(ent));
params.entity = d_handle_from_entity(ent);
d_handle_list_push(scratch.arena, &params.entity_list, params.entity);
d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_CompleteQuery));
} }
} }
} }
@@ -4516,9 +4466,7 @@ DF_VIEW_UI_FUNCTION_DEF(symbol_lister)
String8 name = str8(name_base, name_size); String8 name = str8(name_base, name_size);
if(name.size != 0) if(name.size != 0)
{ {
D_CmdParams p = df_cmd_params_from_view(ws, panel, view); d_cmd(D_CmdKind_CompleteQuery, .string = name);
p.string = name;
d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_CompleteQuery));
} }
break; break;
} }
@@ -4608,9 +4556,7 @@ DF_VIEW_UI_FUNCTION_DEF(symbol_lister)
UI_Signal sig = ui_signal_from_box(box); UI_Signal sig = ui_signal_from_box(box);
if(ui_clicked(sig)) if(ui_clicked(sig))
{ {
D_CmdParams p = df_cmd_params_from_view(ws, panel, view); d_cmd(D_CmdKind_CompleteQuery, .string = name);
p.string = name;
d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_CompleteQuery));
} }
if(ui_hovering(sig)) UI_Tooltip if(ui_hovering(sig)) UI_Tooltip
{ {
@@ -4888,8 +4834,7 @@ DF_VIEW_UI_FUNCTION_DEF(target)
// rjf: focus panel on press // rjf: focus panel on press
if(ui_pressed(sig)) if(ui_pressed(sig))
{ {
D_CmdParams p = df_cmd_params_from_panel(ws, panel); d_cmd(D_CmdKind_FocusPanel);
d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_FocusPanel));
} }
// rjf: begin editing on double-click // rjf: begin editing on double-click
@@ -4931,9 +4876,7 @@ DF_VIEW_UI_FUNCTION_DEF(target)
UI_TextAlignment(UI_TextAlign_Center) UI_TextAlignment(UI_TextAlign_Center)
if(ui_clicked(ui_buttonf("Browse..."))) if(ui_clicked(ui_buttonf("Browse...")))
{ {
D_CmdParams params = df_cmd_params_from_view(ws, panel, view); d_cmd(D_CmdKind_RunCommand, .cmd_spec = d_cmd_spec_from_kind(kv_info[idx].fill_with_file ? D_CmdKind_PickFile : D_CmdKind_PickFolder));
params.cmd_spec = d_cmd_spec_from_kind(kv_info[idx].fill_with_file ? D_CmdKind_PickFile : D_CmdKind_PickFolder);
d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_RunCommand));
tv->pick_dst_kind = kv_info[idx].storage_child_kind; tv->pick_dst_kind = kv_info[idx].storage_child_kind;
} }
} }
@@ -5056,9 +4999,7 @@ DF_VIEW_UI_FUNCTION_DEF(targets)
add_sig = df_icon_buttonf(ws, DF_IconKind_Add, 0, "Add New Target"); add_sig = df_icon_buttonf(ws, DF_IconKind_Add, 0, "Add New Target");
if(ui_clicked(add_sig)) if(ui_clicked(add_sig))
{ {
D_CmdParams params = df_cmd_params_from_view(ws, panel, view); d_cmd(D_CmdKind_RunCommand, .cmd_spec = d_cmd_spec_from_kind(D_CmdKind_AddTarget));
params.cmd_spec = d_cmd_spec_from_kind(D_CmdKind_AddTarget);
d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_RunCommand));
} }
} }
@@ -5078,9 +5019,7 @@ DF_VIEW_UI_FUNCTION_DEF(targets)
UI_Signal sig = df_icon_buttonf(ws, !target->disabled ? DF_IconKind_CheckFilled : DF_IconKind_CheckHollow, 0, "###ebl_%p", target); UI_Signal sig = df_icon_buttonf(ws, !target->disabled ? DF_IconKind_CheckFilled : DF_IconKind_CheckHollow, 0, "###ebl_%p", target);
if(ui_clicked(sig)) if(ui_clicked(sig))
{ {
D_CmdParams p = df_cmd_params_from_view(ws, panel, view); d_cmd(!target->disabled ? D_CmdKind_DisableTarget : D_CmdKind_EnableTarget, .entity = d_handle_from_entity(target));
p.entity = d_handle_from_entity(target);
d_push_cmd(&p, d_cmd_spec_from_kind(!target->disabled ? D_CmdKind_DisableTarget : D_CmdKind_EnableTarget));
} }
} }
@@ -5119,10 +5058,7 @@ DF_VIEW_UI_FUNCTION_DEF(targets)
} }
if(ui_clicked(sig)) if(ui_clicked(sig))
{ {
D_CmdParams params = df_cmd_params_from_view(ws, panel, view); d_cmd(ctrls[ctrl_idx].cmd, .entity = d_handle_from_entity(target));
params.entity = d_handle_from_entity(target);
d_handle_list_push(scratch.arena, &params.entity_list, params.entity);
d_push_cmd(&params, d_cmd_spec_from_kind(ctrls[ctrl_idx].cmd));
} }
} }
} }
@@ -5198,12 +5134,11 @@ DF_VIEW_CMD_FUNCTION_DEF(file_path_map)
String8 pick_string = cmd->params.file_path; String8 pick_string = cmd->params.file_path;
Side pick_side = fpms->pick_file_dst_side; Side pick_side = fpms->pick_file_dst_side;
D_Entity *storage_entity = d_entity_from_handle(fpms->pick_file_dst_map); D_Entity *storage_entity = d_entity_from_handle(fpms->pick_file_dst_map);
D_CmdParams p = df_cmd_params_from_view(ws, panel, view); d_cmd(pick_side == Side_Min ?
p.entity = d_handle_from_entity(storage_entity); D_CmdKind_SetFileOverrideLinkSrc :
p.file_path = pick_string; D_CmdKind_SetFileOverrideLinkDst,
d_push_cmd(&p, d_cmd_spec_from_kind(pick_side == Side_Min ? .entity = d_handle_from_entity(storage_entity),
D_CmdKind_SetFileOverrideLinkSrc : .file_path = pick_string);
D_CmdKind_SetFileOverrideLinkDst));
}break; }break;
} }
} }
@@ -5338,8 +5273,7 @@ DF_VIEW_UI_FUNCTION_DEF(file_path_map)
// rjf: focus panel on press // rjf: focus panel on press
if(ui_pressed(sig)) if(ui_pressed(sig))
{ {
D_CmdParams p = df_cmd_params_from_panel(ws, panel); d_cmd(D_CmdKind_FocusPanel);
d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_FocusPanel));
} }
// rjf: begin editing on double-click // rjf: begin editing on double-click
@@ -5374,9 +5308,7 @@ DF_VIEW_UI_FUNCTION_DEF(file_path_map)
UI_PrefWidth(ui_text_dim(10, 1)) UI_PrefWidth(ui_text_dim(10, 1))
if(ui_clicked(ui_buttonf("Browse..."))) if(ui_clicked(ui_buttonf("Browse...")))
{ {
D_CmdParams params = df_cmd_params_from_view(ws, panel, view); d_cmd(D_CmdKind_RunCommand, .cmd_spec = d_cmd_spec_from_kind(D_CmdKind_PickFileOrFolder));
params.cmd_spec = d_cmd_spec_from_kind(D_CmdKind_PickFileOrFolder);
d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_RunCommand));
fpms->pick_file_dst_map = d_handle_from_entity(map); fpms->pick_file_dst_map = d_handle_from_entity(map);
fpms->pick_file_dst_side = Side_Min; fpms->pick_file_dst_side = Side_Min;
} }
@@ -5411,8 +5343,7 @@ DF_VIEW_UI_FUNCTION_DEF(file_path_map)
// rjf: focus panel on press // rjf: focus panel on press
if(ui_pressed(sig)) if(ui_pressed(sig))
{ {
D_CmdParams p = df_cmd_params_from_panel(ws, panel); d_cmd(D_CmdKind_FocusPanel);
d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_FocusPanel));
} }
// rjf: begin editing on double-click // rjf: begin editing on double-click
@@ -5448,9 +5379,7 @@ DF_VIEW_UI_FUNCTION_DEF(file_path_map)
UI_PrefWidth(ui_text_dim(10, 1)) UI_PrefWidth(ui_text_dim(10, 1))
if(ui_clicked(ui_buttonf("Browse..."))) if(ui_clicked(ui_buttonf("Browse...")))
{ {
D_CmdParams params = df_cmd_params_from_view(ws, panel, view); d_cmd(D_CmdKind_RunCommand, .cmd_spec = d_cmd_spec_from_kind(D_CmdKind_PickFileOrFolder));
params.cmd_spec = d_cmd_spec_from_kind(D_CmdKind_PickFileOrFolder);
d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_RunCommand));
fpms->pick_file_dst_map = d_handle_from_entity(map); fpms->pick_file_dst_map = d_handle_from_entity(map);
fpms->pick_file_dst_side = Side_Max; fpms->pick_file_dst_side = Side_Max;
} }
@@ -5463,12 +5392,11 @@ DF_VIEW_UI_FUNCTION_DEF(file_path_map)
if(edit_commit && commit_side != Side_Invalid) if(edit_commit && commit_side != Side_Invalid)
{ {
String8 new_string = str8(fpms->input_buffer, fpms->input_size); String8 new_string = str8(fpms->input_buffer, fpms->input_size);
D_CmdParams p = df_cmd_params_from_view(ws, panel, view); d_cmd(commit_side == Side_Min ?
p.entity = commit_map; D_CmdKind_SetFileOverrideLinkSrc :
p.file_path = new_string; D_CmdKind_SetFileOverrideLinkDst,
d_push_cmd(&p, d_cmd_spec_from_kind(commit_side == Side_Min ? .entity = commit_map,
D_CmdKind_SetFileOverrideLinkSrc : .file_path = new_string);
D_CmdKind_SetFileOverrideLinkDst));
} }
//- rjf: apply editing finish //- rjf: apply editing finish
@@ -5663,8 +5591,7 @@ DF_VIEW_UI_FUNCTION_DEF(auto_view_rules)
// rjf: focus panel on press // rjf: focus panel on press
if(ui_pressed(sig)) if(ui_pressed(sig))
{ {
D_CmdParams p = df_cmd_params_from_panel(ws, panel); d_cmd(D_CmdKind_FocusPanel);
d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_FocusPanel));
} }
// rjf: begin editing on double-click // rjf: begin editing on double-click
@@ -5725,8 +5652,7 @@ DF_VIEW_UI_FUNCTION_DEF(auto_view_rules)
// rjf: focus panel on press // rjf: focus panel on press
if(ui_pressed(sig)) if(ui_pressed(sig))
{ {
D_CmdParams p = df_cmd_params_from_panel(ws, panel); d_cmd(D_CmdKind_FocusPanel);
d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_FocusPanel));
} }
// rjf: begin editing on double-click // rjf: begin editing on double-click
@@ -5763,12 +5689,11 @@ DF_VIEW_UI_FUNCTION_DEF(auto_view_rules)
if(edit_commit && commit_side != Side_Invalid) if(edit_commit && commit_side != Side_Invalid)
{ {
String8 new_string = str8(avrs->input_buffer, avrs->input_size); String8 new_string = str8(avrs->input_buffer, avrs->input_size);
D_CmdParams p = df_cmd_params_from_view(ws, panel, view); d_cmd(commit_side == Side_Min ?
p.entity = commit_map; D_CmdKind_SetAutoViewRuleType :
p.string = new_string; D_CmdKind_SetAutoViewRuleViewRule,
d_push_cmd(&p, d_cmd_spec_from_kind(commit_side == Side_Min ? .entity = commit_map,
D_CmdKind_SetAutoViewRuleType : .string = new_string);
D_CmdKind_SetAutoViewRuleViewRule));
} }
//- rjf: apply editing finish //- rjf: apply editing finish
@@ -5989,9 +5914,7 @@ DF_VIEW_UI_FUNCTION_DEF(scheduler)
if(ui_clicked(sig)) if(ui_clicked(sig))
{ {
D_CmdKind cmd_kind = frozen ? D_CmdKind_ThawEntity : D_CmdKind_FreezeEntity; D_CmdKind cmd_kind = frozen ? D_CmdKind_ThawEntity : D_CmdKind_FreezeEntity;
D_CmdParams params = df_cmd_params_from_view(ws, panel, view); d_cmd(cmd_kind, .entity = d_handle_from_entity(entity));
params.entity = d_handle_from_entity(entity);
d_push_cmd(&params, d_cmd_spec_from_kind(cmd_kind));
} }
} }
UI_TableCellSized(ui_pct(1, 0)) UI_TableCellSized(ui_pct(1, 0))
@@ -6014,19 +5937,14 @@ DF_VIEW_UI_FUNCTION_DEF(scheduler)
UI_TextAlignment(UI_TextAlign_Center) UI_TextAlignment(UI_TextAlign_Center)
if(ui_clicked(ui_buttonf("Detach"))) if(ui_clicked(ui_buttonf("Detach")))
{ {
D_CmdParams params = df_cmd_params_from_view(ws, panel, view); d_cmd(D_CmdKind_Detach, .entity = d_handle_from_entity(entity));
params.entity = d_handle_from_entity(entity);
d_handle_list_push(scratch.arena, &params.entity_list, d_handle_from_entity(entity));
d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_Detach));
} }
} }
UI_TableCellSized(ui_em(2.25f, 1.f)) UI_FocusHot((row_is_selected && cursor.x == 3) ? UI_FocusKind_On : UI_FocusKind_Off) UI_TableCellSized(ui_em(2.25f, 1.f)) UI_FocusHot((row_is_selected && cursor.x == 3) ? UI_FocusKind_On : UI_FocusKind_Off)
{ {
if(ui_clicked(df_icon_buttonf(ws, DF_IconKind_Redo, 0, "###retry"))) if(ui_clicked(df_icon_buttonf(ws, DF_IconKind_Redo, 0, "###retry")))
{ {
D_CmdParams params = df_cmd_params_from_view(ws, panel, view); d_cmd(D_CmdKind_Restart, .entity = d_handle_from_entity(entity));
d_handle_list_push(scratch.arena, &params.entity_list, d_handle_from_entity(entity));
d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_Restart));
} }
} }
UI_TableCellSized(ui_em(2.25f, 1.f)) UI_FocusHot((row_is_selected && cursor.x == 4) ? UI_FocusKind_On : UI_FocusKind_Off) UI_TableCellSized(ui_em(2.25f, 1.f)) UI_FocusHot((row_is_selected && cursor.x == 4) ? UI_FocusKind_On : UI_FocusKind_Off)
@@ -6034,9 +5952,7 @@ DF_VIEW_UI_FUNCTION_DEF(scheduler)
DF_Palette(ws, DF_PaletteCode_NegativePopButton) DF_Palette(ws, DF_PaletteCode_NegativePopButton)
if(ui_clicked(df_icon_buttonf(ws, DF_IconKind_X, 0, "###kill"))) if(ui_clicked(df_icon_buttonf(ws, DF_IconKind_X, 0, "###kill")))
{ {
D_CmdParams params = df_cmd_params_from_view(ws, panel, view); d_cmd(D_CmdKind_Kill, .entity = d_handle_from_entity(entity));
d_handle_list_push(scratch.arena, &params.entity_list, d_handle_from_entity(entity));
d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_Kill));
} }
} }
}break; }break;
@@ -6320,8 +6236,7 @@ DF_VIEW_UI_FUNCTION_DEF(modules)
if(ui_pressed(sig)) if(ui_pressed(sig))
{ {
next_cursor = v2s64(1, (S64)idx+1); next_cursor = v2s64(1, (S64)idx+1);
D_CmdParams p = df_cmd_params_from_panel(ws, panel); d_cmd(D_CmdKind_FocusPanel);
d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_FocusPanel));
} }
} }
UI_TableCell UI_TableCell
@@ -6361,8 +6276,7 @@ DF_VIEW_UI_FUNCTION_DEF(modules)
{ {
edit_commit = (mv->txt_editing && !txt_is_selected); edit_commit = (mv->txt_editing && !txt_is_selected);
next_cursor = v2s64(2, (S64)idx+1); next_cursor = v2s64(2, (S64)idx+1);
D_CmdParams p = df_cmd_params_from_panel(ws, panel); d_cmd(D_CmdKind_FocusPanel);
d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_FocusPanel));
} }
// rjf: double-click -> begin editing // rjf: double-click -> begin editing
@@ -6387,9 +6301,7 @@ DF_VIEW_UI_FUNCTION_DEF(modules)
{ {
if(ui_clicked(ui_buttonf("Browse...")) || (brw_is_selected && edit_begin)) if(ui_clicked(ui_buttonf("Browse...")) || (brw_is_selected && edit_begin))
{ {
D_CmdParams params = df_cmd_params_from_view(ws, panel, view); d_cmd(D_CmdKind_RunCommand, .cmd_spec = d_cmd_spec_from_kind(D_CmdKind_PickFile));
params.cmd_spec = d_cmd_spec_from_kind(D_CmdKind_PickFile);
d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_RunCommand));
mv->pick_file_dst_entity = d_handle_from_entity(entity); mv->pick_file_dst_entity = d_handle_from_entity(entity);
} }
} }
@@ -6680,7 +6592,7 @@ DF_VIEW_CMD_FUNCTION_DEF(pending_file)
for(D_CmdNode *cmd_node = pves->deferred_cmds.first; cmd_node != 0; cmd_node = cmd_node->next) for(D_CmdNode *cmd_node = pves->deferred_cmds.first; cmd_node != 0; cmd_node = cmd_node->next)
{ {
D_Cmd *cmd = &cmd_node->cmd; D_Cmd *cmd = &cmd_node->cmd;
d_push_cmd(&cmd->params, cmd->spec); d_push_cmd(cmd->spec, &cmd->params);
} }
arena_clear(pves->deferred_cmd_arena); arena_clear(pves->deferred_cmd_arena);
MemoryZeroStruct(&pves->deferred_cmds); MemoryZeroStruct(&pves->deferred_cmds);
@@ -6709,8 +6621,7 @@ DF_VIEW_CMD_FUNCTION_DEF(pending_file)
//- rjf: if entity is ready, but we have no viewer for it, then just close this tab //- rjf: if entity is ready, but we have no viewer for it, then just close this tab
if(file_is_ready && viewer_kind == DF_GfxViewKind_Null) if(file_is_ready && viewer_kind == DF_GfxViewKind_Null)
{ {
D_CmdParams params = df_cmd_params_from_view(ws, panel, view); d_cmd(D_CmdKind_CloseTab);
d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_CloseTab));
} }
scratch_end(scratch); scratch_end(scratch);
@@ -6776,10 +6687,7 @@ DF_VIEW_CMD_FUNCTION_DEF(text)
if(src.size != 0 && dst.size != 0) if(src.size != 0 && dst.size != 0)
{ {
// rjf: record src -> dst mapping // rjf: record src -> dst mapping
D_CmdParams p = df_cmd_params_from_view(ws, panel, view); d_cmd(D_CmdKind_SetFileReplacementPath, .string = src, .file_path = dst);
p.string = src;
p.file_path = dst;
d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_SetFileReplacementPath));
// rjf: switch this view to viewing replacement file // rjf: switch this view to viewing replacement file
view->query_string_size = Min(sizeof(view->query_buffer), dst.size); view->query_string_size = Min(sizeof(view->query_buffer), dst.size);
@@ -6852,9 +6760,7 @@ DF_VIEW_UI_FUNCTION_DEF(text)
UI_TextAlignment(UI_TextAlign_Center) UI_TextAlignment(UI_TextAlign_Center)
if(ui_clicked(ui_buttonf("Find alternative..."))) if(ui_clicked(ui_buttonf("Find alternative...")))
{ {
D_CmdParams params = df_cmd_params_from_view(ws, panel, view); d_cmd(D_CmdKind_RunCommand, .cmd_spec = d_cmd_spec_from_kind(D_CmdKind_PickFile));
params.cmd_spec = d_cmd_spec_from_kind(D_CmdKind_PickFile);
d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_RunCommand));
} }
scratch_end(scratch); scratch_end(scratch);
} }
@@ -7895,8 +7801,7 @@ DF_VIEW_UI_FUNCTION_DEF(memory)
// rjf: press -> focus panel // rjf: press -> focus panel
if(ui_pressed(sig)) if(ui_pressed(sig))
{ {
D_CmdParams p = df_cmd_params_from_panel(ws, panel); d_cmd(D_CmdKind_FocusPanel);
d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_FocusPanel));
} }
// rjf: click & drag -> select // rjf: click & drag -> select
@@ -7923,13 +7828,11 @@ DF_VIEW_UI_FUNCTION_DEF(memory)
ui_eat_event(evt); ui_eat_event(evt);
if(evt->delta_2f32.y < 0) if(evt->delta_2f32.y < 0)
{ {
D_CmdParams params = df_cmd_params_from_window(ws); d_cmd(D_CmdKind_IncCodeFontScale);
d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_IncCodeFontScale));
} }
else if(evt->delta_2f32.y > 0) else if(evt->delta_2f32.y > 0)
{ {
D_CmdParams params = df_cmd_params_from_window(ws); d_cmd(D_CmdKind_DecCodeFontScale);
d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_DecCodeFontScale));
} }
} }
} }
@@ -8376,8 +8279,7 @@ DF_VIEW_UI_FUNCTION_DEF(bitmap)
{ {
if(ui_pressed(canvas_sig)) if(ui_pressed(canvas_sig))
{ {
D_CmdParams p = df_cmd_params_from_view(ws, panel, view); d_cmd(D_CmdKind_FocusPanel);
d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_FocusPanel));
ui_store_drag_struct(&view_center_pos); ui_store_drag_struct(&view_center_pos);
} }
Vec2F32 start_view_center_pos = *ui_get_drag_struct(Vec2F32); Vec2F32 start_view_center_pos = *ui_get_drag_struct(Vec2F32);
@@ -8706,8 +8608,7 @@ DF_VIEW_UI_FUNCTION_DEF(geo3d)
{ {
if(ui_pressed(sig)) if(ui_pressed(sig))
{ {
D_CmdParams p = df_cmd_params_from_view(ws, panel, view); d_cmd(D_CmdKind_FocusPanel);
d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_FocusPanel));
Vec2F32 data = v2f32(yaw_target, pitch_target); Vec2F32 data = v2f32(yaw_target, pitch_target);
ui_store_drag_struct(&data); ui_store_drag_struct(&data);
} }
@@ -9514,8 +9415,7 @@ DF_VIEW_UI_FUNCTION_DEF(settings)
ui_ctx_menu_open(color_ctx_menu_keys[item->color], item_box->key, v2f32(0, dim_2f32(item_box->rect).y)); ui_ctx_menu_open(color_ctx_menu_keys[item->color], item_box->key, v2f32(0, dim_2f32(item_box->rect).y));
sv->color_ctx_menu_color = item->color; sv->color_ctx_menu_color = item->color;
sv->color_ctx_menu_color_hsva = v4f32(hsv.x, hsv.y, hsv.z, rgba.w); sv->color_ctx_menu_color_hsva = v4f32(hsv.x, hsv.y, hsv.z, rgba.w);
D_CmdParams p = df_cmd_params_from_panel(ws, panel); d_cmd(D_CmdKind_FocusPanel);
d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_FocusPanel));
} }
if((item->kind == DF_SettingsItemKind_GlobalSetting || item->kind == DF_SettingsItemKind_WindowSetting) && if((item->kind == DF_SettingsItemKind_GlobalSetting || item->kind == DF_SettingsItemKind_WindowSetting) &&
is_toggler && ui_clicked(sig)) is_toggler && ui_clicked(sig))
src/raddbg/raddbg.c
+8 -12
View File
@@ -106,8 +106,7 @@ update_and_render(OS_Handle repaint_window_handle, void *user_data)
df_gfx_request_frame(); df_gfx_request_frame();
df_unbind_spec(df_gfx_state->bind_change_cmd_spec, df_gfx_state->bind_change_binding); df_unbind_spec(df_gfx_state->bind_change_cmd_spec, df_gfx_state->bind_change_binding);
df_gfx_state->bind_change_active = 0; df_gfx_state->bind_change_active = 0;
D_CmdParams p = df_cmd_params_from_gfx(); d_cmd(d_cfg_src_write_cmd_kind_table[D_CfgSrc_User]);
d_push_cmd(&p, d_cmd_spec_from_kind(d_cfg_src_write_cmd_kind_table[D_CfgSrc_User]));
} }
for(OS_Event *event = events.first, *next = 0; event != 0; event = next) for(OS_Event *event = events.first, *next = 0; event != 0; event = next)
{ {
@@ -134,8 +133,7 @@ update_and_render(OS_Handle repaint_window_handle, void *user_data)
U32 codepoint = os_codepoint_from_event_flags_and_key(event->flags, event->key); U32 codepoint = os_codepoint_from_event_flags_and_key(event->flags, event->key);
os_text(&events, os_handle_zero(), codepoint); os_text(&events, os_handle_zero(), codepoint);
os_eat_event(&events, event); os_eat_event(&events, event);
D_CmdParams p = df_cmd_params_from_gfx(); d_cmd(d_cfg_src_write_cmd_kind_table[D_CfgSrc_User]);
d_push_cmd(&p, d_cmd_spec_from_kind(d_cfg_src_write_cmd_kind_table[D_CfgSrc_User]));
df_gfx_request_frame(); df_gfx_request_frame();
break; break;
} }
@@ -168,8 +166,7 @@ update_and_render(OS_Handle repaint_window_handle, void *user_data)
if(!take && event->kind == OS_EventKind_WindowClose && window != 0) if(!take && event->kind == OS_EventKind_WindowClose && window != 0)
{ {
take = 1; take = 1;
D_CmdParams params = df_cmd_params_from_window(window); d_cmd(D_CmdKind_CloseWindow, .window = df_handle_from_window(window));
d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_CloseWindow));
} }
//- rjf: try menu bar operations //- rjf: try menu bar operations
@@ -224,7 +221,7 @@ update_and_render(OS_Handle repaint_window_handle, void *user_data)
} }
U32 hit_char = os_codepoint_from_event_flags_and_key(event->flags, event->key); U32 hit_char = os_codepoint_from_event_flags_and_key(event->flags, event->key);
take = 1; take = 1;
d_push_cmd(&params, run_spec); d_push_cmd(run_spec, &params);
if(event->flags & OS_EventFlag_Alt) if(event->flags & OS_EventFlag_Alt)
{ {
window->menu_bar_focus_press_started = 0; window->menu_bar_focus_press_started = 0;
@@ -244,7 +241,7 @@ update_and_render(OS_Handle repaint_window_handle, void *user_data)
String8 insertion8 = str8_from_32(scratch.arena, insertion32); String8 insertion8 = str8_from_32(scratch.arena, insertion32);
D_CmdSpec *spec = d_cmd_spec_from_kind(D_CmdKind_InsertText); D_CmdSpec *spec = d_cmd_spec_from_kind(D_CmdKind_InsertText);
params.string = insertion8; params.string = insertion8;
d_push_cmd(&params, spec); d_push_cmd(spec, &params);
df_gfx_request_frame(); df_gfx_request_frame();
take = 1; take = 1;
if(event->flags & OS_EventFlag_Alt) if(event->flags & OS_EventFlag_Alt)
@@ -258,7 +255,7 @@ update_and_render(OS_Handle repaint_window_handle, void *user_data)
{ {
take = 1; take = 1;
params.os_event = event; params.os_event = event;
d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_OSEvent)); d_push_cmd(d_cmd_spec_from_kind(D_CmdKind_OSEvent), &params);
} }
//- rjf: take //- rjf: take
@@ -336,6 +333,7 @@ update_and_render(OS_Handle repaint_window_handle, void *user_data)
last_focused_window = df_handle_from_window(w); last_focused_window = df_handle_from_window(w);
} }
d_push_interact_regs(); d_push_interact_regs();
d_interact_regs()->window = df_handle_from_window(w);
df_window_update_and_render(scratch.arena, w, &cmds); df_window_update_and_render(scratch.arena, w, &cmds);
D_InteractRegs *window_regs = d_pop_interact_regs(); D_InteractRegs *window_regs = d_pop_interact_regs();
if(df_window_from_handle(last_focused_window) == w) if(df_window_from_handle(last_focused_window) == w)
@@ -403,9 +401,7 @@ update_and_render(OS_Handle repaint_window_handle, void *user_data)
os_append_data_to_file_path(main_thread_log_path, log.strings[LogMsgKind_Info]); os_append_data_to_file_path(main_thread_log_path, log.strings[LogMsgKind_Info]);
if(log.strings[LogMsgKind_UserError].size != 0) if(log.strings[LogMsgKind_UserError].size != 0)
{ {
D_CmdParams p = df_cmd_params_from_gfx(); d_error(log.strings[LogMsgKind_UserError]);
p.string = log.strings[LogMsgKind_UserError];
d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_Error));
} }
} }
src/raddbg/raddbg_main.c
+6 -14
View File
@@ -360,22 +360,18 @@ entry_point(CmdLine *cmd_line)
String8 error = d_cmd_params_apply_spec_query(scratch.arena, &params, cmd_spec, d_cmd_arg_part_from_string(msg)); String8 error = d_cmd_params_apply_spec_query(scratch.arena, &params, cmd_spec, d_cmd_arg_part_from_string(msg));
if(error.size == 0) if(error.size == 0)
{ {
d_push_cmd(&params, cmd_spec); d_push_cmd(cmd_spec, &params);
df_gfx_request_frame(); df_gfx_request_frame();
} }
else else
{ {
D_CmdParams params = df_cmd_params_from_window(dst_window); d_error(error);
params.string = error;
d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_Error));
df_gfx_request_frame(); df_gfx_request_frame();
} }
} }
else else
{ {
D_CmdParams params = df_cmd_params_from_window(dst_window); d_errorf("\"%S\" is not a command.", cmd_spec_string);
params.string = push_str8f(scratch.arena, "\"%S\" is not a command.", cmd_spec_string);
d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_Error));
df_gfx_request_frame(); df_gfx_request_frame();
} }
} }
@@ -391,25 +387,21 @@ entry_point(CmdLine *cmd_line)
if(auto_run) if(auto_run)
{ {
auto_run = 0; auto_run = 0;
D_CmdParams params = df_cmd_params_from_gfx(); d_cmd(D_CmdKind_LaunchAndRun);
d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_LaunchAndRun));
} }
//- rjf: auto step //- rjf: auto step
if(auto_step) if(auto_step)
{ {
auto_step = 0; auto_step = 0;
D_CmdParams params = df_cmd_params_from_gfx(); d_cmd(D_CmdKind_StepInto);
d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_StepInto));
} }
//- rjf: jit attach //- rjf: jit attach
if(jit_attach) if(jit_attach)
{ {
jit_attach = 0; jit_attach = 0;
D_CmdParams params = df_cmd_params_from_gfx(); d_cmd(D_CmdKind_Attach, .id = jit_pid);
params.id = jit_pid;
d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_Attach));
} }
//- rjf: quit if no windows are left //- rjf: quit if no windows are left