ps
/
4coder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cull lister render

This commit is contained in:
Peter Slattery 2025-07-07 14:07:26 -07:00
parent 051b5068e5
commit 01a06a59c7
1 changed files with 68 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

135
code/custom/4coder_lister_base.cpp
View File

@ -178,21 +178,21 @@ lister_zero_scroll(Lister *lister){
function void function void
lister_render(Application_Links *app, Frame_Info frame_info, View_ID view){ lister_render(Application_Links *app, Frame_Info frame_info, View_ID view){
Scratch_Block scratch(app); Scratch_Block scratch(app);
Lister *lister = view_get_lister(app, view); Lister *lister = view_get_lister(app, view);
if (lister == 0){ if (lister == 0){
return; return;
} }
Rect_f32 region = draw_background_and_margin(app, view); Rect_f32 region = draw_background_and_margin(app, view);
Rect_f32 prev_clip = draw_set_clip(app, region); Rect_f32 prev_clip = draw_set_clip(app, region);
Face_ID face_id = get_face_id(app, 0); Face_ID face_id = get_face_id(app, 0);
Face_Metrics metrics = get_face_metrics(app, face_id); Face_Metrics metrics = get_face_metrics(app, face_id);
f32 line_height = metrics.line_height; f32 line_height = metrics.line_height;
f32 block_height = lister_get_block_height(line_height); f32 block_height = lister_get_block_height(line_height);
f32 text_field_height = lister_get_text_field_height(line_height); f32 text_field_height = lister_get_text_field_height(line_height);
// NOTE(allen): file bar // NOTE(allen): file bar
// TODO(allen): What's going on with 'showing_file_bar'? I found it like this. // TODO(allen): What's going on with 'showing_file_bar'? I found it like this.
b64 showing_file_bar = false; b64 showing_file_bar = false;
@ -204,13 +204,13 @@ lister_render(Application_Links *app, Frame_Info frame_info, View_ID view){
draw_file_bar(app, view, buffer, face_id, pair.min); draw_file_bar(app, view, buffer, face_id, pair.min);
region = pair.max; region = pair.max;
} }
Mouse_State mouse = get_mouse_state(app); Mouse_State mouse = get_mouse_state(app);
Vec2_f32 m_p = V2f32(mouse.p); Vec2_f32 m_p = V2f32(mouse.p);
lister->visible_count = (i32)((rect_height(region)/block_height)) - 3; lister->visible_count = (i32)((rect_height(region)/block_height)) - 3;
lister->visible_count = clamp_bot(1, lister->visible_count); lister->visible_count = clamp_bot(1, lister->visible_count);
Rect_f32 text_field_rect = {}; Rect_f32 text_field_rect = {};
Rect_f32 list_rect = {}; Rect_f32 list_rect = {};
{ {
@ -218,7 +218,7 @@ lister_render(Application_Links *app, Frame_Info frame_info, View_ID view){
text_field_rect = pair.min; text_field_rect = pair.min;
list_rect = pair.max; list_rect = pair.max;
} }
{ {
Vec2_f32 p = V2f32(text_field_rect.x0 + 3.f, text_field_rect.y0); Vec2_f32 p = V2f32(text_field_rect.x0 + 3.f, text_field_rect.y0);
Fancy_Line text_field = {}; Fancy_Line text_field = {};
@ -226,7 +226,7 @@ lister_render(Application_Links *app, Frame_Info frame_info, View_ID view){
lister->query.string); lister->query.string);
push_fancy_stringf(scratch, &text_field, " "); push_fancy_stringf(scratch, &text_field, " ");
p = draw_fancy_line(app, face_id, fcolor_zero(), &text_field, p); p = draw_fancy_line(app, face_id, fcolor_zero(), &text_field, p);
// TODO(allen): This is a bit of a hack. Maybe an upgrade to fancy to focus // TODO(allen): This is a bit of a hack. Maybe an upgrade to fancy to focus
// more on being good at this and less on overriding everything 10 ways to sunday // more on being good at this and less on overriding everything 10 ways to sunday
// would be good. // would be good.
@ -245,14 +245,14 @@ lister_render(Application_Links *app, Frame_Info frame_info, View_ID view){
draw_fancy_line(app, face_id, fcolor_zero(), &text_field, p); draw_fancy_line(app, face_id, fcolor_zero(), &text_field, p);
} }
} }
Range_f32 x = rect_range_x(list_rect); Range_f32 x = rect_range_x(list_rect);
draw_set_clip(app, list_rect); draw_set_clip(app, list_rect);
// NOTE(allen): auto scroll to the item if the flag is set. // NOTE(allen): auto scroll to the item if the flag is set.
f32 scroll_y = lister->scroll.position.y; f32 scroll_y = lister->scroll.position.y;
if (lister->set_vertical_focus_to_item){ if (lister->set_vertical_focus_to_item){
lister->set_vertical_focus_to_item = false; lister->set_vertical_focus_to_item = false;
Range_f32 item_y = If32_size(lister->item_index*block_height, block_height); Range_f32 item_y = If32_size(lister->item_index*block_height, block_height);
@ -272,39 +272,40 @@ lister_render(Application_Links *app, Frame_Info frame_info, View_ID view){
} }
} }
} }
// NOTE(allen): clamp scroll target and position; smooth scroll rule // NOTE(allen): clamp scroll target and position; smooth scroll rule
i32 count = lister->filtered.count; i32 count = lister->filtered.count;
Range_f32 scroll_range = If32(0.f, clamp_bot(0.f, count*block_height - block_height)); Range_f32 scroll_range = If32(0.f, clamp_bot(0.f, count*block_height - block_height));
lister->scroll.target.y = clamp_range(scroll_range, lister->scroll.target.y); lister->scroll.target.y = clamp_range(scroll_range, lister->scroll.target.y);
lister->scroll.target.x = 0.f; lister->scroll.target.x = 0.f;
Vec2_f32_Delta_Result delta = delta_apply(app, view, Vec2_f32_Delta_Result delta = delta_apply(app, view,
frame_info.animation_dt, lister->scroll); frame_info.animation_dt, lister->scroll);
lister->scroll.position = delta.p; lister->scroll.position = delta.p;
if (delta.still_animating){ if (delta.still_animating){
animate_in_n_milliseconds(app, 0); animate_in_n_milliseconds(app, 0);
} }
lister->scroll.position.y = clamp_range(scroll_range, lister->scroll.position.y); lister->scroll.position.y = clamp_range(scroll_range, lister->scroll.position.y);
lister->scroll.position.x = 0.f; lister->scroll.position.x = 0.f;
scroll_y = lister->scroll.position.y; scroll_y = lister->scroll.position.y;
f32 y_pos = list_rect.y0 - scroll_y; f32 y_pos = list_rect.y0 - scroll_y;
i32 first_index = (i32)(scroll_y/block_height); i32 first_index = (i32)(scroll_y/block_height);
y_pos += first_index*block_height; y_pos += first_index*block_height;
for (i32 i = first_index; i < count; i += 1){ for (i32 i = first_index; i < count; i += 1){
Lister_Node *node = lister->filtered.node_ptrs[i]; Lister_Node *node = lister->filtered.node_ptrs[i];
if (y_pos >= region.y1) break;
Range_f32 y = If32(y_pos, y_pos + block_height); Range_f32 y = If32(y_pos, y_pos + block_height);
y_pos = y.max; y_pos = y.max;
Rect_f32 item_rect = Rf32(x, y); Rect_f32 item_rect = Rf32(x, y);
if (item_rect.y0 > region.y1) { break; } if (item_rect.y0 > region.y1) { break; }
Rect_f32 item_inner = rect_inner(item_rect, 3.f); Rect_f32 item_inner = rect_inner(item_rect, 3.f);
b32 hovered = rect_contains_point(item_rect, m_p); b32 hovered = rect_contains_point(item_rect, m_p);
UI_Highlight_Level highlight = UIHighlight_None; UI_Highlight_Level highlight = UIHighlight_None;
if (node == lister->highlighted_node){ if (node == lister->highlighted_node){
@ -321,21 +322,21 @@ lister_render(Application_Links *app, Frame_Info frame_info, View_ID view){
else if (hovered){ else if (hovered){
highlight = UIHighlight_Hover; highlight = UIHighlight_Hover;
} }
u64 lister_roundness_100 = def_get_config_u64(app, vars_save_string_lit("lister_roundness")); u64 lister_roundness_100 = def_get_config_u64(app, vars_save_string_lit("lister_roundness"));
f32 roundness = block_height*lister_roundness_100*0.01f; f32 roundness = block_height*lister_roundness_100*0.01f;
draw_rectangle_fcolor(app, item_rect, roundness, get_item_margin_color(highlight)); draw_rectangle_fcolor(app, item_rect, roundness, get_item_margin_color(highlight));
draw_rectangle_fcolor(app, item_inner, roundness, get_item_margin_color(highlight, 1)); draw_rectangle_fcolor(app, item_inner, roundness, get_item_margin_color(highlight, 1));
Fancy_Line line = {}; Fancy_Line line = {};
push_fancy_string(scratch, &line, fcolor_id(defcolor_text_default), node->string); push_fancy_string(scratch, &line, fcolor_id(defcolor_text_default), node->string);
push_fancy_stringf(scratch, &line, " "); push_fancy_stringf(scratch, &line, " ");
push_fancy_string(scratch, &line, fcolor_id(defcolor_pop2), node->status); push_fancy_string(scratch, &line, fcolor_id(defcolor_pop2), node->status);
Vec2_f32 p = item_inner.p0 + V2f32(3.f, (block_height - line_height)*0.5f); Vec2_f32 p = item_inner.p0 + V2f32(3.f, (block_height - line_height)*0.5f);
draw_fancy_line(app, face_id, fcolor_zero(), &line, p); draw_fancy_line(app, face_id, fcolor_zero(), &line, p);
} }
draw_set_clip(app, prev_clip); draw_set_clip(app, prev_clip);
} }
@ -359,26 +360,26 @@ lister_get_user_data(Lister *lister, i32 index){
function Lister_Filtered function Lister_Filtered
lister_get_filtered(Arena *arena, Lister *lister){ lister_get_filtered(Arena *arena, Lister *lister){
i32 node_count = lister->options.count; i32 node_count = lister->options.count;
Lister_Filtered filtered = {}; Lister_Filtered filtered = {};
filtered.exact_matches.node_ptrs = push_array(arena, Lister_Node*, 1); filtered.exact_matches.node_ptrs = push_array(arena, Lister_Node*, 1);
filtered.before_extension_matches.node_ptrs = push_array(arena, Lister_Node*, node_count); filtered.before_extension_matches.node_ptrs = push_array(arena, Lister_Node*, node_count);
filtered.substring_matches.node_ptrs = push_array(arena, Lister_Node*, node_count); filtered.substring_matches.node_ptrs = push_array(arena, Lister_Node*, node_count);
Temp_Memory_Block temp(arena); Temp_Memory_Block temp(arena);
String_Const_u8 key = lister->key_string.string; String_Const_u8 key = lister->key_string.string;
key = push_string_copy(arena, key); key = push_string_copy(arena, key);
string_mod_replace_character(key, '_', '*'); string_mod_replace_character(key, '_', '*');
string_mod_replace_character(key, ' ', '*'); string_mod_replace_character(key, ' ', '*');
List_String_Const_u8 absolutes = {}; List_String_Const_u8 absolutes = {};
string_list_push(arena, &absolutes, string_u8_litexpr("")); string_list_push(arena, &absolutes, string_u8_litexpr(""));
List_String_Const_u8 splits = string_split(arena, key, (u8*)"*", 1); List_String_Const_u8 splits = string_split(arena, key, (u8*)"*", 1);
b32 has_wildcard = (splits.node_count > 1); b32 has_wildcard = (splits.node_count > 1);
string_list_push(&absolutes, &splits); string_list_push(&absolutes, &splits);
string_list_push(arena, &absolutes, string_u8_litexpr("")); string_list_push(arena, &absolutes, string_u8_litexpr(""));
for (Lister_Node *node = lister->options.first; for (Lister_Node *node = lister->options.first;
node != 0; node != 0;
node = node->next){ node = node->next){
@ -399,7 +400,7 @@ lister_get_filtered(Arena *arena, Lister *lister){
} }
} }
} }
return(filtered); return(filtered);
} }
@ -421,23 +422,23 @@ function void
lister_update_filtered_list(Application_Links *app, Lister *lister){ lister_update_filtered_list(Application_Links *app, Lister *lister){
Arena *arena = lister->arena; Arena *arena = lister->arena;
Scratch_Block scratch(app, arena); Scratch_Block scratch(app, arena);
Lister_Filtered filtered = lister_get_filtered(scratch, lister); Lister_Filtered filtered = lister_get_filtered(scratch, lister);
Lister_Node_Ptr_Array node_ptr_arrays[] = { Lister_Node_Ptr_Array node_ptr_arrays[] = {
filtered.exact_matches, filtered.exact_matches,
filtered.before_extension_matches, filtered.before_extension_matches,
filtered.substring_matches, filtered.substring_matches,
}; };
end_temp(lister->filter_restore_point); end_temp(lister->filter_restore_point);
i32 total_count = 0; i32 total_count = 0;
for (i32 array_index = 0; array_index < ArrayCount(node_ptr_arrays); array_index += 1){ for (i32 array_index = 0; array_index < ArrayCount(node_ptr_arrays); array_index += 1){
Lister_Node_Ptr_Array node_ptr_array = node_ptr_arrays[array_index]; Lister_Node_Ptr_Array node_ptr_array = node_ptr_arrays[array_index];
total_count += node_ptr_array.count; total_count += node_ptr_array.count;
} }
Lister_Node **node_ptrs = push_array(arena, Lister_Node*, total_count); Lister_Node **node_ptrs = push_array(arena, Lister_Node*, total_count);
lister->filtered.node_ptrs = node_ptrs; lister->filtered.node_ptrs = node_ptrs;
lister->filtered.count = total_count; lister->filtered.count = total_count;
@ -450,7 +451,7 @@ lister_update_filtered_list(Application_Links *app, Lister *lister){
counter += 1; counter += 1;
} }
} }
lister_update_selection_values(lister); lister_update_selection_values(lister);
} }
@ -475,13 +476,13 @@ lister_user_data_at_p(Application_Links *app, View_ID view, Lister *lister, Vec2
Rect_f32 region = view_get_screen_rect(app, view); Rect_f32 region = view_get_screen_rect(app, view);
// TODO(allen): eliminate this. bad bad bad bad :( // TODO(allen): eliminate this. bad bad bad bad :(
region = rect_inner(region, 3.f); region = rect_inner(region, 3.f);
Face_ID face_id = get_face_id(app, 0); Face_ID face_id = get_face_id(app, 0);
Face_Metrics metrics = get_face_metrics(app, face_id); Face_Metrics metrics = get_face_metrics(app, face_id);
f32 line_height = metrics.line_height; f32 line_height = metrics.line_height;
f32 block_height = lister_get_block_height(line_height); f32 block_height = lister_get_block_height(line_height);
f32 text_field_height = lister_get_text_field_height(line_height); f32 text_field_height = lister_get_text_field_height(line_height);
b64 showing_file_bar = false; b64 showing_file_bar = false;
b32 hide_file_bar_in_ui = def_get_config_b32(vars_save_string_lit("hide_file_bar_in_ui")); b32 hide_file_bar_in_ui = def_get_config_b32(vars_save_string_lit("hide_file_bar_in_ui"));
if (view_get_setting(app, view, ViewSetting_ShowFileBar, &showing_file_bar) && if (view_get_setting(app, view, ViewSetting_ShowFileBar, &showing_file_bar) &&
@ -489,10 +490,10 @@ lister_user_data_at_p(Application_Links *app, View_ID view, Lister *lister, Vec2
Rect_f32_Pair pair = layout_file_bar_on_top(region, line_height); Rect_f32_Pair pair = layout_file_bar_on_top(region, line_height);
region = pair.max; region = pair.max;
} }
Rect_f32_Pair pair = lister_get_top_level_layout(region, text_field_height); Rect_f32_Pair pair = lister_get_top_level_layout(region, text_field_height);
Rect_f32 list_rect = pair.max; Rect_f32 list_rect = pair.max;
void *result = 0; void *result = 0;
if (rect_contains_point(list_rect, m_p)){ if (rect_contains_point(list_rect, m_p)){
f32 y = m_p.y - list_rect.y0 + lister->scroll.position.y; f32 y = m_p.y - list_rect.y0 + lister->scroll.position.y;
@ -502,7 +503,7 @@ lister_user_data_at_p(Application_Links *app, View_ID view, Lister *lister, Vec2
result = node->user_data; result = node->user_data;
} }
} }
return(result); return(result);
} }
@ -510,13 +511,13 @@ function Lister_Result
run_lister(Application_Links *app, Lister *lister){ run_lister(Application_Links *app, Lister *lister){
lister->filter_restore_point = begin_temp(lister->arena); lister->filter_restore_point = begin_temp(lister->arena);
lister_update_filtered_list(app, lister); lister_update_filtered_list(app, lister);
View_ID view = get_this_ctx_view(app, Access_Always); View_ID view = get_this_ctx_view(app, Access_Always);
View_Context ctx = view_current_context(app, view); View_Context ctx = view_current_context(app, view);
ctx.render_caller = lister_render; ctx.render_caller = lister_render;
ctx.hides_buffer = true; ctx.hides_buffer = true;
View_Context_Block ctx_block(app, view, &ctx); View_Context_Block ctx_block(app, view, &ctx);
for (;;){ for (;;){
User_Input in = get_next_input(app, EventPropertyGroup_Any, EventProperty_Escape); User_Input in = get_next_input(app, EventPropertyGroup_Any, EventProperty_Escape);
if (in.abort){ if (in.abort){
@ -524,7 +525,7 @@ run_lister(Application_Links *app, Lister *lister){
lister->out.canceled = true; lister->out.canceled = true;
break; break;
} }
Lister_Activation_Code result = ListerActivation_Continue; Lister_Activation_Code result = ListerActivation_Continue;
b32 handled = true; b32 handled = true;
switch (in.event.kind){ switch (in.event.kind){
@ -534,7 +535,7 @@ run_lister(Application_Links *app, Lister *lister){
result = lister->handlers.write_character(app); result = lister->handlers.write_character(app);
} }
}break; }break;
case InputEventKind_KeyStroke: case InputEventKind_KeyStroke:
{ {
switch (in.event.key.code){ switch (in.event.key.code){
@ -549,7 +550,7 @@ run_lister(Application_Links *app, Lister *lister){
lister_activate(app, lister, user_data, false); lister_activate(app, lister, user_data, false);
result = ListerActivation_Finished; result = ListerActivation_Finished;
}break; }break;
case KeyCode_Backspace: case KeyCode_Backspace:
{ {
if (lister->handlers.backspace != 0){ if (lister->handlers.backspace != 0){
@ -562,7 +563,7 @@ run_lister(Application_Links *app, Lister *lister){
handled = false; handled = false;
} }
}break; }break;
case KeyCode_Up: case KeyCode_Up:
{ {
if (lister->handlers.navigate != 0){ if (lister->handlers.navigate != 0){
@ -575,7 +576,7 @@ run_lister(Application_Links *app, Lister *lister){
handled = false; handled = false;
} }
}break; }break;
case KeyCode_Down: case KeyCode_Down:
{ {
if (lister->handlers.navigate != 0){ if (lister->handlers.navigate != 0){
@ -588,7 +589,7 @@ run_lister(Application_Links *app, Lister *lister){
handled = false; handled = false;
} }
}break; }break;
case KeyCode_PageUp: case KeyCode_PageUp:
{ {
if (lister->handlers.navigate != 0){ if (lister->handlers.navigate != 0){
@ -602,7 +603,7 @@ run_lister(Application_Links *app, Lister *lister){
handled = false; handled = false;
} }
}break; }break;
case KeyCode_PageDown: case KeyCode_PageDown:
{ {
if (lister->handlers.navigate != 0){ if (lister->handlers.navigate != 0){
@ -616,7 +617,7 @@ run_lister(Application_Links *app, Lister *lister){
handled = false; handled = false;
} }
}break; }break;
default: default:
{ {
if (lister->handlers.key_stroke != 0){ if (lister->handlers.key_stroke != 0){
@ -628,7 +629,7 @@ run_lister(Application_Links *app, Lister *lister){
}break; }break;
} }
}break; }break;
case InputEventKind_MouseButton: case InputEventKind_MouseButton:
{ {
switch (in.event.mouse.code){ switch (in.event.mouse.code){
@ -638,14 +639,14 @@ run_lister(Application_Links *app, Lister *lister){
void *clicked = lister_user_data_at_p(app, view, lister, p); void *clicked = lister_user_data_at_p(app, view, lister, p);
lister->hot_user_data = clicked; lister->hot_user_data = clicked;
}break; }break;
default: default:
{ {
handled = false; handled = false;
}break; }break;
} }
}break; }break;
case InputEventKind_MouseButtonRelease: case InputEventKind_MouseButtonRelease:
{ {
switch (in.event.mouse.code){ switch (in.event.mouse.code){
@ -661,26 +662,26 @@ run_lister(Application_Links *app, Lister *lister){
} }
lister->hot_user_data = 0; lister->hot_user_data = 0;
}break; }break;
default: default:
{ {
handled = false; handled = false;
}break; }break;
} }
}break; }break;
case InputEventKind_MouseWheel: case InputEventKind_MouseWheel:
{ {
Mouse_State mouse = get_mouse_state(app); Mouse_State mouse = get_mouse_state(app);
lister->scroll.target.y += mouse.wheel; lister->scroll.target.y += mouse.wheel;
lister_update_filtered_list(app, lister); lister_update_filtered_list(app, lister);
}break; }break;
case InputEventKind_MouseMove: case InputEventKind_MouseMove:
{ {
lister_update_filtered_list(app, lister); lister_update_filtered_list(app, lister);
}break; }break;
case InputEventKind_Core: case InputEventKind_Core:
{ {
switch (in.event.core.code){ switch (in.event.core.code){
@ -688,28 +689,28 @@ run_lister(Application_Links *app, Lister *lister){
{ {
lister_update_filtered_list(app, lister); lister_update_filtered_list(app, lister);
}break; }break;
default: default:
{ {
handled = false; handled = false;
}break; }break;
} }
}break; }break;
default: default:
{ {
handled = false; handled = false;
}break; }break;
} }
if (result == ListerActivation_Finished){ if (result == ListerActivation_Finished){
break; break;
} }
if (!handled){ if (!handled){
Mapping *mapping = lister->mapping; Mapping *mapping = lister->mapping;
Command_Map *map = lister->map; Command_Map *map = lister->map;
Fallback_Dispatch_Result disp_result = Fallback_Dispatch_Result disp_result =
fallback_command_dispatch(app, mapping, map, &in); fallback_command_dispatch(app, mapping, map, &in);
if (disp_result.code == FallbackDispatch_DelayedUICall){ if (disp_result.code == FallbackDispatch_DelayedUICall){
@ -724,7 +725,7 @@ run_lister(Application_Links *app, Lister *lister){
} }
} }
} }
return(lister->out); return(lister->out);
} }
@ -972,7 +973,7 @@ get_choice_from_user(Application_Links *app, String_Const_u8 query,
handlers.navigate = lister__navigate__default; handlers.navigate = lister__navigate__default;
handlers.key_stroke = lister__key_stroke__choice_list; handlers.key_stroke = lister__key_stroke__choice_list;
lister_set_handlers(lister, &handlers); lister_set_handlers(lister, &handlers);
Lister_Result l_result = run_lister(app, lister); Lister_Result l_result = run_lister(app, lister);
Lister_Choice *result = 0; Lister_Choice *result = 0;
if (!l_result.canceled){ if (!l_result.canceled){