ed/raddebugger
1
0
Fork 0
mirror of https://github.com/Ed94/raddebugger.git synced 2026-06-20 19:04:58 -07:00
Code Issues Packages Projects Releases Wiki Activity

clean up visualizer default sizes, clean up rough edges of various combos of theme setting / config state

Browse Source
This commit is contained in:
Ryan Fleury
2025-05-05 09:48:07 -07:00
parent f7a3239294
commit c840071bf8
9 changed files with 164 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/eval/eval_core.c
+18
View File
@@ -1219,6 +1219,24 @@ e_base_offset_from_eval(E_Eval eval)
return eval.value.u64;
}
internal U64
e_range_size_from_eval(E_Eval eval)
{
U64 result = 256;
E_TypeKey type_unwrapped = e_type_key_unwrap(eval.irtree.type_key, E_TypeUnwrapFlag_AllDecorative);
E_TypeKind type_unwrapped_kind = e_type_kind_from_key(type_unwrapped);
if(e_type_kind_is_pointer_or_ref(type_unwrapped_kind) ||
type_unwrapped_kind == E_TypeKind_Function)
{
result = KB(16);
}
else
{
result = e_type_byte_size_from_key(type_unwrapped);
}
return result;
}
////////////////////////////////
//~ rjf: Debug Functions
src/eval/eval_core.h
+1
View File
@@ -1179,6 +1179,7 @@ internal E_Key e_key_wrapf(E_Key key, char *fmt, ...);
//~ rjf: Eval Info Extraction
internal U64 e_base_offset_from_eval(E_Eval eval);
internal U64 e_range_size_from_eval(E_Eval eval);
////////////////////////////////
//~ rjf: Debug Functions
src/raddbg/generated/raddbg.meta.c
+5 -3
View File
File diff suppressed because one or more lines are too long
src/raddbg/generated/raddbg.meta.h
+2 -1
View File
@@ -241,6 +241,7 @@ RD_CmdKind_EditProjectTheme,
RD_CmdKind_AddThemeColor,
RD_CmdKind_ForkTheme,
RD_CmdKind_SaveTheme,
RD_CmdKind_SaveAndSetTheme,
RD_CmdKind_SetNextStatement,
RD_CmdKind_AddTarget,
RD_CmdKind_SelectTarget,
@@ -560,7 +561,7 @@ Z(getting_started)\
C_LINKAGE_BEGIN
extern String8 rd_tab_fast_path_view_name_table[24];
extern String8 rd_tab_fast_path_query_name_table[24];
extern RD_VocabInfo rd_vocab_info_table[334];
extern RD_VocabInfo rd_vocab_info_table[335];
extern RD_NameSchemaInfo rd_name_schema_info_table[24];
extern Rng1U64 rd_reg_slot_range_table[43];
extern String8 rd_binding_version_remap_old_name_table[8];
src/raddbg/raddbg.mdesk
+2 -1
View File
@@ -384,7 +384,7 @@ RD_VocabTable:
{
theme_color,
```
@collection_commands(add_theme_color, fork_theme, save_theme)
@collection_commands(add_theme_color, fork_theme, save_theme, save_and_set_theme)
@row_commands(duplicate_cfg, remove_cfg)
x:
{
@@ -990,6 +990,7 @@ RD_CmdTable: // | | | |
{AddThemeColor 0 0 0 0 "" Null null Nil Null 0 0 0 0 0 0 0 Palette "add_theme_color" "Add Theme Color" "Adds a new theme color." "" "" }
{ForkTheme 0 0 0 0 "" Null null Nil Null 0 0 0 0 0 0 0 Palette "fork_theme" "Fork Theme" "Imports all colors from the current theme so they can be individually edited." "" "" }
{SaveTheme 0 0 0 0 "" String null Nil Null 1 0 0 0 0 1 1 Save "save_theme" "Save Theme" "Saves all theme colors to a new theme file." "" "" }
{SaveAndSetTheme 0 0 0 0 "" String null Nil Null 1 0 0 0 0 1 1 Save "save_and_set_theme" "Save And Set Theme" "Saves all theme colors to a new theme file, and then sets that theme as the selected theme." "" "" }
//- rjf: line operations
{SetNextStatement 1 1 1 0 "" Null null Nil Null 0 0 0 0 0 0 0 RightArrow "set_next_statement" "Set Next Statement" "Sets the selected thread's instruction pointer to the cursor's position." "" "$text_pt," }
src/raddbg/raddbg_core.c
+97 -69
View File
@@ -5188,10 +5188,10 @@ rd_view_ui(Rng2F32 rect)
rd_cmd(RD_CmdKind_SelectThread, .thread = cell_info.entity->handle);
}
// rjf: other cases, but this watch window is floating? -> push query
else if(view_is_floating)
// rjf: other cases, but this watch window is floating, and this has a cfg/entity? -> push query
else if(view_is_floating && (cell_info.entity != &ctrl_entity_nil || cell_info.cfg != &rd_nil_cfg))
{
rd_cmd(RD_CmdKind_PushQuery, .expr = cell->eval.string);
rd_cmd(RD_CmdKind_PushQuery, .expr = e_full_expr_string_from_key(scratch.arena, cell->eval.key));
}
}
@@ -5815,33 +5815,10 @@ rd_window_frame(void)
}
//- rjf: map the theme config to the associated tree (either from a preset, or from a file)
MD_Node *theme_tree = rd_state->theme_preset_trees[RD_ThemePreset_DefaultDark];
if(theme_cfg != &rd_nil_cfg)
MD_Node *theme_tree = rd_theme_tree_from_name(scratch.arena, hs_scope, theme_cfg->first->string);
if(colors_cfgs.count == 0 && theme_tree == &md_nil_node)
{
String8 theme_name = theme_cfg->first->string;
if(theme_name.size != 0)
{
for EachEnumVal(RD_ThemePreset, p)
{
if(str8_match(theme_name, rd_theme_preset_display_string_table[p], 0))
{
theme_tree = rd_state->theme_preset_trees[p];
break;
}
}
if(theme_tree == &md_nil_node)
{
String8 path = push_str8f(scratch.arena, "%S/raddbg/themes/%S", os_get_process_info()->user_program_data_path, theme_name);
U64 endt_us = os_now_microseconds()+100;
if(ws->frames_alive == 0)
{
endt_us = os_now_microseconds()+50000;
}
U128 hash = fs_hash_from_path_range(path, r1u64(0, max_U64), endt_us);
String8 data = hs_data_from_hash(hs_scope, hash);
theme_tree = md_tree_from_string(scratch.arena, data);
}
}
theme_tree = rd_state->theme_preset_trees[RD_ThemePreset_DefaultDark];
}
//- rjf: build tasks for color applications - each task comprises of a metadesk
@@ -9769,6 +9746,38 @@ rd_set_autocomp_regs_(RD_Regs *regs)
//- rjf: colors
internal MD_Node *
rd_theme_tree_from_name(Arena *arena, HS_Scope *scope, String8 theme_name)
{
Temp scratch = scratch_begin(&arena, 1);
MD_Node *theme_tree = &md_nil_node;
if(theme_name.size != 0)
{
for EachEnumVal(RD_ThemePreset, p)
{
if(str8_match(theme_name, rd_theme_preset_display_string_table[p], 0))
{
theme_tree = rd_state->theme_preset_trees[p];
break;
}
}
if(theme_tree == &md_nil_node)
{
String8 path = push_str8f(scratch.arena, "%S/raddbg/themes/%S", os_get_process_info()->user_program_data_path, theme_name);
U64 endt_us = os_now_microseconds()+100;
if(rd_state->frame_index <= 5)
{
endt_us = os_now_microseconds()+50000;
}
U128 hash = fs_hash_from_path_range(path, r1u64(0, max_U64), endt_us);
String8 data = hs_data_from_hash(scope, hash);
theme_tree = md_tree_from_string(arena, data);
}
}
scratch_end(scratch);
return theme_tree;
}
internal Vec4F32
rd_rgba_from_code_color_slot(RD_CodeColorSlot slot)
{
@@ -10121,20 +10130,6 @@ rd_frame_arena(void)
////////////////////////////////
//~ rjf: Registers
internal RD_Regs *
rd_regs(void)
{
RD_Regs *regs = &rd_state->top_regs->v;
return regs;
}
internal RD_Regs *
rd_base_regs(void)
{
RD_Regs *regs = &rd_state->base_regs.v;
return regs;
}
internal RD_Regs *
rd_push_regs_(RD_Regs *regs)
{
@@ -12194,26 +12189,33 @@ rd_frame(void)
RD_Cfg *window = rd_cfg_from_id(rd_regs()->window);
RD_PanelTree panel_tree = rd_panel_tree_from_cfg(scratch.arena, window);
RD_Cfg *tab = panel_tree.focused->selected_tab;
String8 expr = push_str8f(scratch.arena,
"query:commands, "
"query:config.$%I64x, "
"query:config.$%I64x, "
"query:targets, "
"query:breakpoints, "
"query:recent_files, "
"query:recent_projects, "
"query:machines, "
"query:processes, "
"query:threads, "
"query:modules, "
"query:user_settings, "
"query:project_settings, "
"query:procedures, "
"query:types, "
"query:globals, "
"query:thread_locals, "
,
tab->id, window->id);
String8List exprs = {0};
{
str8_list_pushf(scratch.arena, &exprs, "query:commands");
if(tab != &rd_nil_cfg)
{
str8_list_pushf(scratch.arena, &exprs, "query:config.$%I64x", tab->id);
}
if(window != &rd_nil_cfg)
{
str8_list_pushf(scratch.arena, &exprs, "query:config.$%I64x", window->id);
}
str8_list_pushf(scratch.arena, &exprs, "query:targets");
str8_list_pushf(scratch.arena, &exprs, "query:breakpoints");
str8_list_pushf(scratch.arena, &exprs, "query:recent_files");
str8_list_pushf(scratch.arena, &exprs, "query:recent_projects");
str8_list_pushf(scratch.arena, &exprs, "query:machines");
str8_list_pushf(scratch.arena, &exprs, "query:processes");
str8_list_pushf(scratch.arena, &exprs, "query:threads");
str8_list_pushf(scratch.arena, &exprs, "query:modules");
str8_list_pushf(scratch.arena, &exprs, "query:user_settings");
str8_list_pushf(scratch.arena, &exprs, "query:project_settings");
str8_list_pushf(scratch.arena, &exprs, "query:procedures");
str8_list_pushf(scratch.arena, &exprs, "query:types");
str8_list_pushf(scratch.arena, &exprs, "query:globals");
str8_list_pushf(scratch.arena, &exprs, "query:thread_locals");
}
String8 expr = str8_list_join(scratch.arena, &exprs, &(StringJoin){.sep = str8_lit(", ")});
rd_cmd(RD_CmdKind_PushQuery, .expr = expr, .do_implicit_root = 1, .do_lister = 1, .do_big_rows = 1, .view = tab->id, .tab = tab->id);
}break;
@@ -14749,25 +14751,36 @@ rd_frame(void)
}break;
case RD_CmdKind_AddThemeColor:
{
HS_Scope *hs_scope = hs_scope_open();
RD_Cfg *parent = rd_cfg_from_id(rd_regs()->cfg);
RD_Cfg *theme = rd_cfg_child_from_string_or_alloc(parent, str8_lit("theme"));
MD_Node *theme_tree = rd_theme_tree_from_name(scratch.arena, hs_scope, theme->first->string);
if(theme_tree == &md_nil_node)
{
rd_cfg_new_replace(theme, rd_theme_preset_display_string_table[RD_ThemePreset_DefaultDark]);
}
RD_Cfg *color = rd_cfg_new(parent, str8_lit("theme_color"));
rd_cfg_new(color, str8_lit("tags"));
RD_Cfg *value = rd_cfg_new(color, str8_lit("value"));
rd_cfg_new(value, str8_lit("0xffffffff"));
hs_scope_close(hs_scope);
}break;
case RD_CmdKind_ForkTheme:
{
HS_Scope *hs_scope = hs_scope_open();
RD_Cfg *parent = rd_cfg_from_id(rd_regs()->cfg);
RD_CfgList colors = rd_cfg_child_list_from_string(scratch.arena, parent, str8_lit("theme_color"));
for(RD_CfgNode *n = colors.first; n != 0; n = n->next)
{
rd_cfg_release(n->v);
}
String8 color_preset = rd_setting_from_name(str8_lit("theme_preset"));
RD_ThemePreset preset = RD_ThemePreset_DefaultDark;
// TODO(rjf): map preset via string
MD_Node *theme_tree = rd_state->theme_preset_trees[preset];
String8 color_file = rd_setting_from_name(str8_lit("theme_file"));
RD_Cfg *theme_cfg = rd_cfg_child_from_string(parent, str8_lit("theme"));
String8 theme_name = theme_cfg->first->string;
MD_Node *theme_tree = rd_theme_tree_from_name(scratch.arena, hs_scope, theme_name);
if(theme_tree == &md_nil_node)
{
theme_tree = rd_state->theme_preset_trees[RD_ThemePreset_DefaultDark];
}
for(MD_Node *n = theme_tree; !md_node_is_nil(n); n = md_node_rec_depth_first_pre(n, theme_tree).next)
{
if(str8_match(n->string, str8_lit("theme_color"), 0))
@@ -14779,8 +14792,11 @@ rd_frame(void)
rd_cfg_new(value, md_child_from_string(n, str8_lit("value"), 0)->first->string);
}
}
rd_cfg_release(theme_cfg);
hs_scope_close(hs_scope);
}break;
case RD_CmdKind_SaveTheme:
case RD_CmdKind_SaveAndSetTheme:
{
String8 name = rd_regs()->string;
if(name.size != 0)
@@ -14797,7 +14813,19 @@ rd_frame(void)
str8_list_push(scratch.arena, &strings, rd_string_from_cfg_tree(scratch.arena, dst_path, n->v));
}
String8 data = str8_list_join(scratch.arena, &strings, 0);
os_write_data_to_file_path(dst_path, data);
if(os_write_data_to_file_path(dst_path, data))
{
for(RD_CfgNode *n = colors.first; n != 0; n = n->next)
{
rd_cfg_release(n->v);
}
RD_Cfg *theme = rd_cfg_child_from_string_or_alloc(parent, str8_lit("theme"));
rd_cfg_new_replace(theme, name);
}
else
{
log_user_errorf("Could not successfully write to '%S'.", dst_path);
}
}
}
}break;
src/raddbg/raddbg_core.h
+3 -3
View File
@@ -968,7 +968,7 @@ internal void rd_set_autocomp_regs_(RD_Regs *regs);
//~ rjf: Colors, Fonts, Config
//- rjf: colors
internal UI_Theme *rd_ui_theme_from_tree(MD_Node *tree);
internal MD_Node *rd_theme_tree_from_name(Arena *arena, HS_Scope *scope, String8 theme_name);
internal Vec4F32 rd_rgba_from_code_color_slot(RD_CodeColorSlot slot);
internal RD_CodeColorSlot rd_code_color_slot_from_txt_token_kind(TXT_TokenKind kind);
internal RD_CodeColorSlot rd_code_color_slot_from_txt_token_kind_lookup_string(TXT_TokenKind kind, String8 string);
@@ -1008,8 +1008,8 @@ internal Arena *rd_frame_arena(void);
////////////////////////////////
//~ rjf: Registers
internal RD_Regs *rd_regs(void);
internal RD_Regs *rd_base_regs(void);
#define rd_regs() (&rd_state->top_regs->v)
#define rd_base_regs() (&rd_state->base_regs.v)
internal RD_Regs *rd_push_regs_(RD_Regs *regs);
#define rd_push_regs(...) rd_push_regs_(&(RD_Regs){rd_regs_lit_init_top __VA_ARGS__})
internal RD_Regs *rd_pop_regs(void);
src/raddbg/raddbg_eval.c
+1 -1
View File
@@ -130,7 +130,7 @@ E_TYPE_EXPAND_INFO_FUNCTION_DEF(themes)
FuzzyMatchRangeList name_matches = fuzzy_match_find(scratch.arena, filter, name);
if(name_matches.count == name_matches.needle_part_count)
{
str8_list_push(scratch.arena, &names, name);
str8_list_push(scratch.arena, &names, push_str8_copy(arena, name));
}
}
os_file_iter_end(it);
src/raddbg/raddbg_views.c
+35 -3
View File
@@ -1868,6 +1868,38 @@ rd_info_from_watch_row_cell(Arena *arena, EV_Row *row, EV_StringFlags string_fla
}
dr_fstrs_push_new(arena, &fstrs, &params, str8_lit(" "));
dr_fstrs_push_new(arena, &fstrs, &params, name);
{
HS_Scope *hs_scope = hs_scope_open();
MD_Node *theme_tree = rd_theme_tree_from_name(scratch.arena, hs_scope, name);
U64 color_idx = 0;
for(MD_Node *n = theme_tree; color_idx < 4 && !md_node_is_nil(n); n = md_node_rec_depth_first_pre(n, theme_tree).next)
{
if(str8_match(n->string, str8_lit("theme_color"), 0))
{
String8 tags = md_child_from_string(n, str8_lit("tags"), 0)->first->string;
if(str8_match(tags, str8_lit("background"), 0) ||
str8_match(tags, str8_lit("text"), 0) ||
str8_match(tags, str8_lit("focus border"), 0) ||
str8_match(tags, str8_lit("menu_bar background"), 0) ||
str8_match(tags, str8_lit("tab background"), 0) ||
str8_match(tags, str8_lit("code_default"), 0))
{
U64 color = 0;
if(try_u64_from_str8_c_rules(md_child_from_string(n, str8_lit("value"), 0)->first->string, &color))
{
dr_fstrs_push_new(arena, &fstrs, &params, str8_lit(" "));
dr_fstrs_push_new(arena, &fstrs, &params,
rd_icon_kind_text_table[RD_IconKind_CircleFilled],
.font = rd_font_from_slot(RD_FontSlot_Icons),
.raster_flags = rd_raster_flags_from_slot(RD_FontSlot_Icons),
.color = linear_from_srgba(rgba_from_u32((U32)color)));
color_idx += 1;
}
}
}
}
hs_scope_close(hs_scope);
}
result.eval_fstrs = fstrs;
}break;
}
@@ -1975,7 +2007,7 @@ RD_VIEW_UI_FUNCTION_DEF(text)
U64 size = rd_view_setting_value_from_name(str8_lit("size")).u64;
if(size == 0)
{
size = e_type_byte_size_from_key(e_type_key_unwrap(eval.irtree.type_key, E_TypeUnwrapFlag_AllDecorative));
size = e_range_size_from_eval(eval);
}
Rng1U64 range = r1u64(base_offset, base_offset+size);
rd_regs()->text_key = rd_key_from_eval_space_range(eval.space, range, 1);
@@ -2249,7 +2281,7 @@ RD_VIEW_UI_FUNCTION_DEF(disasm)
U64 size = rd_view_setting_value_from_name(str8_lit("size")).u64;
if(size == 0)
{
size = KB(16);
size = e_range_size_from_eval(eval);
}
Rng1U64 range = r1u64(base_offset, base_offset+size);
Arch arch = rd_arch_from_eval(eval);
@@ -2429,7 +2461,7 @@ RD_VIEW_UI_FUNCTION_DEF(memory)
U64 size = rd_view_setting_value_from_name(str8_lit("size")).u64;
if(size == 0)
{
size = e_type_byte_size_from_key(e_type_key_unwrap(eval.irtree.type_key, E_TypeUnwrapFlag_AllDecorative));
size = e_range_size_from_eval(eval);
}
Rng1U64 view_range = r1u64(base_offset, base_offset+size);
if(eval.space.kind == 0)