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

push_cmd__root -> push_cmd

Browse Source
This commit is contained in:
Ryan Fleury
2024-08-28 15:37:55 -07:00
parent cb25e261e4
commit e3dc29d7ae
6 changed files with 198 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/dbg_engine/dbg_engine_core.c
+11 -11
View File
@@ -1271,7 +1271,7 @@ d_entity_notify_mutation(D_Entity *entity)
if(e == entity && flags & D_EntityKindFlag_LeafMutProjectConfig) if(e == entity && flags & D_EntityKindFlag_LeafMutProjectConfig)
{ {
D_CmdParams p = {0}; D_CmdParams p = {0};
d_push_cmd__root(&p, d_cmd_spec_from_kind(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 +6077,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__root(D_CmdParams *params, D_CmdSpec *spec) d_push_cmd(D_CmdParams *params, D_CmdSpec *spec)
{ {
// 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)
@@ -6258,7 +6258,7 @@ d_init(CmdLine *cmdln, D_StateDeltaHistory *hist)
d_state->cfg_path_arenas[src] = arena_alloc(); d_state->cfg_path_arenas[src] = arena_alloc();
D_CmdParams params = d_cmd_params_zero(); D_CmdParams params = d_cmd_params_zero();
params.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__root(&params, d_cmd_spec_from_kind(d_cfg_src_load_cmd_kind_table[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
@@ -8173,13 +8173,13 @@ d_begin_frame(Arena *arena, D_CmdList *cmds, F32 dt)
D_CmdParams p = d_cmd_params_zero(); D_CmdParams p = d_cmd_params_zero();
p.file_path = file_path; p.file_path = file_path;
p.text_point = d_interact_regs()->cursor; p.text_point = d_interact_regs()->cursor;
d_push_cmd__root(&p, d_cmd_spec_from_kind(D_CmdKind_RunToLine)); d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_RunToLine));
} }
else else
{ {
D_CmdParams p = d_cmd_params_zero(); D_CmdParams p = d_cmd_params_zero();
p.vaddr = d_interact_regs()->vaddr_range.min; p.vaddr = d_interact_regs()->vaddr_range.min;
d_push_cmd__root(&p, d_cmd_spec_from_kind(D_CmdKind_RunToAddress)); d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_RunToAddress));
} }
}break; }break;
case D_CmdKind_SetNextStatement: case D_CmdKind_SetNextStatement:
@@ -8263,19 +8263,19 @@ d_begin_frame(Arena *arena, D_CmdList *cmds, F32 dt)
{ {
D_CmdParams p = params; D_CmdParams p = params;
p.entity = d_handle_from_entity(target); p.entity = d_handle_from_entity(target);
d_push_cmd__root(&p, d_cmd_spec_from_kind(D_CmdKind_LaunchAndRun)); 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_CmdParams p = params;
p.string = str8_lit("The ended process' corresponding target is missing."); p.string = str8_lit("The ended process' corresponding target is missing.");
d_push_cmd__root(&p, d_cmd_spec_from_kind(D_CmdKind_Error)); 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_CmdParams p = params;
p.string = str8_lit("Invalid ended process."); p.string = str8_lit("Invalid ended process.");
d_push_cmd__root(&p, d_cmd_spec_from_kind(D_CmdKind_Error)); d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_Error));
} }
}break; }break;
@@ -8324,12 +8324,12 @@ d_begin_frame(Arena *arena, D_CmdList *cmds, F32 dt)
{ {
D_CmdParams p = params; D_CmdParams p = params;
p.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__root(&p, d_cmd_spec_from_kind(D_CmdKind_Error)); d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_Error));
} }
#else #else
D_CmdParams p = params; D_CmdParams p = params;
p.string = str8_lit("Registering as the just-in-time debugger is currently not supported on this system."); p.string = str8_lit("Registering as the just-in-time debugger is currently not supported on this system.");
d_push_cmd__root(&p, d_cmd_spec_from_kind(D_CmdKind_Error)); d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_Error));
#endif #endif
}break; }break;
@@ -8541,7 +8541,7 @@ d_end_frame(void)
{ {
d_state->entities_mut_soft_halt = 0; d_state->entities_mut_soft_halt = 0;
D_CmdParams params = d_cmd_params_zero(); D_CmdParams params = d_cmd_params_zero();
d_push_cmd__root(&params, d_cmd_spec_from_kind(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
+1 -1
View File
@@ -1583,7 +1583,7 @@ 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__root(D_CmdParams *params, D_CmdSpec *spec); internal void d_push_cmd(D_CmdParams *params, D_CmdSpec *spec);
//////////////////////////////// ////////////////////////////////
//~ rjf: Main Layer Top-Level Calls //~ rjf: Main Layer Top-Level Calls
src/dbg_gfx/dbg_gfx_core.c
+101 -101
View File
@@ -173,7 +173,7 @@ df_panel_notify_mutation(DF_Window *window, DF_Panel *panel)
{ {
D_CmdParams p = df_cmd_params_from_panel(window, panel); D_CmdParams p = df_cmd_params_from_panel(window, panel);
D_CfgSrc src = window->cfg_src; D_CfgSrc src = window->cfg_src;
d_push_cmd__root(&p, d_cmd_spec_from_kind(d_cfg_src_write_cmd_kind_table[src])); d_push_cmd(&p, d_cmd_spec_from_kind(d_cfg_src_write_cmd_kind_table[src]));
} }
//- rjf: tree construction //- rjf: tree construction
@@ -1864,7 +1864,7 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds)
D_CmdKind write_cmd = d_cfg_src_write_cmd_kind_table[src]; D_CmdKind write_cmd = d_cfg_src_write_cmd_kind_table[src];
D_CmdParams p = d_cmd_params_zero(); D_CmdParams p = d_cmd_params_zero();
p.file_path = d_cfg_path_from_src(src); p.file_path = d_cfg_path_from_src(src);
d_push_cmd__root(&p, d_cmd_spec_from_kind(write_cmd)); d_push_cmd(&p, d_cmd_spec_from_kind(write_cmd));
} }
}break; }break;
@@ -2224,7 +2224,7 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds)
{ {
D_CmdParams p = d_cmd_params_zero(); D_CmdParams p = d_cmd_params_zero();
p.string = push_str8f(scratch.arena, "Couldn't open file at \"%S\".", path); p.string = push_str8f(scratch.arena, "Couldn't open file at \"%S\".", path);
d_push_cmd__root(&p, d_cmd_spec_from_kind(D_CmdKind_Error)); d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_Error));
} }
}break; }break;
case D_CmdKind_Switch: case D_CmdKind_Switch:
@@ -2744,7 +2744,7 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds)
// rjf: retry on stopped, pending debug info // rjf: retry on stopped, pending debug info
if(!d_ctrl_targets_running() && (dbgi_pending || missing_rip)) if(!d_ctrl_targets_running() && (dbgi_pending || missing_rip))
{ {
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_FindThread)); d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_FindThread));
} }
} }
di_scope_close(scope); di_scope_close(scope);
@@ -2881,7 +2881,7 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds)
{ {
D_CmdParams p = params; D_CmdParams p = params;
p.string = push_str8f(scratch.arena, "`%S` could not be found.", name); p.string = push_str8f(scratch.arena, "`%S` could not be found.", name);
d_push_cmd__root(&p, d_cmd_spec_from_kind(D_CmdKind_Error)); d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_Error));
} }
// rjf: name resolved to voff * dbg info // rjf: name resolved to voff * dbg info
@@ -2948,7 +2948,7 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds)
{ {
D_CmdParams params = df_cmd_params_from_window(ws); D_CmdParams params = df_cmd_params_from_window(ws);
params.string = str8_lit("Invalid target."); params.string = str8_lit("Invalid target.");
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_Error)); d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_Error));
} }
}break; }break;
@@ -2962,19 +2962,19 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds)
{ {
D_CmdParams params = df_cmd_params_from_window(ws); D_CmdParams params = df_cmd_params_from_window(ws);
params.entity = d_handle_from_entity(entity); params.entity = d_handle_from_entity(entity);
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_SpawnEntityView)); d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_SpawnEntityView));
}break; }break;
case D_EntityKind_Thread: case D_EntityKind_Thread:
{ {
D_CmdParams params = df_cmd_params_from_window(ws); D_CmdParams params = df_cmd_params_from_window(ws);
params.entity = d_handle_from_entity(entity); params.entity = d_handle_from_entity(entity);
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_SelectThread)); d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_SelectThread));
}break; }break;
case D_EntityKind_Target: case D_EntityKind_Target:
{ {
D_CmdParams params = df_cmd_params_from_window(ws); D_CmdParams params = df_cmd_params_from_window(ws);
params.entity = d_handle_from_entity(entity); params.entity = d_handle_from_entity(entity);
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_SelectTarget)); d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_SelectTarget));
}break; }break;
} }
}break; }break;
@@ -3351,13 +3351,13 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds)
if(!(ws->query_cmd_spec->info.query.flags & D_CmdQueryFlag_KeepOldInput)) if(!(ws->query_cmd_spec->info.query.flags & D_CmdQueryFlag_KeepOldInput))
{ {
D_CmdParams p = df_cmd_params_from_window(ws); D_CmdParams p = df_cmd_params_from_window(ws);
d_push_cmd__root(&p, d_cmd_spec_from_kind(D_CmdKind_CancelQuery)); d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_CancelQuery));
} }
// rjf: push command if possible // rjf: push command if possible
if(command_ready) if(command_ready)
{ {
d_push_cmd__root(&ws->query_cmd_params, ws->query_cmd_spec); d_push_cmd(&ws->query_cmd_params, ws->query_cmd_spec);
} }
}break; }break;
case D_CmdKind_CancelQuery: case D_CmdKind_CancelQuery:
@@ -3873,7 +3873,7 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds)
D_CmdParams p = df_cmd_params_from_window(ws); D_CmdParams p = df_cmd_params_from_window(ws);
p.entity = d_handle_from_entity(thread); p.entity = d_handle_from_entity(thread);
p.vaddr = new_rip_vaddr; p.vaddr = new_rip_vaddr;
d_push_cmd__root(&p, d_cmd_spec_from_kind(D_CmdKind_SetThreadIP)); d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_SetThreadIP));
ui_ctx_menu_close(); ui_ctx_menu_close();
} }
if(range.min.line == range.max.line && ui_clicked(df_icon_buttonf(ws, DF_IconKind_Play, 0, "Run To Line"))) if(range.min.line == range.max.line && ui_clicked(df_icon_buttonf(ws, DF_IconKind_Play, 0, "Run To Line")))
@@ -3883,13 +3883,13 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds)
D_CmdParams p = df_cmd_params_from_window(ws); D_CmdParams p = df_cmd_params_from_window(ws);
p.file_path = ws->code_ctx_menu_file_path; p.file_path = ws->code_ctx_menu_file_path;
p.text_point = range.min; p.text_point = range.min;
d_push_cmd__root(&p, d_cmd_spec_from_kind(D_CmdKind_RunToLine)); d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_RunToLine));
} }
else else
{ {
D_CmdParams p = df_cmd_params_from_window(ws); D_CmdParams p = df_cmd_params_from_window(ws);
p.vaddr = ws->code_ctx_menu_vaddr; p.vaddr = ws->code_ctx_menu_vaddr;
d_push_cmd__root(&p, d_cmd_spec_from_kind(D_CmdKind_RunToAddress)); d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_RunToAddress));
} }
ui_ctx_menu_close(); ui_ctx_menu_close();
} }
@@ -3910,7 +3910,7 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds)
String8 expr = str8_substr(data, expr_off_range); String8 expr = str8_substr(data, expr_off_range);
D_CmdParams p = df_cmd_params_from_window(ws); D_CmdParams p = df_cmd_params_from_window(ws);
p.string = expr; p.string = expr;
d_push_cmd__root(&p, d_cmd_spec_from_kind(D_CmdKind_GoToName)); d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_GoToName));
ui_ctx_menu_close(); ui_ctx_menu_close();
} }
if(range.min.line == range.max.line && ui_clicked(df_icon_buttonf(ws, DF_IconKind_CircleFilled, 0, "Toggle Breakpoint"))) if(range.min.line == range.max.line && ui_clicked(df_icon_buttonf(ws, DF_IconKind_CircleFilled, 0, "Toggle Breakpoint")))
@@ -3919,7 +3919,7 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds)
p.file_path = ws->code_ctx_menu_file_path; p.file_path = ws->code_ctx_menu_file_path;
p.text_point = range.min; p.text_point = range.min;
p.vaddr = ws->code_ctx_menu_vaddr; p.vaddr = ws->code_ctx_menu_vaddr;
d_push_cmd__root(&p, d_cmd_spec_from_kind(D_CmdKind_ToggleBreakpoint)); d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_ToggleBreakpoint));
ui_ctx_menu_close(); ui_ctx_menu_close();
} }
if(range.min.line == range.max.line && ui_clicked(df_icon_buttonf(ws, DF_IconKind_Binoculars, 0, "Toggle Watch Expression"))) if(range.min.line == range.max.line && ui_clicked(df_icon_buttonf(ws, DF_IconKind_Binoculars, 0, "Toggle Watch Expression")))
@@ -3939,7 +3939,7 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds)
String8 expr = str8_substr(data, expr_off_range); String8 expr = str8_substr(data, expr_off_range);
D_CmdParams p = df_cmd_params_from_window(ws); D_CmdParams p = df_cmd_params_from_window(ws);
p.string = expr; p.string = expr;
d_push_cmd__root(&p, d_cmd_spec_from_kind(D_CmdKind_ToggleWatchExpression)); d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_ToggleWatchExpression));
ui_ctx_menu_close(); ui_ctx_menu_close();
} }
if(ws->code_ctx_menu_file_path.size == 0 && range.min.line == range.max.line && ui_clicked(df_icon_buttonf(ws, DF_IconKind_FileOutline, 0, "Go To Source"))) if(ws->code_ctx_menu_file_path.size == 0 && range.min.line == range.max.line && ui_clicked(df_icon_buttonf(ws, DF_IconKind_FileOutline, 0, "Go To Source")))
@@ -3949,7 +3949,7 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds)
D_CmdParams params = df_cmd_params_from_window(ws); D_CmdParams params = df_cmd_params_from_window(ws);
params.file_path = lines.first->v.file_path; params.file_path = lines.first->v.file_path;
params.text_point = lines.first->v.pt; params.text_point = lines.first->v.pt;
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_FindCodeLocation)); d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_FindCodeLocation));
} }
ui_ctx_menu_close(); ui_ctx_menu_close();
} }
@@ -3970,7 +3970,7 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds)
D_CmdParams params = df_cmd_params_from_window(ws); D_CmdParams params = df_cmd_params_from_window(ws);
params.entity = d_handle_from_entity(thread); params.entity = d_handle_from_entity(thread);
params.vaddr = vaddr; params.vaddr = vaddr;
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_FindCodeLocation)); d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_FindCodeLocation));
ui_ctx_menu_close(); ui_ctx_menu_close();
} }
hs_scope_close(hs_scope); hs_scope_close(hs_scope);
@@ -4025,7 +4025,7 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds)
D_CmdParams params = df_cmd_params_from_window(ws); D_CmdParams params = df_cmd_params_from_window(ws);
params.entity = d_handle_from_entity(entity); params.entity = d_handle_from_entity(entity);
params.string = str8(ws->entity_ctx_menu_input_buffer, ws->entity_ctx_menu_input_size); params.string = str8(ws->entity_ctx_menu_input_buffer, ws->entity_ctx_menu_input_size);
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_NameEntity)); d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_NameEntity));
} }
} }
@@ -4048,7 +4048,7 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds)
D_CmdParams params = df_cmd_params_from_window(ws); D_CmdParams params = df_cmd_params_from_window(ws);
params.entity = d_handle_from_entity(condition); params.entity = d_handle_from_entity(condition);
params.string = new_string; params.string = new_string;
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_NameEntity)); d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_NameEntity));
} }
else if(!d_entity_is_nil(condition)) else if(!d_entity_is_nil(condition))
{ {
@@ -4074,7 +4074,7 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds)
D_CmdParams params = df_cmd_params_from_window(ws); D_CmdParams params = df_cmd_params_from_window(ws);
params.entity = d_handle_from_entity(exe); params.entity = d_handle_from_entity(exe);
params.string = new_string; params.string = new_string;
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_NameEntity)); d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_NameEntity));
} }
else if(!d_entity_is_nil(exe)) else if(!d_entity_is_nil(exe))
{ {
@@ -4100,7 +4100,7 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds)
D_CmdParams params = df_cmd_params_from_window(ws); D_CmdParams params = df_cmd_params_from_window(ws);
params.entity = d_handle_from_entity(args); params.entity = d_handle_from_entity(args);
params.string = new_string; params.string = new_string;
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_NameEntity)); d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_NameEntity));
} }
else if(!d_entity_is_nil(args)) else if(!d_entity_is_nil(args))
{ {
@@ -4127,7 +4127,7 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds)
{ {
D_CmdParams params = df_cmd_params_from_window(ws); D_CmdParams params = df_cmd_params_from_window(ws);
params.entity = d_handle_from_entity(entity); params.entity = d_handle_from_entity(entity);
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_DuplicateEntity)); d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_DuplicateEntity));
ui_ctx_menu_close(); ui_ctx_menu_close();
} }
@@ -4136,7 +4136,7 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds)
{ {
D_CmdParams params = df_cmd_params_from_window(ws); D_CmdParams params = df_cmd_params_from_window(ws);
params.entity = d_handle_from_entity(entity); params.entity = d_handle_from_entity(entity);
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_EditEntity)); d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_EditEntity));
ui_ctx_menu_close(); ui_ctx_menu_close();
} }
@@ -4145,7 +4145,7 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds)
{ {
D_CmdParams params = df_cmd_params_from_window(ws); D_CmdParams params = df_cmd_params_from_window(ws);
params.entity = d_handle_from_entity(entity); params.entity = d_handle_from_entity(entity);
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_RemoveEntity)); d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_RemoveEntity));
ui_ctx_menu_close(); ui_ctx_menu_close();
} }
@@ -4157,13 +4157,13 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds)
{ {
D_CmdParams params = df_cmd_params_from_window(ws); D_CmdParams params = df_cmd_params_from_window(ws);
params.entity = d_handle_from_entity(entity); params.entity = d_handle_from_entity(entity);
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_EnableEntity)); d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_EnableEntity));
} }
if(is_enabled && ui_clicked(df_icon_buttonf(ws, DF_IconKind_CheckFilled, 0, "Disable###enabler"))) if(is_enabled && ui_clicked(df_icon_buttonf(ws, DF_IconKind_CheckFilled, 0, "Disable###enabler")))
{ {
D_CmdParams params = df_cmd_params_from_window(ws); D_CmdParams params = df_cmd_params_from_window(ws);
params.entity = d_handle_from_entity(entity); params.entity = d_handle_from_entity(entity);
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_DisableEntity)); d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_DisableEntity));
} }
} }
@@ -4176,13 +4176,13 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds)
{ {
D_CmdParams params = df_cmd_params_from_window(ws); D_CmdParams params = df_cmd_params_from_window(ws);
params.entity = d_handle_from_entity(entity); params.entity = d_handle_from_entity(entity);
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_ThawEntity)); d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_ThawEntity));
} }
if(!is_frozen && ui_clicked(df_icon_buttonf(ws, DF_IconKind_Unlocked, 0, "Freeze###freeze_thaw"))) if(!is_frozen && ui_clicked(df_icon_buttonf(ws, DF_IconKind_Unlocked, 0, "Freeze###freeze_thaw")))
{ {
D_CmdParams params = df_cmd_params_from_window(ws); D_CmdParams params = df_cmd_params_from_window(ws);
params.entity = d_handle_from_entity(entity); params.entity = d_handle_from_entity(entity);
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_FreezeEntity)); d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_FreezeEntity));
} }
} }
@@ -4195,7 +4195,7 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds)
params.file_path = loc->name; params.file_path = loc->name;
params.text_point = loc->text_point; params.text_point = loc->text_point;
params.vaddr = loc->vaddr; params.vaddr = loc->vaddr;
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_FindCodeLocation)); d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_FindCodeLocation));
ui_ctx_menu_close(); ui_ctx_menu_close();
} }
} }
@@ -4217,12 +4217,12 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds)
{ {
D_CmdParams p = d_cmd_params_zero(); D_CmdParams p = d_cmd_params_zero();
p.file_path = path_w_slash; p.file_path = path_w_slash;
d_push_cmd__root(&p, d_cmd_spec_from_kind(D_CmdKind_SetCurrentPath)); d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_SetCurrentPath));
} }
{ {
D_CmdParams p = df_cmd_params_from_window(ws); D_CmdParams p = df_cmd_params_from_window(ws);
p.cmd_spec = d_cmd_spec_from_kind(D_CmdKind_Open); p.cmd_spec = d_cmd_spec_from_kind(D_CmdKind_Open);
d_push_cmd__root(&p, d_cmd_spec_from_kind(D_CmdKind_RunCommand)); d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_RunCommand));
} }
ui_ctx_menu_close(); ui_ctx_menu_close();
} }
@@ -4233,7 +4233,7 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds)
D_CmdParams params = df_cmd_params_from_window(ws); D_CmdParams params = df_cmd_params_from_window(ws);
params.file_path = d_full_path_from_entity(scratch.arena, entity); params.file_path = d_full_path_from_entity(scratch.arena, entity);
params.text_point = txt_pt(1, 1); params.text_point = txt_pt(1, 1);
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_FindCodeLocation)); d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_FindCodeLocation));
ui_ctx_menu_close(); ui_ctx_menu_close();
} }
}break; }break;
@@ -4252,7 +4252,7 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds)
{ {
D_CmdParams params = df_cmd_params_from_window(ws); D_CmdParams params = df_cmd_params_from_window(ws);
params.entity = d_handle_from_entity(entity); params.entity = d_handle_from_entity(entity);
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_SelectThread)); d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_SelectThread));
ui_ctx_menu_close(); ui_ctx_menu_close();
} }
} }
@@ -4331,7 +4331,7 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds)
{ {
D_CmdParams params = df_cmd_params_from_window(ws); D_CmdParams params = df_cmd_params_from_window(ws);
params.entity = d_handle_from_entity(entity); params.entity = d_handle_from_entity(entity);
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_FindThread)); d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_FindThread));
ui_ctx_menu_close(); ui_ctx_menu_close();
} }
} }
@@ -4373,14 +4373,14 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds)
{ {
D_CmdParams params = df_cmd_params_from_window(ws); D_CmdParams params = df_cmd_params_from_window(ws);
params.entity = d_handle_from_entity(entity); params.entity = d_handle_from_entity(entity);
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_LaunchAndRun)); d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_LaunchAndRun));
ui_ctx_menu_close(); ui_ctx_menu_close();
} }
if(ui_clicked(df_icon_buttonf(ws, DF_IconKind_PlayStepForward, 0, "Launch And Initialize"))) if(ui_clicked(df_icon_buttonf(ws, DF_IconKind_PlayStepForward, 0, "Launch And Initialize")))
{ {
D_CmdParams params = df_cmd_params_from_window(ws); D_CmdParams params = df_cmd_params_from_window(ws);
params.entity = d_handle_from_entity(entity); params.entity = d_handle_from_entity(entity);
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_LaunchAndInit)); d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_LaunchAndInit));
ui_ctx_menu_close(); ui_ctx_menu_close();
} }
}break; }break;
@@ -4555,7 +4555,7 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds)
{ {
params.view = df_handle_from_view(view); params.view = df_handle_from_view(view);
} }
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_Filter)); d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_Filter));
ui_ctx_menu_close(); ui_ctx_menu_close();
} }
if(ui_clicked(df_cmd_spec_button(ws, d_cmd_spec_from_kind(D_CmdKind_ClearFilter)))) if(ui_clicked(df_cmd_spec_button(ws, d_cmd_spec_from_kind(D_CmdKind_ClearFilter))))
@@ -4564,7 +4564,7 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds)
{ {
params.view = df_handle_from_view(view); params.view = df_handle_from_view(view);
} }
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_ClearFilter)); d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_ClearFilter));
ui_ctx_menu_close(); ui_ctx_menu_close();
} }
} }
@@ -4573,7 +4573,7 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds)
if(ui_clicked(df_icon_buttonf(ws, DF_IconKind_X, 0, "Close Tab"))) if(ui_clicked(df_icon_buttonf(ws, DF_IconKind_X, 0, "Close Tab")))
{ {
D_CmdParams params = df_cmd_params_from_view(ws, panel, view); D_CmdParams params = df_cmd_params_from_view(ws, panel, view);
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_CloseTab)); d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_CloseTab));
ui_ctx_menu_close(); ui_ctx_menu_close();
} }
@@ -4623,14 +4623,14 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds)
if(ui_clicked(ui_buttonf("OK")) || (ui_key_match(bg_box->default_nav_focus_hot_key, ui_key_zero()) && ui_slot_press(UI_EventActionSlot_Accept))) if(ui_clicked(ui_buttonf("OK")) || (ui_key_match(bg_box->default_nav_focus_hot_key, ui_key_zero()) && ui_slot_press(UI_EventActionSlot_Accept)))
{ {
D_CmdParams p = d_cmd_params_zero(); D_CmdParams p = d_cmd_params_zero();
d_push_cmd__root(&p, d_cmd_spec_from_kind(D_CmdKind_ConfirmAccept)); d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_ConfirmAccept));
} }
UI_CornerRadius10(ui_top_font_size()*0.25f) UI_CornerRadius10(ui_top_font_size()*0.25f)
UI_CornerRadius11(ui_top_font_size()*0.25f) UI_CornerRadius11(ui_top_font_size()*0.25f)
if(ui_clicked(ui_buttonf("Cancel")) || ui_slot_press(UI_EventActionSlot_Cancel)) if(ui_clicked(ui_buttonf("Cancel")) || ui_slot_press(UI_EventActionSlot_Cancel))
{ {
D_CmdParams p = d_cmd_params_zero(); D_CmdParams p = d_cmd_params_zero();
d_push_cmd__root(&p, d_cmd_spec_from_kind(D_CmdKind_ConfirmCancel)); d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_ConfirmCancel));
} }
} }
ui_spacer(ui_em(3.f, 1.f)); ui_spacer(ui_em(3.f, 1.f));
@@ -5192,7 +5192,7 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds)
{ {
D_CmdParams params = df_cmd_params_from_window(ws); D_CmdParams params = df_cmd_params_from_window(ws);
params.entity = d_handle_from_entity(target); params.entity = d_handle_from_entity(target);
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_EditTarget)); d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_EditTarget));
ui_ctx_menu_close(); ui_ctx_menu_close();
ws->menu_bar_focused = 0; ws->menu_bar_focused = 0;
} }
@@ -5463,7 +5463,7 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds)
if(ui_clicked(sig)) if(ui_clicked(sig))
{ {
D_CmdParams params = df_cmd_params_from_window(ws); D_CmdParams params = df_cmd_params_from_window(ws);
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_Run)); d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_Run));
} }
} }
@@ -5498,7 +5498,7 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds)
if(ui_clicked(sig)) if(ui_clicked(sig))
{ {
D_CmdParams params = df_cmd_params_from_window(ws); D_CmdParams params = df_cmd_params_from_window(ws);
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_Restart)); d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_Restart));
} }
} }
@@ -5525,7 +5525,7 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds)
if(ui_clicked(sig)) if(ui_clicked(sig))
{ {
D_CmdParams params = df_cmd_params_from_window(ws); D_CmdParams params = df_cmd_params_from_window(ws);
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_Halt)); d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_Halt));
} }
} }
@@ -5555,7 +5555,7 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds)
if(ui_clicked(sig)) if(ui_clicked(sig))
{ {
D_CmdParams params = df_cmd_params_from_window(ws); D_CmdParams params = df_cmd_params_from_window(ws);
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_Kill)); d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_Kill));
} }
} }
@@ -5588,7 +5588,7 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds)
if(ui_clicked(sig)) if(ui_clicked(sig))
{ {
D_CmdParams params = df_cmd_params_from_window(ws); D_CmdParams params = df_cmd_params_from_window(ws);
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_StepOver)); d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_StepOver));
} }
} }
@@ -5621,7 +5621,7 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds)
if(ui_clicked(sig)) if(ui_clicked(sig))
{ {
D_CmdParams params = df_cmd_params_from_window(ws); D_CmdParams params = df_cmd_params_from_window(ws);
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_StepInto)); d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_StepInto));
} }
} }
@@ -5654,7 +5654,7 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds)
if(ui_clicked(sig)) if(ui_clicked(sig))
{ {
D_CmdParams params = df_cmd_params_from_window(ws); D_CmdParams params = df_cmd_params_from_window(ws);
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_StepOut)); d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_StepOut));
} }
} }
@@ -5695,7 +5695,7 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds)
{ {
D_CmdParams p = df_cmd_params_from_window(ws); D_CmdParams p = df_cmd_params_from_window(ws);
p.cmd_spec = d_cmd_spec_from_kind(D_CmdKind_OpenUser); p.cmd_spec = d_cmd_spec_from_kind(D_CmdKind_OpenUser);
d_push_cmd__root(&p, d_cmd_spec_from_kind(D_CmdKind_RunCommand)); d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_RunCommand));
} }
} }
@@ -5730,7 +5730,7 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds)
{ {
D_CmdParams p = df_cmd_params_from_window(ws); D_CmdParams p = df_cmd_params_from_window(ws);
p.cmd_spec = d_cmd_spec_from_kind(D_CmdKind_OpenProject); p.cmd_spec = d_cmd_spec_from_kind(D_CmdKind_OpenProject);
d_push_cmd__root(&p, d_cmd_spec_from_kind(D_CmdKind_RunCommand)); d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_RunCommand));
} }
} }
@@ -5767,7 +5767,7 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds)
if(ui_clicked(cls_sig)) if(ui_clicked(cls_sig))
{ {
D_CmdParams p = df_cmd_params_from_window(ws); D_CmdParams p = df_cmd_params_from_window(ws);
d_push_cmd__root(&p, d_cmd_spec_from_kind(D_CmdKind_CloseWindow)); d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_CloseWindow));
} }
os_window_push_custom_title_bar_client_area(ws->os, min_sig.box->rect); os_window_push_custom_title_bar_client_area(ws->os, min_sig.box->rect);
os_window_push_custom_title_bar_client_area(ws->os, max_sig.box->rect); os_window_push_custom_title_bar_client_area(ws->os, max_sig.box->rect);
@@ -6110,7 +6110,7 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds)
ui_slot_press(UI_EventActionSlot_Cancel)) || query_cancelled) ui_slot_press(UI_EventActionSlot_Cancel)) || query_cancelled)
{ {
D_CmdParams params = df_cmd_params_from_window(ws); D_CmdParams params = df_cmd_params_from_window(ws);
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_CancelQuery)); d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_CancelQuery));
} }
if((ui_is_focus_active() && ui_slot_press(UI_EventActionSlot_Accept)) || query_completed) if((ui_is_focus_active() && ui_slot_press(UI_EventActionSlot_Accept)) || query_completed)
{ {
@@ -6118,12 +6118,12 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds)
DF_View *view = ws->query_view_stack_top; DF_View *view = ws->query_view_stack_top;
D_CmdParams params = df_cmd_params_from_window(ws); D_CmdParams params = df_cmd_params_from_window(ws);
String8 error = d_cmd_params_apply_spec_query(scratch.arena, &params, ws->query_cmd_spec, str8(view->query_buffer, view->query_string_size)); String8 error = d_cmd_params_apply_spec_query(scratch.arena, &params, ws->query_cmd_spec, str8(view->query_buffer, view->query_string_size));
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_CompleteQuery)); d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_CompleteQuery));
if(error.size != 0) if(error.size != 0)
{ {
D_CmdParams p = df_cmd_params_from_window(ws); D_CmdParams p = df_cmd_params_from_window(ws);
p.string = error; p.string = error;
d_push_cmd__root(&p, d_cmd_spec_from_kind(D_CmdKind_Error)); d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_Error));
} }
scratch_end(scratch); scratch_end(scratch);
} }
@@ -6404,7 +6404,7 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds)
{ {
D_CmdParams params = df_cmd_params_from_window(ws); D_CmdParams params = df_cmd_params_from_window(ws);
params.string = str8_lit("Could not commit value successfully."); params.string = str8_lit("Could not commit value successfully.");
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_Error)); d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_Error));
} }
} }
} }
@@ -6436,7 +6436,7 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds)
{ {
D_CmdParams params = df_cmd_params_from_window(ws); D_CmdParams params = df_cmd_params_from_window(ws);
params.string = expr; params.string = expr;
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_ToggleWatchExpression)); d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_ToggleWatchExpression));
} }
} }
if(ws->hover_eval_file_path.size != 0 || ws->hover_eval_vaddr != 0) if(ws->hover_eval_file_path.size != 0 || ws->hover_eval_vaddr != 0)
@@ -6460,7 +6460,7 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds)
params.text_point = ws->hover_eval_file_pt; params.text_point = ws->hover_eval_file_pt;
params.vaddr = ws->hover_eval_vaddr; params.vaddr = ws->hover_eval_vaddr;
params.string = expr; params.string = expr;
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_ToggleWatchPin)); d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_ToggleWatchPin));
} }
} }
} }
@@ -6610,7 +6610,7 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds)
p.panel = payload.panel; p.panel = payload.panel;
p.view = payload.view; p.view = payload.view;
p.dir2 = dir; p.dir2 = dir;
d_push_cmd__root(&p, d_cmd_spec_from_kind(D_CmdKind_SplitPanel)); d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_SplitPanel));
} }
} }
} }
@@ -6696,7 +6696,7 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds)
p.panel = payload.panel; p.panel = payload.panel;
p.view = payload.view; p.view = payload.view;
p.dir2 = dir; p.dir2 = dir;
d_push_cmd__root(&p, d_cmd_spec_from_kind(D_CmdKind_SplitPanel)); d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_SplitPanel));
} }
// rjf: exit on opl child // rjf: exit on opl child
@@ -6995,7 +6995,7 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds)
p.panel = payload.panel; p.panel = payload.panel;
p.view = payload.view; p.view = payload.view;
p.dir2 = dir; p.dir2 = dir;
d_push_cmd__root(&p, d_cmd_spec_from_kind(D_CmdKind_SplitPanel)); d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_SplitPanel));
} }
else else
{ {
@@ -7004,7 +7004,7 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds)
p.panel = payload.panel; p.panel = payload.panel;
p.view = payload.view; p.view = payload.view;
p.prev_view = df_handle_from_view(panel->last_tab_view); p.prev_view = df_handle_from_view(panel->last_tab_view);
d_push_cmd__root(&p, d_cmd_spec_from_kind(D_CmdKind_MoveTab)); d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_MoveTab));
} }
} }
} }
@@ -7055,7 +7055,7 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds)
if(view->is_filtering && ui_is_focus_active() && ui_slot_press(UI_EventActionSlot_Accept)) if(view->is_filtering && ui_is_focus_active() && ui_slot_press(UI_EventActionSlot_Accept))
{ {
D_CmdParams p = df_cmd_params_from_view(ws, panel, view); D_CmdParams p = df_cmd_params_from_view(ws, panel, view);
d_push_cmd__root(&p, d_cmd_spec_from_kind(D_CmdKind_ApplyFilter)); d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_ApplyFilter));
} }
if(view->is_filtering || view->is_filtering_t > 0.01f) if(view->is_filtering || view->is_filtering_t > 0.01f)
{ {
@@ -7096,7 +7096,7 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds)
if(ui_pressed(sig)) if(ui_pressed(sig))
{ {
D_CmdParams p = df_cmd_params_from_panel(ws, panel); D_CmdParams p = df_cmd_params_from_panel(ws, panel);
d_push_cmd__root(&p, d_cmd_spec_from_kind(D_CmdKind_FocusPanel)); d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_FocusPanel));
} }
} }
} }
@@ -7200,22 +7200,22 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds)
if(evt->flags & UI_EventFlag_Paste) if(evt->flags & UI_EventFlag_Paste)
{ {
ui_eat_event(evt); ui_eat_event(evt);
d_push_cmd__root(&p, d_cmd_spec_from_kind(D_CmdKind_Filter)); d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_Filter));
d_push_cmd__root(&p, d_cmd_spec_from_kind(D_CmdKind_Paste)); d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_Paste));
} }
else if(evt->string.size != 0 && evt->kind == UI_EventKind_Text) else if(evt->string.size != 0 && evt->kind == UI_EventKind_Text)
{ {
ui_eat_event(evt); ui_eat_event(evt);
d_push_cmd__root(&p, d_cmd_spec_from_kind(D_CmdKind_Filter)); d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_Filter));
p.string = evt->string; p.string = evt->string;
d_push_cmd__root(&p, d_cmd_spec_from_kind(D_CmdKind_InsertText)); d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_InsertText));
} }
} }
} }
if(view->spec->info.flags & DF_ViewSpecFlag_CanFilter && (view->query_string_size != 0 || view->is_filtering) && ui_is_focus_active() && ui_slot_press(UI_EventActionSlot_Cancel)) if(view->spec->info.flags & DF_ViewSpecFlag_CanFilter && (view->query_string_size != 0 || view->is_filtering) && ui_is_focus_active() && ui_slot_press(UI_EventActionSlot_Cancel))
{ {
D_CmdParams p = df_cmd_params_from_view(ws, panel, view); D_CmdParams p = df_cmd_params_from_view(ws, panel, view);
d_push_cmd__root(&p, d_cmd_spec_from_kind(D_CmdKind_ClearFilter)); d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_ClearFilter));
} }
} }
@@ -7226,7 +7226,7 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds)
if(ui_pressed(panel_sig)) if(ui_pressed(panel_sig))
{ {
D_CmdParams p = df_cmd_params_from_panel(ws, panel); D_CmdParams p = df_cmd_params_from_panel(ws, panel);
d_push_cmd__root(&p, d_cmd_spec_from_kind(D_CmdKind_FocusPanel)); d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_FocusPanel));
} }
////////////////////////// //////////////////////////
@@ -7374,7 +7374,7 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds)
if(ui_clicked(sig) || ui_middle_clicked(sig)) if(ui_clicked(sig) || ui_middle_clicked(sig))
{ {
D_CmdParams params = df_cmd_params_from_view(ws, panel, view); D_CmdParams params = df_cmd_params_from_view(ws, panel, view);
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_CloseTab)); d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_CloseTab));
} }
} }
} }
@@ -7386,7 +7386,7 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds)
{ {
next_selected_tab_view = view; next_selected_tab_view = view;
D_CmdParams p = df_cmd_params_from_panel(ws, panel); D_CmdParams p = df_cmd_params_from_panel(ws, panel);
d_push_cmd__root(&p, d_cmd_spec_from_kind(D_CmdKind_FocusPanel)); d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_FocusPanel));
} }
else if(ui_dragging(sig) && !df_drag_is_active() && length_2f32(ui_drag_delta()) > 10.f) else if(ui_dragging(sig) && !df_drag_is_active() && length_2f32(ui_drag_delta()) > 10.f)
{ {
@@ -7407,7 +7407,7 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds)
else if(ui_middle_clicked(sig)) else if(ui_middle_clicked(sig))
{ {
D_CmdParams params = df_cmd_params_from_view(ws, panel, view); D_CmdParams params = df_cmd_params_from_view(ws, panel, view);
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_CloseTab)); d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_CloseTab));
} }
if(ui_released(sig)) if(ui_released(sig))
{ {
@@ -7465,7 +7465,7 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds)
if(ui_clicked(sig)) if(ui_clicked(sig))
{ {
D_CmdParams p = df_cmd_params_from_panel(ws, panel); D_CmdParams p = df_cmd_params_from_panel(ws, panel);
d_push_cmd__root(&p, d_cmd_spec_from_kind(D_CmdKind_FocusPanel)); d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_FocusPanel));
UI_Key view_menu_key = ui_key_from_string(ui_key_zero(), str8_lit("_view_menu_key_")); UI_Key view_menu_key = ui_key_from_string(ui_key_zero(), str8_lit("_view_menu_key_"));
ui_ctx_menu_open(view_menu_key, add_new_box->key, v2f32(0, tab_bar_vheight)); ui_ctx_menu_open(view_menu_key, add_new_box->key, v2f32(0, tab_bar_vheight));
} }
@@ -7537,7 +7537,7 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds)
params.dest_panel = df_handle_from_panel(panel); params.dest_panel = df_handle_from_panel(panel);
params.view = df_handle_from_view(view); params.view = df_handle_from_view(view);
params.prev_view = df_handle_from_view(active_drop_site->prev_view); params.prev_view = df_handle_from_view(active_drop_site->prev_view);
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_MoveTab)); d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_MoveTab));
} }
} }
} }
@@ -7596,7 +7596,7 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds)
params.panel = df_handle_from_panel(src_panel); params.panel = df_handle_from_panel(src_panel);
params.dest_panel = df_handle_from_panel(panel); params.dest_panel = df_handle_from_panel(panel);
params.view = df_handle_from_view(view); params.view = df_handle_from_view(view);
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_MoveTab)); d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_MoveTab));
df_panel_notify_mutation(ws, panel); df_panel_notify_mutation(ws, panel);
} }
@@ -7607,7 +7607,7 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds)
params.panel = df_handle_from_panel(panel); params.panel = df_handle_from_panel(panel);
params.text_point = payload.text_point; params.text_point = payload.text_point;
params.entity = d_handle_from_entity(entity); params.entity = d_handle_from_entity(entity);
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_SpawnEntityView)); d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_SpawnEntityView));
} }
} }
} }
@@ -7626,7 +7626,7 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds)
Temp scratch = scratch_begin(0, 0); Temp scratch = scratch_begin(0, 0);
D_CmdParams p = df_cmd_params_from_panel(ws, panel); D_CmdParams p = df_cmd_params_from_panel(ws, panel);
p.file_path = path_normalized_from_string(scratch.arena, n->string); p.file_path = path_normalized_from_string(scratch.arena, n->string);
d_push_cmd__root(&p, d_cmd_spec_from_kind(D_CmdKind_Open)); d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_Open));
scratch_end(scratch); scratch_end(scratch);
} }
ui_eat_event(evt); ui_eat_event(evt);
@@ -7736,12 +7736,12 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, D_CmdList *cmds)
if(evt->delta_2f32.y < 0) if(evt->delta_2f32.y < 0)
{ {
D_CmdParams params = df_cmd_params_from_window(ws); D_CmdParams params = df_cmd_params_from_window(ws);
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_IncUIFontScale)); d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_IncUIFontScale));
} }
else if(evt->delta_2f32.y > 0) else if(evt->delta_2f32.y > 0)
{ {
D_CmdParams params = df_cmd_params_from_window(ws); D_CmdParams params = df_cmd_params_from_window(ws);
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_DecUIFontScale)); d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_DecUIFontScale));
} }
} }
} }
@@ -9873,7 +9873,7 @@ df_cmd_binding_buttons(DF_Window *ws, D_CmdSpec *spec)
{ {
D_CmdParams p = d_cmd_params_zero(); D_CmdParams p = d_cmd_params_zero();
p.string = str8_lit("Cannot rebind; this command uses a reserved keybinding."); p.string = str8_lit("Cannot rebind; this command uses a reserved keybinding.");
d_push_cmd__root(&p, d_cmd_spec_from_kind(D_CmdKind_Error)); d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_Error));
} }
else else
{ {
@@ -10035,7 +10035,7 @@ df_cmd_list_menu_buttons(DF_Window *ws, U64 count, D_CmdKind *cmds, U32 *fastpat
{ {
D_CmdParams params = df_cmd_params_from_window(ws); D_CmdParams params = df_cmd_params_from_window(ws);
params.cmd_spec = spec; params.cmd_spec = spec;
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_RunCommand)); d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_RunCommand));
ui_ctx_menu_close(); ui_ctx_menu_close();
ws->menu_bar_focused = 0; ws->menu_bar_focused = 0;
} }
@@ -10434,7 +10434,7 @@ df_entity_desc_button(DF_Window *ws, D_Entity *entity, FuzzyMatchRangeList *name
{ {
D_CmdParams params = df_cmd_params_from_window(ws); D_CmdParams params = df_cmd_params_from_window(ws);
params.entity = d_handle_from_entity(entity); params.entity = d_handle_from_entity(entity);
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_EntityRefFastPath)); d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_EntityRefFastPath));
} }
// rjf: right-click => context menu for this entity // rjf: right-click => context menu for this entity
@@ -10493,7 +10493,7 @@ df_src_loc_button(DF_Window *ws, String8 file_path, TxtPt point)
D_CmdParams params = df_cmd_params_from_window(ws); D_CmdParams params = df_cmd_params_from_window(ws);
params.file_path = file_path; params.file_path = file_path;
params.text_point = point; params.text_point = point;
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_FindCodeLocation)); d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_FindCodeLocation));
} }
// rjf: hover => show full path // rjf: hover => show full path
@@ -11010,7 +11010,7 @@ df_code_slice(DF_Window *ws, DF_CodeSliceParams *params, TxtPt *cursor, TxtPt *m
{ {
D_CmdParams params = df_cmd_params_from_window(ws); D_CmdParams params = df_cmd_params_from_window(ws);
params.entity = d_handle_from_entity(thread); params.entity = d_handle_from_entity(thread);
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_SelectThread)); d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_SelectThread));
ui_kill_action(); ui_kill_action();
} }
@@ -11090,7 +11090,7 @@ df_code_slice(DF_Window *ws, DF_CodeSliceParams *params, TxtPt *cursor, TxtPt *m
{ {
D_CmdParams params = df_cmd_params_from_window(ws); D_CmdParams params = df_cmd_params_from_window(ws);
params.entity = d_handle_from_entity(bp); params.entity = d_handle_from_entity(bp);
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_RemoveBreakpoint)); d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_RemoveBreakpoint));
} }
// rjf: drag start // rjf: drag start
@@ -11149,7 +11149,7 @@ df_code_slice(DF_Window *ws, DF_CodeSliceParams *params, TxtPt *cursor, TxtPt *m
{ {
D_CmdParams params = df_cmd_params_from_window(ws); D_CmdParams params = df_cmd_params_from_window(ws);
params.entity = d_handle_from_entity(pin); params.entity = d_handle_from_entity(pin);
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_RemoveEntity)); d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_RemoveEntity));
} }
// rjf: drag start // rjf: drag start
@@ -11178,7 +11178,7 @@ df_code_slice(DF_Window *ws, DF_CodeSliceParams *params, TxtPt *cursor, TxtPt *m
p.file_path = d_interact_regs()->file_path; p.file_path = d_interact_regs()->file_path;
p.text_point = txt_pt(line_num, 1); p.text_point = txt_pt(line_num, 1);
p.vaddr = params->line_vaddrs[line_idx]; p.vaddr = params->line_vaddrs[line_idx];
d_push_cmd__root(&p, d_cmd_spec_from_kind(D_CmdKind_AddBreakpoint)); d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_AddBreakpoint));
} }
} }
} }
@@ -11580,7 +11580,7 @@ df_code_slice(DF_Window *ws, DF_CodeSliceParams *params, TxtPt *cursor, TxtPt *m
p.file_path = d_interact_regs()->file_path; p.file_path = d_interact_regs()->file_path;
p.text_point = txt_pt(line_num, 1); p.text_point = txt_pt(line_num, 1);
p.vaddr = line_vaddr; p.vaddr = line_vaddr;
d_push_cmd__root(&p, d_cmd_spec_from_kind(D_CmdKind_RelocateEntity)); d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_RelocateEntity));
}break; }break;
case D_EntityKind_Thread: case D_EntityKind_Thread:
{ {
@@ -11602,7 +11602,7 @@ df_code_slice(DF_Window *ws, DF_CodeSliceParams *params, TxtPt *cursor, TxtPt *m
D_CmdParams p = df_cmd_params_from_window(ws); D_CmdParams p = df_cmd_params_from_window(ws);
p.entity = d_handle_from_entity(dropped_entity); p.entity = d_handle_from_entity(dropped_entity);
p.vaddr = new_rip_vaddr; p.vaddr = new_rip_vaddr;
d_push_cmd__root(&p, d_cmd_spec_from_kind(D_CmdKind_SetThreadIP)); d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_SetThreadIP));
}break; }break;
} }
} }
@@ -13189,8 +13189,8 @@ df_gfx_begin_frame(Arena *arena, D_CmdList *cmds)
// rjf: save // rjf: save
{ {
D_CmdParams params = d_cmd_params_zero(); D_CmdParams params = d_cmd_params_zero();
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_WriteUserData)); d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_WriteUserData));
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_WriteProjectData)); d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_WriteProjectData));
df_gfx_state->last_window_queued_save = 1; df_gfx_state->last_window_queued_save = 1;
} }
@@ -13198,7 +13198,7 @@ df_gfx_begin_frame(Arena *arena, D_CmdList *cmds)
for(DF_Window *window = df_gfx_state->first_window; window != 0; window = window->next) for(DF_Window *window = df_gfx_state->first_window; window != 0; window = window->next)
{ {
D_CmdParams params = df_cmd_params_from_window(window); D_CmdParams params = df_cmd_params_from_window(window);
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_CloseWindow)); d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_CloseWindow));
} }
}break; }break;
@@ -13212,7 +13212,7 @@ df_gfx_begin_frame(Arena *arena, D_CmdList *cmds)
{ {
D_CmdParams p = df_cmd_params_from_window(w); D_CmdParams p = df_cmd_params_from_window(w);
p.string = push_str8_copy(arena, params.string); p.string = push_str8_copy(arena, params.string);
d_push_cmd__root(&p, d_cmd_spec_from_kind(D_CmdKind_Error)); d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_Error));
} }
} }
}break; }break;
@@ -13266,10 +13266,10 @@ df_gfx_begin_frame(Arena *arena, D_CmdList *cmds)
df_gfx_state->last_window_queued_save = 1; df_gfx_state->last_window_queued_save = 1;
{ {
D_CmdParams params = d_cmd_params_zero(); D_CmdParams params = d_cmd_params_zero();
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_WriteUserData)); d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_WriteUserData));
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_WriteProjectData)); d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_WriteProjectData));
} }
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_CloseWindow)); d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_CloseWindow));
} }
// NOTE(rjf): if this is the last window and we've queued the final autosave, // NOTE(rjf): if this is the last window and we've queued the final autosave,
@@ -13314,7 +13314,7 @@ df_gfx_begin_frame(Arena *arena, D_CmdList *cmds)
df_gfx_state->confirm_key = ui_key_zero(); df_gfx_state->confirm_key = ui_key_zero();
for(D_CmdNode *n = df_gfx_state->confirm_cmds.first; n != 0; n = n->next) for(D_CmdNode *n = df_gfx_state->confirm_cmds.first; n != 0; n = n->next)
{ {
d_push_cmd__root(&n->cmd.params, n->cmd.spec); d_push_cmd(&n->cmd.params, n->cmd.spec);
} }
}break; }break;
case D_CmdKind_ConfirmCancel: case D_CmdKind_ConfirmCancel:
@@ -13382,7 +13382,7 @@ df_gfx_begin_frame(Arena *arena, D_CmdList *cmds)
continue; continue;
} }
D_CmdParams params = df_cmd_params_from_window(window); D_CmdParams params = df_cmd_params_from_window(window);
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_CloseWindow)); d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_CloseWindow));
} }
//- rjf: apply fonts //- rjf: apply fonts
src/dbg_gfx/dbg_gfx_views.c
+72 -72
View File
@@ -439,7 +439,7 @@ df_code_view_build(Arena *arena, DF_Window *ws, DF_Panel *panel, DF_View *view,
{ {
D_CmdParams params = df_cmd_params_from_view(ws, panel, view); D_CmdParams params = df_cmd_params_from_view(ws, panel, view);
params.string = push_str8f(scratch.arena, "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__root(&params, d_cmd_spec_from_kind(D_CmdKind_Error)); d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_Error));
} }
scratch_end(scratch); scratch_end(scratch);
} }
@@ -502,7 +502,7 @@ df_code_view_build(Arena *arena, DF_Window *ws, DF_Panel *panel, DF_View *view,
{ {
D_CmdParams params = df_cmd_params_from_view(ws, panel, view); D_CmdParams params = df_cmd_params_from_view(ws, panel, view);
params.string = push_str8f(scratch.arena, "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__root(&params, d_cmd_spec_from_kind(D_CmdKind_Error)); d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_Error));
} }
scratch_end(scratch); scratch_end(scratch);
} }
@@ -556,7 +556,7 @@ df_code_view_build(Arena *arena, DF_Window *ws, DF_Panel *panel, DF_View *view,
if(ui_pressed(sig.base)) if(ui_pressed(sig.base))
{ {
D_CmdParams p = df_cmd_params_from_panel(ws, panel); D_CmdParams p = df_cmd_params_from_panel(ws, panel);
d_push_cmd__root(&p, d_cmd_spec_from_kind(D_CmdKind_FocusPanel)); d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_FocusPanel));
} }
//- rjf: dragging & outside region? -> contain cursor //- rjf: dragging & outside region? -> contain cursor
@@ -578,7 +578,7 @@ df_code_view_build(Arena *arena, DF_Window *ws, DF_Panel *panel, DF_View *view,
ui_kill_action(); ui_kill_action();
D_CmdParams params = df_cmd_params_from_view(ws, panel, view); D_CmdParams params = df_cmd_params_from_view(ws, panel, view);
params.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__root(&params, d_cmd_spec_from_kind(D_CmdKind_GoToName)); d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_GoToName));
} }
//- rjf: watch expr at mouse //- rjf: watch expr at mouse
@@ -587,7 +587,7 @@ df_code_view_build(Arena *arena, DF_Window *ws, DF_Panel *panel, DF_View *view,
cv->watch_expr_at_mouse = 0; cv->watch_expr_at_mouse = 0;
D_CmdParams params = df_cmd_params_from_view(ws, panel, view); D_CmdParams params = df_cmd_params_from_view(ws, panel, view);
params.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__root(&params, d_cmd_spec_from_kind(D_CmdKind_ToggleWatchExpression)); 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
@@ -733,12 +733,12 @@ df_code_view_build(Arena *arena, DF_Window *ws, DF_Panel *panel, DF_View *view,
if(evt->delta_2f32.y < 0) if(evt->delta_2f32.y < 0)
{ {
D_CmdParams params = df_cmd_params_from_window(ws); D_CmdParams params = df_cmd_params_from_window(ws);
d_push_cmd__root(&params, d_cmd_spec_from_kind(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_CmdParams params = df_cmd_params_from_window(ws);
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_DecCodeFontScale)); d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_DecCodeFontScale));
} }
} }
} }
@@ -1653,7 +1653,7 @@ df_watch_view_build(DF_Window *ws, DF_Panel *panel, DF_View *view, DF_WatchViewS
p.string = e_string_from_expr(scratch.arena, row->expr); p.string = e_string_from_expr(scratch.arena, row->expr);
p.view_spec = df_view_spec_from_string(row->expand_ui_rule_spec->info.string); p.view_spec = df_view_spec_from_string(row->expand_ui_rule_spec->info.string);
p.params_tree = row->expand_ui_rule_params; p.params_tree = row->expand_ui_rule_params;
d_push_cmd__root(&p, d_cmd_spec_from_kind(D_CmdKind_OpenTab)); d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_OpenTab));
} }
} }
} }
@@ -1687,7 +1687,7 @@ df_watch_view_build(DF_Window *ws, DF_Panel *panel, DF_View *view, DF_WatchViewS
p.file_path = lines.first->v.file_path; p.file_path = lines.first->v.file_path;
p.text_point = lines.first->v.pt; p.text_point = lines.first->v.pt;
} }
d_push_cmd__root(&p, d_cmd_spec_from_kind(D_CmdKind_FindCodeLocation)); d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_FindCodeLocation));
} }
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)
{ {
@@ -1696,7 +1696,7 @@ df_watch_view_build(DF_Window *ws, DF_Panel *panel, DF_View *view, DF_WatchViewS
p.entity = d_interact_regs()->thread; p.entity = d_interact_regs()->thread;
p.unwind_index = frame_row->unwind_idx; p.unwind_index = frame_row->unwind_idx;
p.inline_depth = frame_row->inline_depth; p.inline_depth = frame_row->inline_depth;
d_push_cmd__root(&p, d_cmd_spec_from_kind(D_CmdKind_SelectUnwind)); d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_SelectUnwind));
} }
} }
@@ -1814,7 +1814,7 @@ df_watch_view_build(DF_Window *ws, DF_Panel *panel, DF_View *view, DF_WatchViewS
{ {
D_CmdParams params = df_cmd_params_from_view(ws, panel, view); D_CmdParams params = df_cmd_params_from_view(ws, panel, view);
params.string = str8_lit("Could not commit value successfully."); params.string = str8_lit("Could not commit value successfully.");
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_Error)); d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_Error));
} }
}break; }break;
case DF_WatchViewColumnKind_Type:{}break; case DF_WatchViewColumnKind_Type:{}break;
@@ -2361,7 +2361,7 @@ df_watch_view_build(DF_Window *ws, DF_Panel *panel, DF_View *view, DF_WatchViewS
p.string = e_string_from_expr(scratch.arena, row->expr); p.string = e_string_from_expr(scratch.arena, row->expr);
p.view_spec = canvas_view_spec; p.view_spec = canvas_view_spec;
p.params_tree = row->expand_ui_rule_params; p.params_tree = row->expand_ui_rule_params;
d_push_cmd__root(&p, d_cmd_spec_from_kind(D_CmdKind_OpenTab)); d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_OpenTab));
} }
} }
@@ -2667,7 +2667,7 @@ df_watch_view_build(DF_Window *ws, DF_Panel *panel, DF_View *view, DF_WatchViewS
{ {
ui_kill_action(); ui_kill_action();
D_CmdParams p = df_cmd_params_from_view(ws, panel, view); D_CmdParams p = df_cmd_params_from_view(ws, panel, view);
d_push_cmd__root(&p, d_cmd_spec_from_kind(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
@@ -2686,7 +2686,7 @@ df_watch_view_build(DF_Window *ws, DF_Panel *panel, DF_View *view, DF_WatchViewS
p.file_path = lines.first->v.file_path; p.file_path = lines.first->v.file_path;
p.text_point = lines.first->v.pt; p.text_point = lines.first->v.pt;
} }
d_push_cmd__root(&p, d_cmd_spec_from_kind(D_CmdKind_FindCodeLocation)); d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_FindCodeLocation));
} }
// rjf: double-click, not editable, callstack frame -> select frame // rjf: double-click, not editable, callstack frame -> select frame
@@ -2697,7 +2697,7 @@ df_watch_view_build(DF_Window *ws, DF_Panel *panel, DF_View *view, DF_WatchViewS
p.entity = d_interact_regs()->thread; p.entity = d_interact_regs()->thread;
p.unwind_index = frame_row->unwind_idx; p.unwind_index = frame_row->unwind_idx;
p.inline_depth = frame_row->inline_depth; p.inline_depth = frame_row->inline_depth;
d_push_cmd__root(&p, d_cmd_spec_from_kind(D_CmdKind_SelectUnwind)); 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
@@ -2882,7 +2882,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_CmdParams p = df_cmd_params_from_panel(ws, panel);
d_push_cmd__root(&p, d_cmd_spec_from_kind(D_CmdKind_FocusPanel)); d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_FocusPanel));
} }
scratch_end(scratch); scratch_end(scratch);
@@ -2920,7 +2920,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_CmdParams p = df_cmd_params_from_panel(ws, panel);
d_push_cmd__root(&p, d_cmd_spec_from_kind(D_CmdKind_ClosePanel)); d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_ClosePanel));
} }
} }
} }
@@ -2993,7 +2993,7 @@ DF_VIEW_UI_FUNCTION_DEF(getting_started)
{ {
D_CmdParams params = df_cmd_params_from_view(ws, panel, view); D_CmdParams params = df_cmd_params_from_view(ws, panel, view);
params.cmd_spec = d_cmd_spec_from_kind(D_CmdKind_AddTarget); params.cmd_spec = d_cmd_spec_from_kind(D_CmdKind_AddTarget);
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_RunCommand)); d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_RunCommand));
} }
}break; }break;
@@ -3015,14 +3015,14 @@ DF_VIEW_UI_FUNCTION_DEF(getting_started)
{ {
D_CmdParams params = df_cmd_params_from_view(ws, panel, view); D_CmdParams params = df_cmd_params_from_view(ws, panel, view);
params.entity = d_handle_from_entity(target); params.entity = d_handle_from_entity(target);
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_LaunchAndRun)); 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_CmdParams params = df_cmd_params_from_view(ws, panel, view);
params.entity = d_handle_from_entity(target); params.entity = d_handle_from_entity(target);
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_LaunchAndInit)); d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_LaunchAndInit));
} }
} }
}break; }break;
@@ -3232,7 +3232,7 @@ DF_VIEW_UI_FUNCTION_DEF(commands)
DF_CmdListerItem *item = &cmd_array.v[0]; DF_CmdListerItem *item = &cmd_array.v[0];
params.cmd_spec = item->cmd_spec; params.cmd_spec = item->cmd_spec;
} }
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_CompleteQuery)); d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_CompleteQuery));
} }
//- rjf: selected kind -> cursor //- rjf: selected kind -> cursor
@@ -3346,7 +3346,7 @@ DF_VIEW_UI_FUNCTION_DEF(commands)
{ {
D_CmdParams params = df_cmd_params_from_view(ws, panel, view); D_CmdParams params = df_cmd_params_from_view(ws, panel, view);
params.cmd_spec = item->cmd_spec; params.cmd_spec = item->cmd_spec;
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_CompleteQuery)); d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_CompleteQuery));
} }
} }
} }
@@ -3547,7 +3547,7 @@ DF_VIEW_UI_FUNCTION_DEF(file_system)
{ {
D_CmdParams p = d_cmd_params_zero(); D_CmdParams p = d_cmd_params_zero();
p.file_path = path_query.path; p.file_path = path_query.path;
d_push_cmd__root(&p, d_cmd_spec_from_kind(D_CmdKind_SetCurrentPath)); d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_SetCurrentPath));
} }
//- rjf: get files, filtered //- rjf: get files, filtered
@@ -3637,7 +3637,7 @@ DF_VIEW_UI_FUNCTION_DEF(file_system)
{ {
D_CmdParams params = df_cmd_params_from_view(ws, panel, view); D_CmdParams params = df_cmd_params_from_view(ws, panel, view);
params.file_path = query_normalized_with_opt_slash; params.file_path = query_normalized_with_opt_slash;
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_CompleteQuery)); 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:
@@ -3655,7 +3655,7 @@ DF_VIEW_UI_FUNCTION_DEF(file_system)
{ {
D_CmdParams params = df_cmd_params_from_view(ws, panel, view); D_CmdParams params = df_cmd_params_from_view(ws, panel, view);
params.file_path = query_normalized_with_opt_slash; params.file_path = query_normalized_with_opt_slash;
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_CompleteQuery)); d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_CompleteQuery));
} }
} }
@@ -3664,7 +3664,7 @@ DF_VIEW_UI_FUNCTION_DEF(file_system)
{ {
D_CmdParams params = df_cmd_params_from_view(ws, panel, view); D_CmdParams params = df_cmd_params_from_view(ws, panel, view);
params.file_path = path_query.path; params.file_path = path_query.path;
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_CompleteQuery)); 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:
@@ -3681,7 +3681,7 @@ DF_VIEW_UI_FUNCTION_DEF(file_system)
{ {
D_CmdParams params = df_cmd_params_from_view(ws, panel, view); D_CmdParams params = df_cmd_params_from_view(ws, panel, view);
params.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_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_CompleteQuery)); d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_CompleteQuery));
} }
} }
@@ -3690,7 +3690,7 @@ DF_VIEW_UI_FUNCTION_DEF(file_system)
{ {
D_CmdParams params = df_cmd_params_from_view(ws, panel, view); D_CmdParams params = df_cmd_params_from_view(ws, panel, view);
params.file_path = query; params.file_path = query;
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_CompleteQuery)); d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_CompleteQuery));
} }
} }
@@ -3891,7 +3891,7 @@ DF_VIEW_UI_FUNCTION_DEF(file_system)
{ {
D_CmdParams params = df_cmd_params_from_view(ws, panel, view); D_CmdParams params = df_cmd_params_from_view(ws, panel, view);
params.file_path = new_path; params.file_path = new_path;
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_CompleteQuery)); d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_CompleteQuery));
} }
} }
} }
@@ -4114,7 +4114,7 @@ DF_VIEW_UI_FUNCTION_DEF(system_processes)
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_CmdParams params = df_cmd_params_from_view(ws, panel, view);
params.id = info->info.pid; params.id = info->info.pid;
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_CompleteQuery)); d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_CompleteQuery));
} }
//- rjf: selected PID -> cursor //- rjf: selected PID -> cursor
@@ -4204,7 +4204,7 @@ DF_VIEW_UI_FUNCTION_DEF(system_processes)
{ {
D_CmdParams params = df_cmd_params_from_view(ws, panel, view); D_CmdParams params = df_cmd_params_from_view(ws, panel, view);
params.id = info->info.pid; params.id = info->info.pid;
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_CompleteQuery)); d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_CompleteQuery));
} }
} }
} }
@@ -4356,7 +4356,7 @@ DF_VIEW_UI_FUNCTION_DEF(entity_lister)
D_CmdParams params = df_cmd_params_from_view(ws, panel, view); D_CmdParams params = df_cmd_params_from_view(ws, panel, view);
params.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_handle_list_push(scratch.arena, &params.entity_list, params.entity);
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_CompleteQuery)); d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_CompleteQuery));
} }
//- rjf: selected entity -> cursor //- rjf: selected entity -> cursor
@@ -4438,7 +4438,7 @@ DF_VIEW_UI_FUNCTION_DEF(entity_lister)
D_CmdParams params = df_cmd_params_from_view(ws, panel, view); D_CmdParams params = df_cmd_params_from_view(ws, panel, view);
params.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_handle_list_push(scratch.arena, &params.entity_list, params.entity);
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_CompleteQuery)); d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_CompleteQuery));
} }
} }
} }
@@ -4518,7 +4518,7 @@ DF_VIEW_UI_FUNCTION_DEF(symbol_lister)
{ {
D_CmdParams p = df_cmd_params_from_view(ws, panel, view); D_CmdParams p = df_cmd_params_from_view(ws, panel, view);
p.string = name; p.string = name;
d_push_cmd__root(&p, d_cmd_spec_from_kind(D_CmdKind_CompleteQuery)); d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_CompleteQuery));
} }
break; break;
} }
@@ -4610,7 +4610,7 @@ DF_VIEW_UI_FUNCTION_DEF(symbol_lister)
{ {
D_CmdParams p = df_cmd_params_from_view(ws, panel, view); D_CmdParams p = df_cmd_params_from_view(ws, panel, view);
p.string = name; p.string = name;
d_push_cmd__root(&p, d_cmd_spec_from_kind(D_CmdKind_CompleteQuery)); d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_CompleteQuery));
} }
if(ui_hovering(sig)) UI_Tooltip if(ui_hovering(sig)) UI_Tooltip
{ {
@@ -4889,7 +4889,7 @@ DF_VIEW_UI_FUNCTION_DEF(target)
if(ui_pressed(sig)) if(ui_pressed(sig))
{ {
D_CmdParams p = df_cmd_params_from_panel(ws, panel); D_CmdParams p = df_cmd_params_from_panel(ws, panel);
d_push_cmd__root(&p, d_cmd_spec_from_kind(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
@@ -4933,7 +4933,7 @@ DF_VIEW_UI_FUNCTION_DEF(target)
{ {
D_CmdParams params = df_cmd_params_from_view(ws, panel, view); D_CmdParams params = df_cmd_params_from_view(ws, panel, view);
params.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__root(&params, d_cmd_spec_from_kind(D_CmdKind_RunCommand)); 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;
} }
} }
@@ -5058,7 +5058,7 @@ DF_VIEW_UI_FUNCTION_DEF(targets)
{ {
D_CmdParams params = df_cmd_params_from_view(ws, panel, view); D_CmdParams params = df_cmd_params_from_view(ws, panel, view);
params.cmd_spec = d_cmd_spec_from_kind(D_CmdKind_AddTarget); params.cmd_spec = d_cmd_spec_from_kind(D_CmdKind_AddTarget);
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_RunCommand)); d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_RunCommand));
} }
} }
@@ -5080,7 +5080,7 @@ DF_VIEW_UI_FUNCTION_DEF(targets)
{ {
D_CmdParams p = df_cmd_params_from_view(ws, panel, view); D_CmdParams p = df_cmd_params_from_view(ws, panel, view);
p.entity = d_handle_from_entity(target); p.entity = d_handle_from_entity(target);
d_push_cmd__root(&p, d_cmd_spec_from_kind(!target->disabled ? D_CmdKind_DisableTarget : D_CmdKind_EnableTarget)); d_push_cmd(&p, d_cmd_spec_from_kind(!target->disabled ? D_CmdKind_DisableTarget : D_CmdKind_EnableTarget));
} }
} }
@@ -5122,7 +5122,7 @@ DF_VIEW_UI_FUNCTION_DEF(targets)
D_CmdParams params = df_cmd_params_from_view(ws, panel, view); D_CmdParams params = df_cmd_params_from_view(ws, panel, view);
params.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_handle_list_push(scratch.arena, &params.entity_list, params.entity);
d_push_cmd__root(&params, d_cmd_spec_from_kind(ctrls[ctrl_idx].cmd)); d_push_cmd(&params, d_cmd_spec_from_kind(ctrls[ctrl_idx].cmd));
} }
} }
} }
@@ -5201,9 +5201,9 @@ DF_VIEW_CMD_FUNCTION_DEF(file_path_map)
D_CmdParams p = df_cmd_params_from_view(ws, panel, view); D_CmdParams p = df_cmd_params_from_view(ws, panel, view);
p.entity = d_handle_from_entity(storage_entity); p.entity = d_handle_from_entity(storage_entity);
p.file_path = pick_string; p.file_path = pick_string;
d_push_cmd__root(&p, d_cmd_spec_from_kind(pick_side == Side_Min ? d_push_cmd(&p, d_cmd_spec_from_kind(pick_side == Side_Min ?
D_CmdKind_SetFileOverrideLinkSrc : D_CmdKind_SetFileOverrideLinkSrc :
D_CmdKind_SetFileOverrideLinkDst)); D_CmdKind_SetFileOverrideLinkDst));
}break; }break;
} }
} }
@@ -5339,7 +5339,7 @@ DF_VIEW_UI_FUNCTION_DEF(file_path_map)
if(ui_pressed(sig)) if(ui_pressed(sig))
{ {
D_CmdParams p = df_cmd_params_from_panel(ws, panel); D_CmdParams p = df_cmd_params_from_panel(ws, panel);
d_push_cmd__root(&p, d_cmd_spec_from_kind(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
@@ -5376,7 +5376,7 @@ DF_VIEW_UI_FUNCTION_DEF(file_path_map)
{ {
D_CmdParams params = df_cmd_params_from_view(ws, panel, view); D_CmdParams params = df_cmd_params_from_view(ws, panel, view);
params.cmd_spec = d_cmd_spec_from_kind(D_CmdKind_PickFileOrFolder); params.cmd_spec = d_cmd_spec_from_kind(D_CmdKind_PickFileOrFolder);
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_RunCommand)); 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;
} }
@@ -5412,7 +5412,7 @@ DF_VIEW_UI_FUNCTION_DEF(file_path_map)
if(ui_pressed(sig)) if(ui_pressed(sig))
{ {
D_CmdParams p = df_cmd_params_from_panel(ws, panel); D_CmdParams p = df_cmd_params_from_panel(ws, panel);
d_push_cmd__root(&p, d_cmd_spec_from_kind(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
@@ -5450,7 +5450,7 @@ DF_VIEW_UI_FUNCTION_DEF(file_path_map)
{ {
D_CmdParams params = df_cmd_params_from_view(ws, panel, view); D_CmdParams params = df_cmd_params_from_view(ws, panel, view);
params.cmd_spec = d_cmd_spec_from_kind(D_CmdKind_PickFileOrFolder); params.cmd_spec = d_cmd_spec_from_kind(D_CmdKind_PickFileOrFolder);
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_RunCommand)); 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;
} }
@@ -5466,9 +5466,9 @@ DF_VIEW_UI_FUNCTION_DEF(file_path_map)
D_CmdParams p = df_cmd_params_from_view(ws, panel, view); D_CmdParams p = df_cmd_params_from_view(ws, panel, view);
p.entity = commit_map; p.entity = commit_map;
p.file_path = new_string; p.file_path = new_string;
d_push_cmd__root(&p, d_cmd_spec_from_kind(commit_side == Side_Min ? d_push_cmd(&p, d_cmd_spec_from_kind(commit_side == Side_Min ?
D_CmdKind_SetFileOverrideLinkSrc : D_CmdKind_SetFileOverrideLinkSrc :
D_CmdKind_SetFileOverrideLinkDst)); D_CmdKind_SetFileOverrideLinkDst));
} }
//- rjf: apply editing finish //- rjf: apply editing finish
@@ -5664,7 +5664,7 @@ DF_VIEW_UI_FUNCTION_DEF(auto_view_rules)
if(ui_pressed(sig)) if(ui_pressed(sig))
{ {
D_CmdParams p = df_cmd_params_from_panel(ws, panel); D_CmdParams p = df_cmd_params_from_panel(ws, panel);
d_push_cmd__root(&p, d_cmd_spec_from_kind(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
@@ -5726,7 +5726,7 @@ DF_VIEW_UI_FUNCTION_DEF(auto_view_rules)
if(ui_pressed(sig)) if(ui_pressed(sig))
{ {
D_CmdParams p = df_cmd_params_from_panel(ws, panel); D_CmdParams p = df_cmd_params_from_panel(ws, panel);
d_push_cmd__root(&p, d_cmd_spec_from_kind(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
@@ -5766,9 +5766,9 @@ DF_VIEW_UI_FUNCTION_DEF(auto_view_rules)
D_CmdParams p = df_cmd_params_from_view(ws, panel, view); D_CmdParams p = df_cmd_params_from_view(ws, panel, view);
p.entity = commit_map; p.entity = commit_map;
p.string = new_string; p.string = new_string;
d_push_cmd__root(&p, d_cmd_spec_from_kind(commit_side == Side_Min ? d_push_cmd(&p, d_cmd_spec_from_kind(commit_side == Side_Min ?
D_CmdKind_SetAutoViewRuleType : D_CmdKind_SetAutoViewRuleType :
D_CmdKind_SetAutoViewRuleViewRule)); D_CmdKind_SetAutoViewRuleViewRule));
} }
//- rjf: apply editing finish //- rjf: apply editing finish
@@ -5991,7 +5991,7 @@ DF_VIEW_UI_FUNCTION_DEF(scheduler)
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_CmdParams params = df_cmd_params_from_view(ws, panel, view);
params.entity = d_handle_from_entity(entity); params.entity = d_handle_from_entity(entity);
d_push_cmd__root(&params, d_cmd_spec_from_kind(cmd_kind)); d_push_cmd(&params, d_cmd_spec_from_kind(cmd_kind));
} }
} }
UI_TableCellSized(ui_pct(1, 0)) UI_TableCellSized(ui_pct(1, 0))
@@ -6017,7 +6017,7 @@ DF_VIEW_UI_FUNCTION_DEF(scheduler)
D_CmdParams params = df_cmd_params_from_view(ws, panel, view); D_CmdParams params = df_cmd_params_from_view(ws, panel, view);
params.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_handle_list_push(scratch.arena, &params.entity_list, d_handle_from_entity(entity));
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_Detach)); 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)
@@ -6026,7 +6026,7 @@ DF_VIEW_UI_FUNCTION_DEF(scheduler)
{ {
D_CmdParams params = df_cmd_params_from_view(ws, panel, view); D_CmdParams params = df_cmd_params_from_view(ws, panel, view);
d_handle_list_push(scratch.arena, &params.entity_list, d_handle_from_entity(entity)); d_handle_list_push(scratch.arena, &params.entity_list, d_handle_from_entity(entity));
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_Restart)); 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)
@@ -6036,7 +6036,7 @@ DF_VIEW_UI_FUNCTION_DEF(scheduler)
{ {
D_CmdParams params = df_cmd_params_from_view(ws, panel, view); D_CmdParams params = df_cmd_params_from_view(ws, panel, view);
d_handle_list_push(scratch.arena, &params.entity_list, d_handle_from_entity(entity)); d_handle_list_push(scratch.arena, &params.entity_list, d_handle_from_entity(entity));
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_Kill)); d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_Kill));
} }
} }
}break; }break;
@@ -6321,7 +6321,7 @@ DF_VIEW_UI_FUNCTION_DEF(modules)
{ {
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_CmdParams p = df_cmd_params_from_panel(ws, panel);
d_push_cmd__root(&p, d_cmd_spec_from_kind(D_CmdKind_FocusPanel)); d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_FocusPanel));
} }
} }
UI_TableCell UI_TableCell
@@ -6362,7 +6362,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_CmdParams p = df_cmd_params_from_panel(ws, panel);
d_push_cmd__root(&p, d_cmd_spec_from_kind(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
@@ -6389,7 +6389,7 @@ DF_VIEW_UI_FUNCTION_DEF(modules)
{ {
D_CmdParams params = df_cmd_params_from_view(ws, panel, view); D_CmdParams params = df_cmd_params_from_view(ws, panel, view);
params.cmd_spec = d_cmd_spec_from_kind(D_CmdKind_PickFile); params.cmd_spec = d_cmd_spec_from_kind(D_CmdKind_PickFile);
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_RunCommand)); 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 +6680,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__root(&cmd->params, cmd->spec); d_push_cmd(&cmd->params, cmd->spec);
} }
arena_clear(pves->deferred_cmd_arena); arena_clear(pves->deferred_cmd_arena);
MemoryZeroStruct(&pves->deferred_cmds); MemoryZeroStruct(&pves->deferred_cmds);
@@ -6710,7 +6710,7 @@ DF_VIEW_CMD_FUNCTION_DEF(pending_file)
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_CmdParams params = df_cmd_params_from_view(ws, panel, view);
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_CloseTab)); d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_CloseTab));
} }
scratch_end(scratch); scratch_end(scratch);
@@ -6779,7 +6779,7 @@ DF_VIEW_CMD_FUNCTION_DEF(text)
D_CmdParams p = df_cmd_params_from_view(ws, panel, view); D_CmdParams p = df_cmd_params_from_view(ws, panel, view);
p.string = src; p.string = src;
p.file_path = dst; p.file_path = dst;
d_push_cmd__root(&p, d_cmd_spec_from_kind(D_CmdKind_SetFileReplacementPath)); 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);
@@ -6854,7 +6854,7 @@ DF_VIEW_UI_FUNCTION_DEF(text)
{ {
D_CmdParams params = df_cmd_params_from_view(ws, panel, view); D_CmdParams params = df_cmd_params_from_view(ws, panel, view);
params.cmd_spec = d_cmd_spec_from_kind(D_CmdKind_PickFile); params.cmd_spec = d_cmd_spec_from_kind(D_CmdKind_PickFile);
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_RunCommand)); d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_RunCommand));
} }
scratch_end(scratch); scratch_end(scratch);
} }
@@ -7896,7 +7896,7 @@ DF_VIEW_UI_FUNCTION_DEF(memory)
if(ui_pressed(sig)) if(ui_pressed(sig))
{ {
D_CmdParams p = df_cmd_params_from_panel(ws, panel); D_CmdParams p = df_cmd_params_from_panel(ws, panel);
d_push_cmd__root(&p, d_cmd_spec_from_kind(D_CmdKind_FocusPanel)); d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_FocusPanel));
} }
// rjf: click & drag -> select // rjf: click & drag -> select
@@ -7924,12 +7924,12 @@ DF_VIEW_UI_FUNCTION_DEF(memory)
if(evt->delta_2f32.y < 0) if(evt->delta_2f32.y < 0)
{ {
D_CmdParams params = df_cmd_params_from_window(ws); D_CmdParams params = df_cmd_params_from_window(ws);
d_push_cmd__root(&params, d_cmd_spec_from_kind(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_CmdParams params = df_cmd_params_from_window(ws);
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_DecCodeFontScale)); d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_DecCodeFontScale));
} }
} }
} }
@@ -8377,7 +8377,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_CmdParams p = df_cmd_params_from_view(ws, panel, view);
d_push_cmd__root(&p, d_cmd_spec_from_kind(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);
@@ -8707,7 +8707,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_CmdParams p = df_cmd_params_from_view(ws, panel, view);
d_push_cmd__root(&p, d_cmd_spec_from_kind(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);
} }
@@ -9515,7 +9515,7 @@ DF_VIEW_UI_FUNCTION_DEF(settings)
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_CmdParams p = df_cmd_params_from_panel(ws, panel);
d_push_cmd__root(&p, d_cmd_spec_from_kind(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
+7 -7
View File
@@ -107,7 +107,7 @@ update_and_render(OS_Handle repaint_window_handle, void *user_data)
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_CmdParams p = df_cmd_params_from_gfx();
d_push_cmd__root(&p, d_cmd_spec_from_kind(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)
{ {
@@ -135,7 +135,7 @@ update_and_render(OS_Handle repaint_window_handle, void *user_data)
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_CmdParams p = df_cmd_params_from_gfx();
d_push_cmd__root(&p, d_cmd_spec_from_kind(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;
} }
@@ -169,7 +169,7 @@ update_and_render(OS_Handle repaint_window_handle, void *user_data)
{ {
take = 1; take = 1;
D_CmdParams params = df_cmd_params_from_window(window); D_CmdParams params = df_cmd_params_from_window(window);
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_CloseWindow)); d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_CloseWindow));
} }
//- rjf: try menu bar operations //- rjf: try menu bar operations
@@ -224,7 +224,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__root(&params, run_spec); d_push_cmd(&params, run_spec);
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 +244,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__root(&params, spec); d_push_cmd(&params, spec);
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 +258,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__root(&params, d_cmd_spec_from_kind(D_CmdKind_OSEvent)); d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_OSEvent));
} }
//- rjf: take //- rjf: take
@@ -405,7 +405,7 @@ update_and_render(OS_Handle repaint_window_handle, void *user_data)
{ {
D_CmdParams p = df_cmd_params_from_gfx(); D_CmdParams p = df_cmd_params_from_gfx();
p.string = log.strings[LogMsgKind_UserError]; p.string = log.strings[LogMsgKind_UserError];
d_push_cmd__root(&p, d_cmd_spec_from_kind(D_CmdKind_Error)); d_push_cmd(&p, d_cmd_spec_from_kind(D_CmdKind_Error));
} }
} }
src/raddbg/raddbg_main.c
+6 -6
View File
@@ -360,14 +360,14 @@ 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__root(&params, cmd_spec); d_push_cmd(&params, cmd_spec);
df_gfx_request_frame(); df_gfx_request_frame();
} }
else else
{ {
D_CmdParams params = df_cmd_params_from_window(dst_window); D_CmdParams params = df_cmd_params_from_window(dst_window);
params.string = error; params.string = error;
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_Error)); d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_Error));
df_gfx_request_frame(); df_gfx_request_frame();
} }
} }
@@ -375,7 +375,7 @@ entry_point(CmdLine *cmd_line)
{ {
D_CmdParams params = df_cmd_params_from_window(dst_window); D_CmdParams params = df_cmd_params_from_window(dst_window);
params.string = push_str8f(scratch.arena, "\"%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__root(&params, d_cmd_spec_from_kind(D_CmdKind_Error)); d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_Error));
df_gfx_request_frame(); df_gfx_request_frame();
} }
} }
@@ -392,7 +392,7 @@ entry_point(CmdLine *cmd_line)
{ {
auto_run = 0; auto_run = 0;
D_CmdParams params = df_cmd_params_from_gfx(); D_CmdParams params = df_cmd_params_from_gfx();
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_LaunchAndRun)); d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_LaunchAndRun));
} }
//- rjf: auto step //- rjf: auto step
@@ -400,7 +400,7 @@ entry_point(CmdLine *cmd_line)
{ {
auto_step = 0; auto_step = 0;
D_CmdParams params = df_cmd_params_from_gfx(); D_CmdParams params = df_cmd_params_from_gfx();
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_StepInto)); d_push_cmd(&params, d_cmd_spec_from_kind(D_CmdKind_StepInto));
} }
//- rjf: jit attach //- rjf: jit attach
@@ -409,7 +409,7 @@ entry_point(CmdLine *cmd_line)
jit_attach = 0; jit_attach = 0;
D_CmdParams params = df_cmd_params_from_gfx(); D_CmdParams params = df_cmd_params_from_gfx();
params.id = jit_pid; params.id = jit_pid;
d_push_cmd__root(&params, d_cmd_spec_from_kind(D_CmdKind_Attach)); 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