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

correct rich hovering for rich watch window rows; distinguish between single/double-click watch cells; more convergence

Browse Source
This commit is contained in:
Ryan Fleury
2025-02-13 15:12:34 -08:00
parent c39cc5d642
commit 141dd69eba
6 changed files with 169 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/eval_visualization/eval_visualization_core.c
+23
View File
@@ -110,6 +110,29 @@ ev_type_key_is_editable(E_TypeKey type_key)
for(E_TypeKey t = type_key; !result; t = e_type_unwrap(e_type_direct_from_key(e_type_unwrap(t))))
{
E_TypeKind kind = e_type_kind_from_key(t);
if(kind == E_TypeKind_Array)
{
E_TypeKind element_kind = e_type_kind_from_key(e_type_unwrap(e_type_direct_from_key(e_type_unwrap(t))));
if(element_kind != E_TypeKind_U8 &&
element_kind != E_TypeKind_U16 &&
element_kind != E_TypeKind_U32 &&
element_kind != E_TypeKind_S8 &&
element_kind != E_TypeKind_S16 &&
element_kind != E_TypeKind_S32 &&
element_kind != E_TypeKind_UChar8 &&
element_kind != E_TypeKind_UChar16 &&
element_kind != E_TypeKind_UChar32 &&
element_kind != E_TypeKind_Char8 &&
element_kind != E_TypeKind_Char16 &&
element_kind != E_TypeKind_Char32)
{
break;
}
else
{
result = 1;
}
}
if(kind == E_TypeKind_Null || kind == E_TypeKind_Function)
{
break;
src/raddbg/raddbg_core.c
+41 -2
View File
@@ -1152,7 +1152,7 @@ rd_title_fstrs_from_cfg(Arena *arena, RD_Cfg *cfg, Vec4F32 secondary_color, F32
Vec4F32 rgba = rd_rgba_from_cfg(cfg);
if(rgba.w == 0)
{
rgba = ui_top_palette()->text;
rgba = rd_rgba_from_theme_color(RD_ThemeColor_Text);
}
RD_IconKind icon_kind = rd_icon_kind_from_code_name(cfg->string);
B32 is_from_command_line = 0;
@@ -2522,7 +2522,11 @@ rd_commit_eval_value_string(E_Eval dst_eval, String8 string, B32 string_needs_un
E_Eval src_eval_value = e_value_eval_from_eval(src_eval);
E_TypeKind src_eval_value_type_kind = e_type_kind_from_key(src_eval_value.type_key);
if(direct_type_kind == E_TypeKind_Char8 ||
direct_type_kind == E_TypeKind_Char16 ||
direct_type_kind == E_TypeKind_Char32 ||
direct_type_kind == E_TypeKind_UChar8 ||
direct_type_kind == E_TypeKind_UChar16 ||
direct_type_kind == E_TypeKind_UChar32 ||
e_type_kind_is_integer(direct_type_kind))
{
B32 is_quoted = 0;
@@ -2551,6 +2555,26 @@ rd_commit_eval_value_string(E_Eval dst_eval, String8 string, B32 string_needs_un
{
commit_at_ptr_dest = 1;
}
switch(direct_type_kind)
{
default:{}break;
case E_TypeKind_S16:
case E_TypeKind_U16:
case E_TypeKind_Char16:
case E_TypeKind_UChar16:
{
String16 data16 = str16_from_8(scratch.arena, commit_data);
commit_data = str8((U8 *)data16.str, data16.size*sizeof(U16));
}break;
case E_TypeKind_Char32:
case E_TypeKind_UChar32:
case E_TypeKind_S32:
case E_TypeKind_U32:
{
String32 data32 = str32_from_8(scratch.arena, commit_data);
commit_data = str8((U8 *)data32.str, data32.size*sizeof(U32));
}break;
}
}
else if(type_kind == E_TypeKind_Ptr &&
(e_type_kind_is_pointer_or_ref(src_eval_value_type_kind) ||
@@ -7821,6 +7845,19 @@ rd_window_frame(void)
MemoryCopyArray(inst->corner_radii, box->corner_radii);
}
// rjf: soft circle around mouse
if(ui_key_match(ui_hot_key(), box->key))
{
DR_ClipScope(box->rect)
{
Vec2F32 center = ui_mouse();
F32 radius = box->font_size*12.f;
Vec4F32 color = rd_rgba_from_theme_color(RD_ThemeColor_Hover);
color.w *= 0.1f*t;
dr_rect(pad_2f32(r2f32p(center.x, center.y, center.x, center.y), radius), color, radius, 0, radius/3.f);
}
}
// rjf: slight emboss fadeoff
if(0)
{
@@ -14068,6 +14105,7 @@ Z(getting_started)
#undef Z
//- rjf: find all the fixed tabs, and all text viewers
B32 any_fixed_tabs_found = 0;
RD_CfgList texts = {0};
for(RD_PanelNode *panel = panel_tree.root;
panel != &rd_nil_panel_node;
@@ -14093,6 +14131,7 @@ Z(getting_started)
if(need_unhook)
{
rd_cfg_unhook(panel->cfg, tab);
any_fixed_tabs_found = 1;
}
}
}
@@ -14103,7 +14142,7 @@ Z(getting_started)
//- rjf: allocate any missing tabs
#define X(name) if(name == &rd_nil_cfg) {name = rd_cfg_alloc(); rd_cfg_equip_string(name, str8_lit("watch")); RD_Cfg *expr_cfg = rd_cfg_new(name, str8_lit("expression")); rd_cfg_new(expr_cfg, str8_lit("query:" #name));}
#define Y(name, rule, expr) if(name == &rd_nil_cfg) {name = rd_cfg_alloc(); rd_cfg_equip_string(name, str8_lit(#rule)); RD_Cfg *expr_cfg = rd_cfg_new(name, str8_lit("expression")); rd_cfg_new(expr_cfg, str8_lit(expr));}
#define Z(name) if(name == &rd_nil_cfg) {name = rd_cfg_alloc(); rd_cfg_equip_string(name, str8_lit(#name));}
#define Z(name) if(name == &rd_nil_cfg && !any_fixed_tabs_found) {name = rd_cfg_alloc(); rd_cfg_equip_string(name, str8_lit(#name));}
FixedTab_XList
#undef X
#undef Y
src/raddbg/raddbg_views.c
+74 -41
View File
@@ -1011,7 +1011,7 @@ rd_watch_row_info_from_row(Arena *arena, EV_Row *row)
(row->block->parent == &ev_nil_block && evalled_cfg != &rd_nil_cfg))
{
RD_Cfg *cfg = evalled_cfg;
rd_watch_cell_list_push_new(arena, &info.cells, RD_WatchCellKind_Expr, .is_button = 1, .pct = 1.f, .fstrs = rd_title_fstrs_from_cfg(arena, cfg, ui_top_palette()->text_weak, ui_top_font_size()));
rd_watch_cell_list_push_new(arena, &info.cells, RD_WatchCellKind_Expr, .flags = RD_WatchCellFlag_Button, .pct = 1.f, .fstrs = rd_title_fstrs_from_cfg(arena, cfg, ui_top_palette()->text_weak, ui_top_font_size()));
MD_Node *schema = rd_schema_from_name(arena, cfg->string);
MD_Node *cmds_root = md_tag_from_string(schema, str8_lit("commands"), 0);
for MD_EachNode(cmd, cmds_root->first)
@@ -1040,7 +1040,7 @@ rd_watch_row_info_from_row(Arena *arena, EV_Row *row)
}
if(cmd_kind != RD_CmdKind_Null)
{
rd_watch_cell_list_push_new(arena, &info.cells, RD_WatchCellKind_Eval, .px = floor_f32(ui_top_font_size()*4.f), .string = push_str8f(arena, "query:commands[%I64u]", (U64)cmd_kind-1));
rd_watch_cell_list_push_new(arena, &info.cells, RD_WatchCellKind_Eval, .flags = RD_WatchCellFlag_ActivateWithSingleClick|RD_WatchCellFlag_Button, .px = floor_f32(ui_top_font_size()*4.f), .string = push_str8f(arena, "query:commands[%I64u]", (U64)cmd_kind-1));
}
}
}
@@ -1048,7 +1048,7 @@ rd_watch_row_info_from_row(Arena *arena, EV_Row *row)
// rjf: entity rows
else if(info.eval.space.kind == RD_EvalSpaceKind_MetaCtrlEntity && info.group_entity != &ctrl_entity_nil)
{
rd_watch_cell_list_push_new(arena, &info.cells, RD_WatchCellKind_Expr, .is_button = 1, .pct = 1.f);
rd_watch_cell_list_push_new(arena, &info.cells, RD_WatchCellKind_Expr, .flags = RD_WatchCellFlag_Button, .pct = 1.f);
}
// rjf: singular button for commands
@@ -1059,7 +1059,7 @@ rd_watch_row_info_from_row(Arena *arena, EV_Row *row)
{
RD_CmdKind cmd_kind = e_value_eval_from_eval(info.eval).value.u64;
RD_CmdKindInfo *cmd_kind_info = &rd_cmd_kind_info_table[cmd_kind];
rd_watch_cell_list_push_new(arena, &info.cells, RD_WatchCellKind_Expr, .is_button = 1, .pct = 1.f, .fstrs = rd_title_fstrs_from_code_name(arena, cmd_kind_info->string, ui_top_palette()->text_weak, ui_top_font_size()));
rd_watch_cell_list_push_new(arena, &info.cells, RD_WatchCellKind_Expr, .flags = RD_WatchCellFlag_Button|RD_WatchCellFlag_ActivateWithSingleClick, .pct = 1.f, .fstrs = rd_title_fstrs_from_code_name(arena, cmd_kind_info->string, ui_top_palette()->text_weak, ui_top_font_size()));
}
// rjf: singular cell for view ui
@@ -1149,7 +1149,9 @@ rd_info_from_watch_row_cell(Arena *arena, EV_Row *row, EV_StringFlags string_fla
result.view_ui_rule = &rd_nil_view_ui_rule;
result.view_ui_tag = &e_expr_nil;
result.fstrs = cell->fstrs;
result.is_button = cell->is_button;
result.flags = cell->flags;
result.cfg = &rd_nil_cfg;
result.entity = &ctrl_entity_nil;
//- rjf: do per-kind fills
switch(cell->kind)
@@ -1162,7 +1164,7 @@ rd_info_from_watch_row_cell(Arena *arena, EV_Row *row, EV_StringFlags string_fla
{
if(!ev_key_match(ev_key_root(), row->block->key) && (row->string.size != 0 || row->expr == &e_expr_nil))
{
result.can_edit = 1;
result.flags |= RD_WatchCellFlag_CanEdit;
}
result.eval = (cell->eval.mode != E_Mode_Null ? cell->eval : e_eval_from_expr(arena, row->expr));
result.string = row->string;
@@ -1213,7 +1215,7 @@ rd_info_from_watch_row_cell(Arena *arena, EV_Row *row, EV_StringFlags string_fla
is_non_code = 1;
}
}
result.is_non_code = is_non_code;
result.flags |= (!!is_non_code * RD_WatchCellFlag_IsNonCode);
result.string = string;
}break;
}
@@ -1270,7 +1272,7 @@ rd_info_from_watch_row_cell(Arena *arena, EV_Row *row, EV_StringFlags string_fla
//- rjf: evaluate wrapped expression
result.eval = (cell->eval.mode != E_Mode_Null ? cell->eval : e_eval_from_expr(arena, root_expr));
result.string = rd_value_string_from_eval(arena, string_flags, 10, font, font_size, max_size_px, result.eval);
result.can_edit = (ev_type_key_is_editable(result.eval.type_key) && result.eval.mode == E_Mode_Offset);
result.flags |= !!(ev_type_key_is_editable(result.eval.type_key) && result.eval.mode == E_Mode_Offset) * RD_WatchCellFlag_CanEdit;
scratch_end(scratch);
}break;
@@ -1280,7 +1282,7 @@ rd_info_from_watch_row_cell(Arena *arena, EV_Row *row, EV_StringFlags string_fla
{
EV_View *ev_view = rd_view_eval_view();
result.string = ev_view_rule_from_key(ev_view, row->key);
result.can_edit = 1;
result.flags |= RD_WatchCellFlag_CanEdit;
}break;
//- rjf: view ui cells
@@ -1295,6 +1297,20 @@ rd_info_from_watch_row_cell(Arena *arena, EV_Row *row, EV_StringFlags string_fla
//- rjf: adjust style based on evaluation
switch(cell->kind)
{
default:{}break;
case RD_WatchCellKind_Expr:
{
if(result.eval.space.kind == RD_EvalSpaceKind_MetaCfg &&
result.eval.value.u64 == 0)
{
RD_Cfg *cfg = rd_cfg_from_eval_space(result.eval.space);
E_TypeKey cfg_type = e_string2typekey_map_lookup(rd_state->meta_name2type_map, cfg->string);
if(e_type_key_match(cfg_type, result.eval.type_key))
{
result.cfg = cfg;
}
}
}break;
case RD_WatchCellKind_Eval:
{
if(result.eval.space.kind == RD_EvalSpaceKind_MetaCfg &&
@@ -1305,7 +1321,8 @@ rd_info_from_watch_row_cell(Arena *arena, EV_Row *row, EV_StringFlags string_fla
if(e_type_key_match(cfg_type, result.eval.type_key))
{
result.fstrs = rd_title_fstrs_from_cfg(arena, cfg, ui_top_palette()->text_weak, ui_top_font_size());
result.is_button = 1;
result.flags |= RD_WatchCellFlag_Button;
result.cfg = cfg;
}
}
else if(result.eval.space.kind == RD_EvalSpaceKind_MetaCmd)
@@ -1321,7 +1338,7 @@ rd_info_from_watch_row_cell(Arena *arena, EV_Row *row, EV_StringFlags string_fla
{
result.fstrs = rd_title_fstrs_from_code_name(arena, cmd_name, ui_top_palette()->text_weak, ui_top_font_size());
}
result.is_button = 1;
result.flags |= RD_WatchCellFlag_Button;
}
}break;
}
@@ -1649,8 +1666,8 @@ RD_VIEW_UI_FUNCTION_DEF(watch)
{
continue;
}
RD_WatchRowCellInfo cell_info = rd_info_from_watch_row_cell(scratch.arena, row, string_flags, &row_info, cell, ui_top_font(), ui_top_font_size(), row_string_max_size_px);
if(cell_info.can_edit)
RD_WatchRowCellInfo cell_info = rd_info_from_watch_row_cell(scratch.arena, row, string_flags & (~EV_StringFlag_ReadOnlyDisplayRules), &row_info, cell, ui_top_font(), ui_top_font_size(), row_string_max_size_px);
if(cell_info.flags & RD_WatchCellFlag_CanEdit)
{
any_edits_started = 1;
String8 string = cell_info.string;
@@ -2690,7 +2707,7 @@ RD_VIEW_UI_FUNCTION_DEF(watch)
UI_BoxFlags cell_flags = 0;
UI_Palette *palette = ui_top_palette();
{
if(cell_info.is_errored)
if(cell_info.flags & RD_WatchCellFlag_IsErrored)
{
palette = ui_build_palette(ui_top_palette(), .text = rd_rgba_from_theme_color(RD_ThemeColor_TextNegative), .text_weak = rd_rgba_from_theme_color(RD_ThemeColor_TextNegative), .background = rd_rgba_from_theme_color(RD_ThemeColor_HighlightOverlayError));
cell_flags |= UI_BoxFlag_DrawBackground;
@@ -2700,6 +2717,19 @@ RD_VIEW_UI_FUNCTION_DEF(watch)
palette = ui_build_palette(ui_top_palette(), .background = rd_rgba_from_theme_color(RD_ThemeColor_HighlightOverlay));
cell_flags |= UI_BoxFlag_DrawBackground;
}
else if(cell_info.cfg->id == rd_get_hover_regs()->cfg &&
rd_state->hover_regs_slot == RD_RegSlot_Cfg)
{
RD_Cfg *cfg = cell_info.cfg;
Vec4F32 rgba = rd_rgba_from_cfg(cfg);
if(rgba.w == 0)
{
rgba = rd_rgba_from_theme_color(RD_ThemeColor_HighlightOverlay);
}
rgba.w *= ui_anim(ui_key_from_stringf(ui_key_zero(), "###cfg_hover_t_%p", cfg), 1.f, .rate = entity_hover_t_rate);
palette = ui_build_palette(ui_top_palette(), .overlay = rgba);
cell_flags |= UI_BoxFlag_DrawOverlay;
}
}
ProfEnd();
@@ -2708,7 +2738,7 @@ RD_VIEW_UI_FUNCTION_DEF(watch)
UI_Palette(palette) UI_PrefWidth(ui_px(cell_width_px, 0.f))
{
ui_set_next_fixed_height(floor_f32(row->visual_size * row_height_px));
cell_box = ui_build_box_from_stringf(UI_BoxFlag_DrawSideLeft, "cell_%I64x_%I64x", row_hash, cell_id);
cell_box = ui_build_box_from_stringf(UI_BoxFlag_DrawSideLeft|cell_flags, "cell_%I64x_%I64x", row_hash, cell_id);
}
//- rjf: build cell contents
@@ -2720,10 +2750,8 @@ RD_VIEW_UI_FUNCTION_DEF(watch)
RD_Font(RD_FontSlot_Code)
UI_FlagsAdd(row_depth > 0 ? UI_BoxFlag_DrawTextWeak : 0)
{
ui_set_next_flags(ui_top_flags() | cell_flags);
// rjf: cell has errors? -> build error box
if(cell_info.is_errored) RD_Font(RD_FontSlot_Main)
if(cell_info.flags & RD_WatchCellFlag_IsErrored) RD_Font(RD_FontSlot_Main)
{
UI_Box *box = ui_build_box_from_stringf(UI_BoxFlag_Clip|UI_BoxFlag_Clickable, "###%I64x_%I64x", cell_id, row_hash);
sig = ui_signal_from_box(box);
@@ -2793,16 +2821,17 @@ RD_VIEW_UI_FUNCTION_DEF(watch)
}
// rjf: build cell line edit
else RD_Font(cell_info.is_non_code ? RD_FontSlot_Main : RD_FontSlot_Code)
else RD_Font(cell_info.flags & RD_WatchCellFlag_IsNonCode ? RD_FontSlot_Main : RD_FontSlot_Code)
{
RD_LineEditParams line_edit_params = {0};
{
line_edit_params.flags = (RD_LineEditFlag_CodeContents|
RD_LineEditFlag_NoBackground*!(cell_info.is_button)|
RD_LineEditFlag_Button*!!(cell_info.is_button)|
RD_LineEditFlag_NoBackground*!(cell_info.flags & RD_WatchCellFlag_Button)|
RD_LineEditFlag_Button*!!(cell_info.flags & RD_WatchCellFlag_Button)|
RD_LineEditFlag_SingleClickActivate*!!(cell_info.flags & RD_WatchCellFlag_ActivateWithSingleClick)|
RD_LineEditFlag_KeyboardClickable|
RD_LineEditFlag_Expander*!!(row_is_expandable && cell == row_info->cells.first)|
RD_LineEditFlag_ExpanderPlaceholder*(row_depth==0 && cell == row_info->cells.first && !cell_info.is_button)|
RD_LineEditFlag_ExpanderPlaceholder*(row_depth==0 && cell == row_info->cells.first && !(cell_info.flags & RD_WatchCellFlag_Button))|
RD_LineEditFlag_ExpanderSpace*((row_depth!=0 && cell == row_info->cells.first)));
line_edit_params.depth = (cell_x == 0 ? row_depth : 0);
line_edit_params.cursor = &cell_edit_state->cursor;
@@ -2834,17 +2863,27 @@ RD_VIEW_UI_FUNCTION_DEF(watch)
//- rjf: handle interactions
{
// rjf: hover -> rich hover cfgs
if(ui_hovering(sig) && cell_info.cfg != &rd_nil_cfg)
{
RD_RegsScope(.cfg = cell_info.cfg->id) rd_set_hover_regs(RD_RegSlot_Cfg);
}
// rjf: single-click -> move selection here
if(ui_pressed(sig))
if(!(cell_info.flags & RD_WatchCellFlag_ActivateWithSingleClick) && ui_pressed(sig))
{
ewv->next_cursor = ewv->next_mark = cell_pt;
pressed = 1;
}
// rjf: double-click actions
if(ui_double_clicked(sig) || sig.f & UI_SignalFlag_KeyboardPressed)
if(ui_double_clicked(sig) ||
((cell_info.flags & RD_WatchCellFlag_ActivateWithSingleClick) && ui_clicked(sig)))
{
ui_kill_action();
if(!(cell_info.flags & RD_WatchCellFlag_ActivateWithSingleClick))
{
ui_kill_action();
}
// rjf: has callstack info? -> select unwind
if(row_info->callstack_thread != &ctrl_entity_nil)
@@ -2856,24 +2895,19 @@ RD_VIEW_UI_FUNCTION_DEF(watch)
}
// rjf: can edit? -> begin editing
else if(cell_info.can_edit)
else if(cell_info.flags & RD_WatchCellFlag_CanEdit)
{
rd_cmd(RD_CmdKind_Edit);
}
#if 0 // TODO(rjf): @cfg
// rjf: cannot edit, has addr info? -> go to address
else if(row_kind == RD_WatchViewRowKind_Normal &&
(col->kind == RD_WatchViewColumnKind_Value ||
col->kind == RD_WatchViewColumnKind_Member) &&
cell_eval.space.kind == RD_EvalSpaceKind_CtrlEntity)
// rjf: can't edit, but has address info? -> go to address
else if(cell_info.eval.space.kind == RD_EvalSpaceKind_CtrlEntity)
{
CTRL_Entity *entity = rd_ctrl_entity_from_eval_space(cell_eval.space);
CTRL_Entity *entity = rd_ctrl_entity_from_eval_space(cell_info.eval.space);
CTRL_Entity *process = ctrl_process_from_entity(entity);
if(process != &ctrl_entity_nil)
{
U64 vaddr = cell_eval.value.u64;
U64 vaddr = cell_info.eval.value.u64;
CTRL_Entity *module = ctrl_module_from_process_vaddr(process, vaddr);
DI_Key dbgi_key = ctrl_dbgi_key_from_module(module);
U64 voff = ctrl_voff_from_vaddr(module, vaddr);
@@ -2884,15 +2918,14 @@ RD_VIEW_UI_FUNCTION_DEF(watch)
{
file_path = lines.first->v.file_path;
pt = lines.first->v.pt;
rd_cmd(RD_CmdKind_FindCodeLocation,
.process = process->handle,
.vaddr = vaddr,
.file_path = file_path,
.cursor = pt);
}
rd_cmd(RD_CmdKind_FindCodeLocation,
.process = process->handle,
.vaddr = vaddr,
.file_path = file_path,
.cursor = pt);
}
}
#endif
}
// rjf: hovering with inheritance string -> show tooltip
src/raddbg/raddbg_views.h
+14 -5
View File
@@ -51,6 +51,16 @@ typedef enum RD_WatchCellKind
}
RD_WatchCellKind;
typedef U32 RD_WatchCellFlags;
enum
{
RD_WatchCellFlag_Button = (1<<0),
RD_WatchCellFlag_ActivateWithSingleClick = (1<<1),
RD_WatchCellFlag_IsNonCode = (1<<2),
RD_WatchCellFlag_CanEdit = (1<<3),
RD_WatchCellFlag_IsErrored = (1<<4),
};
typedef struct RD_WatchCell RD_WatchCell;
struct RD_WatchCell
{
@@ -59,7 +69,7 @@ struct RD_WatchCell
String8 string;
E_Eval eval;
DR_FStrList fstrs;
B32 is_button;
RD_WatchCellFlags flags;
F32 default_pct;
F32 pct;
F32 px;
@@ -95,13 +105,12 @@ struct RD_WatchRowInfo
typedef struct RD_WatchRowCellInfo RD_WatchRowCellInfo;
struct RD_WatchRowCellInfo
{
RD_WatchCellFlags flags;
E_Eval eval;
RD_Cfg *cfg;
CTRL_Entity *entity;
String8 string;
DR_FStrList fstrs;
B32 is_button;
B32 is_non_code;
B32 can_edit;
B32 is_errored;
String8 error_tooltip;
String8 inheritance_tooltip;
RD_ViewUIRule *view_ui_rule;
src/raddbg/raddbg_widgets.c
+14 -11
View File
@@ -755,8 +755,8 @@ rd_code_slice(RD_CodeSliceParams *params, TxtPt *cursor, TxtPt *mark, S64 *prefe
rd_state->hover_regs_slot == RD_RegSlot_Thread);
RD_ThreadBoxDrawExtData *u = push_array(ui_build_arena(), RD_ThreadBoxDrawExtData, 1);
u->thread_color = color;
u->alive_t = ui_anim(ui_key_from_stringf(top_container_box->key, "###thread_alive_t_%p", thread), 1.f, .rate = entity_alive_t_rate);
u->hover_t = ui_anim(ui_key_from_stringf(top_container_box->key, "###thread_hover_t_%p", thread), (F32)!!is_hovering, .rate = entity_hover_t_rate);
u->alive_t = ui_anim(ui_key_from_stringf(top_container_box->key, "###entity_alive_t_%p", thread), 1.f, .rate = entity_alive_t_rate);
u->hover_t = ui_anim(ui_key_from_stringf(top_container_box->key, "###entity_hover_t_%p", thread), (F32)!!is_hovering, .rate = entity_hover_t_rate);
u->is_selected = (thread == selected_thread);
u->is_frozen = !!thread->is_frozen;
u->do_lines = do_thread_lines;
@@ -903,8 +903,8 @@ rd_code_slice(RD_CodeSliceParams *params, TxtPt *cursor, TxtPt *mark, S64 *prefe
rd_state->hover_regs_slot == RD_RegSlot_Thread);
RD_ThreadBoxDrawExtData *u = push_array(ui_build_arena(), RD_ThreadBoxDrawExtData, 1);
u->thread_color = color;
u->alive_t = ui_anim(ui_key_from_stringf(top_container_box->key, "###thread_alive_t_%p", thread), 1.f, .rate = entity_alive_t_rate);
u->hover_t = ui_anim(ui_key_from_stringf(top_container_box->key, "###thread_hover_t_%p", thread), (F32)!!is_hovering, .rate = entity_hover_t_rate);
u->alive_t = ui_anim(ui_key_from_stringf(top_container_box->key, "###entity_alive_t_%p", thread), 1.f, .rate = entity_alive_t_rate);
u->hover_t = ui_anim(ui_key_from_stringf(top_container_box->key, "###entity_hover_t_%p", thread), (F32)!!is_hovering, .rate = entity_hover_t_rate);
u->is_selected = (thread == selected_thread);
u->is_frozen = !!thread->is_frozen;
ui_box_equip_custom_draw(thread_box, rd_thread_box_draw_extensions, u);
@@ -960,11 +960,11 @@ rd_code_slice(RD_CodeSliceParams *params, TxtPt *cursor, TxtPt *mark, S64 *prefe
{
RD_Cfg *bp = n->v;
Vec4F32 bp_rgba = rd_rgba_from_cfg(bp);
B32 bp_is_disabled = rd_disabled_from_cfg(bp);
if(bp_rgba.w == 0)
{
bp_rgba = rd_rgba_from_theme_color(RD_ThemeColor_Breakpoint);
}
B32 bp_is_disabled = rd_disabled_from_cfg(bp);
if(bp_is_disabled)
{
bp_rgba = v4f32(bp_rgba.x * 0.6f, bp_rgba.y * 0.6f, bp_rgba.z * 0.6f, bp_rgba.w * 0.6f);
@@ -976,8 +976,8 @@ rd_code_slice(RD_CodeSliceParams *params, TxtPt *cursor, TxtPt *mark, S64 *prefe
RD_Regs *hover_regs = rd_get_hover_regs();
B32 is_hovering = (rd_cfg_from_id(hover_regs->cfg) == bp && rd_state->hover_regs_slot == RD_RegSlot_Cfg);
bp_draw->color = bp_rgba;
bp_draw->alive_t = ui_anim(ui_key_from_stringf(ui_key_zero(), "bp_alive_t_%p", bp), 1.f, .rate = entity_alive_t_rate);
bp_draw->hover_t = ui_anim(ui_key_from_stringf(ui_key_zero(), "bp_hover_t_%p", bp), (F32)!!is_hovering, .rate = entity_hover_t_rate);
bp_draw->alive_t = ui_anim(ui_key_from_stringf(ui_key_zero(), "cfg_alive_t_%p", bp), 1.f, .rate = entity_alive_t_rate);
bp_draw->hover_t = ui_anim(ui_key_from_stringf(ui_key_zero(), "cfg_hover_t_%p", bp), (F32)!!is_hovering, .rate = entity_hover_t_rate);
bp_draw->do_lines = do_bp_lines;
bp_draw->do_glow = do_bp_glow;
if(params->line_vaddrs[line_idx] == 0)
@@ -1015,7 +1015,7 @@ rd_code_slice(RD_CodeSliceParams *params, TxtPt *cursor, TxtPt *mark, S64 *prefe
if(ui_hovering(bp_sig) && !rd_drag_is_active())
{
rd_set_hover_eval(v2f32(bp_box->rect.x0, bp_box->rect.y1-2.f), str8_zero(), txt_pt(0, 0), 0, push_str8f(scratch.arena, "$%I64u", bp->id));
// RD_RegsScope(.cfg = bp->id) rd_set_hover_regs(RD_RegSlot_Cfg);
RD_RegsScope(.cfg = bp->id) rd_set_hover_regs(RD_RegSlot_Cfg);
}
// rjf: shift+click => enable breakpoint
@@ -1055,7 +1055,7 @@ rd_code_slice(RD_CodeSliceParams *params, TxtPt *cursor, TxtPt *mark, S64 *prefe
Vec4F32 color = rd_rgba_from_cfg(pin);
if(color.w == 0)
{
color = rd_rgba_from_theme_color(RD_ThemeColor_Text);
color = rd_rgba_from_theme_color(RD_ThemeColor_CodeDefault);
}
// rjf: build box for watch
@@ -2469,7 +2469,7 @@ rd_line_edit(RD_LineEditParams *params, String8 string)
(!!(params->flags & RD_LineEditFlag_KeyboardClickable)*UI_BoxFlag_KeyboardClickable)|
UI_BoxFlag_ClickToFocus|
UI_BoxFlag_DrawHotEffects|
//(!!(params->flags & RD_LineEditFlag_Button)*UI_BoxFlag_DrawActiveEffects)|
(!!(params->flags & RD_LineEditFlag_SingleClickActivate)*UI_BoxFlag_DrawActiveEffects)|
(!(params->flags & RD_LineEditFlag_NoBackground)*UI_BoxFlag_DrawBackground)|
(!!(params->flags & RD_LineEditFlag_Border)*UI_BoxFlag_DrawBorder)|
((is_auto_focus_hot || is_auto_focus_active)*UI_BoxFlag_KeyboardClickable)|
@@ -2571,7 +2571,10 @@ rd_line_edit(RD_LineEditParams *params, String8 string)
MemoryCopy(params->edit_buffer, edit_string.str, edit_string.size);
params->edit_string_size_out[0] = edit_string.size;
ui_set_auto_focus_active_key(key);
ui_kill_action();
if(!(params->flags & RD_LineEditFlag_Button))
{
ui_kill_action();
}
params->cursor[0] = txt_pt(1, edit_string.size+1);
params->mark[0] = txt_pt(1, 1);
focus_started = 1;
src/raddbg/raddbg_widgets.h
+3 -2
View File
@@ -19,8 +19,9 @@ enum
RD_LineEditFlag_Border = (1<<6),
RD_LineEditFlag_NoBackground = (1<<7),
RD_LineEditFlag_Button = (1<<8),
RD_LineEditFlag_PreferDisplayString = (1<<9),
RD_LineEditFlag_DisplayStringIsCode = (1<<10),
RD_LineEditFlag_SingleClickActivate = (1<<9),
RD_LineEditFlag_PreferDisplayString = (1<<10),
RD_LineEditFlag_DisplayStringIsCode = (1<<11),
};
typedef struct RD_LineEditParams RD_LineEditParams;