From 76edc98c4dc4647a61e1e8fbafbc0c70664e94f0 Mon Sep 17 00:00:00 2001 From: Allen Webster Date: Sat, 22 Sep 2018 16:45:24 -0700 Subject: [PATCH] Line highlight, snipe target highlight --- 4coder_API/types.h | 8 + 4coder_base_commands.cpp | 42 ++- 4coder_default_hooks.cpp | 59 ++++- 4coder_generated/command_metadata.h | 357 +++++++++++++------------- 4coder_generated/remapping.h | 16 +- 4coder_generated/style.h | 2 + 4coder_helper.cpp | 9 + 4coder_jump_sticky.cpp | 24 +- 4coder_seek.cpp | 3 +- 4ed.cpp | 12 + 4ed_app_models.h | 7 + 4ed_generated_style.h | 2 + 4ed_view.cpp | 172 +++++++++++-- 4ed_view_ui.cpp | 31 ++- meta/4ed_metagen.cpp | 7 + site/source_material/binding_list.txt | 3 +- themes/theme-4coder.4coder | 3 +- themes/theme-handmade-hero.4coder | 3 +- themes/theme-hjortshoej.4coder | 1 + themes/theme-midnight.4coder | 1 + themes/theme-stb-dark.4coder | 1 + themes/theme-stb.4coder | 1 + themes/theme-strange.4coder | 1 + themes/theme-sunlight.4coder | 1 + themes/theme-twilight.4coder | 1 + todo.txt | 22 +- 26 files changed, 548 insertions(+), 241 deletions(-) diff --git a/4coder_API/types.h b/4coder_API/types.h index 70ea1e33..b0907236 100644 --- a/4coder_API/types.h +++ b/4coder_API/types.h @@ -947,6 +947,8 @@ ENUM(int32_t, Special_Hook_ID){ /* DOC(TODO) */ special_hook_command_caller, /* DOC(TODO) */ + special_hook_render_caller, + /* DOC(TODO) */ special_hook_input_filter, /* DOC(TODO) */ special_hook_start, @@ -957,6 +959,11 @@ ENUM(int32_t, Special_Hook_ID){ TYPEDEF_FUNC int32_t Command_Caller_Hook_Function(struct Application_Links *app, Generic_Command cmd); #define COMMAND_CALLER_HOOK(name) int32_t name(struct Application_Links *app, Generic_Command cmd) +TYPEDEF_FUNC void Render_Callback(struct Application_Links *app); +TYPEDEF_FUNC void Render_Caller_Function(struct Application_Links *app, View_ID view_id, Render_Callback *do_core_render); +#define RENDER_CALLER_SIG(name) \ +void name(struct Application_Links *app, View_ID view_id, Render_Callback *do_core_render) + TYPEDEF_FUNC int32_t Hook_Function(struct Application_Links *app); #define HOOK_SIG(name) int32_t name(struct Application_Links *app) @@ -970,6 +977,7 @@ TYPEDEF_FUNC int32_t Scroll_Rule_Function(float target_x, float target_y, float #define SCROLL_RULE_SIG(name) \ int32_t name(float target_x, float target_y, float *scroll_x, float *scroll_y, int32_t view_id, int32_t is_new_target, float dt) + STRUCT Buffer_Name_Conflict_Entry{ Buffer_ID buffer_id; char *file_name; diff --git a/4coder_base_commands.cpp b/4coder_base_commands.cpp index c96da8c7..66be5bd0 100644 --- a/4coder_base_commands.cpp +++ b/4coder_base_commands.cpp @@ -180,9 +180,7 @@ global_point_to_view_point(View_Summary *view, int32_t x, int32_t y, float *x_ou CUSTOM_COMMAND_SIG(click_set_cursor) CUSTOM_DOC("Sets the cursor position to the mouse position.") { - uint32_t access = AccessProtected; - View_Summary view = get_active_view(app, access); - + View_Summary view = get_active_view(app, AccessProtected); Mouse_State mouse = get_mouse_state(app); float rx = 0, ry = 0; if (global_point_to_view_point(&view, mouse.x, mouse.y, &rx, &ry)){ @@ -193,9 +191,7 @@ CUSTOM_DOC("Sets the cursor position to the mouse position.") CUSTOM_COMMAND_SIG(click_set_mark) CUSTOM_DOC("Sets the mark position to the mouse position.") { - uint32_t access = AccessProtected; - View_Summary view = get_active_view(app, access); - + View_Summary view = get_active_view(app, AccessProtected); Mouse_State mouse = get_mouse_state(app); float rx = 0, ry = 0; if (global_point_to_view_point(&view, mouse.x, mouse.y, &rx, &ry)){ @@ -203,6 +199,18 @@ CUSTOM_DOC("Sets the mark position to the mouse position.") } } +CUSTOM_COMMAND_SIG(mouse_wheel_scroll) +CUSTOM_DOC("Reads the scroll wheel value from the mouse state and scrolls accordingly.") +{ + View_Summary view = get_active_view(app, AccessProtected); + Mouse_State mouse = get_mouse_state(app); + if (mouse.wheel != 0){ + GUI_Scroll_Vars scroll = view.scroll_vars; + scroll.target_y += mouse.wheel; + view_set_scroll(app, &view, scroll); + } +} + //////////////////////////////// inline void @@ -611,12 +619,13 @@ CUSTOM_COMMAND_SIG(search); CUSTOM_COMMAND_SIG(reverse_search); static void -isearch__update_highlight(Application_Links *app, Managed_Object highlight, +isearch__update_highlight(Application_Links *app, View_Summary *view, Managed_Object highlight, int32_t start, int32_t end){ - Marker markers[2] = {0}; + Marker markers[4] = {0}; markers[0].pos = start; markers[1].pos = end; managed_object_store_data(app, highlight, 0, 2, markers); + view_set_cursor(app, view, seek_pos(start), false); } static void @@ -657,13 +666,10 @@ isearch(Application_Links *app, bool32 start_reversed, String query_init, bool32 Managed_Buffer_Markers_Type marker_type = BufferMarkersType_CharacterHighlightRanges; buffer_markers_set_visuals(app, highlight, marker_type, color.color, 0, view.view_id); - isearch__update_highlight(app, highlight, start_pos, start_pos); + isearch__update_highlight(app, &view, highlight, match.start, match.end); User_Input in = {0}; for (;;){ - isearch__update_highlight(app, highlight, - match.start, match.end); - // NOTE(allen): Change the bar's prompt to match the current direction. if (reverse){ bar.prompt = rsearch_str; @@ -675,6 +681,7 @@ isearch(Application_Links *app, bool32 start_reversed, String query_init, bool32 bool32 step_forward = false; bool32 step_backward = false; bool32 backspace = false; + bool32 suppress_highligh_update = false; if (!first_step){ in = get_user_input(app, EventOnAnyKey, EventOnEsc); @@ -720,6 +727,11 @@ isearch(Application_Links *app, bool32 start_reversed, String query_init, bool32 step_forward = true; } + if (in.command.command == mouse_wheel_scroll){ + mouse_wheel_scroll(app); + suppress_highligh_update = true; + } + if ((in.command.command == reverse_search) || in.key.keycode == key_page_up || in.key.keycode == key_up){ step_backward = true; } @@ -784,6 +796,10 @@ isearch(Application_Links *app, bool32 start_reversed, String query_init, bool32 match.end = match.start + bar.string.size; } } + + if (!suppress_highligh_update){ + isearch__update_highlight(app, &view, highlight, match.start, match.end); + } } managed_object_free(app, highlight); @@ -795,8 +811,6 @@ isearch(Application_Links *app, bool32 start_reversed, String query_init, bool32 view_set_cursor(app, &view, seek_pos(first_pos), true); return; } - - view_set_cursor(app, &view, seek_pos(match.min), true); } CUSTOM_COMMAND_SIG(search) diff --git a/4coder_default_hooks.cpp b/4coder_default_hooks.cpp index 661f6cc0..dfa652bf 100644 --- a/4coder_default_hooks.cpp +++ b/4coder_default_hooks.cpp @@ -51,6 +51,62 @@ COMMAND_CALLER_HOOK(default_command_caller){ return(0); } +RENDER_CALLER_SIG(default_render_caller){ + View_Summary view = get_view(app, view_id, AccessAll); + Buffer_Summary buffer = get_buffer(app, view.buffer_id, AccessAll); + + uint32_t line_color = 0; + uint32_t token_color = 0; + + { + Theme_Color color = {0}; + color.tag = Stag_Highlight_Cursor_Line; + get_theme_colors(app, &color, 1); + line_color = color.color; + } + + { + Theme_Color color = {0}; + color.tag = Stag_Cursor; + get_theme_colors(app, &color, 1); + token_color = (0x50 << 24) | (color.color&0xFFFFFF); + } + + // NOTE(allen): Line highlight setup + Managed_Object line_highlight = alloc_buffer_markers_on_buffer(app, buffer.buffer_id, 1, 0); + buffer_markers_set_visuals(app, line_highlight, BufferMarkersType_LineHighlights, line_color, 0, 0); + Marker marker = {0}; + marker.pos = view.cursor.pos; + managed_object_store_data(app, line_highlight, 0, 1, &marker); + + // NOTE(allen): Token highlight setup + bool32 do_token_highlight = true; + Managed_Object token_highlight = 0; + + { + uint32_t token_flags = BoundaryToken|BoundaryWhitespace; + int32_t pos0 = view.cursor.pos; + int32_t pos1 = buffer_boundary_seek(app, &buffer, pos0, DirLeft , token_flags); + int32_t pos2 = buffer_boundary_seek(app, &buffer, pos1, DirRight, token_flags); + + if (do_token_highlight){ + token_highlight = alloc_buffer_markers_on_buffer(app, buffer.buffer_id, 2, 0); + buffer_markers_set_visuals(app, token_highlight, BufferMarkersType_CharacterHighlightRanges, token_color, 0, 0); + Marker range_markers[2] = {0}; + range_markers[0].pos = pos1; + range_markers[1].pos = pos2; + managed_object_store_data(app, token_highlight, 0, 2, range_markers); + } + } + + do_core_render(app); + + managed_object_free(app, line_highlight); + if (do_token_highlight){ + managed_object_free(app, token_highlight); + } +} + HOOK_SIG(default_exit){ // If this returns zero it cancels the exit. if (allow_immediate_close_without_checking_for_changes){ @@ -473,14 +529,12 @@ SCROLL_RULE_SIG(smooth_scroll_rule){ velocity->x = 1.f; velocity->y = 1.f; } - if (smooth_camera_step(target_y, scroll_y, &velocity->y, 80.f, 1.f/2.f)){ result = 1; } if (smooth_camera_step(target_x, scroll_x, &velocity->x, 80.f, 1.f/2.f)){ result = 1; } - return(result); } @@ -497,6 +551,7 @@ set_all_default_hooks(Bind_Helper *context){ set_end_file_hook(context, end_file_close_jump_list); set_command_caller(context, default_command_caller); + set_render_caller(context, default_render_caller); set_input_filter(context, default_suppress_mouse_filter); set_scroll_rule(context, smooth_scroll_rule); set_buffer_name_resolver(context, default_buffer_name_resolution); diff --git a/4coder_generated/command_metadata.h b/4coder_generated/command_metadata.h index fb08ab84..b0419741 100644 --- a/4coder_generated/command_metadata.h +++ b/4coder_generated/command_metadata.h @@ -2,7 +2,7 @@ #define command_id(c) (fcoder_metacmd_ID_##c) #define command_metadata(c) (&fcoder_metacmd_table[command_id(c)]) #define command_metadata_by_id(id) (&fcoder_metacmd_table[id]) -#define command_one_past_last_id 208 +#define command_one_past_last_id 209 #if defined(CUSTOM_COMMAND_SIG) #define PROC_LINKS(x,y) x #else @@ -112,6 +112,7 @@ CUSTOM_COMMAND_SIG(lister__write_character__file_path); CUSTOM_COMMAND_SIG(lister__write_character__fixed_list); CUSTOM_COMMAND_SIG(load_project); CUSTOM_COMMAND_SIG(make_directory_query); +CUSTOM_COMMAND_SIG(mouse_wheel_scroll); CUSTOM_COMMAND_SIG(move_down); CUSTOM_COMMAND_SIG(move_down_10); CUSTOM_COMMAND_SIG(move_down_textual); @@ -228,76 +229,76 @@ char *source_name; int32_t source_name_len; int32_t line_number; }; -static Command_Metadata fcoder_metacmd_table[208] = { +static Command_Metadata fcoder_metacmd_table[209] = { { PROC_LINKS(allow_mouse, 0), "allow_mouse", 11, "Shows the mouse and causes all mouse input to be processed normally.", 68, "w:\\4ed\\code\\4coder_default_framework.cpp", 40, 240 }, { PROC_LINKS(auto_tab_line_at_cursor, 0), "auto_tab_line_at_cursor", 23, "Auto-indents the line on which the cursor sits.", 47, "w:\\4ed\\code\\4coder_auto_indent.cpp", 34, 722 }, { PROC_LINKS(auto_tab_range, 0), "auto_tab_range", 14, "Auto-indents the range between the cursor and the mark.", 55, "w:\\4ed\\code\\4coder_auto_indent.cpp", 34, 733 }, { PROC_LINKS(auto_tab_whole_file, 0), "auto_tab_whole_file", 19, "Audo-indents the entire current buffer.", 39, "w:\\4ed\\code\\4coder_auto_indent.cpp", 34, 712 }, { PROC_LINKS(backspace_char, 0), "backspace_char", 14, "Deletes the character to the left of the cursor.", 48, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 73 }, { PROC_LINKS(backspace_word, 0), "backspace_word", 14, "Delete characters between the cursor position and the first alphanumeric boundary to the left.", 94, "w:\\4ed\\code\\4coder_seek.cpp", 27, 1247 }, -{ PROC_LINKS(basic_change_active_panel, 0), "basic_change_active_panel", 25, "Change the currently active panel, moving to the panel with the next highest view_id. Will not skipe the build panel if it is open.", 132, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 439 }, +{ PROC_LINKS(basic_change_active_panel, 0), "basic_change_active_panel", 25, "Change the currently active panel, moving to the panel with the next highest view_id. Will not skipe the build panel if it is open.", 132, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 447 }, { PROC_LINKS(build_in_build_panel, 0), "build_in_build_panel", 20, "Looks for a build.bat, build.sh, or makefile in the current and parent directories. Runs the first that it finds and prints the output to *compilation*. Puts the *compilation* buffer in a panel at the footer of the current view.", 230, "w:\\4ed\\code\\4coder_build_commands.cpp", 37, 187 }, { PROC_LINKS(build_search, 0), "build_search", 12, "Looks for a build.bat, build.sh, or makefile in the current and parent directories. Runs the first that it finds and prints the output to *compilation*.", 153, "w:\\4ed\\code\\4coder_build_commands.cpp", 37, 155 }, { PROC_LINKS(center_view, 0), "center_view", 11, "Centers the view vertically on the line on which the cursor sits.", 65, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 126 }, { PROC_LINKS(change_active_panel, 0), "change_active_panel", 19, "Change the currently active panel, moving to the panel with the next highest view_id.", 85, "w:\\4ed\\code\\4coder_default_framework.cpp", 40, 144 }, { PROC_LINKS(change_active_panel_backwards, 0), "change_active_panel_backwards", 29, "Change the currently active panel, moving to the panel with the next lowest view_id.", 84, "w:\\4ed\\code\\4coder_default_framework.cpp", 40, 154 }, { PROC_LINKS(change_to_build_panel, 0), "change_to_build_panel", 21, "If the special build panel is open, makes the build panel the active panel.", 75, "w:\\4ed\\code\\4coder_build_commands.cpp", 37, 209 }, -{ PROC_LINKS(clean_all_lines, 0), "clean_all_lines", 15, "Removes trailing whitespace from all lines in the current buffer.", 65, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 374 }, +{ PROC_LINKS(clean_all_lines, 0), "clean_all_lines", 15, "Removes trailing whitespace from all lines in the current buffer.", 65, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 382 }, { PROC_LINKS(click_set_cursor, 0), "click_set_cursor", 16, "Sets the cursor position to the mouse position.", 47, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 180 }, -{ PROC_LINKS(click_set_mark, 0), "click_set_mark", 14, "Sets the mark position to the mouse position.", 45, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 193 }, +{ PROC_LINKS(click_set_mark, 0), "click_set_mark", 14, "Sets the mark position to the mouse position.", 45, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 191 }, { PROC_LINKS(close_all_code, 0), "close_all_code", 14, "Closes any buffer with a filename ending with an extension configured to be recognized as a code file type.", 107, "w:\\4ed\\code\\4coder_project_commands.cpp", 39, 1060 }, { PROC_LINKS(close_build_panel, 0), "close_build_panel", 17, "If the special build panel is open, closes it.", 46, "w:\\4ed\\code\\4coder_build_commands.cpp", 37, 203 }, -{ PROC_LINKS(close_panel, 0), "close_panel", 11, "Closes the currently active panel if it is not the only panel open.", 67, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 447 }, +{ PROC_LINKS(close_panel, 0), "close_panel", 11, "Closes the currently active panel if it is not the only panel open.", 67, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 455 }, { PROC_LINKS(command_lister, 0), "command_lister", 14, "Opens an interactive list of all registered commands.", 53, "w:\\4ed\\code\\4coder_lists.cpp", 28, 935 }, { PROC_LINKS(copy, 0), "copy", 4, "Copy the text in the range from the cursor to the mark onto the clipboard.", 74, "w:\\4ed\\code\\4coder_clipboard.cpp", 32, 26 }, { PROC_LINKS(cursor_mark_swap, 0), "cursor_mark_swap", 16, "Swaps the position of the cursor and the mark.", 46, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 101 }, { PROC_LINKS(cut, 0), "cut", 3, "Cut the text in the range from the cursor to the mark onto the clipboard.", 73, "w:\\4ed\\code\\4coder_clipboard.cpp", 32, 35 }, -{ PROC_LINKS(decrease_face_size, 0), "decrease_face_size", 18, "Decrease the size of the face used by the current buffer.", 57, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 537 }, -{ PROC_LINKS(decrease_line_wrap, 0), "decrease_line_wrap", 18, "Decrases the current buffer's width for line wrapping.", 54, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 514 }, +{ PROC_LINKS(decrease_face_size, 0), "decrease_face_size", 18, "Decrease the size of the face used by the current buffer.", 57, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 545 }, +{ PROC_LINKS(decrease_line_wrap, 0), "decrease_line_wrap", 18, "Decrases the current buffer's width for line wrapping.", 54, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 522 }, { PROC_LINKS(delete_char, 0), "delete_char", 11, "Deletes the character to the right of the cursor.", 49, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 55 }, { PROC_LINKS(delete_current_scope, 0), "delete_current_scope", 20, "Deletes the braces surrounding the currently selected scope. Leaves the contents within the scope.", 99, "w:\\4ed\\code\\4coder_scope_commands.cpp", 37, 487 }, -{ PROC_LINKS(delete_file_query, 0), "delete_file_query", 17, "Deletes the file of the current buffer if 4coder has the appropriate access rights. Will ask the user for confirmation first.", 125, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 1064 }, -{ PROC_LINKS(delete_line, 0), "delete_line", 11, "Delete the line the on which the cursor sits.", 45, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 1314 }, +{ PROC_LINKS(delete_file_query, 0), "delete_file_query", 17, "Deletes the file of the current buffer if 4coder has the appropriate access rights. Will ask the user for confirmation first.", 125, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 1066 }, +{ PROC_LINKS(delete_line, 0), "delete_line", 11, "Delete the line the on which the cursor sits.", 45, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 1316 }, { PROC_LINKS(delete_range, 0), "delete_range", 12, "Deletes the text in the range between the cursor and the mark.", 62, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 113 }, { PROC_LINKS(delete_word, 0), "delete_word", 11, "Delete characters between the cursor position and the first alphanumeric boundary to the right.", 95, "w:\\4ed\\code\\4coder_seek.cpp", 27, 1253 }, -{ PROC_LINKS(duplicate_line, 0), "duplicate_line", 14, "Create a copy of the line on which the cursor sits.", 51, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 1292 }, -{ PROC_LINKS(eol_dosify, 0), "eol_dosify", 10, "Puts the buffer in DOS line ending mode.", 40, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 567 }, -{ PROC_LINKS(eol_nixify, 0), "eol_nixify", 10, "Puts the buffer in NIX line ending mode.", 40, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 575 }, +{ PROC_LINKS(duplicate_line, 0), "duplicate_line", 14, "Create a copy of the line on which the cursor sits.", 51, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 1294 }, +{ PROC_LINKS(eol_dosify, 0), "eol_dosify", 10, "Puts the buffer in DOS line ending mode.", 40, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 575 }, +{ PROC_LINKS(eol_nixify, 0), "eol_nixify", 10, "Puts the buffer in NIX line ending mode.", 40, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 583 }, { PROC_LINKS(execute_any_cli, 0), "execute_any_cli", 15, "Queries for an output buffer name and system command, runs the system command as a CLI and prints the output to the specified buffer.", 133, "w:\\4ed\\code\\4coder_system_command.cpp", 37, 23 }, { PROC_LINKS(execute_previous_cli, 0), "execute_previous_cli", 20, "If the command execute_any_cli has already been used, this will execute a CLI reusing the most recent buffer name and command.", 126, "w:\\4ed\\code\\4coder_system_command.cpp", 37, 7 }, -{ PROC_LINKS(exit_4coder, 0), "exit_4coder", 11, "Attempts to close 4coder.", 25, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 583 }, +{ PROC_LINKS(exit_4coder, 0), "exit_4coder", 11, "Attempts to close 4coder.", 25, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 591 }, { PROC_LINKS(goto_beginning_of_file, 0), "goto_beginning_of_file", 22, "Sets the cursor to the beginning of the file.", 45, "w:\\4ed\\code\\4coder_seek.cpp", 27, 1168 }, { PROC_LINKS(goto_end_of_file, 0), "goto_end_of_file", 16, "Sets the cursor to the end of the file.", 39, "w:\\4ed\\code\\4coder_seek.cpp", 27, 1175 }, { PROC_LINKS(goto_first_jump_direct, 0), "goto_first_jump_direct", 22, "If a buffer containing jump locations has been locked in, goes to the first jump in the buffer.", 95, "w:\\4ed\\code\\4coder_jump_direct.cpp", 34, 84 }, -{ PROC_LINKS(goto_first_jump_same_panel_sticky, 0), "goto_first_jump_same_panel_sticky", 33, "If a buffer containing jump locations has been locked in, goes to the first jump in the buffer and views the buffer in the panel where the jump list was.", 153, "w:\\4ed\\code\\4coder_jump_sticky.cpp", 34, 546 }, -{ PROC_LINKS(goto_first_jump_sticky, 0), "goto_first_jump_sticky", 22, "If a buffer containing jump locations has been locked in, goes to the first jump in the buffer.", 95, "w:\\4ed\\code\\4coder_jump_sticky.cpp", 34, 528 }, +{ PROC_LINKS(goto_first_jump_same_panel_sticky, 0), "goto_first_jump_same_panel_sticky", 33, "If a buffer containing jump locations has been locked in, goes to the first jump in the buffer and views the buffer in the panel where the jump list was.", 153, "w:\\4ed\\code\\4coder_jump_sticky.cpp", 34, 560 }, +{ PROC_LINKS(goto_first_jump_sticky, 0), "goto_first_jump_sticky", 22, "If a buffer containing jump locations has been locked in, goes to the first jump in the buffer.", 95, "w:\\4ed\\code\\4coder_jump_sticky.cpp", 34, 542 }, { PROC_LINKS(goto_jump_at_cursor_direct, 0), "goto_jump_at_cursor_direct", 26, "If the cursor is found to be on a jump location, parses the jump location and brings up the file and position in another view and changes the active panel to the view containing the jump.", 187, "w:\\4ed\\code\\4coder_jump_direct.cpp", 34, 8 }, { PROC_LINKS(goto_jump_at_cursor_same_panel_direct, 0), "goto_jump_at_cursor_same_panel_direct", 37, "If the cursor is found to be on a jump location, parses the jump location and brings up the file and position in this view, losing the compilation output or jump list..", 168, "w:\\4ed\\code\\4coder_jump_direct.cpp", 34, 29 }, -{ PROC_LINKS(goto_jump_at_cursor_same_panel_sticky, 0), "goto_jump_at_cursor_same_panel_sticky", 37, "If the cursor is found to be on a jump location, parses the jump location and brings up the file and position in this view, losing the compilation output or jump list.", 167, "w:\\4ed\\code\\4coder_jump_sticky.cpp", 34, 372 }, -{ PROC_LINKS(goto_jump_at_cursor_sticky, 0), "goto_jump_at_cursor_sticky", 26, "If the cursor is found to be on a jump location, parses the jump location and brings up the file and position in another view and changes the active panel to the view containing the jump.", 187, "w:\\4ed\\code\\4coder_jump_sticky.cpp", 34, 344 }, -{ PROC_LINKS(goto_line, 0), "goto_line", 9, "Queries the user for a number, and jumps the cursor to the corresponding line.", 78, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 591 }, +{ PROC_LINKS(goto_jump_at_cursor_same_panel_sticky, 0), "goto_jump_at_cursor_same_panel_sticky", 37, "If the cursor is found to be on a jump location, parses the jump location and brings up the file and position in this view, losing the compilation output or jump list.", 167, "w:\\4ed\\code\\4coder_jump_sticky.cpp", 34, 386 }, +{ PROC_LINKS(goto_jump_at_cursor_sticky, 0), "goto_jump_at_cursor_sticky", 26, "If the cursor is found to be on a jump location, parses the jump location and brings up the file and position in another view and changes the active panel to the view containing the jump.", 187, "w:\\4ed\\code\\4coder_jump_sticky.cpp", 34, 358 }, +{ PROC_LINKS(goto_line, 0), "goto_line", 9, "Queries the user for a number, and jumps the cursor to the corresponding line.", 78, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 599 }, { PROC_LINKS(goto_next_jump_direct, 0), "goto_next_jump_direct", 21, "If a buffer containing jump locations has been locked in, goes to the next jump in the buffer, skipping sub jump locations.", 123, "w:\\4ed\\code\\4coder_jump_direct.cpp", 34, 48 }, { PROC_LINKS(goto_next_jump_no_skips_direct, 0), "goto_next_jump_no_skips_direct", 30, "If a buffer containing jump locations has been locked in, goes to the next jump in the buffer, and does not skip sub jump locations.", 132, "w:\\4ed\\code\\4coder_jump_direct.cpp", 34, 66 }, -{ PROC_LINKS(goto_next_jump_no_skips_sticky, 0), "goto_next_jump_no_skips_sticky", 30, "If a buffer containing jump locations has been locked in, goes to the next jump in the buffer, and does not skip sub jump locations.", 132, "w:\\4ed\\code\\4coder_jump_sticky.cpp", 34, 497 }, -{ PROC_LINKS(goto_next_jump_sticky, 0), "goto_next_jump_sticky", 21, "If a buffer containing jump locations has been locked in, goes to the next jump in the buffer, skipping sub jump locations.", 123, "w:\\4ed\\code\\4coder_jump_sticky.cpp", 34, 467 }, +{ PROC_LINKS(goto_next_jump_no_skips_sticky, 0), "goto_next_jump_no_skips_sticky", 30, "If a buffer containing jump locations has been locked in, goes to the next jump in the buffer, and does not skip sub jump locations.", 132, "w:\\4ed\\code\\4coder_jump_sticky.cpp", 34, 511 }, +{ PROC_LINKS(goto_next_jump_sticky, 0), "goto_next_jump_sticky", 21, "If a buffer containing jump locations has been locked in, goes to the next jump in the buffer, skipping sub jump locations.", 123, "w:\\4ed\\code\\4coder_jump_sticky.cpp", 34, 481 }, { PROC_LINKS(goto_prev_jump_direct, 0), "goto_prev_jump_direct", 21, "If a buffer containing jump locations has been locked in, goes to the previous jump in the buffer, skipping sub jump locations.", 127, "w:\\4ed\\code\\4coder_jump_direct.cpp", 34, 57 }, { PROC_LINKS(goto_prev_jump_no_skips_direct, 0), "goto_prev_jump_no_skips_direct", 30, "If a buffer containing jump locations has been locked in, goes to the previous jump in the buffer, and does not skip sub jump locations.", 136, "w:\\4ed\\code\\4coder_jump_direct.cpp", 34, 75 }, -{ PROC_LINKS(goto_prev_jump_no_skips_sticky, 0), "goto_prev_jump_no_skips_sticky", 30, "If a buffer containing jump locations has been locked in, goes to the previous jump in the buffer, and does not skip sub jump locations.", 136, "w:\\4ed\\code\\4coder_jump_sticky.cpp", 34, 513 }, -{ PROC_LINKS(goto_prev_jump_sticky, 0), "goto_prev_jump_sticky", 21, "If a buffer containing jump locations has been locked in, goes to the previous jump in the buffer, skipping sub jump locations.", 127, "w:\\4ed\\code\\4coder_jump_sticky.cpp", 34, 483 }, -{ PROC_LINKS(hide_filebar, 0), "hide_filebar", 12, "Sets the current view to hide it's filebar.", 43, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 477 }, -{ PROC_LINKS(hide_scrollbar, 0), "hide_scrollbar", 14, "Sets the current view to hide it's scrollbar.", 45, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 463 }, +{ PROC_LINKS(goto_prev_jump_no_skips_sticky, 0), "goto_prev_jump_no_skips_sticky", 30, "If a buffer containing jump locations has been locked in, goes to the previous jump in the buffer, and does not skip sub jump locations.", 136, "w:\\4ed\\code\\4coder_jump_sticky.cpp", 34, 527 }, +{ PROC_LINKS(goto_prev_jump_sticky, 0), "goto_prev_jump_sticky", 21, "If a buffer containing jump locations has been locked in, goes to the previous jump in the buffer, skipping sub jump locations.", 127, "w:\\4ed\\code\\4coder_jump_sticky.cpp", 34, 497 }, +{ PROC_LINKS(hide_filebar, 0), "hide_filebar", 12, "Sets the current view to hide it's filebar.", 43, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 485 }, +{ PROC_LINKS(hide_scrollbar, 0), "hide_scrollbar", 14, "Sets the current view to hide it's scrollbar.", 45, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 471 }, { PROC_LINKS(highlight_next_scope_absolute, 0), "highlight_next_scope_absolute", 29, "Finds the first scope started by '{' after the cursor and puts the cursor and mark on the '{' and '}'.", 102, "w:\\4ed\\code\\4coder_scope_commands.cpp", 37, 363 }, { PROC_LINKS(highlight_prev_scope_absolute, 0), "highlight_prev_scope_absolute", 29, "Finds the first scope started by '{' before the cursor and puts the cursor and mark on the '{' and '}'.", 103, "w:\\4ed\\code\\4coder_scope_commands.cpp", 37, 382 }, { PROC_LINKS(highlight_surrounding_scope, 0), "highlight_surrounding_scope", 27, "Finds the scope enclosed by '{' '}' surrounding the cursor and puts the cursor and mark on the '{' and '}'.", 107, "w:\\4ed\\code\\4coder_scope_commands.cpp", 37, 341 }, { PROC_LINKS(if0_off, 0), "if0_off", 7, "Surround the range between the cursor and mark with an '#if 0' and an '#endif'", 78, "w:\\4ed\\code\\4coder_combined_write_commands.cpp", 46, 81 }, -{ PROC_LINKS(increase_face_size, 0), "increase_face_size", 18, "Increase the size of the face used by the current buffer.", 57, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 525 }, -{ PROC_LINKS(increase_line_wrap, 0), "increase_line_wrap", 18, "Increases the current buffer's width for line wrapping.", 55, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 503 }, +{ PROC_LINKS(increase_face_size, 0), "increase_face_size", 18, "Increase the size of the face used by the current buffer.", 57, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 533 }, +{ PROC_LINKS(increase_line_wrap, 0), "increase_line_wrap", 18, "Increases the current buffer's width for line wrapping.", 55, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 511 }, { PROC_LINKS(interactive_kill_buffer, 0), "interactive_kill_buffer", 23, "Interactively kill an open buffer.", 34, "w:\\4ed\\code\\4coder_lists.cpp", 28, 749 }, { PROC_LINKS(interactive_new, 0), "interactive_new", 15, "Interactively creates a new file.", 33, "w:\\4ed\\code\\4coder_lists.cpp", 28, 853 }, { PROC_LINKS(interactive_open, 0), "interactive_open", 16, "Interactively opens a file.", 27, "w:\\4ed\\code\\4coder_lists.cpp", 28, 881 }, { PROC_LINKS(interactive_open_or_new, 0), "interactive_open_or_new", 23, "Interactively open a file out of the file system.", 49, "w:\\4ed\\code\\4coder_lists.cpp", 28, 819 }, { PROC_LINKS(interactive_switch_buffer, 0), "interactive_switch_buffer", 25, "Interactively switch to an open buffer.", 39, "w:\\4ed\\code\\4coder_lists.cpp", 28, 730 }, -{ PROC_LINKS(kill_buffer, 0), "kill_buffer", 11, "Kills the current buffer.", 25, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 1484 }, +{ PROC_LINKS(kill_buffer, 0), "kill_buffer", 11, "Kills the current buffer.", 25, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 1486 }, { PROC_LINKS(left_adjust_view, 0), "left_adjust_view", 16, "Sets the left size of the view near the x position of the cursor.", 65, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 141 }, { PROC_LINKS(list_all_functions_all_buffers, 0), "list_all_functions_all_buffers", 30, "Creates a jump list of lines from all buffers that appear to define or declare functions.", 89, "w:\\4ed\\code\\4coder_function_list.cpp", 36, 358 }, { PROC_LINKS(list_all_functions_all_buffers_lister, 0), "list_all_functions_all_buffers_lister", 37, "Creates a lister of locations that look like function definitions and declarations all buffers.", 95, "w:\\4ed\\code\\4coder_function_list.cpp", 36, 364 }, @@ -331,33 +332,34 @@ static Command_Metadata fcoder_metacmd_table[208] = { { PROC_LINKS(lister__write_character__file_path, 0), "lister__write_character__file_path", 34, "A lister mode command that inserts a character into the text field of a file system list.", 89, "w:\\4ed\\code\\4coder_lists.cpp", 28, 193 }, { PROC_LINKS(lister__write_character__fixed_list, 0), "lister__write_character__fixed_list", 35, "A lister mode command that handles input for the fixed sure to kill list.", 73, "w:\\4ed\\code\\4coder_lists.cpp", 28, 253 }, { PROC_LINKS(load_project, 0), "load_project", 12, "Looks for a project.4coder file in the current directory and tries to load it. Looks in parent directories until a project file is found or there are no more parents.", 167, "w:\\4ed\\code\\4coder_project_commands.cpp", 39, 1083 }, -{ PROC_LINKS(make_directory_query, 0), "make_directory_query", 20, "Queries the user for a name and creates a new directory with the given name.", 76, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 1172 }, -{ PROC_LINKS(move_down, 0), "move_down", 9, "Moves the cursor down one line.", 31, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 256 }, -{ PROC_LINKS(move_down_10, 0), "move_down_10", 12, "Moves the cursor down ten lines.", 32, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 268 }, -{ PROC_LINKS(move_down_textual, 0), "move_down_textual", 17, "Moves down to the next line of actual text, regardless of line wrapping.", 72, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 274 }, -{ PROC_LINKS(move_left, 0), "move_left", 9, "Moves the cursor one character to the left.", 43, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 305 }, -{ PROC_LINKS(move_line_down, 0), "move_line_down", 14, "Swaps the line under the cursor with the line below it, and moves the cursor down with it.", 90, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 1269 }, -{ PROC_LINKS(move_line_up, 0), "move_line_up", 12, "Swaps the line under the cursor with the line above it, and moves the cursor up with it.", 88, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 1205 }, -{ PROC_LINKS(move_right, 0), "move_right", 10, "Moves the cursor one character to the right.", 44, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 314 }, -{ PROC_LINKS(move_up, 0), "move_up", 7, "Moves the cursor up one line.", 29, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 250 }, -{ PROC_LINKS(move_up_10, 0), "move_up_10", 10, "Moves the cursor up ten lines.", 30, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 262 }, +{ PROC_LINKS(make_directory_query, 0), "make_directory_query", 20, "Queries the user for a name and creates a new directory with the given name.", 76, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 1174 }, +{ PROC_LINKS(mouse_wheel_scroll, 0), "mouse_wheel_scroll", 18, "Reads the scroll wheel value from the mouse state and scrolls accordingly.", 74, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 202 }, +{ PROC_LINKS(move_down, 0), "move_down", 9, "Moves the cursor down one line.", 31, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 264 }, +{ PROC_LINKS(move_down_10, 0), "move_down_10", 12, "Moves the cursor down ten lines.", 32, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 276 }, +{ PROC_LINKS(move_down_textual, 0), "move_down_textual", 17, "Moves down to the next line of actual text, regardless of line wrapping.", 72, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 282 }, +{ PROC_LINKS(move_left, 0), "move_left", 9, "Moves the cursor one character to the left.", 43, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 313 }, +{ PROC_LINKS(move_line_down, 0), "move_line_down", 14, "Swaps the line under the cursor with the line below it, and moves the cursor down with it.", 90, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 1271 }, +{ PROC_LINKS(move_line_up, 0), "move_line_up", 12, "Swaps the line under the cursor with the line above it, and moves the cursor up with it.", 88, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 1207 }, +{ PROC_LINKS(move_right, 0), "move_right", 10, "Moves the cursor one character to the right.", 44, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 322 }, +{ PROC_LINKS(move_up, 0), "move_up", 7, "Moves the cursor up one line.", 29, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 258 }, +{ PROC_LINKS(move_up_10, 0), "move_up_10", 10, "Moves the cursor up ten lines.", 30, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 270 }, { PROC_LINKS(newline_or_goto_position_direct, 0), "newline_or_goto_position_direct", 31, "If the buffer in the active view is writable, inserts a character, otherwise performs goto_jump_at_cursor.", 106, "w:\\4ed\\code\\4coder_jump_direct.cpp", 34, 101 }, { PROC_LINKS(newline_or_goto_position_same_panel_direct, 0), "newline_or_goto_position_same_panel_direct", 42, "If the buffer in the active view is writable, inserts a character, otherwise performs goto_jump_at_cursor_same_panel.", 117, "w:\\4ed\\code\\4coder_jump_direct.cpp", 34, 116 }, -{ PROC_LINKS(newline_or_goto_position_same_panel_sticky, 0), "newline_or_goto_position_same_panel_sticky", 42, "If the buffer in the active view is writable, inserts a character, otherwise performs goto_jump_at_cursor_same_panel.", 117, "w:\\4ed\\code\\4coder_jump_sticky.cpp", 34, 584 }, -{ PROC_LINKS(newline_or_goto_position_sticky, 0), "newline_or_goto_position_sticky", 31, "If the buffer in the active view is writable, inserts a character, otherwise performs goto_jump_at_cursor.", 106, "w:\\4ed\\code\\4coder_jump_sticky.cpp", 34, 569 }, +{ PROC_LINKS(newline_or_goto_position_same_panel_sticky, 0), "newline_or_goto_position_same_panel_sticky", 42, "If the buffer in the active view is writable, inserts a character, otherwise performs goto_jump_at_cursor_same_panel.", 117, "w:\\4ed\\code\\4coder_jump_sticky.cpp", 34, 598 }, +{ PROC_LINKS(newline_or_goto_position_sticky, 0), "newline_or_goto_position_sticky", 31, "If the buffer in the active view is writable, inserts a character, otherwise performs goto_jump_at_cursor.", 106, "w:\\4ed\\code\\4coder_jump_sticky.cpp", 34, 583 }, { PROC_LINKS(open_all_code, 0), "open_all_code", 13, "Open all code in the current directory. File types are determined by extensions. An extension is considered code based on the extensions specified in 4coder.config.", 164, "w:\\4ed\\code\\4coder_project_commands.cpp", 39, 1067 }, { PROC_LINKS(open_all_code_recursive, 0), "open_all_code_recursive", 23, "Works as open_all_code but also runs in all subdirectories.", 59, "w:\\4ed\\code\\4coder_project_commands.cpp", 39, 1074 }, { PROC_LINKS(open_color_tweaker, 0), "open_color_tweaker", 18, "Opens the 4coder theme selector list.", 37, "w:\\4ed\\code\\4coder_lists.cpp", 28, 897 }, -{ PROC_LINKS(open_file_in_quotes, 0), "open_file_in_quotes", 19, "Reads a filename from surrounding '\"' characters and attempts to open the corresponding file.", 94, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 1391 }, -{ PROC_LINKS(open_in_other, 0), "open_in_other", 13, "Interactively opens a file in the other panel.", 46, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 1542 }, +{ PROC_LINKS(open_file_in_quotes, 0), "open_file_in_quotes", 19, "Reads a filename from surrounding '\"' characters and attempts to open the corresponding file.", 94, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 1393 }, +{ PROC_LINKS(open_in_other, 0), "open_in_other", 13, "Interactively opens a file in the other panel.", 46, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 1544 }, { PROC_LINKS(open_long_braces, 0), "open_long_braces", 16, "At the cursor, insert a '{' and '}' separated by a blank line.", 62, "w:\\4ed\\code\\4coder_combined_write_commands.cpp", 46, 57 }, { PROC_LINKS(open_long_braces_break, 0), "open_long_braces_break", 22, "At the cursor, insert a '{' and '}break;' separated by a blank line.", 68, "w:\\4ed\\code\\4coder_combined_write_commands.cpp", 46, 73 }, { PROC_LINKS(open_long_braces_semicolon, 0), "open_long_braces_semicolon", 26, "At the cursor, insert a '{' and '};' separated by a blank line.", 63, "w:\\4ed\\code\\4coder_combined_write_commands.cpp", 46, 65 }, -{ PROC_LINKS(open_matching_file_cpp, 0), "open_matching_file_cpp", 22, "If the current file is a *.cpp or *.h, attempts to open the corresponding *.h or *.cpp file in the other view.", 110, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 1427 }, +{ PROC_LINKS(open_matching_file_cpp, 0), "open_matching_file_cpp", 22, "If the current file is a *.cpp or *.h, attempts to open the corresponding *.h or *.cpp file in the other view.", 110, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 1429 }, { PROC_LINKS(open_panel_hsplit, 0), "open_panel_hsplit", 17, "Create a new panel by horizontally splitting the active panel.", 62, "w:\\4ed\\code\\4coder_default_framework.cpp", 40, 173 }, { PROC_LINKS(open_panel_vsplit, 0), "open_panel_vsplit", 17, "Create a new panel by vertically splitting the active panel.", 60, "w:\\4ed\\code\\4coder_default_framework.cpp", 40, 164 }, -{ PROC_LINKS(page_down, 0), "page_down", 9, "Scrolls the view down one view height and moves the cursor down one view height.", 80, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 294 }, -{ PROC_LINKS(page_up, 0), "page_up", 7, "Scrolls the view up one view height and moves the cursor up one view height.", 76, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 285 }, +{ PROC_LINKS(page_down, 0), "page_down", 9, "Scrolls the view down one view height and moves the cursor down one view height.", 80, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 302 }, +{ PROC_LINKS(page_up, 0), "page_up", 7, "Scrolls the view up one view height and moves the cursor up one view height.", 76, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 293 }, { PROC_LINKS(paste, 0), "paste", 5, "At the cursor, insert the text at the top of the clipboard.", 59, "w:\\4ed\\code\\4coder_clipboard.cpp", 32, 46 }, { PROC_LINKS(paste_and_indent, 0), "paste_and_indent", 16, "Paste from the top of clipboard and run auto-indent on the newly pasted text.", 77, "w:\\4ed\\code\\4coder_clipboard.cpp", 32, 131 }, { PROC_LINKS(paste_next, 0), "paste_next", 10, "If the previous command was paste or paste_next, replaces the paste range with the next text down on the clipboard, otherwise operates as the paste command.", 156, "w:\\4ed\\code\\4coder_clipboard.cpp", 32, 83 }, @@ -366,23 +368,23 @@ static Command_Metadata fcoder_metacmd_table[208] = { { PROC_LINKS(project_command_lister, 0), "project_command_lister", 22, "Open a lister of all commands in the currently loaded project.", 62, "w:\\4ed\\code\\4coder_project_commands.cpp", 39, 1529 }, { PROC_LINKS(project_fkey_command, 0), "project_fkey_command", 20, "Run an 'fkey command' configured in a project.4coder file. Determines the index of the 'fkey command' by which function key or numeric key was pressed to trigger the command.", 175, "w:\\4ed\\code\\4coder_project_commands.cpp", 39, 1090 }, { PROC_LINKS(project_go_to_root_directory, 0), "project_go_to_root_directory", 28, "Changes 4coder's hot directory to the root directory of the currently loaded project. With no loaded project nothing hapepns.", 125, "w:\\4ed\\code\\4coder_project_commands.cpp", 39, 1115 }, -{ PROC_LINKS(query_replace, 0), "query_replace", 13, "Queries the user for two strings, and incrementally replaces every occurence of the first string with the second string.", 120, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 952 }, -{ PROC_LINKS(query_replace_identifier, 0), "query_replace_identifier", 24, "Queries the user for a string, and incrementally replace every occurence of the word or token found at the cursor with the specified string.", 140, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 972 }, -{ PROC_LINKS(query_replace_selection, 0), "query_replace_selection", 23, "Queries the user for a string, and incrementally replace every occurence of the string found in the selected range with the specified string.", 141, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 990 }, -{ PROC_LINKS(redo, 0), "redo", 4, "Advances forewards through the undo history.", 44, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 1499 }, -{ PROC_LINKS(reload_themes, 0), "reload_themes", 13, "Loads all the theme files in the theme folder, replacing duplicates with the new theme data.", 92, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 1519 }, +{ PROC_LINKS(query_replace, 0), "query_replace", 13, "Queries the user for two strings, and incrementally replaces every occurence of the first string with the second string.", 120, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 954 }, +{ PROC_LINKS(query_replace_identifier, 0), "query_replace_identifier", 24, "Queries the user for a string, and incrementally replace every occurence of the word or token found at the cursor with the specified string.", 140, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 974 }, +{ PROC_LINKS(query_replace_selection, 0), "query_replace_selection", 23, "Queries the user for a string, and incrementally replace every occurence of the string found in the selected range with the specified string.", 141, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 992 }, +{ PROC_LINKS(redo, 0), "redo", 4, "Advances forewards through the undo history.", 44, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 1501 }, +{ PROC_LINKS(reload_themes, 0), "reload_themes", 13, "Loads all the theme files in the theme folder, replacing duplicates with the new theme data.", 92, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 1521 }, { PROC_LINKS(remap_interactive, 0), "remap_interactive", 17, "Switch to a named key binding map.", 34, "w:\\4ed\\code\\4coder_default_framework.cpp", 40, 260 }, -{ PROC_LINKS(rename_file_query, 0), "rename_file_query", 17, "Queries the user for a new name and renames the file of the current buffer, altering the buffer's name too.", 107, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 1130 }, -{ PROC_LINKS(reopen, 0), "reopen", 6, "Reopen the current buffer from the hard drive.", 46, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 1505 }, -{ PROC_LINKS(replace_in_range, 0), "replace_in_range", 16, "Queries the user for two strings, and replaces all occurences of the first string in the range between the cursor and the mark with the second string.", 150, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 850 }, -{ PROC_LINKS(reverse_search, 0), "reverse_search", 14, "Begins an incremental search up through the current buffer for a user specified string.", 87, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 821 }, -{ PROC_LINKS(reverse_search_identifier, 0), "reverse_search_identifier", 25, "Begins an incremental search up through the current buffer for the word or token under the cursor.", 98, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 839 }, -{ PROC_LINKS(save, 0), "save", 4, "Saves the current buffer.", 25, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 1511 }, -{ PROC_LINKS(save_all_dirty_buffers, 0), "save_all_dirty_buffers", 22, "Saves all buffers marked dirty (showing the '*' indicator).", 59, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 1034 }, -{ PROC_LINKS(save_to_query, 0), "save_to_query", 13, "Queries the user for a file name and saves the contents of the current buffer, altering the buffer's name too.", 110, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 1090 }, +{ PROC_LINKS(rename_file_query, 0), "rename_file_query", 17, "Queries the user for a new name and renames the file of the current buffer, altering the buffer's name too.", 107, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 1132 }, +{ PROC_LINKS(reopen, 0), "reopen", 6, "Reopen the current buffer from the hard drive.", 46, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 1507 }, +{ PROC_LINKS(replace_in_range, 0), "replace_in_range", 16, "Queries the user for two strings, and replaces all occurences of the first string in the range between the cursor and the mark with the second string.", 150, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 852 }, +{ PROC_LINKS(reverse_search, 0), "reverse_search", 14, "Begins an incremental search up through the current buffer for a user specified string.", 87, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 823 }, +{ PROC_LINKS(reverse_search_identifier, 0), "reverse_search_identifier", 25, "Begins an incremental search up through the current buffer for the word or token under the cursor.", 98, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 841 }, +{ PROC_LINKS(save, 0), "save", 4, "Saves the current buffer.", 25, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 1513 }, +{ PROC_LINKS(save_all_dirty_buffers, 0), "save_all_dirty_buffers", 22, "Saves all buffers marked dirty (showing the '*' indicator).", 59, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 1036 }, +{ PROC_LINKS(save_to_query, 0), "save_to_query", 13, "Queries the user for a file name and saves the contents of the current buffer, altering the buffer's name too.", 110, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 1092 }, { PROC_LINKS(scope_absorb_down, 0), "scope_absorb_down", 17, "If a scope is currently selected, and a statement or block statement is present below the current scope, the statement is moved into the scope.", 143, "w:\\4ed\\code\\4coder_scope_commands.cpp", 37, 738 }, -{ PROC_LINKS(search, 0), "search", 6, "Begins an incremental search down through the current buffer for a user specified string.", 89, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 814 }, -{ PROC_LINKS(search_identifier, 0), "search_identifier", 17, "Begins an incremental search down through the current buffer for the word or token under the cursor.", 100, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 828 }, +{ PROC_LINKS(search, 0), "search", 6, "Begins an incremental search down through the current buffer for a user specified string.", 89, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 816 }, +{ PROC_LINKS(search_identifier, 0), "search_identifier", 17, "Begins an incremental search down through the current buffer for the word or token under the cursor.", 100, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 830 }, { PROC_LINKS(seek_alphanumeric_left, 0), "seek_alphanumeric_left", 22, "Seek left for boundary between alphanumeric characters and non-alphanumeric characters.", 87, "w:\\4ed\\code\\4coder_seek.cpp", 27, 1227 }, { PROC_LINKS(seek_alphanumeric_or_camel_left, 0), "seek_alphanumeric_or_camel_left", 31, "Seek left for boundary between alphanumeric characters or camel case word and non-alphanumeric characters.", 106, "w:\\4ed\\code\\4coder_seek.cpp", 27, 1239 }, { PROC_LINKS(seek_alphanumeric_or_camel_right, 0), "seek_alphanumeric_or_camel_right", 32, "Seek right for boundary between alphanumeric characters or camel case word and non-alphanumeric characters.", 107, "w:\\4ed\\code\\4coder_seek.cpp", 27, 1233 }, @@ -401,7 +403,7 @@ static Command_Metadata fcoder_metacmd_table[208] = { { PROC_LINKS(seek_whitespace_right, 0), "seek_whitespace_right", 21, "Seek right for the next boundary between whitespace and non-whitespace.", 71, "w:\\4ed\\code\\4coder_seek.cpp", 27, 1185 }, { PROC_LINKS(seek_whitespace_up, 0), "seek_whitespace_up", 18, "Seeks the cursor up to the next blank line.", 43, "w:\\4ed\\code\\4coder_seek.cpp", 27, 1090 }, { PROC_LINKS(seek_whitespace_up_end_line, 0), "seek_whitespace_up_end_line", 27, "Seeks the cursor up to the next blank line and places it at the end of the line.", 80, "w:\\4ed\\code\\4coder_seek.cpp", 27, 1148 }, -{ PROC_LINKS(select_all, 0), "select_all", 10, "Puts the cursor at the top of the file, and the mark at the bottom of the file.", 79, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 323 }, +{ PROC_LINKS(select_all, 0), "select_all", 10, "Puts the cursor at the top of the file, and the mark at the bottom of the file.", 79, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 331 }, { PROC_LINKS(set_bindings_choose, 0), "set_bindings_choose", 19, "Remap keybindings using the 'choose' mapping rule.", 50, "w:\\4ed\\code\\4coder_remapping_commands.cpp", 41, 47 }, { PROC_LINKS(set_bindings_default, 0), "set_bindings_default", 20, "Remap keybindings using the 'default' mapping rule.", 51, "w:\\4ed\\code\\4coder_remapping_commands.cpp", 41, 61 }, { PROC_LINKS(set_bindings_mac_default, 0), "set_bindings_mac_default", 24, "Remap keybindings using the 'mac-default' mapping rule.", 55, "w:\\4ed\\code\\4coder_remapping_commands.cpp", 41, 75 }, @@ -410,23 +412,23 @@ static Command_Metadata fcoder_metacmd_table[208] = { { PROC_LINKS(setup_build_bat_and_sh, 0), "setup_build_bat_and_sh", 22, "Queries the user for several configuration options and initializes a new build batch script.", 92, "w:\\4ed\\code\\4coder_project_commands.cpp", 39, 1512 }, { PROC_LINKS(setup_build_sh, 0), "setup_build_sh", 14, "Queries the user for several configuration options and initializes a new build shell script.", 92, "w:\\4ed\\code\\4coder_project_commands.cpp", 39, 1506 }, { PROC_LINKS(setup_new_project, 0), "setup_new_project", 17, "Queries the user for several configuration options and initializes a new 4coder project with build scripts for every OS.", 120, "w:\\4ed\\code\\4coder_project_commands.cpp", 39, 1493 }, -{ PROC_LINKS(show_filebar, 0), "show_filebar", 12, "Sets the current view to show it's filebar.", 43, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 470 }, -{ PROC_LINKS(show_scrollbar, 0), "show_scrollbar", 14, "Sets the current view to show it's scrollbar.", 45, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 456 }, +{ PROC_LINKS(show_filebar, 0), "show_filebar", 12, "Sets the current view to show it's filebar.", 43, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 478 }, +{ PROC_LINKS(show_scrollbar, 0), "show_scrollbar", 14, "Sets the current view to show it's scrollbar.", 45, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 464 }, { PROC_LINKS(snipe_token_or_word, 0), "snipe_token_or_word", 19, "Delete a single, whole token on or to the left of the cursor and post it to the clipboard.", 90, "w:\\4ed\\code\\4coder_seek.cpp", 27, 1259 }, { PROC_LINKS(snipe_token_or_word_right, 0), "snipe_token_or_word_right", 25, "Delete a single, whole token on or to the right of the cursor and post it to the clipboard.", 91, "w:\\4ed\\code\\4coder_seek.cpp", 27, 1265 }, { PROC_LINKS(snippet_lister, 0), "snippet_lister", 14, "Opens a snippet lister for inserting whole pre-written snippets of text.", 72, "w:\\4ed\\code\\4coder_combined_write_commands.cpp", 46, 193 }, { PROC_LINKS(suppress_mouse, 0), "suppress_mouse", 14, "Hides the mouse and causes all mosue input (clicks, position, wheel) to be ignored.", 83, "w:\\4ed\\code\\4coder_default_framework.cpp", 40, 234 }, -{ PROC_LINKS(swap_buffers_between_panels, 0), "swap_buffers_between_panels", 27, "Set the other non-active panel to view the buffer that the active panel views, and switch to that panel.", 104, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 1451 }, -{ PROC_LINKS(to_lowercase, 0), "to_lowercase", 12, "Converts all ascii text in the range between the cursor and the mark to lowercase.", 82, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 354 }, -{ PROC_LINKS(to_uppercase, 0), "to_uppercase", 12, "Converts all ascii text in the range between the cursor and the mark to uppercase.", 82, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 334 }, -{ PROC_LINKS(toggle_filebar, 0), "toggle_filebar", 14, "Toggles the visibility status of the current view's filebar.", 60, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 484 }, +{ PROC_LINKS(swap_buffers_between_panels, 0), "swap_buffers_between_panels", 27, "Set the other non-active panel to view the buffer that the active panel views, and switch to that panel.", 104, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 1453 }, +{ PROC_LINKS(to_lowercase, 0), "to_lowercase", 12, "Converts all ascii text in the range between the cursor and the mark to lowercase.", 82, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 362 }, +{ PROC_LINKS(to_uppercase, 0), "to_uppercase", 12, "Converts all ascii text in the range between the cursor and the mark to uppercase.", 82, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 342 }, +{ PROC_LINKS(toggle_filebar, 0), "toggle_filebar", 14, "Toggles the visibility status of the current view's filebar.", 60, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 492 }, { PROC_LINKS(toggle_fullscreen, 0), "toggle_fullscreen", 17, "Toggle fullscreen mode on or off. The change(s) do not take effect until the next frame.", 89, "w:\\4ed\\code\\4coder_default_framework.cpp", 40, 252 }, -{ PROC_LINKS(toggle_line_wrap, 0), "toggle_line_wrap", 16, "Toggles the current buffer's line wrapping status.", 50, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 493 }, +{ PROC_LINKS(toggle_line_wrap, 0), "toggle_line_wrap", 16, "Toggles the current buffer's line wrapping status.", 50, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 501 }, { PROC_LINKS(toggle_mouse, 0), "toggle_mouse", 12, "Toggles the mouse suppression mode, see suppress_mouse and allow_mouse.", 71, "w:\\4ed\\code\\4coder_default_framework.cpp", 40, 246 }, -{ PROC_LINKS(toggle_show_whitespace, 0), "toggle_show_whitespace", 22, "Toggles the current buffer's whitespace visibility status.", 58, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 560 }, -{ PROC_LINKS(toggle_virtual_whitespace, 0), "toggle_virtual_whitespace", 25, "Toggles the current buffer's virtual whitespace status.", 55, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 549 }, -{ PROC_LINKS(undo, 0), "undo", 4, "Advances backwards through the undo history.", 44, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 1493 }, -{ PROC_LINKS(view_buffer_other_panel, 0), "view_buffer_other_panel", 23, "Set the other non-active panel to view the buffer that the active panel views, and switch to that panel.", 104, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 1441 }, +{ PROC_LINKS(toggle_show_whitespace, 0), "toggle_show_whitespace", 22, "Toggles the current buffer's whitespace visibility status.", 58, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 568 }, +{ PROC_LINKS(toggle_virtual_whitespace, 0), "toggle_virtual_whitespace", 25, "Toggles the current buffer's virtual whitespace status.", 55, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 557 }, +{ PROC_LINKS(undo, 0), "undo", 4, "Advances backwards through the undo history.", 44, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 1495 }, +{ PROC_LINKS(view_buffer_other_panel, 0), "view_buffer_other_panel", 23, "Set the other non-active panel to view the buffer that the active panel views, and switch to that panel.", 104, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 1443 }, { PROC_LINKS(view_jump_list_with_lister, 0), "view_jump_list_with_lister", 26, "When executed on a buffer with jumps, creates a persistent lister for all the jumps", 83, "w:\\4ed\\code\\4coder_jump_lister.cpp", 34, 108 }, { PROC_LINKS(word_complete, 0), "word_complete", 13, "Iteratively tries completing the word to the left of the cursor with other words in open buffers that have the same prefix string.", 130, "w:\\4ed\\code\\4coder_search.cpp", 29, 856 }, { PROC_LINKS(write_and_auto_tab, 0), "write_and_auto_tab", 18, "Inserts a character and auto-indents the line on which the cursor sits.", 71, "w:\\4ed\\code\\4coder_auto_indent.cpp", 34, 745 }, @@ -541,109 +543,110 @@ static int32_t fcoder_metacmd_ID_lister__write_character__file_path = 99; static int32_t fcoder_metacmd_ID_lister__write_character__fixed_list = 100; static int32_t fcoder_metacmd_ID_load_project = 101; static int32_t fcoder_metacmd_ID_make_directory_query = 102; -static int32_t fcoder_metacmd_ID_move_down = 103; -static int32_t fcoder_metacmd_ID_move_down_10 = 104; -static int32_t fcoder_metacmd_ID_move_down_textual = 105; -static int32_t fcoder_metacmd_ID_move_left = 106; -static int32_t fcoder_metacmd_ID_move_line_down = 107; -static int32_t fcoder_metacmd_ID_move_line_up = 108; -static int32_t fcoder_metacmd_ID_move_right = 109; -static int32_t fcoder_metacmd_ID_move_up = 110; -static int32_t fcoder_metacmd_ID_move_up_10 = 111; -static int32_t fcoder_metacmd_ID_newline_or_goto_position_direct = 112; -static int32_t fcoder_metacmd_ID_newline_or_goto_position_same_panel_direct = 113; -static int32_t fcoder_metacmd_ID_newline_or_goto_position_same_panel_sticky = 114; -static int32_t fcoder_metacmd_ID_newline_or_goto_position_sticky = 115; -static int32_t fcoder_metacmd_ID_open_all_code = 116; -static int32_t fcoder_metacmd_ID_open_all_code_recursive = 117; -static int32_t fcoder_metacmd_ID_open_color_tweaker = 118; -static int32_t fcoder_metacmd_ID_open_file_in_quotes = 119; -static int32_t fcoder_metacmd_ID_open_in_other = 120; -static int32_t fcoder_metacmd_ID_open_long_braces = 121; -static int32_t fcoder_metacmd_ID_open_long_braces_break = 122; -static int32_t fcoder_metacmd_ID_open_long_braces_semicolon = 123; -static int32_t fcoder_metacmd_ID_open_matching_file_cpp = 124; -static int32_t fcoder_metacmd_ID_open_panel_hsplit = 125; -static int32_t fcoder_metacmd_ID_open_panel_vsplit = 126; -static int32_t fcoder_metacmd_ID_page_down = 127; -static int32_t fcoder_metacmd_ID_page_up = 128; -static int32_t fcoder_metacmd_ID_paste = 129; -static int32_t fcoder_metacmd_ID_paste_and_indent = 130; -static int32_t fcoder_metacmd_ID_paste_next = 131; -static int32_t fcoder_metacmd_ID_paste_next_and_indent = 132; -static int32_t fcoder_metacmd_ID_place_in_scope = 133; -static int32_t fcoder_metacmd_ID_project_command_lister = 134; -static int32_t fcoder_metacmd_ID_project_fkey_command = 135; -static int32_t fcoder_metacmd_ID_project_go_to_root_directory = 136; -static int32_t fcoder_metacmd_ID_query_replace = 137; -static int32_t fcoder_metacmd_ID_query_replace_identifier = 138; -static int32_t fcoder_metacmd_ID_query_replace_selection = 139; -static int32_t fcoder_metacmd_ID_redo = 140; -static int32_t fcoder_metacmd_ID_reload_themes = 141; -static int32_t fcoder_metacmd_ID_remap_interactive = 142; -static int32_t fcoder_metacmd_ID_rename_file_query = 143; -static int32_t fcoder_metacmd_ID_reopen = 144; -static int32_t fcoder_metacmd_ID_replace_in_range = 145; -static int32_t fcoder_metacmd_ID_reverse_search = 146; -static int32_t fcoder_metacmd_ID_reverse_search_identifier = 147; -static int32_t fcoder_metacmd_ID_save = 148; -static int32_t fcoder_metacmd_ID_save_all_dirty_buffers = 149; -static int32_t fcoder_metacmd_ID_save_to_query = 150; -static int32_t fcoder_metacmd_ID_scope_absorb_down = 151; -static int32_t fcoder_metacmd_ID_search = 152; -static int32_t fcoder_metacmd_ID_search_identifier = 153; -static int32_t fcoder_metacmd_ID_seek_alphanumeric_left = 154; -static int32_t fcoder_metacmd_ID_seek_alphanumeric_or_camel_left = 155; -static int32_t fcoder_metacmd_ID_seek_alphanumeric_or_camel_right = 156; -static int32_t fcoder_metacmd_ID_seek_alphanumeric_right = 157; -static int32_t fcoder_metacmd_ID_seek_beginning_of_line = 158; -static int32_t fcoder_metacmd_ID_seek_beginning_of_textual_line = 159; -static int32_t fcoder_metacmd_ID_seek_end_of_line = 160; -static int32_t fcoder_metacmd_ID_seek_end_of_textual_line = 161; -static int32_t fcoder_metacmd_ID_seek_token_left = 162; -static int32_t fcoder_metacmd_ID_seek_token_right = 163; -static int32_t fcoder_metacmd_ID_seek_white_or_token_left = 164; -static int32_t fcoder_metacmd_ID_seek_white_or_token_right = 165; -static int32_t fcoder_metacmd_ID_seek_whitespace_down = 166; -static int32_t fcoder_metacmd_ID_seek_whitespace_down_end_line = 167; -static int32_t fcoder_metacmd_ID_seek_whitespace_left = 168; -static int32_t fcoder_metacmd_ID_seek_whitespace_right = 169; -static int32_t fcoder_metacmd_ID_seek_whitespace_up = 170; -static int32_t fcoder_metacmd_ID_seek_whitespace_up_end_line = 171; -static int32_t fcoder_metacmd_ID_select_all = 172; -static int32_t fcoder_metacmd_ID_set_bindings_choose = 173; -static int32_t fcoder_metacmd_ID_set_bindings_default = 174; -static int32_t fcoder_metacmd_ID_set_bindings_mac_default = 175; -static int32_t fcoder_metacmd_ID_set_mark = 176; -static int32_t fcoder_metacmd_ID_setup_build_bat = 177; -static int32_t fcoder_metacmd_ID_setup_build_bat_and_sh = 178; -static int32_t fcoder_metacmd_ID_setup_build_sh = 179; -static int32_t fcoder_metacmd_ID_setup_new_project = 180; -static int32_t fcoder_metacmd_ID_show_filebar = 181; -static int32_t fcoder_metacmd_ID_show_scrollbar = 182; -static int32_t fcoder_metacmd_ID_snipe_token_or_word = 183; -static int32_t fcoder_metacmd_ID_snipe_token_or_word_right = 184; -static int32_t fcoder_metacmd_ID_snippet_lister = 185; -static int32_t fcoder_metacmd_ID_suppress_mouse = 186; -static int32_t fcoder_metacmd_ID_swap_buffers_between_panels = 187; -static int32_t fcoder_metacmd_ID_to_lowercase = 188; -static int32_t fcoder_metacmd_ID_to_uppercase = 189; -static int32_t fcoder_metacmd_ID_toggle_filebar = 190; -static int32_t fcoder_metacmd_ID_toggle_fullscreen = 191; -static int32_t fcoder_metacmd_ID_toggle_line_wrap = 192; -static int32_t fcoder_metacmd_ID_toggle_mouse = 193; -static int32_t fcoder_metacmd_ID_toggle_show_whitespace = 194; -static int32_t fcoder_metacmd_ID_toggle_virtual_whitespace = 195; -static int32_t fcoder_metacmd_ID_undo = 196; -static int32_t fcoder_metacmd_ID_view_buffer_other_panel = 197; -static int32_t fcoder_metacmd_ID_view_jump_list_with_lister = 198; -static int32_t fcoder_metacmd_ID_word_complete = 199; -static int32_t fcoder_metacmd_ID_write_and_auto_tab = 200; -static int32_t fcoder_metacmd_ID_write_block = 201; -static int32_t fcoder_metacmd_ID_write_character = 202; -static int32_t fcoder_metacmd_ID_write_hack = 203; -static int32_t fcoder_metacmd_ID_write_note = 204; -static int32_t fcoder_metacmd_ID_write_todo = 205; -static int32_t fcoder_metacmd_ID_write_underscore = 206; -static int32_t fcoder_metacmd_ID_write_zero_struct = 207; +static int32_t fcoder_metacmd_ID_mouse_wheel_scroll = 103; +static int32_t fcoder_metacmd_ID_move_down = 104; +static int32_t fcoder_metacmd_ID_move_down_10 = 105; +static int32_t fcoder_metacmd_ID_move_down_textual = 106; +static int32_t fcoder_metacmd_ID_move_left = 107; +static int32_t fcoder_metacmd_ID_move_line_down = 108; +static int32_t fcoder_metacmd_ID_move_line_up = 109; +static int32_t fcoder_metacmd_ID_move_right = 110; +static int32_t fcoder_metacmd_ID_move_up = 111; +static int32_t fcoder_metacmd_ID_move_up_10 = 112; +static int32_t fcoder_metacmd_ID_newline_or_goto_position_direct = 113; +static int32_t fcoder_metacmd_ID_newline_or_goto_position_same_panel_direct = 114; +static int32_t fcoder_metacmd_ID_newline_or_goto_position_same_panel_sticky = 115; +static int32_t fcoder_metacmd_ID_newline_or_goto_position_sticky = 116; +static int32_t fcoder_metacmd_ID_open_all_code = 117; +static int32_t fcoder_metacmd_ID_open_all_code_recursive = 118; +static int32_t fcoder_metacmd_ID_open_color_tweaker = 119; +static int32_t fcoder_metacmd_ID_open_file_in_quotes = 120; +static int32_t fcoder_metacmd_ID_open_in_other = 121; +static int32_t fcoder_metacmd_ID_open_long_braces = 122; +static int32_t fcoder_metacmd_ID_open_long_braces_break = 123; +static int32_t fcoder_metacmd_ID_open_long_braces_semicolon = 124; +static int32_t fcoder_metacmd_ID_open_matching_file_cpp = 125; +static int32_t fcoder_metacmd_ID_open_panel_hsplit = 126; +static int32_t fcoder_metacmd_ID_open_panel_vsplit = 127; +static int32_t fcoder_metacmd_ID_page_down = 128; +static int32_t fcoder_metacmd_ID_page_up = 129; +static int32_t fcoder_metacmd_ID_paste = 130; +static int32_t fcoder_metacmd_ID_paste_and_indent = 131; +static int32_t fcoder_metacmd_ID_paste_next = 132; +static int32_t fcoder_metacmd_ID_paste_next_and_indent = 133; +static int32_t fcoder_metacmd_ID_place_in_scope = 134; +static int32_t fcoder_metacmd_ID_project_command_lister = 135; +static int32_t fcoder_metacmd_ID_project_fkey_command = 136; +static int32_t fcoder_metacmd_ID_project_go_to_root_directory = 137; +static int32_t fcoder_metacmd_ID_query_replace = 138; +static int32_t fcoder_metacmd_ID_query_replace_identifier = 139; +static int32_t fcoder_metacmd_ID_query_replace_selection = 140; +static int32_t fcoder_metacmd_ID_redo = 141; +static int32_t fcoder_metacmd_ID_reload_themes = 142; +static int32_t fcoder_metacmd_ID_remap_interactive = 143; +static int32_t fcoder_metacmd_ID_rename_file_query = 144; +static int32_t fcoder_metacmd_ID_reopen = 145; +static int32_t fcoder_metacmd_ID_replace_in_range = 146; +static int32_t fcoder_metacmd_ID_reverse_search = 147; +static int32_t fcoder_metacmd_ID_reverse_search_identifier = 148; +static int32_t fcoder_metacmd_ID_save = 149; +static int32_t fcoder_metacmd_ID_save_all_dirty_buffers = 150; +static int32_t fcoder_metacmd_ID_save_to_query = 151; +static int32_t fcoder_metacmd_ID_scope_absorb_down = 152; +static int32_t fcoder_metacmd_ID_search = 153; +static int32_t fcoder_metacmd_ID_search_identifier = 154; +static int32_t fcoder_metacmd_ID_seek_alphanumeric_left = 155; +static int32_t fcoder_metacmd_ID_seek_alphanumeric_or_camel_left = 156; +static int32_t fcoder_metacmd_ID_seek_alphanumeric_or_camel_right = 157; +static int32_t fcoder_metacmd_ID_seek_alphanumeric_right = 158; +static int32_t fcoder_metacmd_ID_seek_beginning_of_line = 159; +static int32_t fcoder_metacmd_ID_seek_beginning_of_textual_line = 160; +static int32_t fcoder_metacmd_ID_seek_end_of_line = 161; +static int32_t fcoder_metacmd_ID_seek_end_of_textual_line = 162; +static int32_t fcoder_metacmd_ID_seek_token_left = 163; +static int32_t fcoder_metacmd_ID_seek_token_right = 164; +static int32_t fcoder_metacmd_ID_seek_white_or_token_left = 165; +static int32_t fcoder_metacmd_ID_seek_white_or_token_right = 166; +static int32_t fcoder_metacmd_ID_seek_whitespace_down = 167; +static int32_t fcoder_metacmd_ID_seek_whitespace_down_end_line = 168; +static int32_t fcoder_metacmd_ID_seek_whitespace_left = 169; +static int32_t fcoder_metacmd_ID_seek_whitespace_right = 170; +static int32_t fcoder_metacmd_ID_seek_whitespace_up = 171; +static int32_t fcoder_metacmd_ID_seek_whitespace_up_end_line = 172; +static int32_t fcoder_metacmd_ID_select_all = 173; +static int32_t fcoder_metacmd_ID_set_bindings_choose = 174; +static int32_t fcoder_metacmd_ID_set_bindings_default = 175; +static int32_t fcoder_metacmd_ID_set_bindings_mac_default = 176; +static int32_t fcoder_metacmd_ID_set_mark = 177; +static int32_t fcoder_metacmd_ID_setup_build_bat = 178; +static int32_t fcoder_metacmd_ID_setup_build_bat_and_sh = 179; +static int32_t fcoder_metacmd_ID_setup_build_sh = 180; +static int32_t fcoder_metacmd_ID_setup_new_project = 181; +static int32_t fcoder_metacmd_ID_show_filebar = 182; +static int32_t fcoder_metacmd_ID_show_scrollbar = 183; +static int32_t fcoder_metacmd_ID_snipe_token_or_word = 184; +static int32_t fcoder_metacmd_ID_snipe_token_or_word_right = 185; +static int32_t fcoder_metacmd_ID_snippet_lister = 186; +static int32_t fcoder_metacmd_ID_suppress_mouse = 187; +static int32_t fcoder_metacmd_ID_swap_buffers_between_panels = 188; +static int32_t fcoder_metacmd_ID_to_lowercase = 189; +static int32_t fcoder_metacmd_ID_to_uppercase = 190; +static int32_t fcoder_metacmd_ID_toggle_filebar = 191; +static int32_t fcoder_metacmd_ID_toggle_fullscreen = 192; +static int32_t fcoder_metacmd_ID_toggle_line_wrap = 193; +static int32_t fcoder_metacmd_ID_toggle_mouse = 194; +static int32_t fcoder_metacmd_ID_toggle_show_whitespace = 195; +static int32_t fcoder_metacmd_ID_toggle_virtual_whitespace = 196; +static int32_t fcoder_metacmd_ID_undo = 197; +static int32_t fcoder_metacmd_ID_view_buffer_other_panel = 198; +static int32_t fcoder_metacmd_ID_view_jump_list_with_lister = 199; +static int32_t fcoder_metacmd_ID_word_complete = 200; +static int32_t fcoder_metacmd_ID_write_and_auto_tab = 201; +static int32_t fcoder_metacmd_ID_write_block = 202; +static int32_t fcoder_metacmd_ID_write_character = 203; +static int32_t fcoder_metacmd_ID_write_hack = 204; +static int32_t fcoder_metacmd_ID_write_note = 205; +static int32_t fcoder_metacmd_ID_write_todo = 206; +static int32_t fcoder_metacmd_ID_write_underscore = 207; +static int32_t fcoder_metacmd_ID_write_zero_struct = 208; #endif diff --git a/4coder_generated/remapping.h b/4coder_generated/remapping.h index 94281497..de984254 100644 --- a/4coder_generated/remapping.h +++ b/4coder_generated/remapping.h @@ -16,6 +16,7 @@ bind(context, 'n', MDFR_ALT, goto_next_jump_no_skips_sticky); bind(context, 'N', MDFR_ALT, goto_prev_jump_no_skips_sticky); bind(context, 'M', MDFR_ALT, goto_first_jump_sticky); bind(context, 'm', MDFR_ALT, build_in_build_panel); +bind(context, 'b', MDFR_ALT, toggle_filebar); bind(context, 'z', MDFR_ALT, execute_any_cli); bind(context, 'Z', MDFR_ALT, execute_previous_cli); bind(context, 'x', MDFR_ALT, command_lister); @@ -37,6 +38,7 @@ bind(context, key_f13, MDFR_NONE, project_fkey_command); bind(context, key_f14, MDFR_NONE, project_fkey_command); bind(context, key_f15, MDFR_NONE, project_fkey_command); bind(context, key_f16, MDFR_NONE, project_fkey_command); +bind(context, key_mouse_wheel, MDFR_NONE, mouse_wheel_scroll); end_map(context); begin_map(context, mapid_file); bind_vanilla_keys(context, write_character); @@ -171,6 +173,7 @@ bind(context, 'n', MDFR_CTRL, goto_next_jump_sticky); bind(context, 'N', MDFR_CTRL, goto_prev_jump_sticky); bind(context, 'M', MDFR_CTRL, goto_first_jump_sticky); bind(context, 'm', MDFR_CTRL, build_in_build_panel); +bind(context, 'b', MDFR_ALT, toggle_filebar); bind(context, 'z', MDFR_CTRL, execute_any_cli); bind(context, 'Z', MDFR_CTRL, execute_previous_cli); bind(context, 'x', MDFR_CTRL, command_lister); @@ -192,6 +195,7 @@ bind(context, key_f13, MDFR_NONE, project_fkey_command); bind(context, key_f14, MDFR_NONE, project_fkey_command); bind(context, key_f15, MDFR_NONE, project_fkey_command); bind(context, key_f16, MDFR_NONE, project_fkey_command); +bind(context, key_mouse_wheel, MDFR_NONE, mouse_wheel_scroll); end_map(context); begin_map(context, mapid_file); bind_vanilla_keys(context, write_character); @@ -341,7 +345,7 @@ Meta_Sub_Map *sub_maps; int32_t sub_map_count; LINK_PROCS(void (*fill_keys_proc)(Bind_Helper *context);) }; -static Meta_Key_Bind fcoder_binds_for_default_mapid_global[36] = { +static Meta_Key_Bind fcoder_binds_for_default_mapid_global[38] = { {0, 44, 1, "change_active_panel", 19, LINK_PROCS(change_active_panel)}, {0, 60, 1, "change_active_panel_backwards", 29, LINK_PROCS(change_active_panel_backwards)}, {0, 110, 1, "interactive_new", 15, LINK_PROCS(interactive_new)}, @@ -357,6 +361,7 @@ static Meta_Key_Bind fcoder_binds_for_default_mapid_global[36] = { {0, 78, 2, "goto_prev_jump_no_skips_sticky", 30, LINK_PROCS(goto_prev_jump_no_skips_sticky)}, {0, 77, 2, "goto_first_jump_sticky", 22, LINK_PROCS(goto_first_jump_sticky)}, {0, 109, 2, "build_in_build_panel", 20, LINK_PROCS(build_in_build_panel)}, +{0, 98, 2, "toggle_filebar", 14, LINK_PROCS(toggle_filebar)}, {0, 122, 2, "execute_any_cli", 15, LINK_PROCS(execute_any_cli)}, {0, 90, 2, "execute_previous_cli", 20, LINK_PROCS(execute_previous_cli)}, {0, 120, 2, "command_lister", 14, LINK_PROCS(command_lister)}, @@ -378,6 +383,7 @@ static Meta_Key_Bind fcoder_binds_for_default_mapid_global[36] = { {0, 55328, 0, "project_fkey_command", 20, LINK_PROCS(project_fkey_command)}, {0, 55329, 0, "project_fkey_command", 20, LINK_PROCS(project_fkey_command)}, {0, 55330, 0, "project_fkey_command", 20, LINK_PROCS(project_fkey_command)}, +{0, 55312, 0, "mouse_wheel_scroll", 18, LINK_PROCS(mouse_wheel_scroll)}, }; static Meta_Key_Bind fcoder_binds_for_default_mapid_file[63] = { {1, 0, 0, "write_character", 15, LINK_PROCS(write_character)}, @@ -494,12 +500,12 @@ static Meta_Key_Bind fcoder_binds_for_default_default_lister_ui_map[14] = { {0, 55314, 0, "lister__repaint", 15, LINK_PROCS(lister__repaint)}, }; static Meta_Sub_Map fcoder_submaps_for_default[4] = { -{"mapid_global", 12, "The following bindings apply in all situations.", 47, 0, 0, fcoder_binds_for_default_mapid_global, 36}, +{"mapid_global", 12, "The following bindings apply in all situations.", 47, 0, 0, fcoder_binds_for_default_mapid_global, 38}, {"mapid_file", 10, "The following bindings apply in general text files and most apply in code files, but some are overriden by other commands specific to code files.", 145, 0, 0, fcoder_binds_for_default_mapid_file, 63}, {"default_code_map", 16, "The following commands only apply in files where the lexer (syntax highlighting) is turned on.", 94, "mapid_file", 10, fcoder_binds_for_default_default_code_map, 31}, {"default_lister_ui_map", 21, "These commands apply in 'lister mode' such as when you open a file.", 67, 0, 0, fcoder_binds_for_default_default_lister_ui_map, 14}, }; -static Meta_Key_Bind fcoder_binds_for_mac_default_mapid_global[36] = { +static Meta_Key_Bind fcoder_binds_for_mac_default_mapid_global[38] = { {0, 44, 4, "change_active_panel", 19, LINK_PROCS(change_active_panel)}, {0, 60, 4, "change_active_panel_backwards", 29, LINK_PROCS(change_active_panel_backwards)}, {0, 110, 4, "interactive_new", 15, LINK_PROCS(interactive_new)}, @@ -515,6 +521,7 @@ static Meta_Key_Bind fcoder_binds_for_mac_default_mapid_global[36] = { {0, 78, 1, "goto_prev_jump_sticky", 21, LINK_PROCS(goto_prev_jump_sticky)}, {0, 77, 1, "goto_first_jump_sticky", 22, LINK_PROCS(goto_first_jump_sticky)}, {0, 109, 1, "build_in_build_panel", 20, LINK_PROCS(build_in_build_panel)}, +{0, 98, 2, "toggle_filebar", 14, LINK_PROCS(toggle_filebar)}, {0, 122, 1, "execute_any_cli", 15, LINK_PROCS(execute_any_cli)}, {0, 90, 1, "execute_previous_cli", 20, LINK_PROCS(execute_previous_cli)}, {0, 120, 1, "command_lister", 14, LINK_PROCS(command_lister)}, @@ -536,6 +543,7 @@ static Meta_Key_Bind fcoder_binds_for_mac_default_mapid_global[36] = { {0, 55328, 0, "project_fkey_command", 20, LINK_PROCS(project_fkey_command)}, {0, 55329, 0, "project_fkey_command", 20, LINK_PROCS(project_fkey_command)}, {0, 55330, 0, "project_fkey_command", 20, LINK_PROCS(project_fkey_command)}, +{0, 55312, 0, "mouse_wheel_scroll", 18, LINK_PROCS(mouse_wheel_scroll)}, }; static Meta_Key_Bind fcoder_binds_for_mac_default_mapid_file[62] = { {1, 0, 0, "write_character", 15, LINK_PROCS(write_character)}, @@ -651,7 +659,7 @@ static Meta_Key_Bind fcoder_binds_for_mac_default_default_lister_ui_map[14] = { {0, 55314, 0, "lister__repaint", 15, LINK_PROCS(lister__repaint)}, }; static Meta_Sub_Map fcoder_submaps_for_mac_default[4] = { -{"mapid_global", 12, "The following bindings apply in all situations.", 47, 0, 0, fcoder_binds_for_mac_default_mapid_global, 36}, +{"mapid_global", 12, "The following bindings apply in all situations.", 47, 0, 0, fcoder_binds_for_mac_default_mapid_global, 38}, {"mapid_file", 10, "The following bindings apply in general text files and most apply in code files, but some are overriden by other commands specific to code files.", 145, 0, 0, fcoder_binds_for_mac_default_mapid_file, 62}, {"default_code_map", 16, "The following commands only apply in files where the lexer (syntax highlighting) is turned on.", 94, "mapid_file", 10, fcoder_binds_for_mac_default_default_code_map, 31}, {"default_lister_ui_map", 21, "These commands apply in 'lister mode' such as when you open a file.", 67, 0, 0, fcoder_binds_for_mac_default_default_lister_ui_map, 14}, diff --git a/4coder_generated/style.h b/4coder_generated/style.h index dc8c84c2..622dda74 100644 --- a/4coder_generated/style.h +++ b/4coder_generated/style.h @@ -13,6 +13,7 @@ Stag_List_Item_Hover, Stag_List_Item_Active, Stag_Cursor, Stag_At_Cursor, +Stag_Highlight_Cursor_Line, Stag_Highlight, Stag_At_Highlight, Stag_Mark, @@ -51,6 +52,7 @@ static char *style_tag_names[] = { "List_Item_Active", "Cursor", "At_Cursor", +"Highlight_Cursor_Line", "Highlight", "At_Highlight", "Mark", diff --git a/4coder_helper.cpp b/4coder_helper.cpp index aa8898b0..a39f20f3 100644 --- a/4coder_helper.cpp +++ b/4coder_helper.cpp @@ -221,6 +221,15 @@ set_command_caller(Bind_Helper *helper, Command_Caller_Hook_Function *func){ write_unit(helper, unit); } +inline void +set_render_caller(Bind_Helper *helper, Render_Caller_Function *func){ + Binding_Unit unit = {0}; + unit.type = unit_hook; + unit.hook.hook_id = special_hook_render_caller; + unit.hook.func = (void*)func; + write_unit(helper, unit); +} + inline void set_input_filter(Bind_Helper *helper, Input_Filter_Function *func){ Binding_Unit unit = {0}; diff --git a/4coder_jump_sticky.cpp b/4coder_jump_sticky.cpp index 6e212abf..25f80c0a 100644 --- a/4coder_jump_sticky.cpp +++ b/4coder_jump_sticky.cpp @@ -97,6 +97,7 @@ static void init_marker_list(Application_Links *app, Partition *scratch, Heap *heap, Buffer_ID buffer_id, Marker_List *list){ Buffer_Summary buffer = get_buffer(app, buffer_id, AccessAll); + bool32 is_compilation_buffer = match(make_string(buffer.buffer_name, buffer.buffer_name_len), "*compilation*"); Temp_Memory temp = begin_temp_memory(scratch); Sticky_Jump_Array jumps = parse_buffer_to_jump_array(app, scratch, buffer); @@ -147,16 +148,29 @@ init_marker_list(Application_Links *app, Partition *scratch, Heap *heap, Buffer_ } } - Theme_Color color = {}; - color.tag = Stag_Pop2; - get_theme_colors(app, &color, 1); + Managed_Buffer_Markers_Type marker_type = 0; + uint32_t marker_color = 0; + + if (is_compilation_buffer){ + marker_type = BufferMarkersType_LineHighlights; + Theme_Color color = {}; + color.tag = Stag_Highlight_Junk; + get_theme_colors(app, &color, 1); + marker_color = color.color; + } + else{ + marker_type = BufferMarkersType_CharacterBlocks; + Theme_Color color = {}; + color.tag = Stag_Highlight; + get_theme_colors(app, &color, 1); + marker_color = color.color; + } scope_array[1] = buffer_get_managed_scope(app, target_buffer_id); Managed_Scope scope = get_managed_scope_with_multiple_dependencies(app, scope_array, ArrayCount(scope_array)); Managed_Object marker_handle = alloc_buffer_markers_on_buffer(app, target_buffer_id, total_jump_count, &scope); - Managed_Buffer_Markers_Type marker_type = BufferMarkersType_CharacterWireFrames; buffer_markers_set_visuals(app, marker_handle, - marker_type, color.color, 0, 0); + marker_type, marker_color, 0, 0); managed_object_store_data(app, marker_handle, 0, total_jump_count, markers); end_temp_memory(marker_temp); diff --git a/4coder_seek.cpp b/4coder_seek.cpp index 70371947..17651801 100644 --- a/4coder_seek.cpp +++ b/4coder_seek.cpp @@ -1268,5 +1268,4 @@ CUSTOM_DOC("Delete a single, whole token on or to the right of the cursor and po current_view_snipe_delete(app, DirRight, BoundaryToken|BoundaryWhitespace); } -// BOTTOM - +// BOTTOM \ No newline at end of file diff --git a/4ed.cpp b/4ed.cpp index 102c404e..1a8e04de 100644 --- a/4ed.cpp +++ b/4ed.cpp @@ -386,6 +386,7 @@ interpret_binding_buffer(Models *models, void *buffer, i32 size){ models->hook_save_file = 0; models->hook_end_file = 0; models->command_caller = 0; + models->render_caller = 0; models->input_filter = 0; b32 did_top = false; @@ -615,6 +616,11 @@ interpret_binding_buffer(Models *models, void *buffer, i32 size){ models->command_caller = (Command_Caller_Hook_Function*)unit->hook.func; }break; + case special_hook_render_caller: + { + models->render_caller = (Render_Caller_Function*)unit->hook.func; + }break; + case special_hook_scroll_rule: { models->scroll_rule = (Scroll_Rule_Function*)unit->hook.func; @@ -1863,6 +1869,8 @@ App_Step_Sig(app_step){ USE_PANEL(active_panel); USE_VIEW(active_view); + cmd->target = target; + // NOTE(allen): render the panels for (Panel *panel = models->layout.used_sentinel.next; panel != &models->layout.used_sentinel; @@ -1879,6 +1887,10 @@ App_Step_Sig(app_step){ GUI_Scroll_Vars *scroll_vars = &view->transient.edit_pos->scroll; + cmd->render_view = view; + cmd->render_rect = panel->inner; + cmd->render_is_active = active; + do_render_file_view(system, view, models, scroll_vars, active_view, panel->inner, active, target, &dead_input); u32 margin_color; diff --git a/4ed_app_models.h b/4ed_app_models.h index e71a70b2..df3f2710 100644 --- a/4ed_app_models.h +++ b/4ed_app_models.h @@ -55,6 +55,7 @@ struct Models{ Open_File_Hook_Function *hook_save_file; Open_File_Hook_Function *hook_end_file; Command_Caller_Hook_Function *command_caller; + Render_Caller_Function *render_caller; Input_Filter_Function *input_filter; Scroll_Rule_Function *scroll_rule; Buffer_Name_Resolver_Function *buffer_name_resolver; @@ -126,6 +127,12 @@ struct Command_Data{ i32 screen_height; Key_Event_Data key; + + // Render Context + View *render_view; + i32_Rect render_rect; + b32 render_is_active; + Render_Target *target; }; enum Input_Types{ diff --git a/4ed_generated_style.h b/4ed_generated_style.h index 61a4fd5d..3a35024a 100644 --- a/4ed_generated_style.h +++ b/4ed_generated_style.h @@ -16,6 +16,7 @@ u32 list_item_hover_color; u32 list_item_active_color; u32 cursor_color; u32 at_cursor_color; +u32 highlight_cursor_line_color; u32 highlight_color; u32 at_highlight_color; u32 mark_color; @@ -57,6 +58,7 @@ case Stag_List_Item_Hover: result = &s->list_item_hover_color; break; case Stag_List_Item_Active: result = &s->list_item_active_color; break; case Stag_Cursor: result = &s->cursor_color; break; case Stag_At_Cursor: result = &s->at_cursor_color; break; +case Stag_Highlight_Cursor_Line: result = &s->highlight_cursor_line_color; break; case Stag_Highlight: result = &s->highlight_color; break; case Stag_At_Highlight: result = &s->at_highlight_color; break; case Stag_Mark: result = &s->mark_color; break; diff --git a/4ed_view.cpp b/4ed_view.cpp index 3194bd5a..3994f343 100644 --- a/4ed_view.cpp +++ b/4ed_view.cpp @@ -512,7 +512,7 @@ get_visual_markers(Partition *arena, Dynamic_Workspace *workspace, i32 *range_co Marker *marker = markers; for (i32 i = 0; i < count; i += 1, marker += 1){ if (range.first <= marker->pos && - marker->pos < range.one_past_last){ + marker->pos <= range.one_past_last){ Render_Marker *render_marker = push_array(arena, Render_Marker, 1); render_marker->type = marker_type; render_marker->pos = marker->pos; @@ -530,8 +530,8 @@ get_visual_markers(Partition *arena, Dynamic_Workspace *workspace, i32 *range_co range_b.one_past_last = marker[1].pos; if (range_b.first >= range_b.one_past_last) continue; - if (!((range.min - range_b.max < 0) && - (range.max - range_b.min > 0))) continue; + if (!((range.min - range_b.max <= 0) && + (range.max - range_b.min >= 0))) continue; i32 range_id = *range_counter_ptr; *range_counter_ptr += 2; @@ -548,6 +548,28 @@ get_visual_markers(Partition *arena, Dynamic_Workspace *workspace, i32 *range_co } } +internal void +visual_markers_segment_sort(Render_Marker *markers, i32 first, i32 one_past_last, Range *ranges_out){ + // NOTE(allen): This sort only works for a two segment sort, if we end up wanting more segments, + // scrap it and try again. + i32 i1 = first; + i32 i0 = one_past_last - 1; + for (;;){ + for (; i1 < one_past_last && markers[i1].type != BufferMarkersType_LineHighlights; i1 += 1); + for (; i0 >= 0 && markers[i0].type == BufferMarkersType_LineHighlights; i0 -= 1); + if (i1 < i0){ + Swap(Render_Marker, markers[i0], markers[i1]); + } + else{ + break; + } + } + ranges_out[0].first = 0; + ranges_out[0].one_past_last = i1; + ranges_out[1].first = i1; + ranges_out[1].one_past_last = one_past_last; +} + internal void visual_markers_quick_sort(Render_Marker *markers, i32 first, i32 one_past_last){ if (first + 1 < one_past_last){ @@ -581,7 +603,36 @@ visual_markers_quick_sort(Render_Marker *markers, i32 first, i32 one_past_last){ } } -internal i32 +internal void +visual_markers_replace_pos_with_first_byte_of_line(Render_Marker_Array markers, i32 *line_starts, i32 line_count, i32 hint_line_index){ + if (markers.count > 0){ + Assert(0 <= hint_line_index && hint_line_index < line_count); + Assert(line_starts[hint_line_index] <= markers.markers[0].pos); + i32 marker_scan_index = 0; + for (i32 line_scan_index = hint_line_index;; line_scan_index += 1){ + Assert(line_scan_index < line_count); + i32 look_ahead_line_index = line_scan_index + 1; + i32 first_byte_index_of_next_line = 0; + if (look_ahead_line_index < line_count){ + first_byte_index_of_next_line = line_starts[look_ahead_line_index]; + } + else{ + first_byte_index_of_next_line = max_i32; + } + i32 first_byte_index_of_this_line = line_starts[line_scan_index]; + for (;(marker_scan_index < markers.count && + markers.markers[marker_scan_index].pos < first_byte_index_of_next_line); + marker_scan_index += 1){ + markers.markers[marker_scan_index].pos = first_byte_index_of_this_line; + } + if (marker_scan_index == markers.count){ + break; + } + } + } +} + +internal void render_loaded_file_in_view(System_Functions *system, View *view, Models *models, i32_Rect rect, b32 is_active, Render_Target *target){ Editing_File *file = view->transient.file_data.file; @@ -738,12 +789,51 @@ render_loaded_file_in_view(System_Functions *system, View *view, Models *models, markers.count = (i32)(push_array(part, Render_Marker, 0) - markers.markers); // NOTE(allen): Sort visual markers by position - visual_markers_quick_sort(markers.markers, 0, markers.count); + Range marker_segments[2]; + visual_markers_segment_sort(markers.markers, 0, markers.count, marker_segments); + for (i32 i = 0; i < ArrayCount(marker_segments); i += 1){ + visual_markers_quick_sort(markers.markers, marker_segments[i].first, marker_segments[i].one_past_last); + } + + Render_Marker_Array character_markers = {0}; + character_markers.markers = markers.markers + marker_segments[0].first; + character_markers.count = marker_segments[0].one_past_last - marker_segments[0].first; + + Render_Marker_Array line_markers = {0}; + line_markers.markers = markers.markers + marker_segments[1].first; + line_markers.count = marker_segments[1].one_past_last - marker_segments[1].first; + + i32 *line_starts = file->state.buffer.line_starts; + i32 line_count = file->state.buffer.line_count; + i32 line_scan_index = render_cursor.line - 1; + i32 first_byte_index_of_next_line = 0; + if (line_scan_index + 1 < line_count){ + first_byte_index_of_next_line = line_starts[line_scan_index + 1]; + } + else{ + first_byte_index_of_next_line = max_i32; + } + + i32 *wrap_starts = file->state.wrap_positions; + i32 wrap_count = file->state.wrap_position_count; + i32 wrap_scan_index = render_cursor.wrap_line - render_cursor.line; + i32 first_byte_index_of_next_wrap = 0; + if (wrap_scan_index + 1 < wrap_count){ + first_byte_index_of_next_wrap = wrap_starts[wrap_scan_index + 1]; + } + else{ + first_byte_index_of_next_wrap = max_i32; + } + + visual_markers_replace_pos_with_first_byte_of_line(line_markers, line_starts, line_count, line_scan_index); i32 visual_markers_scan_index = 0; i32 visual_markers_range_id = -1; u32 visual_markers_range_color = 0; + i32 visual_line_markers_scan_index = 0; + u32 visual_line_markers_color = 0; + i32 cursor_begin = 0; i32 cursor_end = 0; u32 cursor_color = 0; @@ -779,6 +869,43 @@ render_loaded_file_in_view(System_Functions *system, View *view, Models *models, for (; item < item_end; ++item){ i32 ind = item->index; + + // NOTE(allen): Line scanning + b32 is_new_line = false; + for (; line_scan_index < line_count;){ + if (ind < first_byte_index_of_next_line){ + break; + } + line_scan_index += 1; + is_new_line = true; + if (line_scan_index + 1 < line_count){ + first_byte_index_of_next_line = line_starts[line_scan_index + 1]; + } + else{ + first_byte_index_of_next_line = max_i32; + } + } + if (item == items){ + is_new_line = true; + } + + // NOTE(allen): Wrap scanning + b32 is_new_wrap = false; + for (; wrap_scan_index < wrap_count;){ + if (ind < first_byte_index_of_next_wrap){ + break; + } + wrap_scan_index += 1; + is_new_wrap = true; + if (wrap_scan_index + 1 < wrap_count){ + first_byte_index_of_next_wrap = wrap_starts[wrap_scan_index + 1]; + } + else{ + first_byte_index_of_next_wrap = max_i32; + } + } + + // NOTE(allen): Token scanning u32 highlight_this_color = 0; if (tokens_use && ind != prev_ind){ Cpp_Token current_token = token_array.tokens[token_i-1]; @@ -820,14 +947,32 @@ render_loaded_file_in_view(System_Functions *system, View *view, Models *models, highlight_this_color = highlight_color; } + // NOTE(allen): Line marker colors + if (is_new_line){ + visual_line_markers_color = 0; + } + + for (;visual_line_markers_scan_index < line_markers.count && + line_markers.markers[visual_line_markers_scan_index].pos <= ind; + visual_line_markers_scan_index += 1){ + Render_Marker *marker = &line_markers.markers[visual_line_markers_scan_index]; + Assert(marker->type == BufferMarkersType_LineHighlights); + visual_line_markers_color = marker->color; + } + + u32 marker_line_highlight = 0; + if (is_new_line || is_new_wrap){ + marker_line_highlight = visual_line_markers_color; + } + // NOTE(allen): Visual marker colors u32 marker_highlight = 0; u32 marker_wireframe = 0; u32 marker_ibar = 0; - for (;visual_markers_scan_index < markers.count && - markers.markers[visual_markers_scan_index].pos <= ind; + for (;visual_markers_scan_index < character_markers.count && + character_markers.markers[visual_markers_scan_index].pos <= ind; visual_markers_scan_index += 1){ - Render_Marker *marker = &markers.markers[visual_markers_scan_index]; + Render_Marker *marker = &character_markers.markers[visual_markers_scan_index]; switch (marker->type){ case BufferMarkersType_CharacterBlocks: { @@ -847,11 +992,6 @@ render_loaded_file_in_view(System_Functions *system, View *view, Models *models, } }break; - case BufferMarkersType_LineHighlights: - { - NotImplemented; - }break; - case BufferMarkersType_CharacterWireFrames: { marker_wireframe = marker->color; @@ -920,6 +1060,10 @@ render_loaded_file_in_view(System_Functions *system, View *view, Models *models, } } + if (marker_line_highlight != 0){ + f32_Rect line_rect = f32R((f32)rect.x0, char_rect.y0, (f32)rect.x1, char_rect.y1); + draw_rectangle(target, line_rect, marker_line_highlight); + } if (color_highlight != 0){ draw_rectangle(target, char_rect, color_highlight); } @@ -950,8 +1094,6 @@ render_loaded_file_in_view(System_Functions *system, View *view, Models *models, } end_temp_memory(temp); - - return(0); } // BOTTOM diff --git a/4ed_view_ui.cpp b/4ed_view_ui.cpp index a92bd8e7..852e0e81 100644 --- a/4ed_view_ui.cpp +++ b/4ed_view_ui.cpp @@ -71,12 +71,6 @@ do_step_file_view(System_Functions *system, View *view, Models *models, i32_Rect view->transient.widget_height = (f32)bar_count*(view->transient.line_height + 2); if (!view->transient.ui_mode){ - if (user_input->mouse.wheel != 0){ - result.scroll.target_y += user_input->mouse.wheel; - result.scroll.target_y = clamp(0, result.scroll.target_y, max_y); - result.is_animating = true; - } - view->transient.file_region = rect; Editing_File *file = view->transient.file_data.file; @@ -230,14 +224,24 @@ draw_file_bar(System_Functions *system, Render_Target *target, View *view, Model } } -internal i32 +internal void +do_core_render(Application_Links *app){ + Command_Data *cmd = (Command_Data*)app->cmd_context; + System_Functions *system = cmd->system; + Models *models = cmd->models; + View *view = cmd->render_view; + i32_Rect rect = cmd->render_rect; + b32 is_active = cmd->render_is_active; + Render_Target *target = cmd->target; + render_loaded_file_in_view(system, view, models, rect, is_active, target); +} + +internal void do_render_file_view(System_Functions *system, View *view, Models *models, GUI_Scroll_Vars *scroll, View *active, i32_Rect rect, b32 is_active, Render_Target *target, Input_Summary *user_input){ Editing_File *file = view->transient.file_data.file; Assert(file != 0); - i32 result = 0; - i32 line_height = view->transient.line_height; Style *style = &models->styles.styles[0]; Face_ID font_id = file->settings.font_id; @@ -280,7 +284,12 @@ do_render_file_view(System_Functions *system, View *view, Models *models, GUI_Sc draw_push_clip(target, rect); if (!view->transient.ui_mode){ if (file_is_ready(file)){ - result = render_loaded_file_in_view(system, view, models, rect, is_active, target); + if (models->render_caller != 0){ + models->render_caller(&models->app_links, view->persistent.id + 1, do_core_render); + } + else{ + render_loaded_file_in_view(system, view, models, rect, is_active, target); + } } } else{ @@ -387,8 +396,6 @@ do_render_file_view(System_Functions *system, View *view, Models *models, GUI_Sc } } draw_pop_clip(target); - - return(result); } // BOTTOM diff --git a/meta/4ed_metagen.cpp b/meta/4ed_metagen.cpp index 8cf6041a..6fd2b531 100644 --- a/meta/4ed_metagen.cpp +++ b/meta/4ed_metagen.cpp @@ -152,6 +152,7 @@ static char* main_style_fields[] = { "list_item_active", "cursor", "at_cursor", + "highlight_cursor_line", "highlight", "at_highlight", "mark", @@ -693,6 +694,7 @@ generate_remapping_code_and_data(){ bind(mappings, 'N', MDFR_ALT, goto_prev_jump_no_skips_sticky); bind(mappings, 'M', MDFR_ALT, goto_first_jump_sticky); bind(mappings, 'm', MDFR_ALT, build_in_build_panel); + bind(mappings, 'b', MDFR_ALT, toggle_filebar); bind(mappings, 'z', MDFR_ALT, execute_any_cli); bind(mappings, 'Z', MDFR_ALT, execute_previous_cli); @@ -722,6 +724,8 @@ generate_remapping_code_and_data(){ bind(mappings, key_f15, MDFR_NONE, project_fkey_command); bind(mappings, key_f16, MDFR_NONE, project_fkey_command); + bind(mappings, key_mouse_wheel, MDFR_NONE, mouse_wheel_scroll); + end_map(mappings); // NOTE(allen): FILE @@ -893,6 +897,7 @@ generate_remapping_code_and_data(){ bind(mappings, 'N', MDFR_CTRL, goto_prev_jump_sticky); bind(mappings, 'M', MDFR_CTRL, goto_first_jump_sticky); bind(mappings, 'm', MDFR_CTRL, build_in_build_panel); + bind(mappings, 'b', MDFR_ALT, toggle_filebar); bind(mappings, 'z', MDFR_CTRL, execute_any_cli); bind(mappings, 'Z', MDFR_CTRL, execute_previous_cli); @@ -922,6 +927,8 @@ generate_remapping_code_and_data(){ bind(mappings, key_f15, MDFR_NONE, project_fkey_command); bind(mappings, key_f16, MDFR_NONE, project_fkey_command); + bind(mappings, key_mouse_wheel, MDFR_NONE, mouse_wheel_scroll); + end_map(mappings); // NOTE(allen): FILE diff --git a/site/source_material/binding_list.txt b/site/source_material/binding_list.txt index a2d37501..db0d7b73 100644 --- a/site/source_material/binding_list.txt +++ b/site/source_material/binding_list.txt @@ -45,6 +45,7 @@ The following bindings apply in all situations. \ITEM \STYLE{code} \END Queries for an output buffer name and system command, runs the system command as a CLI and prints the output to the specified buffer. \ITEM \STYLE{code} \END If the command execute_any_cli has already been used, this will execute a CLI reusing the most recent buffer name and command. \ITEM \STYLE{code} \END Opens an interactive list of all registered commands. +\ITEM \STYLE{code} \END Creates a lister of locations that look like function definitions and declarations in the buffer. \ITEM \STYLE{code} \END Attempts to close 4coder. \ITEM \STYLE{code} \END Run an 'fkey command' configured in a project.4coder file. Determines the index of the 'fkey command' by which function key or numeric key was pressed to trigger the command. \ITEM \STYLE{code} \END Run an 'fkey command' configured in a project.4coder file. Determines the index of the 'fkey command' by which function key or numeric key was pressed to trigger the command. @@ -107,6 +108,7 @@ The following bindings apply in general text files and most apply in code files, \ITEM \STYLE{code} \END Queries the user for a string and lists all case-insensitive substring matches found in all open buffers. \ITEM \STYLE{code} \END Queries the user for a number, and jumps the cursor to the corresponding line. \ITEM \STYLE{code} \END Reads the string in the selected range and lists all exact case-sensitive mathces in all open buffers. +\ITEM \STYLE{code} \END Opens a snippet lister for inserting whole pre-written snippets of text. \ITEM \STYLE{code} \END Kills the current buffer. \ITEM \STYLE{code} \END Create a copy of the line on which the cursor sits. \ITEM \STYLE{code} \END Swaps the position of the cursor and the mark. @@ -165,7 +167,6 @@ The following commands only apply in files where the lexer (syntax highlighting) \ITEM \STYLE{code} \END Reads a filename from surrounding '"' characters and attempts to open the corresponding file. \ITEM \STYLE{code} \END If the current file is a *.cpp or *.h, attempts to open the corresponding *.h or *.cpp file in the other view. \ITEM \STYLE{code} \END At the cursor, insert a ' = {0};'. -\ITEM \STYLE{code} \END Creates a lister of locations that look like function definitions and declarations in the buffer. \END \END \SECTION{default-lister-ui-map} diff --git a/themes/theme-4coder.4coder b/themes/theme-4coder.4coder index 3ce72073..f2125b92 100644 --- a/themes/theme-4coder.4coder +++ b/themes/theme-4coder.4coder @@ -8,10 +8,11 @@ List_Item = Margin; List_Item_Hover = Margin_Hover; List_Item_Active = Margin_Active; Cursor = 0xFF00EE00; +At_Cursor = Back; +Highlight_Cursor_Line = 0xff003a3a; Highlight = 0xFFDDEE00; Mark = 0xFF494949; Default = 0xFF90B080; -At_Cursor = Back; At_Highlight = 0xFFFF44DD; Comment = 0xFF2090F0; Keyword = 0xFFD08F20; diff --git a/themes/theme-handmade-hero.4coder b/themes/theme-handmade-hero.4coder index 103295ff..f1ca0045 100644 --- a/themes/theme-handmade-hero.4coder +++ b/themes/theme-handmade-hero.4coder @@ -8,10 +8,11 @@ List_Item = Margin; List_Item_Hover = Margin_Hover; List_Item_Active = Margin_Active; Cursor = 0xFF40FF40; +At_Cursor = Back; +Highlight_Cursor_Line = 0xFF003A3A; Highlight = 0xFF703419; Mark = 0xFF808080; Default = 0xFFA08563; -At_Cursor = Back; At_Highlight = 0xFFCDAA7D; Comment = 0xFF7D7D7D; Keyword = 0xFFCD950C; diff --git a/themes/theme-hjortshoej.4coder b/themes/theme-hjortshoej.4coder index 4622e5dc..3c1b3ef3 100644 --- a/themes/theme-hjortshoej.4coder +++ b/themes/theme-hjortshoej.4coder @@ -9,6 +9,7 @@ List_Item_Hover = Margin_Hover; List_Item_Active = Margin_Active; Cursor = 0xFF000000; At_Cursor = 0xFFD6D6D6; +Highlight_Cursor_Line = 0xFFB8B098; Mark = 0xFF525252; Highlight = 0xFFB87600; At_Highlight = 0xFF000000; diff --git a/themes/theme-midnight.4coder b/themes/theme-midnight.4coder index 26d8b4e2..9c36ad4d 100644 --- a/themes/theme-midnight.4coder +++ b/themes/theme-midnight.4coder @@ -9,6 +9,7 @@ List_Item_Hover = Margin_Hover; List_Item_Active = Margin_Active; Cursor = 0xFFDDDDDD; At_Cursor = Back; +Highlight_Cursor_Line = 0xFF383838; Mark = 0xFF808080; Highlight = 0xFF006080; At_Highlight = Back; diff --git a/themes/theme-stb-dark.4coder b/themes/theme-stb-dark.4coder index bb6d4922..ca5a4853 100644 --- a/themes/theme-stb-dark.4coder +++ b/themes/theme-stb-dark.4coder @@ -9,6 +9,7 @@ List_Item_Hover = Margin_Hover; List_Item_Active = Margin_Active; Cursor = 0xFFDDDDDD; At_Cursor = Back; +Highlight_Cursor_Line = 0xFF383838; Mark = 0xFF808080; Highlight = 0xFF006080; At_Highlight = Back; diff --git a/themes/theme-stb.4coder b/themes/theme-stb.4coder index 474700b6..31d15c46 100644 --- a/themes/theme-stb.4coder +++ b/themes/theme-stb.4coder @@ -9,6 +9,7 @@ List_Item_Hover = Margin_Hover; List_Item_Active = Margin_Active; Cursor = 0xFF000000; At_Cursor = Back; +Highlight_Cursor_Line = 0xFFBCBCBC; Mark = 0xFF525252; Highlight = 0xFF0044FF; At_Highlight = Back; diff --git a/themes/theme-strange.4coder b/themes/theme-strange.4coder index 1730918b..44ce909f 100644 --- a/themes/theme-strange.4coder +++ b/themes/theme-strange.4coder @@ -9,6 +9,7 @@ List_Item_Hover = Margin_Hover; List_Item_Active = Margin_Active; Cursor = 0xFFd96e26; At_Cursor = Back; +Highlight_Cursor_Line = 0xFF003A3A; Mark = 0xFF808080; Highlight = 0xFF703419; At_Highlight = 0xFFCDAA7D; diff --git a/themes/theme-sunlight.4coder b/themes/theme-sunlight.4coder index 0172ee94..f81c4a2d 100644 --- a/themes/theme-sunlight.4coder +++ b/themes/theme-sunlight.4coder @@ -9,6 +9,7 @@ List_Item_Hover = Margin_Hover; List_Item_Active = Margin_Active; Cursor = 0xFF222222; At_Cursor = Back; +Highlight_Cursor_Line = 0xFFC7C7C7; Mark = 0xFF797979; Highlight = 0xFFFF9979; At_Highlight = Back; diff --git a/themes/theme-twilight.4coder b/themes/theme-twilight.4coder index 88862831..898dc768 100644 --- a/themes/theme-twilight.4coder +++ b/themes/theme-twilight.4coder @@ -9,6 +9,7 @@ List_Item_Hover = Margin_Hover; List_Item_Active = Margin_Active; Cursor = 0xFFEEE800; At_Cursor = Back; +Highlight_Cursor_Line = 0xFF151F2A; Mark = 0xFF8BA8CC; Highlight = 0xFF037A7B; At_Highlight = Back; diff --git a/todo.txt b/todo.txt index 7a80b75b..a2de5976 100644 --- a/todo.txt +++ b/todo.txt @@ -3,18 +3,18 @@ { Features { - [] Visible Markers + [] New Features with Visible Markers { - [] Line Highlight - [] Cursor Block - [] Cursor Bar - [] Wire Cursor Block - [] Highlight Range + [x] Customizable Highlight Line at Cursor All the Time + [x] Customizable Highlight Token at Cursor All the Time + [] Paren/Brace Matching (with color pallette expansion) + [] Figure out what to do with sticky jumps that would be helpful + [] isearch upgrade with full parse and all that } [] Color Pallette Expansion For Keywords - [] Color Pallette Expansion For Paren/Brace Matching [] Reload all out of sync files [] Doubly Linked List Node Managed Object + [] Jump to Command Definition (useful for 4coder customization developers only) } Bugs @@ -74,6 +74,14 @@ Change Log [x] Snippet Lister [x] Project Command Lister } + [x] Visible Markers + { + [x] Line Highlight + [x] Cursor Block + [x] Cursor Bar + [x] Wire Cursor Block + [x] Highlight Range + } } }