From 1eaac285d9a1631aa7e312bc6bd61058cf7f40b3 Mon Sep 17 00:00:00 2001 From: Allen Webster Date: Sun, 10 May 2020 08:00:50 -0700 Subject: [PATCH] point stack - jump to definition - fusion --- 4ed.cpp | 2 +- custom/4coder_base_commands.cpp | 29 ++ custom/4coder_code_index_listers.cpp | 31 ++ custom/4coder_default_framework.cpp | 153 ++++++ custom/4coder_default_framework.h | 15 + custom/4coder_default_framework_variables.cpp | 4 + custom/4coder_default_hooks.cpp | 96 +--- custom/4coder_default_map.cpp | 2 + custom/4coder_mac_map.cpp | 2 + custom/generated/command_metadata.h | 482 +++++++++--------- custom/generated/managed_id_metadata.cpp | 2 + fusion/4coder_fusion.cpp | 248 +++++++++ project.4coder | 6 +- 13 files changed, 758 insertions(+), 314 deletions(-) create mode 100644 fusion/4coder_fusion.cpp diff --git a/4ed.cpp b/4ed.cpp index c757b3eb..d56dc553 100644 --- a/4ed.cpp +++ b/4ed.cpp @@ -782,7 +782,7 @@ App_Step_Sig(app_step){ Application_Links app = {}; app.tctx = tctx; app.cmd_context = models; -#define M "SERIOUS ERROR: coroutine wind down did not complete" +#define M "SERIOUS ERROR: coroutine wind down did not complete\n" print_message(&app, string_u8_litexpr(M)); #undef M break; diff --git a/custom/4coder_base_commands.cpp b/custom/4coder_base_commands.cpp index ca4ec960..fff2be07 100644 --- a/custom/4coder_base_commands.cpp +++ b/custom/4coder_base_commands.cpp @@ -1330,6 +1330,35 @@ CUSTOM_DOC("Queries the user for a string, and incrementally replace every occur //////////////////////////////// +CUSTOM_COMMAND_SIG(jump_to_last_point) +CUSTOM_DOC("Read from the top of the point stack and jump there; if already there pop the top and go to the next option") +{ + View_ID view = get_active_view(app, Access_Visible); + if (view != 0){ + Buffer_ID buffer = view_get_buffer(app, view, Access_Always); + i64 pos = view_get_cursor_pos(app, view); + + for (;;){ + Buffer_ID stack_buffer = 0; + i64 stack_pos = 0; + if (point_stack_read_top(app, &stack_buffer, &stack_pos)){ + if (stack_buffer != 0 && + (stack_buffer != buffer || stack_pos != pos)){ + view_set_buffer(app, view, stack_buffer, 0); + view_set_cursor_and_preferred_x(app, view, seek_pos(stack_pos)); + break; + } + point_stack_pop(app); + } + else{ + break; + } + } + } +} + +//////////////////////////////// + function void delete_file_base(Application_Links *app, String_Const_u8 file_name, Buffer_ID buffer_id){ String_Const_u8 path = string_remove_last_folder(file_name); diff --git a/custom/4coder_code_index_listers.cpp b/custom/4coder_code_index_listers.cpp index 53f0ed29..1f1ac30e 100644 --- a/custom/4coder_code_index_listers.cpp +++ b/custom/4coder_code_index_listers.cpp @@ -60,9 +60,40 @@ CUSTOM_DOC("List all definitions in the code index and jump to one chosen by the if (result.buffer != 0){ View_ID view = get_this_ctx_view(app, Access_Always); + point_stack_push_view_cursor(app, view); jump_to_location(app, view, result.buffer, result.pos); } } +CUSTOM_UI_COMMAND_SIG(jump_to_definition_at_cursor) +CUSTOM_DOC("Jump to the first definition in the code index matching an identifier at the cursor") +{ + View_ID view = get_active_view(app, Access_Visible); + + if (view != 0){ + Scratch_Block scratch(app); + String_Const_u8 query = push_token_or_word_under_active_cursor(app, scratch); + + code_index_lock(); + for (Buffer_ID buffer = get_buffer_next(app, 0, Access_Always); + buffer != 0; + buffer = get_buffer_next(app, buffer, Access_Always)){ + Code_Index_File *file = code_index_get_file(buffer); + if (file != 0){ + for (i32 i = 0; i < file->note_array.count; i += 1){ + Code_Index_Note *note = file->note_array.ptrs[i]; + if (string_match(note->text, query)){ + point_stack_push_view_cursor(app, view); + jump_to_location(app, view, buffer, note->pos.first); + goto done; + } + } + } + } + done:; + code_index_unlock(); + } +} + // BOTTOM diff --git a/custom/4coder_default_framework.cpp b/custom/4coder_default_framework.cpp index 737fdc98..9d65f5b2 100644 --- a/custom/4coder_default_framework.cpp +++ b/custom/4coder_default_framework.cpp @@ -4,6 +4,81 @@ // TOP +function void +point_stack_push(Application_Links *app, Buffer_ID buffer, i64 pos){ + Managed_Object object = alloc_buffer_markers_on_buffer(app, buffer, 1, 0); + Marker *marker = (Marker*)managed_object_get_pointer(app, object); + marker->pos = pos; + marker->lean_right = false; + + i32 next_top = (point_stack.top + 1)%ArrayCount(point_stack.markers); + if (next_top == point_stack.bot){ + Point_Stack_Slot *slot = &point_stack.markers[point_stack.bot]; + managed_object_free(app, slot->object); + block_zero_struct(slot); + point_stack.bot = (point_stack.bot + 1)%ArrayCount(point_stack.markers); + } + + Point_Stack_Slot *slot = &point_stack.markers[point_stack.top]; + slot->buffer = buffer; + slot->object = object; + point_stack.top = next_top; +} + +function void +point_stack_push_view_cursor(Application_Links *app, View_ID view){ + Buffer_ID buffer = view_get_buffer(app, view, Access_Always); + i64 pos = view_get_cursor_pos(app, view); + point_stack_push(app, buffer, pos); +} + +function b32 +point_stack_pop(Application_Links *app){ + b32 result = false; + if (point_stack.top != point_stack.bot){ + result = true; + if (point_stack.top > 0){ + point_stack.top -= 1; + } + else{ + point_stack.top = ArrayCount(point_stack.markers) - 1; + } + Point_Stack_Slot *slot = &point_stack.markers[point_stack.top]; + managed_object_free(app, slot->object); + block_zero_struct(slot); + } + return(result); +} + +function b32 +point_stack_read_top(Application_Links *app, Buffer_ID *buffer_out, i64 *pos_out){ + b32 result = false; + if (point_stack.top != point_stack.bot){ + result = true; + i32 prev_top = point_stack.top; + if (prev_top > 0){ + prev_top -= 1; + } + else{ + prev_top = ArrayCount(point_stack.markers) - 1; + } + Point_Stack_Slot *slot = &point_stack.markers[prev_top]; + Managed_Object object = slot->object; + Marker *marker = (Marker*)managed_object_get_pointer(app, object); + if (marker != 0){ + *buffer_out = slot->buffer; + *pos_out = marker->pos; + } + else{ + *buffer_out = 0; + *pos_out = 0; + } + } + return(result); +} + +//////////////////////////////// + function void unlock_jump_buffer(void){ locked_buffer.size = 0; @@ -69,6 +144,7 @@ new_view_settings(Application_Links *app, View_ID view){ //////////////////////////////// + function void view_set_passive(Application_Links *app, View_ID view_id, b32 value){ Managed_Scope scope = view_get_managed_scope(app, view_id); @@ -897,5 +973,82 @@ default_framework_init(Application_Links *app){ fade_range_arena = make_arena_system(KB(8)); } +//////////////////////////////// + +function void +default_input_handler_init(Application_Links *app, Arena *arena){ + Thread_Context *tctx = get_thread_context(app); + + View_ID view = get_this_ctx_view(app, Access_Always); + String_Const_u8 name = push_u8_stringf(arena, "view %d", view); + + Profile_Global_List *list = get_core_profile_list(app); + ProfileThreadName(tctx, list, name); + + View_Context ctx = view_current_context(app, view); + ctx.mapping = &framework_mapping; + ctx.map_id = mapid_global; + view_alter_context(app, view, &ctx); +} + +function Command_Map_ID +default_get_map_id(Application_Links *app, View_ID view){ + Command_Map_ID result = 0; + Buffer_ID buffer = view_get_buffer(app, view, Access_Always); + Managed_Scope buffer_scope = buffer_get_managed_scope(app, buffer); + Command_Map_ID *result_ptr = scope_attachment(app, buffer_scope, buffer_map_id, Command_Map_ID); + if (result_ptr != 0){ + if (*result_ptr == 0){ + *result_ptr = mapid_file; + } + result = *result_ptr; + } + else{ + result = mapid_global; + } + return(result); +} + +function void +default_pre_command(Application_Links *app, Managed_Scope scope){ + Rewrite_Type *next_rewrite = + scope_attachment(app, scope, view_next_rewrite_loc, Rewrite_Type); + *next_rewrite = Rewrite_None; + if (fcoder_mode == FCoderMode_NotepadLike){ + for (View_ID view_it = get_view_next(app, 0, Access_Always); + view_it != 0; + view_it = get_view_next(app, view_it, Access_Always)){ + Managed_Scope scope_it = view_get_managed_scope(app, view_it); + b32 *snap_mark_to_cursor = + scope_attachment(app, scope_it, view_snap_mark_to_cursor, + b32); + *snap_mark_to_cursor = true; + } + } +} + +function void +default_post_command(Application_Links *app, Managed_Scope scope){ + Rewrite_Type *next_rewrite = scope_attachment(app, scope, view_next_rewrite_loc, Rewrite_Type); + if (next_rewrite != 0){ + Rewrite_Type *rewrite = + scope_attachment(app, scope, view_rewrite_loc, Rewrite_Type); + *rewrite = *next_rewrite; + if (fcoder_mode == FCoderMode_NotepadLike){ + for (View_ID view_it = get_view_next(app, 0, Access_Always); + view_it != 0; + view_it = get_view_next(app, view_it, Access_Always)){ + Managed_Scope scope_it = view_get_managed_scope(app, view_it); + b32 *snap_mark_to_cursor = + scope_attachment(app, scope_it, view_snap_mark_to_cursor, b32); + if (*snap_mark_to_cursor){ + i64 pos = view_get_cursor_pos(app, view_it); + view_set_mark(app, view_it, seek_pos(pos)); + } + } + } + } +} + // BOTTOM diff --git a/custom/4coder_default_framework.h b/custom/4coder_default_framework.h index ff383944..77812b36 100644 --- a/custom/4coder_default_framework.h +++ b/custom/4coder_default_framework.h @@ -54,6 +54,21 @@ struct ID_Pos_Jump_Location_Array{ //////////////////////////////// +#define POINT_STACK_DEPTH 100 + +struct Point_Stack_Slot{ + Buffer_ID buffer; + Managed_Object object; +}; + +struct Point_Stack{ + Point_Stack_Slot markers[POINT_STACK_DEPTH + 1]; + i32 top; + i32 bot; +}; + +//////////////////////////////// + typedef i32 Fallback_Dispatch_Result_Code; enum{ FallbackDispatch_Unhandled, diff --git a/custom/4coder_default_framework_variables.cpp b/custom/4coder_default_framework_variables.cpp index 1c8095d3..2ebb9e0c 100644 --- a/custom/4coder_default_framework_variables.cpp +++ b/custom/4coder_default_framework_variables.cpp @@ -101,6 +101,10 @@ global Fade_Range *free_fade_ranges = 0; //////////////////////////////// +global Point_Stack point_stack = {}; + +//////////////////////////////// + global Clipboard clipboard0 = {}; // BOTTOM diff --git a/custom/4coder_default_hooks.cpp b/custom/4coder_default_hooks.cpp index fe53688d..64d243a7 100644 --- a/custom/4coder_default_hooks.cpp +++ b/custom/4coder_default_hooks.cpp @@ -51,101 +51,43 @@ CUSTOM_DOC("Default command for responding to a try-exit event") CUSTOM_COMMAND_SIG(default_view_input_handler) CUSTOM_DOC("Input consumption loop for default view behavior") { - Thread_Context *tctx = get_thread_context(app); - Scratch_Block scratch(tctx); + Scratch_Block scratch(app); + default_input_handler_init(app, scratch); - { - View_ID view = get_this_ctx_view(app, Access_Always); - String_Const_u8 name = push_u8_stringf(scratch, "view %d", view); - - Profile_Global_List *list = get_core_profile_list(app); - ProfileThreadName(tctx, list, name); - - View_Context ctx = view_current_context(app, view); - ctx.mapping = &framework_mapping; - ctx.map_id = mapid_global; - view_alter_context(app, view, &ctx); - } + View_ID view = get_this_ctx_view(app, Access_Always); + Managed_Scope scope = view_get_managed_scope(app, view); for (;;){ - // NOTE(allen): Get the binding from the buffer's current map + // NOTE(allen): Get input User_Input input = get_next_input(app, EventPropertyGroup_Any, 0); - ProfileScopeNamed(app, "before view input", view_input_profile); if (input.abort){ break; } - Event_Property event_properties = get_event_properties(&input.event); + ProfileScopeNamed(app, "before view input", view_input_profile); + // NOTE(allen): Mouse Suppression + Event_Property event_properties = get_event_properties(&input.event); if (suppressing_mouse && (event_properties & EventPropertyGroup_AnyMouseEvent) != 0){ continue; } - View_ID view = get_this_ctx_view(app, Access_Always); - - Buffer_ID buffer = view_get_buffer(app, view, Access_Always); - Managed_Scope buffer_scope = buffer_get_managed_scope(app, buffer); - Command_Map_ID *map_id_ptr = scope_attachment(app, buffer_scope, buffer_map_id, Command_Map_ID); - if (*map_id_ptr == 0){ - *map_id_ptr = mapid_file; - } - Command_Map_ID map_id = *map_id_ptr; + // NOTE(allen): Get map_id + Command_Map_ID map_id = default_get_map_id(app, view); + // NOTE(allen): Get binding Command_Binding binding = map_get_binding_recursive(&framework_mapping, map_id, &input.event); - - Managed_Scope scope = view_get_managed_scope(app, view); - if (binding.custom == 0){ - // NOTE(allen): we don't have anything to do with this input, - // leave it marked unhandled so that if there's a follow up - // event it is not blocked. leave_current_input_unhandled(app); + continue; } - else{ - // NOTE(allen): before the command is called do some book keeping - Rewrite_Type *next_rewrite = - scope_attachment(app, scope, view_next_rewrite_loc, Rewrite_Type); - *next_rewrite = Rewrite_None; - if (fcoder_mode == FCoderMode_NotepadLike){ - for (View_ID view_it = get_view_next(app, 0, Access_Always); - view_it != 0; - view_it = get_view_next(app, view_it, Access_Always)){ - Managed_Scope scope_it = view_get_managed_scope(app, view_it); - b32 *snap_mark_to_cursor = - scope_attachment(app, scope_it, view_snap_mark_to_cursor, - b32); - *snap_mark_to_cursor = true; - } - } - - ProfileCloseNow(view_input_profile); - - // NOTE(allen): call the command - binding.custom(app); - - // NOTE(allen): after the command is called do some book keeping - ProfileScope(app, "after view input"); - - next_rewrite = scope_attachment(app, scope, view_next_rewrite_loc, Rewrite_Type); - if (next_rewrite != 0){ - Rewrite_Type *rewrite = - scope_attachment(app, scope, view_rewrite_loc, Rewrite_Type); - *rewrite = *next_rewrite; - if (fcoder_mode == FCoderMode_NotepadLike){ - for (View_ID view_it = get_view_next(app, 0, Access_Always); - view_it != 0; - view_it = get_view_next(app, view_it, Access_Always)){ - Managed_Scope scope_it = view_get_managed_scope(app, view_it); - b32 *snap_mark_to_cursor = - scope_attachment(app, scope_it, view_snap_mark_to_cursor, b32); - if (*snap_mark_to_cursor){ - i64 pos = view_get_cursor_pos(app, view_it); - view_set_mark(app, view_it, seek_pos(pos)); - } - } - } - } - } + + // NOTE(allen): Run the command and pre/post command stuff + default_pre_command(app, scope); + ProfileCloseNow(view_input_profile); + binding.custom(app); + ProfileScope(app, "after view input"); + default_post_command(app, scope); } } diff --git a/custom/4coder_default_map.cpp b/custom/4coder_default_map.cpp index bf48243a..a121a0cb 100644 --- a/custom/4coder_default_map.cpp +++ b/custom/4coder_default_map.cpp @@ -37,6 +37,7 @@ setup_default_mapping(Mapping *mapping, i64 global_id, i64 file_id, i64 code_id) Bind(command_lister, KeyCode_X, KeyCode_Alt); Bind(project_command_lister, KeyCode_X, KeyCode_Alt, KeyCode_Shift); Bind(quick_swap_buffer, KeyCode_BackwardSlash, KeyCode_Alt); + Bind(jump_to_last_point, KeyCode_P, KeyCode_Control); Bind(list_all_functions_current_buffer_lister, KeyCode_I, KeyCode_Control, KeyCode_Shift); Bind(exit_4coder, KeyCode_F4, KeyCode_Alt); Bind(project_fkey_command, KeyCode_F1); @@ -155,6 +156,7 @@ setup_default_mapping(Mapping *mapping, i64 global_id, i64 file_id, i64 code_id) Bind(open_file_in_quotes, KeyCode_1, KeyCode_Alt); Bind(open_matching_file_cpp, KeyCode_2, KeyCode_Alt); Bind(write_zero_struct, KeyCode_0, KeyCode_Control); + Bind(jump_to_definition_at_cursor, KeyCode_W, KeyCode_Control); } // BOTTOM diff --git a/custom/4coder_mac_map.cpp b/custom/4coder_mac_map.cpp index 7595a136..909a55ee 100644 --- a/custom/4coder_mac_map.cpp +++ b/custom/4coder_mac_map.cpp @@ -37,6 +37,7 @@ setup_mac_mapping(Mapping *mapping, i64 global_id, i64 file_id, i64 code_id){ Bind(command_lister, KeyCode_X, KeyCode_Control); Bind(project_command_lister, KeyCode_X, KeyCode_Control, KeyCode_Shift); Bind(quick_swap_buffer, KeyCode_BackwardSlash, KeyCode_Command); + Bind(jump_to_last_point, KeyCode_P, KeyCode_Command); Bind(list_all_functions_current_buffer, KeyCode_I, KeyCode_Command, KeyCode_Shift); Bind(project_fkey_command, KeyCode_F1); Bind(project_fkey_command, KeyCode_F2); @@ -156,6 +157,7 @@ setup_mac_mapping(Mapping *mapping, i64 global_id, i64 file_id, i64 code_id){ Bind(open_file_in_quotes, KeyCode_1, KeyCode_Control); Bind(open_matching_file_cpp, KeyCode_2, KeyCode_Control); Bind(write_zero_struct, KeyCode_0, KeyCode_Command); + Bind(jump_to_definition_at_cursor, KeyCode_W, KeyCode_Command); } // BOTTOM diff --git a/custom/generated/command_metadata.h b/custom/generated/command_metadata.h index 6e0e18ef..55603404 100644 --- a/custom/generated/command_metadata.h +++ b/custom/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 246 +#define command_one_past_last_id 250 #if defined(CUSTOM_COMMAND_SIG) #define PROC_LINKS(x,y) x #else @@ -61,6 +61,8 @@ CUSTOM_COMMAND_SIG(duplicate_line); CUSTOM_COMMAND_SIG(execute_any_cli); CUSTOM_COMMAND_SIG(execute_previous_cli); CUSTOM_COMMAND_SIG(exit_4coder); +CUSTOM_COMMAND_SIG(fusion_input_handler); +CUSTOM_COMMAND_SIG(fusion_toggle_mode); CUSTOM_COMMAND_SIG(goto_beginning_of_file); CUSTOM_COMMAND_SIG(goto_end_of_file); CUSTOM_COMMAND_SIG(goto_first_jump); @@ -85,6 +87,8 @@ CUSTOM_COMMAND_SIG(interactive_open); CUSTOM_COMMAND_SIG(interactive_open_or_new); CUSTOM_COMMAND_SIG(interactive_switch_buffer); CUSTOM_COMMAND_SIG(jump_to_definition); +CUSTOM_COMMAND_SIG(jump_to_definition_at_cursor); +CUSTOM_COMMAND_SIG(jump_to_last_point); CUSTOM_COMMAND_SIG(keyboard_macro_finish_recording); CUSTOM_COMMAND_SIG(keyboard_macro_replay); CUSTOM_COMMAND_SIG(keyboard_macro_start_recording); @@ -267,8 +271,8 @@ char *source_name; i32 source_name_len; i32 line_number; }; -static Command_Metadata fcoder_metacmd_table[246] = { -{ PROC_LINKS(allow_mouse, 0), false, "allow_mouse", 11, "Shows the mouse and causes all mouse input to be processed normally.", 68, "w:\\4ed\\code\\custom\\4coder_default_framework.cpp", 47, 409 }, +static Command_Metadata fcoder_metacmd_table[250] = { +{ PROC_LINKS(allow_mouse, 0), false, "allow_mouse", 11, "Shows the mouse and causes all mouse input to be processed normally.", 68, "w:\\4ed\\code\\custom\\4coder_default_framework.cpp", 47, 485 }, { PROC_LINKS(auto_indent_line_at_cursor, 0), false, "auto_indent_line_at_cursor", 26, "Auto-indents the line on which the cursor sits.", 47, "w:\\4ed\\code\\custom\\4coder_auto_indent.cpp", 41, 417 }, { PROC_LINKS(auto_indent_range, 0), false, "auto_indent_range", 17, "Auto-indents the range between the cursor and the mark.", 55, "w:\\4ed\\code\\custom\\4coder_auto_indent.cpp", 41, 427 }, { PROC_LINKS(auto_indent_whole_file, 0), false, "auto_indent_whole_file", 22, "Audo-indents the entire current buffer.", 39, "w:\\4ed\\code\\custom\\4coder_auto_indent.cpp", 41, 408 }, @@ -279,12 +283,12 @@ static Command_Metadata fcoder_metacmd_table[246] = { { PROC_LINKS(build_in_build_panel, 0), false, "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\\custom\\4coder_build_commands.cpp", 44, 159 }, { PROC_LINKS(build_search, 0), false, "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\\custom\\4coder_build_commands.cpp", 44, 122 }, { PROC_LINKS(center_view, 0), false, "center_view", 11, "Centers the view vertically on the line on which the cursor sits.", 65, "w:\\4ed\\code\\custom\\4coder_base_commands.cpp", 43, 195 }, -{ PROC_LINKS(change_active_panel, 0), false, "change_active_panel", 19, "Change the currently active panel, moving to the panel with the next highest view_id.", 85, "w:\\4ed\\code\\custom\\4coder_default_framework.cpp", 47, 284 }, -{ PROC_LINKS(change_active_panel_backwards, 0), false, "change_active_panel_backwards", 29, "Change the currently active panel, moving to the panel with the next lowest view_id.", 84, "w:\\4ed\\code\\custom\\4coder_default_framework.cpp", 47, 290 }, +{ PROC_LINKS(change_active_panel, 0), false, "change_active_panel", 19, "Change the currently active panel, moving to the panel with the next highest view_id.", 85, "w:\\4ed\\code\\custom\\4coder_default_framework.cpp", 47, 360 }, +{ PROC_LINKS(change_active_panel_backwards, 0), false, "change_active_panel_backwards", 29, "Change the currently active panel, moving to the panel with the next lowest view_id.", 84, "w:\\4ed\\code\\custom\\4coder_default_framework.cpp", 47, 366 }, { PROC_LINKS(change_to_build_panel, 0), false, "change_to_build_panel", 21, "If the special build panel is open, makes the build panel the active panel.", 75, "w:\\4ed\\code\\custom\\4coder_build_commands.cpp", 44, 180 }, { PROC_LINKS(clean_all_lines, 0), false, "clean_all_lines", 15, "Removes trailing whitespace from all lines and removes all blank lines in the current buffer.", 93, "w:\\4ed\\code\\custom\\4coder_base_commands.cpp", 43, 645 }, { PROC_LINKS(clean_trailing_whitespace, 0), false, "clean_trailing_whitespace", 25, "Removes trailing whitespace from all lines in the current buffer.", 65, "w:\\4ed\\code\\custom\\4coder_base_commands.cpp", 43, 654 }, -{ PROC_LINKS(clear_all_themes, 0), false, "clear_all_themes", 16, "Clear the theme list", 20, "w:\\4ed\\code\\custom\\4coder_default_framework.cpp", 47, 480 }, +{ PROC_LINKS(clear_all_themes, 0), false, "clear_all_themes", 16, "Clear the theme list", 20, "w:\\4ed\\code\\custom\\4coder_default_framework.cpp", 47, 556 }, { PROC_LINKS(clear_clipboard, 0), false, "clear_clipboard", 15, "Clears the history of the clipboard", 35, "w:\\4ed\\code\\custom\\4coder_clipboard.cpp", 39, 216 }, { PROC_LINKS(click_set_cursor, 0), false, "click_set_cursor", 16, "Sets the cursor position to the mouse position.", 47, "w:\\4ed\\code\\custom\\4coder_base_commands.cpp", 43, 233 }, { PROC_LINKS(click_set_cursor_and_mark, 0), false, "click_set_cursor_and_mark", 25, "Sets the cursor position and mark to the mouse position.", 56, "w:\\4ed\\code\\custom\\4coder_base_commands.cpp", 43, 223 }, @@ -303,23 +307,25 @@ static Command_Metadata fcoder_metacmd_table[246] = { { PROC_LINKS(custom_api_documentation, 0), true, "custom_api_documentation", 24, "Prompts the user to select a Custom API item then loads a doc buffer for that item", 82, "w:\\4ed\\code\\custom\\4coder_docs.cpp", 34, 175 }, { PROC_LINKS(cut, 0), false, "cut", 3, "Cut the text in the range from the cursor to the mark onto the clipboard.", 73, "w:\\4ed\\code\\custom\\4coder_clipboard.cpp", 39, 116 }, { PROC_LINKS(decrease_face_size, 0), false, "decrease_face_size", 18, "Decrease the size of the face used by the current buffer.", 57, "w:\\4ed\\code\\custom\\4coder_base_commands.cpp", 43, 756 }, -{ PROC_LINKS(default_file_externally_modified, 0), false, "default_file_externally_modified", 32, "Notes the external modification of attached files by printing a message.", 72, "w:\\4ed\\code\\custom\\4coder_base_commands.cpp", 43, 2025 }, +{ PROC_LINKS(default_file_externally_modified, 0), false, "default_file_externally_modified", 32, "Notes the external modification of attached files by printing a message.", 72, "w:\\4ed\\code\\custom\\4coder_base_commands.cpp", 43, 2054 }, { PROC_LINKS(default_startup, 0), false, "default_startup", 15, "Default command for responding to a startup event", 49, "w:\\4ed\\code\\custom\\4coder_default_hooks.cpp", 43, 7 }, { PROC_LINKS(default_try_exit, 0), false, "default_try_exit", 16, "Default command for responding to a try-exit event", 50, "w:\\4ed\\code\\custom\\4coder_default_hooks.cpp", 43, 23 }, { PROC_LINKS(default_view_input_handler, 0), false, "default_view_input_handler", 26, "Input consumption loop for default view behavior", 48, "w:\\4ed\\code\\custom\\4coder_default_hooks.cpp", 43, 51 }, { PROC_LINKS(delete_alpha_numeric_boundary, 0), false, "delete_alpha_numeric_boundary", 29, "Delete characters between the cursor position and the first alphanumeric boundary to the right.", 95, "w:\\4ed\\code\\custom\\4coder_base_commands.cpp", 43, 161 }, { PROC_LINKS(delete_char, 0), false, "delete_char", 11, "Deletes the character to the right of the cursor.", 49, "w:\\4ed\\code\\custom\\4coder_base_commands.cpp", 43, 79 }, { PROC_LINKS(delete_current_scope, 0), false, "delete_current_scope", 20, "Deletes the braces surrounding the currently selected scope. Leaves the contents within the scope.", 99, "w:\\4ed\\code\\custom\\4coder_scope_commands.cpp", 44, 112 }, -{ PROC_LINKS(delete_file_query, 0), false, "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\\custom\\4coder_base_commands.cpp", 43, 1351 }, -{ PROC_LINKS(delete_line, 0), false, "delete_line", 11, "Delete the line the on which the cursor sits.", 45, "w:\\4ed\\code\\custom\\4coder_base_commands.cpp", 43, 1523 }, +{ PROC_LINKS(delete_file_query, 0), false, "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\\custom\\4coder_base_commands.cpp", 43, 1380 }, +{ PROC_LINKS(delete_line, 0), false, "delete_line", 11, "Delete the line the on which the cursor sits.", 45, "w:\\4ed\\code\\custom\\4coder_base_commands.cpp", 43, 1552 }, { PROC_LINKS(delete_range, 0), false, "delete_range", 12, "Deletes the text in the range between the cursor and the mark.", 62, "w:\\4ed\\code\\custom\\4coder_base_commands.cpp", 43, 134 }, { PROC_LINKS(display_key_codes, 0), false, "display_key_codes", 17, "Example of input handling loop", 30, "w:\\4ed\\code\\custom\\4coder_examples.cpp", 38, 90 }, { PROC_LINKS(display_text_input, 0), false, "display_text_input", 18, "Example of to_writable and leave_current_input_unhandled", 56, "w:\\4ed\\code\\custom\\4coder_examples.cpp", 38, 137 }, { PROC_LINKS(double_backspace, 0), false, "double_backspace", 16, "Example of history group helpers", 32, "w:\\4ed\\code\\custom\\4coder_examples.cpp", 38, 10 }, -{ PROC_LINKS(duplicate_line, 0), false, "duplicate_line", 14, "Create a copy of the line on which the cursor sits.", 51, "w:\\4ed\\code\\custom\\4coder_base_commands.cpp", 43, 1509 }, +{ PROC_LINKS(duplicate_line, 0), false, "duplicate_line", 14, "Create a copy of the line on which the cursor sits.", 51, "w:\\4ed\\code\\custom\\4coder_base_commands.cpp", 43, 1538 }, { PROC_LINKS(execute_any_cli, 0), false, "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\\custom\\4coder_cli_command.cpp", 41, 22 }, { PROC_LINKS(execute_previous_cli, 0), false, "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\\custom\\4coder_cli_command.cpp", 41, 7 }, { PROC_LINKS(exit_4coder, 0), false, "exit_4coder", 11, "Attempts to close 4coder.", 25, "w:\\4ed\\code\\custom\\4coder_base_commands.cpp", 43, 843 }, +{ PROC_LINKS(fusion_input_handler, 0), false, "fusion_input_handler", 20, "TODO - document fusion mode", 27, "w:\\4ed\\code\\fusion\\4coder_fusion.cpp", 36, 62 }, +{ PROC_LINKS(fusion_toggle_mode, 0), false, "fusion_toggle_mode", 18, "TODO - document fusion mode", 27, "w:\\4ed\\code\\fusion\\4coder_fusion.cpp", 36, 51 }, { PROC_LINKS(goto_beginning_of_file, 0), false, "goto_beginning_of_file", 22, "Sets the cursor to the beginning of the file.", 45, "w:\\4ed\\code\\custom\\4coder_helper.cpp", 36, 2245 }, { PROC_LINKS(goto_end_of_file, 0), false, "goto_end_of_file", 16, "Sets the cursor to the end of the file.", 39, "w:\\4ed\\code\\custom\\4coder_helper.cpp", 36, 2253 }, { PROC_LINKS(goto_first_jump, 0), false, "goto_first_jump", 15, "If a buffer containing jump locations has been locked in, goes to the first jump in the buffer.", 95, "w:\\4ed\\code\\custom\\4coder_jump_sticky.cpp", 41, 525 }, @@ -344,10 +350,12 @@ static Command_Metadata fcoder_metacmd_table[246] = { { PROC_LINKS(interactive_open_or_new, 0), true, "interactive_open_or_new", 23, "Interactively open a file out of the file system.", 49, "w:\\4ed\\code\\custom\\4coder_lists.cpp", 35, 611 }, { PROC_LINKS(interactive_switch_buffer, 0), true, "interactive_switch_buffer", 25, "Interactively switch to an open buffer.", 39, "w:\\4ed\\code\\custom\\4coder_lists.cpp", 35, 510 }, { PROC_LINKS(jump_to_definition, 0), true, "jump_to_definition", 18, "List all definitions in the code index and jump to one chosen by the user.", 74, "w:\\4ed\\code\\custom\\4coder_code_index_listers.cpp", 48, 12 }, +{ PROC_LINKS(jump_to_definition_at_cursor, 0), true, "jump_to_definition_at_cursor", 28, "Jump to the first definition in the code index matching an identifier at the cursor", 83, "w:\\4ed\\code\\custom\\4coder_code_index_listers.cpp", 48, 68 }, +{ PROC_LINKS(jump_to_last_point, 0), false, "jump_to_last_point", 18, "Read from the top of the point stack and jump there; if already there pop the top and go to the next option", 107, "w:\\4ed\\code\\custom\\4coder_base_commands.cpp", 43, 1333 }, { PROC_LINKS(keyboard_macro_finish_recording, 0), false, "keyboard_macro_finish_recording", 31, "Stop macro recording, do nothing if macro recording is not already started", 74, "w:\\4ed\\code\\custom\\4coder_keyboard_macro.cpp", 44, 54 }, { PROC_LINKS(keyboard_macro_replay, 0), false, "keyboard_macro_replay", 21, "Replay the most recently recorded keyboard macro", 48, "w:\\4ed\\code\\custom\\4coder_keyboard_macro.cpp", 44, 77 }, { PROC_LINKS(keyboard_macro_start_recording, 0), false, "keyboard_macro_start_recording", 30, "Start macro recording, do nothing if macro recording is already started", 71, "w:\\4ed\\code\\custom\\4coder_keyboard_macro.cpp", 44, 41 }, -{ PROC_LINKS(kill_buffer, 0), false, "kill_buffer", 11, "Kills the current buffer.", 25, "w:\\4ed\\code\\custom\\4coder_base_commands.cpp", 43, 1687 }, +{ PROC_LINKS(kill_buffer, 0), false, "kill_buffer", 11, "Kills the current buffer.", 25, "w:\\4ed\\code\\custom\\4coder_base_commands.cpp", 43, 1716 }, { PROC_LINKS(kill_tutorial, 0), false, "kill_tutorial", 13, "If there is an active tutorial, kill it.", 40, "w:\\4ed\\code\\custom\\4coder_tutorial.cpp", 38, 9 }, { PROC_LINKS(left_adjust_view, 0), false, "left_adjust_view", 16, "Sets the left size of the view near the x position of the cursor.", 65, "w:\\4ed\\code\\custom\\4coder_base_commands.cpp", 43, 210 }, { PROC_LINKS(list_all_functions_all_buffers, 0), false, "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\\custom\\4coder_function_list.cpp", 43, 296 }, @@ -366,9 +374,9 @@ static Command_Metadata fcoder_metacmd_table[246] = { { PROC_LINKS(list_all_substring_locations_case_insensitive, 0), false, "list_all_substring_locations_case_insensitive", 45, "Queries the user for a string and lists all case-insensitive substring matches found in all open buffers.", 105, "w:\\4ed\\code\\custom\\4coder_search.cpp", 36, 183 }, { PROC_LINKS(load_project, 0), false, "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\\custom\\4coder_project_commands.cpp", 46, 864 }, { PROC_LINKS(load_theme_current_buffer, 0), false, "load_theme_current_buffer", 25, "Parse the current buffer as a theme file and add the theme to the theme list. If the buffer has a .4coder postfix in it's name, it is removed when the name is saved.", 165, "w:\\4ed\\code\\custom\\4coder_config.cpp", 36, 1667 }, -{ PROC_LINKS(load_themes_default_folder, 0), false, "load_themes_default_folder", 26, "Loads all the theme files in the default theme folder.", 54, "w:\\4ed\\code\\custom\\4coder_default_framework.cpp", 47, 457 }, -{ PROC_LINKS(load_themes_hot_directory, 0), false, "load_themes_hot_directory", 25, "Loads all the theme files in the current hot directory.", 55, "w:\\4ed\\code\\custom\\4coder_default_framework.cpp", 47, 469 }, -{ PROC_LINKS(make_directory_query, 0), false, "make_directory_query", 20, "Queries the user for a name and creates a new directory with the given name.", 76, "w:\\4ed\\code\\custom\\4coder_base_commands.cpp", 43, 1463 }, +{ PROC_LINKS(load_themes_default_folder, 0), false, "load_themes_default_folder", 26, "Loads all the theme files in the default theme folder.", 54, "w:\\4ed\\code\\custom\\4coder_default_framework.cpp", 47, 533 }, +{ PROC_LINKS(load_themes_hot_directory, 0), false, "load_themes_hot_directory", 25, "Loads all the theme files in the current hot directory.", 55, "w:\\4ed\\code\\custom\\4coder_default_framework.cpp", 47, 545 }, +{ PROC_LINKS(make_directory_query, 0), false, "make_directory_query", 20, "Queries the user for a name and creates a new directory with the given name.", 76, "w:\\4ed\\code\\custom\\4coder_base_commands.cpp", 43, 1492 }, { PROC_LINKS(miblo_decrement_basic, 0), false, "miblo_decrement_basic", 21, "Decrement an integer under the cursor by one.", 45, "w:\\4ed\\code\\custom\\4coder_miblo_numbers.cpp", 43, 44 }, { PROC_LINKS(miblo_decrement_time_stamp, 0), false, "miblo_decrement_time_stamp", 26, "Decrement a time stamp under the cursor by one second. (format [m]m:ss or h:mm:ss", 81, "w:\\4ed\\code\\custom\\4coder_miblo_numbers.cpp", 43, 237 }, { PROC_LINKS(miblo_decrement_time_stamp_minute, 0), false, "miblo_decrement_time_stamp_minute", 33, "Decrement a time stamp under the cursor by one minute. (format [m]m:ss or h:mm:ss", 81, "w:\\4ed\\code\\custom\\4coder_miblo_numbers.cpp", 43, 249 }, @@ -389,8 +397,8 @@ static Command_Metadata fcoder_metacmd_table[246] = { { PROC_LINKS(move_left_token_boundary, 0), false, "move_left_token_boundary", 24, "Seek left for the next beginning of a token.", 44, "w:\\4ed\\code\\custom\\4coder_base_commands.cpp", 43, 489 }, { PROC_LINKS(move_left_whitespace_boundary, 0), false, "move_left_whitespace_boundary", 29, "Seek left for the next boundary between whitespace and non-whitespace.", 70, "w:\\4ed\\code\\custom\\4coder_base_commands.cpp", 43, 474 }, { PROC_LINKS(move_left_whitespace_or_token_boundary, 0), false, "move_left_whitespace_or_token_boundary", 38, "Seek left for the next end of a token or boundary between whitespace and non-whitespace.", 88, "w:\\4ed\\code\\custom\\4coder_base_commands.cpp", 43, 503 }, -{ PROC_LINKS(move_line_down, 0), false, "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\\custom\\4coder_base_commands.cpp", 43, 1503 }, -{ PROC_LINKS(move_line_up, 0), false, "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\\custom\\4coder_base_commands.cpp", 43, 1497 }, +{ PROC_LINKS(move_line_down, 0), false, "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\\custom\\4coder_base_commands.cpp", 43, 1532 }, +{ PROC_LINKS(move_line_up, 0), false, "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\\custom\\4coder_base_commands.cpp", 43, 1526 }, { PROC_LINKS(move_right, 0), false, "move_right", 10, "Moves the cursor one character to the right.", 44, "w:\\4ed\\code\\custom\\4coder_base_commands.cpp", 43, 448 }, { PROC_LINKS(move_right_alpha_numeric_boundary, 0), false, "move_right_alpha_numeric_boundary", 33, "Seek right for boundary between alphanumeric characters and non-alphanumeric characters.", 88, "w:\\4ed\\code\\custom\\4coder_base_commands.cpp", 43, 510 }, { PROC_LINKS(move_right_alpha_numeric_or_camel_boundary, 0), false, "move_right_alpha_numeric_or_camel_boundary", 42, "Seek right for boundary between alphanumeric characters or camel case word and non-alphanumeric characters.", 107, "w:\\4ed\\code\\custom\\4coder_base_commands.cpp", 43, 524 }, @@ -407,14 +415,14 @@ static Command_Metadata fcoder_metacmd_table[246] = { { PROC_LINKS(multi_paste_interactive_quick, 0), false, "multi_paste_interactive_quick", 29, "Paste multiple lines from the clipboard history, controlled by inputing the number of lines to paste", 100, "w:\\4ed\\code\\custom\\4coder_clipboard.cpp", 39, 375 }, { PROC_LINKS(open_all_code, 0), false, "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\\custom\\4coder_project_commands.cpp", 46, 850 }, { PROC_LINKS(open_all_code_recursive, 0), false, "open_all_code_recursive", 23, "Works as open_all_code but also runs in all subdirectories.", 59, "w:\\4ed\\code\\custom\\4coder_project_commands.cpp", 46, 856 }, -{ PROC_LINKS(open_file_in_quotes, 0), false, "open_file_in_quotes", 19, "Reads a filename from surrounding '\"' characters and attempts to open the corresponding file.", 94, "w:\\4ed\\code\\custom\\4coder_base_commands.cpp", 43, 1588 }, -{ PROC_LINKS(open_in_other, 0), false, "open_in_other", 13, "Interactively opens a file in the other panel.", 46, "w:\\4ed\\code\\custom\\4coder_base_commands.cpp", 43, 2019 }, +{ PROC_LINKS(open_file_in_quotes, 0), false, "open_file_in_quotes", 19, "Reads a filename from surrounding '\"' characters and attempts to open the corresponding file.", 94, "w:\\4ed\\code\\custom\\4coder_base_commands.cpp", 43, 1617 }, +{ PROC_LINKS(open_in_other, 0), false, "open_in_other", 13, "Interactively opens a file in the other panel.", 46, "w:\\4ed\\code\\custom\\4coder_base_commands.cpp", 43, 2048 }, { PROC_LINKS(open_long_braces, 0), false, "open_long_braces", 16, "At the cursor, insert a '{' and '}' separated by a blank line.", 62, "w:\\4ed\\code\\custom\\4coder_combined_write_commands.cpp", 53, 46 }, { PROC_LINKS(open_long_braces_break, 0), false, "open_long_braces_break", 22, "At the cursor, insert a '{' and '}break;' separated by a blank line.", 68, "w:\\4ed\\code\\custom\\4coder_combined_write_commands.cpp", 53, 62 }, { PROC_LINKS(open_long_braces_semicolon, 0), false, "open_long_braces_semicolon", 26, "At the cursor, insert a '{' and '};' separated by a blank line.", 63, "w:\\4ed\\code\\custom\\4coder_combined_write_commands.cpp", 53, 54 }, -{ PROC_LINKS(open_matching_file_cpp, 0), false, "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\\custom\\4coder_base_commands.cpp", 43, 1620 }, -{ PROC_LINKS(open_panel_hsplit, 0), false, "open_panel_hsplit", 17, "Create a new panel by horizontally splitting the active panel.", 62, "w:\\4ed\\code\\custom\\4coder_default_framework.cpp", 47, 310 }, -{ PROC_LINKS(open_panel_vsplit, 0), false, "open_panel_vsplit", 17, "Create a new panel by vertically splitting the active panel.", 60, "w:\\4ed\\code\\custom\\4coder_default_framework.cpp", 47, 300 }, +{ PROC_LINKS(open_matching_file_cpp, 0), false, "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\\custom\\4coder_base_commands.cpp", 43, 1649 }, +{ PROC_LINKS(open_panel_hsplit, 0), false, "open_panel_hsplit", 17, "Create a new panel by horizontally splitting the active panel.", 62, "w:\\4ed\\code\\custom\\4coder_default_framework.cpp", 47, 386 }, +{ PROC_LINKS(open_panel_vsplit, 0), false, "open_panel_vsplit", 17, "Create a new panel by vertically splitting the active panel.", 60, "w:\\4ed\\code\\custom\\4coder_default_framework.cpp", 47, 376 }, { PROC_LINKS(page_down, 0), false, "page_down", 9, "Scrolls the view down one view height and moves the cursor down one view height.", 80, "w:\\4ed\\code\\custom\\4coder_base_commands.cpp", 43, 375 }, { PROC_LINKS(page_up, 0), false, "page_up", 7, "Scrolls the view up one view height and moves the cursor up one view height.", 76, "w:\\4ed\\code\\custom\\4coder_base_commands.cpp", 43, 367 }, { PROC_LINKS(paste, 0), false, "paste", 5, "At the cursor, insert the text at the top of the clipboard.", 59, "w:\\4ed\\code\\custom\\4coder_clipboard.cpp", 39, 127 }, @@ -433,19 +441,19 @@ static Command_Metadata fcoder_metacmd_table[246] = { { PROC_LINKS(query_replace, 0), false, "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\\custom\\4coder_base_commands.cpp", 43, 1279 }, { PROC_LINKS(query_replace_identifier, 0), false, "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\\custom\\4coder_base_commands.cpp", 43, 1300 }, { PROC_LINKS(query_replace_selection, 0), false, "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\\custom\\4coder_base_commands.cpp", 43, 1316 }, -{ PROC_LINKS(quick_swap_buffer, 0), false, "quick_swap_buffer", 17, "Change to the most recently used buffer in this view - or to the top of the buffer stack if the most recent doesn't exist anymore", 129, "w:\\4ed\\code\\custom\\4coder_base_commands.cpp", 43, 1667 }, -{ PROC_LINKS(redo, 0), false, "redo", 4, "Advances forwards through the undo history of the current buffer.", 65, "w:\\4ed\\code\\custom\\4coder_base_commands.cpp", 43, 1846 }, -{ PROC_LINKS(redo_all_buffers, 0), false, "redo_all_buffers", 16, "Advances forward through the undo history in the buffer containing the most recent regular edit.", 96, "w:\\4ed\\code\\custom\\4coder_base_commands.cpp", 43, 1943 }, -{ PROC_LINKS(rename_file_query, 0), false, "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\\custom\\4coder_base_commands.cpp", 43, 1428 }, -{ PROC_LINKS(reopen, 0), false, "reopen", 6, "Reopen the current buffer from the hard drive.", 46, "w:\\4ed\\code\\custom\\4coder_base_commands.cpp", 43, 1705 }, +{ PROC_LINKS(quick_swap_buffer, 0), false, "quick_swap_buffer", 17, "Change to the most recently used buffer in this view - or to the top of the buffer stack if the most recent doesn't exist anymore", 129, "w:\\4ed\\code\\custom\\4coder_base_commands.cpp", 43, 1696 }, +{ PROC_LINKS(redo, 0), false, "redo", 4, "Advances forwards through the undo history of the current buffer.", 65, "w:\\4ed\\code\\custom\\4coder_base_commands.cpp", 43, 1875 }, +{ PROC_LINKS(redo_all_buffers, 0), false, "redo_all_buffers", 16, "Advances forward through the undo history in the buffer containing the most recent regular edit.", 96, "w:\\4ed\\code\\custom\\4coder_base_commands.cpp", 43, 1972 }, +{ PROC_LINKS(rename_file_query, 0), false, "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\\custom\\4coder_base_commands.cpp", 43, 1457 }, +{ PROC_LINKS(reopen, 0), false, "reopen", 6, "Reopen the current buffer from the hard drive.", 46, "w:\\4ed\\code\\custom\\4coder_base_commands.cpp", 43, 1734 }, { PROC_LINKS(replace_in_all_buffers, 0), false, "replace_in_all_buffers", 22, "Queries the user for a needle and string. Replaces all occurences of needle with string in all editable buffers.", 112, "w:\\4ed\\code\\custom\\4coder_base_commands.cpp", 43, 1189 }, { PROC_LINKS(replace_in_buffer, 0), false, "replace_in_buffer", 17, "Queries the user for a needle and string. Replaces all occurences of needle with string in the active buffer.", 109, "w:\\4ed\\code\\custom\\4coder_base_commands.cpp", 43, 1180 }, { PROC_LINKS(replace_in_range, 0), false, "replace_in_range", 16, "Queries the user for a needle and string. Replaces all occurences of needle with string in the range between cursor and the mark in the active buffer.", 150, "w:\\4ed\\code\\custom\\4coder_base_commands.cpp", 43, 1171 }, { PROC_LINKS(reverse_search, 0), false, "reverse_search", 14, "Begins an incremental search up through the current buffer for a user specified string.", 87, "w:\\4ed\\code\\custom\\4coder_base_commands.cpp", 43, 1112 }, { PROC_LINKS(reverse_search_identifier, 0), false, "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\\custom\\4coder_base_commands.cpp", 43, 1124 }, -{ PROC_LINKS(save, 0), false, "save", 4, "Saves the current buffer.", 25, "w:\\4ed\\code\\custom\\4coder_base_commands.cpp", 43, 1695 }, -{ PROC_LINKS(save_all_dirty_buffers, 0), false, "save_all_dirty_buffers", 22, "Saves all buffers marked dirty (showing the '*' indicator).", 59, "w:\\4ed\\code\\custom\\4coder_default_framework.cpp", 47, 382 }, -{ PROC_LINKS(save_to_query, 0), false, "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\\custom\\4coder_base_commands.cpp", 43, 1395 }, +{ PROC_LINKS(save, 0), false, "save", 4, "Saves the current buffer.", 25, "w:\\4ed\\code\\custom\\4coder_base_commands.cpp", 43, 1724 }, +{ PROC_LINKS(save_all_dirty_buffers, 0), false, "save_all_dirty_buffers", 22, "Saves all buffers marked dirty (showing the '*' indicator).", 59, "w:\\4ed\\code\\custom\\4coder_default_framework.cpp", 47, 458 }, +{ PROC_LINKS(save_to_query, 0), false, "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\\custom\\4coder_base_commands.cpp", 43, 1424 }, { PROC_LINKS(search, 0), false, "search", 6, "Begins an incremental search down through the current buffer for a user specified string.", 89, "w:\\4ed\\code\\custom\\4coder_base_commands.cpp", 43, 1106 }, { PROC_LINKS(search_identifier, 0), false, "search_identifier", 17, "Begins an incremental search down through the current buffer for the word or token under the cursor.", 100, "w:\\4ed\\code\\custom\\4coder_base_commands.cpp", 43, 1118 }, { PROC_LINKS(seek_beginning_of_line, 0), false, "seek_beginning_of_line", 22, "Seeks the cursor to the beginning of the visual line.", 53, "w:\\4ed\\code\\custom\\4coder_helper.cpp", 36, 2233 }, @@ -466,8 +474,8 @@ static Command_Metadata fcoder_metacmd_table[246] = { { PROC_LINKS(set_face_size, 0), false, "set_face_size", 13, "Set face size of the face used by the current buffer.", 53, "w:\\4ed\\code\\custom\\4coder_base_commands.cpp", 43, 725 }, { PROC_LINKS(set_face_size_this_buffer, 0), false, "set_face_size_this_buffer", 25, "Set face size of the face used by the current buffer; if any other buffers are using the same face a new face is created so that only this buffer is effected", 157, "w:\\4ed\\code\\custom\\4coder_base_commands.cpp", 43, 767 }, { PROC_LINKS(set_mark, 0), false, "set_mark", 8, "Sets the mark to the current position of the cursor.", 52, "w:\\4ed\\code\\custom\\4coder_base_commands.cpp", 43, 115 }, -{ PROC_LINKS(set_mode_to_notepad_like, 0), false, "set_mode_to_notepad_like", 24, "Sets the edit mode to Notepad like.", 35, "w:\\4ed\\code\\custom\\4coder_default_framework.cpp", 47, 427 }, -{ PROC_LINKS(set_mode_to_original, 0), false, "set_mode_to_original", 20, "Sets the edit mode to 4coder original.", 38, "w:\\4ed\\code\\custom\\4coder_default_framework.cpp", 47, 421 }, +{ PROC_LINKS(set_mode_to_notepad_like, 0), false, "set_mode_to_notepad_like", 24, "Sets the edit mode to Notepad like.", 35, "w:\\4ed\\code\\custom\\4coder_default_framework.cpp", 47, 503 }, +{ PROC_LINKS(set_mode_to_original, 0), false, "set_mode_to_original", 20, "Sets the edit mode to 4coder original.", 38, "w:\\4ed\\code\\custom\\4coder_default_framework.cpp", 47, 497 }, { PROC_LINKS(setup_build_bat, 0), false, "setup_build_bat", 15, "Queries the user for several configuration options and initializes a new build batch script.", 92, "w:\\4ed\\code\\custom\\4coder_project_commands.cpp", 46, 1239 }, { PROC_LINKS(setup_build_bat_and_sh, 0), false, "setup_build_bat_and_sh", 22, "Queries the user for several configuration options and initializes a new build batch script.", 92, "w:\\4ed\\code\\custom\\4coder_project_commands.cpp", 46, 1251 }, { PROC_LINKS(setup_build_sh, 0), false, "setup_build_sh", 14, "Queries the user for several configuration options and initializes a new build shell script.", 92, "w:\\4ed\\code\\custom\\4coder_project_commands.cpp", 46, 1245 }, @@ -479,29 +487,29 @@ static Command_Metadata fcoder_metacmd_table[246] = { { PROC_LINKS(snipe_forward_whitespace_or_token_boundary, 0), false, "snipe_forward_whitespace_or_token_boundary", 42, "Delete a single, whole token on or to the right of the cursor and post it to the clipboard.", 91, "w:\\4ed\\code\\custom\\4coder_base_commands.cpp", 43, 185 }, { PROC_LINKS(snippet_lister, 0), true, "snippet_lister", 14, "Opens a snippet lister for inserting whole pre-written snippets of text.", 72, "w:\\4ed\\code\\custom\\4coder_combined_write_commands.cpp", 53, 237 }, { PROC_LINKS(string_repeat, 0), false, "string_repeat", 13, "Example of query_user_string and query_user_number", 50, "w:\\4ed\\code\\custom\\4coder_examples.cpp", 38, 179 }, -{ PROC_LINKS(suppress_mouse, 0), false, "suppress_mouse", 14, "Hides the mouse and causes all mosue input (clicks, position, wheel) to be ignored.", 83, "w:\\4ed\\code\\custom\\4coder_default_framework.cpp", 47, 403 }, -{ PROC_LINKS(swap_panels, 0), false, "swap_panels", 11, "Swaps the active panel with it's sibling.", 41, "w:\\4ed\\code\\custom\\4coder_base_commands.cpp", 43, 1645 }, +{ PROC_LINKS(suppress_mouse, 0), false, "suppress_mouse", 14, "Hides the mouse and causes all mosue input (clicks, position, wheel) to be ignored.", 83, "w:\\4ed\\code\\custom\\4coder_default_framework.cpp", 47, 479 }, +{ PROC_LINKS(swap_panels, 0), false, "swap_panels", 11, "Swaps the active panel with it's sibling.", 41, "w:\\4ed\\code\\custom\\4coder_base_commands.cpp", 43, 1674 }, { PROC_LINKS(test_the_new_api, 0), false, "test_the_new_api", 16, "If you are reading this I forgot to delete this test, please let me know", 72, "w:\\4ed\\code\\custom\\4coder_examples.cpp", 38, 212 }, { PROC_LINKS(theme_lister, 0), true, "theme_lister", 12, "Opens an interactive list of all registered themes.", 51, "w:\\4ed\\code\\custom\\4coder_lists.cpp", 35, 784 }, { PROC_LINKS(to_lowercase, 0), false, "to_lowercase", 12, "Converts all ascii text in the range between the cursor and the mark to lowercase.", 82, "w:\\4ed\\code\\custom\\4coder_base_commands.cpp", 43, 566 }, { PROC_LINKS(to_uppercase, 0), false, "to_uppercase", 12, "Converts all ascii text in the range between the cursor and the mark to uppercase.", 82, "w:\\4ed\\code\\custom\\4coder_base_commands.cpp", 43, 553 }, { PROC_LINKS(toggle_filebar, 0), false, "toggle_filebar", 14, "Toggles the visibility status of the current view's filebar.", 60, "w:\\4ed\\code\\custom\\4coder_base_commands.cpp", 43, 710 }, { PROC_LINKS(toggle_fps_meter, 0), false, "toggle_fps_meter", 16, "Toggles the visibility of the FPS performance meter", 51, "w:\\4ed\\code\\custom\\4coder_base_commands.cpp", 43, 719 }, -{ PROC_LINKS(toggle_fullscreen, 0), false, "toggle_fullscreen", 17, "Toggle fullscreen mode on or off. The change(s) do not take effect until the next frame.", 89, "w:\\4ed\\code\\custom\\4coder_default_framework.cpp", 47, 451 }, -{ PROC_LINKS(toggle_highlight_enclosing_scopes, 0), false, "toggle_highlight_enclosing_scopes", 33, "In code files scopes surrounding the cursor are highlighted with distinguishing colors.", 87, "w:\\4ed\\code\\custom\\4coder_default_framework.cpp", 47, 439 }, -{ PROC_LINKS(toggle_highlight_line_at_cursor, 0), false, "toggle_highlight_line_at_cursor", 31, "Toggles the line highlight at the cursor.", 41, "w:\\4ed\\code\\custom\\4coder_default_framework.cpp", 47, 433 }, +{ PROC_LINKS(toggle_fullscreen, 0), false, "toggle_fullscreen", 17, "Toggle fullscreen mode on or off. The change(s) do not take effect until the next frame.", 89, "w:\\4ed\\code\\custom\\4coder_default_framework.cpp", 47, 527 }, +{ PROC_LINKS(toggle_highlight_enclosing_scopes, 0), false, "toggle_highlight_enclosing_scopes", 33, "In code files scopes surrounding the cursor are highlighted with distinguishing colors.", 87, "w:\\4ed\\code\\custom\\4coder_default_framework.cpp", 47, 515 }, +{ PROC_LINKS(toggle_highlight_line_at_cursor, 0), false, "toggle_highlight_line_at_cursor", 31, "Toggles the line highlight at the cursor.", 41, "w:\\4ed\\code\\custom\\4coder_default_framework.cpp", 47, 509 }, { PROC_LINKS(toggle_line_numbers, 0), false, "toggle_line_numbers", 19, "Toggles the left margin line numbers.", 37, "w:\\4ed\\code\\custom\\4coder_base_commands.cpp", 43, 824 }, { PROC_LINKS(toggle_line_wrap, 0), false, "toggle_line_wrap", 16, "Toggles the line wrap setting on this buffer.", 45, "w:\\4ed\\code\\custom\\4coder_base_commands.cpp", 43, 830 }, -{ PROC_LINKS(toggle_mouse, 0), false, "toggle_mouse", 12, "Toggles the mouse suppression mode, see suppress_mouse and allow_mouse.", 71, "w:\\4ed\\code\\custom\\4coder_default_framework.cpp", 47, 415 }, -{ PROC_LINKS(toggle_paren_matching_helper, 0), false, "toggle_paren_matching_helper", 28, "In code files matching parentheses pairs are colored with distinguishing colors.", 80, "w:\\4ed\\code\\custom\\4coder_default_framework.cpp", 47, 445 }, +{ PROC_LINKS(toggle_mouse, 0), false, "toggle_mouse", 12, "Toggles the mouse suppression mode, see suppress_mouse and allow_mouse.", 71, "w:\\4ed\\code\\custom\\4coder_default_framework.cpp", 47, 491 }, +{ PROC_LINKS(toggle_paren_matching_helper, 0), false, "toggle_paren_matching_helper", 28, "In code files matching parentheses pairs are colored with distinguishing colors.", 80, "w:\\4ed\\code\\custom\\4coder_default_framework.cpp", 47, 521 }, { PROC_LINKS(toggle_show_whitespace, 0), false, "toggle_show_whitespace", 22, "Toggles the current buffer's whitespace visibility status.", 58, "w:\\4ed\\code\\custom\\4coder_base_commands.cpp", 43, 815 }, { PROC_LINKS(toggle_virtual_whitespace, 0), false, "toggle_virtual_whitespace", 25, "Toggles virtual whitespace for all files.", 41, "w:\\4ed\\code\\custom\\4coder_code_index.cpp", 40, 1176 }, { PROC_LINKS(tutorial_maximize, 0), false, "tutorial_maximize", 17, "Expand the tutorial window", 26, "w:\\4ed\\code\\custom\\4coder_tutorial.cpp", 38, 20 }, { PROC_LINKS(tutorial_minimize, 0), false, "tutorial_minimize", 17, "Shrink the tutorial window", 26, "w:\\4ed\\code\\custom\\4coder_tutorial.cpp", 38, 34 }, { PROC_LINKS(uncomment_line, 0), false, "uncomment_line", 14, "If present, delete '//' at the beginning of the line after leading whitespace.", 78, "w:\\4ed\\code\\custom\\4coder_combined_write_commands.cpp", 53, 137 }, -{ PROC_LINKS(undo, 0), false, "undo", 4, "Advances backwards through the undo history of the current buffer.", 66, "w:\\4ed\\code\\custom\\4coder_base_commands.cpp", 43, 1795 }, -{ PROC_LINKS(undo_all_buffers, 0), false, "undo_all_buffers", 16, "Advances backward through the undo history in the buffer containing the most recent regular edit.", 97, "w:\\4ed\\code\\custom\\4coder_base_commands.cpp", 43, 1872 }, -{ PROC_LINKS(view_buffer_other_panel, 0), false, "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\\custom\\4coder_base_commands.cpp", 43, 1633 }, +{ PROC_LINKS(undo, 0), false, "undo", 4, "Advances backwards through the undo history of the current buffer.", 66, "w:\\4ed\\code\\custom\\4coder_base_commands.cpp", 43, 1824 }, +{ PROC_LINKS(undo_all_buffers, 0), false, "undo_all_buffers", 16, "Advances backward through the undo history in the buffer containing the most recent regular edit.", 97, "w:\\4ed\\code\\custom\\4coder_base_commands.cpp", 43, 1901 }, +{ PROC_LINKS(view_buffer_other_panel, 0), false, "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\\custom\\4coder_base_commands.cpp", 43, 1662 }, { PROC_LINKS(view_jump_list_with_lister, 0), false, "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\\custom\\4coder_jump_lister.cpp", 41, 59 }, { PROC_LINKS(word_complete, 0), false, "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\\custom\\4coder_search.cpp", 36, 430 }, { PROC_LINKS(word_complete_drop_down, 0), false, "word_complete_drop_down", 23, "Word complete with drop down menu.", 34, "w:\\4ed\\code\\custom\\4coder_search.cpp", 36, 677 }, @@ -567,198 +575,202 @@ static i32 fcoder_metacmd_ID_duplicate_line = 48; static i32 fcoder_metacmd_ID_execute_any_cli = 49; static i32 fcoder_metacmd_ID_execute_previous_cli = 50; static i32 fcoder_metacmd_ID_exit_4coder = 51; -static i32 fcoder_metacmd_ID_goto_beginning_of_file = 52; -static i32 fcoder_metacmd_ID_goto_end_of_file = 53; -static i32 fcoder_metacmd_ID_goto_first_jump = 54; -static i32 fcoder_metacmd_ID_goto_first_jump_same_panel_sticky = 55; -static i32 fcoder_metacmd_ID_goto_jump_at_cursor = 56; -static i32 fcoder_metacmd_ID_goto_jump_at_cursor_same_panel = 57; -static i32 fcoder_metacmd_ID_goto_line = 58; -static i32 fcoder_metacmd_ID_goto_next_jump = 59; -static i32 fcoder_metacmd_ID_goto_next_jump_no_skips = 60; -static i32 fcoder_metacmd_ID_goto_prev_jump = 61; -static i32 fcoder_metacmd_ID_goto_prev_jump_no_skips = 62; -static i32 fcoder_metacmd_ID_hide_filebar = 63; -static i32 fcoder_metacmd_ID_hide_scrollbar = 64; -static i32 fcoder_metacmd_ID_hms_demo_tutorial = 65; -static i32 fcoder_metacmd_ID_if0_off = 66; -static i32 fcoder_metacmd_ID_if_read_only_goto_position = 67; -static i32 fcoder_metacmd_ID_if_read_only_goto_position_same_panel = 68; -static i32 fcoder_metacmd_ID_increase_face_size = 69; -static i32 fcoder_metacmd_ID_interactive_kill_buffer = 70; -static i32 fcoder_metacmd_ID_interactive_new = 71; -static i32 fcoder_metacmd_ID_interactive_open = 72; -static i32 fcoder_metacmd_ID_interactive_open_or_new = 73; -static i32 fcoder_metacmd_ID_interactive_switch_buffer = 74; -static i32 fcoder_metacmd_ID_jump_to_definition = 75; -static i32 fcoder_metacmd_ID_keyboard_macro_finish_recording = 76; -static i32 fcoder_metacmd_ID_keyboard_macro_replay = 77; -static i32 fcoder_metacmd_ID_keyboard_macro_start_recording = 78; -static i32 fcoder_metacmd_ID_kill_buffer = 79; -static i32 fcoder_metacmd_ID_kill_tutorial = 80; -static i32 fcoder_metacmd_ID_left_adjust_view = 81; -static i32 fcoder_metacmd_ID_list_all_functions_all_buffers = 82; -static i32 fcoder_metacmd_ID_list_all_functions_all_buffers_lister = 83; -static i32 fcoder_metacmd_ID_list_all_functions_current_buffer = 84; -static i32 fcoder_metacmd_ID_list_all_functions_current_buffer_lister = 85; -static i32 fcoder_metacmd_ID_list_all_locations = 86; -static i32 fcoder_metacmd_ID_list_all_locations_case_insensitive = 87; -static i32 fcoder_metacmd_ID_list_all_locations_of_identifier = 88; -static i32 fcoder_metacmd_ID_list_all_locations_of_identifier_case_insensitive = 89; -static i32 fcoder_metacmd_ID_list_all_locations_of_selection = 90; -static i32 fcoder_metacmd_ID_list_all_locations_of_selection_case_insensitive = 91; -static i32 fcoder_metacmd_ID_list_all_locations_of_type_definition = 92; -static i32 fcoder_metacmd_ID_list_all_locations_of_type_definition_of_identifier = 93; -static i32 fcoder_metacmd_ID_list_all_substring_locations = 94; -static i32 fcoder_metacmd_ID_list_all_substring_locations_case_insensitive = 95; -static i32 fcoder_metacmd_ID_load_project = 96; -static i32 fcoder_metacmd_ID_load_theme_current_buffer = 97; -static i32 fcoder_metacmd_ID_load_themes_default_folder = 98; -static i32 fcoder_metacmd_ID_load_themes_hot_directory = 99; -static i32 fcoder_metacmd_ID_make_directory_query = 100; -static i32 fcoder_metacmd_ID_miblo_decrement_basic = 101; -static i32 fcoder_metacmd_ID_miblo_decrement_time_stamp = 102; -static i32 fcoder_metacmd_ID_miblo_decrement_time_stamp_minute = 103; -static i32 fcoder_metacmd_ID_miblo_increment_basic = 104; -static i32 fcoder_metacmd_ID_miblo_increment_time_stamp = 105; -static i32 fcoder_metacmd_ID_miblo_increment_time_stamp_minute = 106; -static i32 fcoder_metacmd_ID_mouse_wheel_change_face_size = 107; -static i32 fcoder_metacmd_ID_mouse_wheel_scroll = 108; -static i32 fcoder_metacmd_ID_move_down = 109; -static i32 fcoder_metacmd_ID_move_down_10 = 110; -static i32 fcoder_metacmd_ID_move_down_textual = 111; -static i32 fcoder_metacmd_ID_move_down_to_blank_line = 112; -static i32 fcoder_metacmd_ID_move_down_to_blank_line_end = 113; -static i32 fcoder_metacmd_ID_move_down_to_blank_line_skip_whitespace = 114; -static i32 fcoder_metacmd_ID_move_left = 115; -static i32 fcoder_metacmd_ID_move_left_alpha_numeric_boundary = 116; -static i32 fcoder_metacmd_ID_move_left_alpha_numeric_or_camel_boundary = 117; -static i32 fcoder_metacmd_ID_move_left_token_boundary = 118; -static i32 fcoder_metacmd_ID_move_left_whitespace_boundary = 119; -static i32 fcoder_metacmd_ID_move_left_whitespace_or_token_boundary = 120; -static i32 fcoder_metacmd_ID_move_line_down = 121; -static i32 fcoder_metacmd_ID_move_line_up = 122; -static i32 fcoder_metacmd_ID_move_right = 123; -static i32 fcoder_metacmd_ID_move_right_alpha_numeric_boundary = 124; -static i32 fcoder_metacmd_ID_move_right_alpha_numeric_or_camel_boundary = 125; -static i32 fcoder_metacmd_ID_move_right_token_boundary = 126; -static i32 fcoder_metacmd_ID_move_right_whitespace_boundary = 127; -static i32 fcoder_metacmd_ID_move_right_whitespace_or_token_boundary = 128; -static i32 fcoder_metacmd_ID_move_up = 129; -static i32 fcoder_metacmd_ID_move_up_10 = 130; -static i32 fcoder_metacmd_ID_move_up_to_blank_line = 131; -static i32 fcoder_metacmd_ID_move_up_to_blank_line_end = 132; -static i32 fcoder_metacmd_ID_move_up_to_blank_line_skip_whitespace = 133; -static i32 fcoder_metacmd_ID_multi_paste = 134; -static i32 fcoder_metacmd_ID_multi_paste_interactive = 135; -static i32 fcoder_metacmd_ID_multi_paste_interactive_quick = 136; -static i32 fcoder_metacmd_ID_open_all_code = 137; -static i32 fcoder_metacmd_ID_open_all_code_recursive = 138; -static i32 fcoder_metacmd_ID_open_file_in_quotes = 139; -static i32 fcoder_metacmd_ID_open_in_other = 140; -static i32 fcoder_metacmd_ID_open_long_braces = 141; -static i32 fcoder_metacmd_ID_open_long_braces_break = 142; -static i32 fcoder_metacmd_ID_open_long_braces_semicolon = 143; -static i32 fcoder_metacmd_ID_open_matching_file_cpp = 144; -static i32 fcoder_metacmd_ID_open_panel_hsplit = 145; -static i32 fcoder_metacmd_ID_open_panel_vsplit = 146; -static i32 fcoder_metacmd_ID_page_down = 147; -static i32 fcoder_metacmd_ID_page_up = 148; -static i32 fcoder_metacmd_ID_paste = 149; -static i32 fcoder_metacmd_ID_paste_and_indent = 150; -static i32 fcoder_metacmd_ID_paste_next = 151; -static i32 fcoder_metacmd_ID_paste_next_and_indent = 152; -static i32 fcoder_metacmd_ID_place_in_scope = 153; -static i32 fcoder_metacmd_ID_play_with_a_counter = 154; -static i32 fcoder_metacmd_ID_profile_clear = 155; -static i32 fcoder_metacmd_ID_profile_disable = 156; -static i32 fcoder_metacmd_ID_profile_enable = 157; -static i32 fcoder_metacmd_ID_profile_inspect = 158; -static i32 fcoder_metacmd_ID_project_command_lister = 159; -static i32 fcoder_metacmd_ID_project_fkey_command = 160; -static i32 fcoder_metacmd_ID_project_go_to_root_directory = 161; -static i32 fcoder_metacmd_ID_query_replace = 162; -static i32 fcoder_metacmd_ID_query_replace_identifier = 163; -static i32 fcoder_metacmd_ID_query_replace_selection = 164; -static i32 fcoder_metacmd_ID_quick_swap_buffer = 165; -static i32 fcoder_metacmd_ID_redo = 166; -static i32 fcoder_metacmd_ID_redo_all_buffers = 167; -static i32 fcoder_metacmd_ID_rename_file_query = 168; -static i32 fcoder_metacmd_ID_reopen = 169; -static i32 fcoder_metacmd_ID_replace_in_all_buffers = 170; -static i32 fcoder_metacmd_ID_replace_in_buffer = 171; -static i32 fcoder_metacmd_ID_replace_in_range = 172; -static i32 fcoder_metacmd_ID_reverse_search = 173; -static i32 fcoder_metacmd_ID_reverse_search_identifier = 174; -static i32 fcoder_metacmd_ID_save = 175; -static i32 fcoder_metacmd_ID_save_all_dirty_buffers = 176; -static i32 fcoder_metacmd_ID_save_to_query = 177; -static i32 fcoder_metacmd_ID_search = 178; -static i32 fcoder_metacmd_ID_search_identifier = 179; -static i32 fcoder_metacmd_ID_seek_beginning_of_line = 180; -static i32 fcoder_metacmd_ID_seek_beginning_of_textual_line = 181; -static i32 fcoder_metacmd_ID_seek_end_of_line = 182; -static i32 fcoder_metacmd_ID_seek_end_of_textual_line = 183; -static i32 fcoder_metacmd_ID_select_all = 184; -static i32 fcoder_metacmd_ID_select_next_scope_absolute = 185; -static i32 fcoder_metacmd_ID_select_next_scope_after_current = 186; -static i32 fcoder_metacmd_ID_select_prev_scope_absolute = 187; -static i32 fcoder_metacmd_ID_select_prev_top_most_scope = 188; -static i32 fcoder_metacmd_ID_select_surrounding_scope = 189; -static i32 fcoder_metacmd_ID_select_surrounding_scope_maximal = 190; -static i32 fcoder_metacmd_ID_set_eol_mode_from_contents = 191; -static i32 fcoder_metacmd_ID_set_eol_mode_to_binary = 192; -static i32 fcoder_metacmd_ID_set_eol_mode_to_crlf = 193; -static i32 fcoder_metacmd_ID_set_eol_mode_to_lf = 194; -static i32 fcoder_metacmd_ID_set_face_size = 195; -static i32 fcoder_metacmd_ID_set_face_size_this_buffer = 196; -static i32 fcoder_metacmd_ID_set_mark = 197; -static i32 fcoder_metacmd_ID_set_mode_to_notepad_like = 198; -static i32 fcoder_metacmd_ID_set_mode_to_original = 199; -static i32 fcoder_metacmd_ID_setup_build_bat = 200; -static i32 fcoder_metacmd_ID_setup_build_bat_and_sh = 201; -static i32 fcoder_metacmd_ID_setup_build_sh = 202; -static i32 fcoder_metacmd_ID_setup_new_project = 203; -static i32 fcoder_metacmd_ID_show_filebar = 204; -static i32 fcoder_metacmd_ID_show_scrollbar = 205; -static i32 fcoder_metacmd_ID_show_the_log_graph = 206; -static i32 fcoder_metacmd_ID_snipe_backward_whitespace_or_token_boundary = 207; -static i32 fcoder_metacmd_ID_snipe_forward_whitespace_or_token_boundary = 208; -static i32 fcoder_metacmd_ID_snippet_lister = 209; -static i32 fcoder_metacmd_ID_string_repeat = 210; -static i32 fcoder_metacmd_ID_suppress_mouse = 211; -static i32 fcoder_metacmd_ID_swap_panels = 212; -static i32 fcoder_metacmd_ID_test_the_new_api = 213; -static i32 fcoder_metacmd_ID_theme_lister = 214; -static i32 fcoder_metacmd_ID_to_lowercase = 215; -static i32 fcoder_metacmd_ID_to_uppercase = 216; -static i32 fcoder_metacmd_ID_toggle_filebar = 217; -static i32 fcoder_metacmd_ID_toggle_fps_meter = 218; -static i32 fcoder_metacmd_ID_toggle_fullscreen = 219; -static i32 fcoder_metacmd_ID_toggle_highlight_enclosing_scopes = 220; -static i32 fcoder_metacmd_ID_toggle_highlight_line_at_cursor = 221; -static i32 fcoder_metacmd_ID_toggle_line_numbers = 222; -static i32 fcoder_metacmd_ID_toggle_line_wrap = 223; -static i32 fcoder_metacmd_ID_toggle_mouse = 224; -static i32 fcoder_metacmd_ID_toggle_paren_matching_helper = 225; -static i32 fcoder_metacmd_ID_toggle_show_whitespace = 226; -static i32 fcoder_metacmd_ID_toggle_virtual_whitespace = 227; -static i32 fcoder_metacmd_ID_tutorial_maximize = 228; -static i32 fcoder_metacmd_ID_tutorial_minimize = 229; -static i32 fcoder_metacmd_ID_uncomment_line = 230; -static i32 fcoder_metacmd_ID_undo = 231; -static i32 fcoder_metacmd_ID_undo_all_buffers = 232; -static i32 fcoder_metacmd_ID_view_buffer_other_panel = 233; -static i32 fcoder_metacmd_ID_view_jump_list_with_lister = 234; -static i32 fcoder_metacmd_ID_word_complete = 235; -static i32 fcoder_metacmd_ID_word_complete_drop_down = 236; -static i32 fcoder_metacmd_ID_write_block = 237; -static i32 fcoder_metacmd_ID_write_hack = 238; -static i32 fcoder_metacmd_ID_write_note = 239; -static i32 fcoder_metacmd_ID_write_space = 240; -static i32 fcoder_metacmd_ID_write_text_and_auto_indent = 241; -static i32 fcoder_metacmd_ID_write_text_input = 242; -static i32 fcoder_metacmd_ID_write_todo = 243; -static i32 fcoder_metacmd_ID_write_underscore = 244; -static i32 fcoder_metacmd_ID_write_zero_struct = 245; +static i32 fcoder_metacmd_ID_fusion_input_handler = 52; +static i32 fcoder_metacmd_ID_fusion_toggle_mode = 53; +static i32 fcoder_metacmd_ID_goto_beginning_of_file = 54; +static i32 fcoder_metacmd_ID_goto_end_of_file = 55; +static i32 fcoder_metacmd_ID_goto_first_jump = 56; +static i32 fcoder_metacmd_ID_goto_first_jump_same_panel_sticky = 57; +static i32 fcoder_metacmd_ID_goto_jump_at_cursor = 58; +static i32 fcoder_metacmd_ID_goto_jump_at_cursor_same_panel = 59; +static i32 fcoder_metacmd_ID_goto_line = 60; +static i32 fcoder_metacmd_ID_goto_next_jump = 61; +static i32 fcoder_metacmd_ID_goto_next_jump_no_skips = 62; +static i32 fcoder_metacmd_ID_goto_prev_jump = 63; +static i32 fcoder_metacmd_ID_goto_prev_jump_no_skips = 64; +static i32 fcoder_metacmd_ID_hide_filebar = 65; +static i32 fcoder_metacmd_ID_hide_scrollbar = 66; +static i32 fcoder_metacmd_ID_hms_demo_tutorial = 67; +static i32 fcoder_metacmd_ID_if0_off = 68; +static i32 fcoder_metacmd_ID_if_read_only_goto_position = 69; +static i32 fcoder_metacmd_ID_if_read_only_goto_position_same_panel = 70; +static i32 fcoder_metacmd_ID_increase_face_size = 71; +static i32 fcoder_metacmd_ID_interactive_kill_buffer = 72; +static i32 fcoder_metacmd_ID_interactive_new = 73; +static i32 fcoder_metacmd_ID_interactive_open = 74; +static i32 fcoder_metacmd_ID_interactive_open_or_new = 75; +static i32 fcoder_metacmd_ID_interactive_switch_buffer = 76; +static i32 fcoder_metacmd_ID_jump_to_definition = 77; +static i32 fcoder_metacmd_ID_jump_to_definition_at_cursor = 78; +static i32 fcoder_metacmd_ID_jump_to_last_point = 79; +static i32 fcoder_metacmd_ID_keyboard_macro_finish_recording = 80; +static i32 fcoder_metacmd_ID_keyboard_macro_replay = 81; +static i32 fcoder_metacmd_ID_keyboard_macro_start_recording = 82; +static i32 fcoder_metacmd_ID_kill_buffer = 83; +static i32 fcoder_metacmd_ID_kill_tutorial = 84; +static i32 fcoder_metacmd_ID_left_adjust_view = 85; +static i32 fcoder_metacmd_ID_list_all_functions_all_buffers = 86; +static i32 fcoder_metacmd_ID_list_all_functions_all_buffers_lister = 87; +static i32 fcoder_metacmd_ID_list_all_functions_current_buffer = 88; +static i32 fcoder_metacmd_ID_list_all_functions_current_buffer_lister = 89; +static i32 fcoder_metacmd_ID_list_all_locations = 90; +static i32 fcoder_metacmd_ID_list_all_locations_case_insensitive = 91; +static i32 fcoder_metacmd_ID_list_all_locations_of_identifier = 92; +static i32 fcoder_metacmd_ID_list_all_locations_of_identifier_case_insensitive = 93; +static i32 fcoder_metacmd_ID_list_all_locations_of_selection = 94; +static i32 fcoder_metacmd_ID_list_all_locations_of_selection_case_insensitive = 95; +static i32 fcoder_metacmd_ID_list_all_locations_of_type_definition = 96; +static i32 fcoder_metacmd_ID_list_all_locations_of_type_definition_of_identifier = 97; +static i32 fcoder_metacmd_ID_list_all_substring_locations = 98; +static i32 fcoder_metacmd_ID_list_all_substring_locations_case_insensitive = 99; +static i32 fcoder_metacmd_ID_load_project = 100; +static i32 fcoder_metacmd_ID_load_theme_current_buffer = 101; +static i32 fcoder_metacmd_ID_load_themes_default_folder = 102; +static i32 fcoder_metacmd_ID_load_themes_hot_directory = 103; +static i32 fcoder_metacmd_ID_make_directory_query = 104; +static i32 fcoder_metacmd_ID_miblo_decrement_basic = 105; +static i32 fcoder_metacmd_ID_miblo_decrement_time_stamp = 106; +static i32 fcoder_metacmd_ID_miblo_decrement_time_stamp_minute = 107; +static i32 fcoder_metacmd_ID_miblo_increment_basic = 108; +static i32 fcoder_metacmd_ID_miblo_increment_time_stamp = 109; +static i32 fcoder_metacmd_ID_miblo_increment_time_stamp_minute = 110; +static i32 fcoder_metacmd_ID_mouse_wheel_change_face_size = 111; +static i32 fcoder_metacmd_ID_mouse_wheel_scroll = 112; +static i32 fcoder_metacmd_ID_move_down = 113; +static i32 fcoder_metacmd_ID_move_down_10 = 114; +static i32 fcoder_metacmd_ID_move_down_textual = 115; +static i32 fcoder_metacmd_ID_move_down_to_blank_line = 116; +static i32 fcoder_metacmd_ID_move_down_to_blank_line_end = 117; +static i32 fcoder_metacmd_ID_move_down_to_blank_line_skip_whitespace = 118; +static i32 fcoder_metacmd_ID_move_left = 119; +static i32 fcoder_metacmd_ID_move_left_alpha_numeric_boundary = 120; +static i32 fcoder_metacmd_ID_move_left_alpha_numeric_or_camel_boundary = 121; +static i32 fcoder_metacmd_ID_move_left_token_boundary = 122; +static i32 fcoder_metacmd_ID_move_left_whitespace_boundary = 123; +static i32 fcoder_metacmd_ID_move_left_whitespace_or_token_boundary = 124; +static i32 fcoder_metacmd_ID_move_line_down = 125; +static i32 fcoder_metacmd_ID_move_line_up = 126; +static i32 fcoder_metacmd_ID_move_right = 127; +static i32 fcoder_metacmd_ID_move_right_alpha_numeric_boundary = 128; +static i32 fcoder_metacmd_ID_move_right_alpha_numeric_or_camel_boundary = 129; +static i32 fcoder_metacmd_ID_move_right_token_boundary = 130; +static i32 fcoder_metacmd_ID_move_right_whitespace_boundary = 131; +static i32 fcoder_metacmd_ID_move_right_whitespace_or_token_boundary = 132; +static i32 fcoder_metacmd_ID_move_up = 133; +static i32 fcoder_metacmd_ID_move_up_10 = 134; +static i32 fcoder_metacmd_ID_move_up_to_blank_line = 135; +static i32 fcoder_metacmd_ID_move_up_to_blank_line_end = 136; +static i32 fcoder_metacmd_ID_move_up_to_blank_line_skip_whitespace = 137; +static i32 fcoder_metacmd_ID_multi_paste = 138; +static i32 fcoder_metacmd_ID_multi_paste_interactive = 139; +static i32 fcoder_metacmd_ID_multi_paste_interactive_quick = 140; +static i32 fcoder_metacmd_ID_open_all_code = 141; +static i32 fcoder_metacmd_ID_open_all_code_recursive = 142; +static i32 fcoder_metacmd_ID_open_file_in_quotes = 143; +static i32 fcoder_metacmd_ID_open_in_other = 144; +static i32 fcoder_metacmd_ID_open_long_braces = 145; +static i32 fcoder_metacmd_ID_open_long_braces_break = 146; +static i32 fcoder_metacmd_ID_open_long_braces_semicolon = 147; +static i32 fcoder_metacmd_ID_open_matching_file_cpp = 148; +static i32 fcoder_metacmd_ID_open_panel_hsplit = 149; +static i32 fcoder_metacmd_ID_open_panel_vsplit = 150; +static i32 fcoder_metacmd_ID_page_down = 151; +static i32 fcoder_metacmd_ID_page_up = 152; +static i32 fcoder_metacmd_ID_paste = 153; +static i32 fcoder_metacmd_ID_paste_and_indent = 154; +static i32 fcoder_metacmd_ID_paste_next = 155; +static i32 fcoder_metacmd_ID_paste_next_and_indent = 156; +static i32 fcoder_metacmd_ID_place_in_scope = 157; +static i32 fcoder_metacmd_ID_play_with_a_counter = 158; +static i32 fcoder_metacmd_ID_profile_clear = 159; +static i32 fcoder_metacmd_ID_profile_disable = 160; +static i32 fcoder_metacmd_ID_profile_enable = 161; +static i32 fcoder_metacmd_ID_profile_inspect = 162; +static i32 fcoder_metacmd_ID_project_command_lister = 163; +static i32 fcoder_metacmd_ID_project_fkey_command = 164; +static i32 fcoder_metacmd_ID_project_go_to_root_directory = 165; +static i32 fcoder_metacmd_ID_query_replace = 166; +static i32 fcoder_metacmd_ID_query_replace_identifier = 167; +static i32 fcoder_metacmd_ID_query_replace_selection = 168; +static i32 fcoder_metacmd_ID_quick_swap_buffer = 169; +static i32 fcoder_metacmd_ID_redo = 170; +static i32 fcoder_metacmd_ID_redo_all_buffers = 171; +static i32 fcoder_metacmd_ID_rename_file_query = 172; +static i32 fcoder_metacmd_ID_reopen = 173; +static i32 fcoder_metacmd_ID_replace_in_all_buffers = 174; +static i32 fcoder_metacmd_ID_replace_in_buffer = 175; +static i32 fcoder_metacmd_ID_replace_in_range = 176; +static i32 fcoder_metacmd_ID_reverse_search = 177; +static i32 fcoder_metacmd_ID_reverse_search_identifier = 178; +static i32 fcoder_metacmd_ID_save = 179; +static i32 fcoder_metacmd_ID_save_all_dirty_buffers = 180; +static i32 fcoder_metacmd_ID_save_to_query = 181; +static i32 fcoder_metacmd_ID_search = 182; +static i32 fcoder_metacmd_ID_search_identifier = 183; +static i32 fcoder_metacmd_ID_seek_beginning_of_line = 184; +static i32 fcoder_metacmd_ID_seek_beginning_of_textual_line = 185; +static i32 fcoder_metacmd_ID_seek_end_of_line = 186; +static i32 fcoder_metacmd_ID_seek_end_of_textual_line = 187; +static i32 fcoder_metacmd_ID_select_all = 188; +static i32 fcoder_metacmd_ID_select_next_scope_absolute = 189; +static i32 fcoder_metacmd_ID_select_next_scope_after_current = 190; +static i32 fcoder_metacmd_ID_select_prev_scope_absolute = 191; +static i32 fcoder_metacmd_ID_select_prev_top_most_scope = 192; +static i32 fcoder_metacmd_ID_select_surrounding_scope = 193; +static i32 fcoder_metacmd_ID_select_surrounding_scope_maximal = 194; +static i32 fcoder_metacmd_ID_set_eol_mode_from_contents = 195; +static i32 fcoder_metacmd_ID_set_eol_mode_to_binary = 196; +static i32 fcoder_metacmd_ID_set_eol_mode_to_crlf = 197; +static i32 fcoder_metacmd_ID_set_eol_mode_to_lf = 198; +static i32 fcoder_metacmd_ID_set_face_size = 199; +static i32 fcoder_metacmd_ID_set_face_size_this_buffer = 200; +static i32 fcoder_metacmd_ID_set_mark = 201; +static i32 fcoder_metacmd_ID_set_mode_to_notepad_like = 202; +static i32 fcoder_metacmd_ID_set_mode_to_original = 203; +static i32 fcoder_metacmd_ID_setup_build_bat = 204; +static i32 fcoder_metacmd_ID_setup_build_bat_and_sh = 205; +static i32 fcoder_metacmd_ID_setup_build_sh = 206; +static i32 fcoder_metacmd_ID_setup_new_project = 207; +static i32 fcoder_metacmd_ID_show_filebar = 208; +static i32 fcoder_metacmd_ID_show_scrollbar = 209; +static i32 fcoder_metacmd_ID_show_the_log_graph = 210; +static i32 fcoder_metacmd_ID_snipe_backward_whitespace_or_token_boundary = 211; +static i32 fcoder_metacmd_ID_snipe_forward_whitespace_or_token_boundary = 212; +static i32 fcoder_metacmd_ID_snippet_lister = 213; +static i32 fcoder_metacmd_ID_string_repeat = 214; +static i32 fcoder_metacmd_ID_suppress_mouse = 215; +static i32 fcoder_metacmd_ID_swap_panels = 216; +static i32 fcoder_metacmd_ID_test_the_new_api = 217; +static i32 fcoder_metacmd_ID_theme_lister = 218; +static i32 fcoder_metacmd_ID_to_lowercase = 219; +static i32 fcoder_metacmd_ID_to_uppercase = 220; +static i32 fcoder_metacmd_ID_toggle_filebar = 221; +static i32 fcoder_metacmd_ID_toggle_fps_meter = 222; +static i32 fcoder_metacmd_ID_toggle_fullscreen = 223; +static i32 fcoder_metacmd_ID_toggle_highlight_enclosing_scopes = 224; +static i32 fcoder_metacmd_ID_toggle_highlight_line_at_cursor = 225; +static i32 fcoder_metacmd_ID_toggle_line_numbers = 226; +static i32 fcoder_metacmd_ID_toggle_line_wrap = 227; +static i32 fcoder_metacmd_ID_toggle_mouse = 228; +static i32 fcoder_metacmd_ID_toggle_paren_matching_helper = 229; +static i32 fcoder_metacmd_ID_toggle_show_whitespace = 230; +static i32 fcoder_metacmd_ID_toggle_virtual_whitespace = 231; +static i32 fcoder_metacmd_ID_tutorial_maximize = 232; +static i32 fcoder_metacmd_ID_tutorial_minimize = 233; +static i32 fcoder_metacmd_ID_uncomment_line = 234; +static i32 fcoder_metacmd_ID_undo = 235; +static i32 fcoder_metacmd_ID_undo_all_buffers = 236; +static i32 fcoder_metacmd_ID_view_buffer_other_panel = 237; +static i32 fcoder_metacmd_ID_view_jump_list_with_lister = 238; +static i32 fcoder_metacmd_ID_word_complete = 239; +static i32 fcoder_metacmd_ID_word_complete_drop_down = 240; +static i32 fcoder_metacmd_ID_write_block = 241; +static i32 fcoder_metacmd_ID_write_hack = 242; +static i32 fcoder_metacmd_ID_write_note = 243; +static i32 fcoder_metacmd_ID_write_space = 244; +static i32 fcoder_metacmd_ID_write_text_and_auto_indent = 245; +static i32 fcoder_metacmd_ID_write_text_input = 246; +static i32 fcoder_metacmd_ID_write_todo = 247; +static i32 fcoder_metacmd_ID_write_underscore = 248; +static i32 fcoder_metacmd_ID_write_zero_struct = 249; #endif diff --git a/custom/generated/managed_id_metadata.cpp b/custom/generated/managed_id_metadata.cpp index 5f95ac6c..f34c2396 100644 --- a/custom/generated/managed_id_metadata.cpp +++ b/custom/generated/managed_id_metadata.cpp @@ -59,4 +59,6 @@ attachment_tokens = managed_id_declare(app, string_u8_litexpr("attachment"), str mapid_global = managed_id_declare(app, string_u8_litexpr("command_map"), string_u8_litexpr("mapid_global")); mapid_file = managed_id_declare(app, string_u8_litexpr("command_map"), string_u8_litexpr("mapid_file")); mapid_code = managed_id_declare(app, string_u8_litexpr("command_map"), string_u8_litexpr("mapid_code")); +fusion_map_command = managed_id_declare(app, string_u8_litexpr("command_map"), string_u8_litexpr("fusion_map_command")); +fusion_map_insert = managed_id_declare(app, string_u8_litexpr("command_map"), string_u8_litexpr("fusion_map_insert")); } diff --git a/fusion/4coder_fusion.cpp b/fusion/4coder_fusion.cpp new file mode 100644 index 00000000..6f47075d --- /dev/null +++ b/fusion/4coder_fusion.cpp @@ -0,0 +1,248 @@ +/* +4coder_fusion.cpp - 4coder major mode +*/ + +// TOP + +#include "4coder_default_include.cpp" + +//////////////////////////////// + +// NOTE(allen): Users can declare their own managed IDs here. +CUSTOM_ID(command_map, fusion_map_command); +CUSTOM_ID(command_map, fusion_map_insert); + +//////////////////////////////// + +#if !defined(META_PASS) +#include "generated/managed_id_metadata.cpp" +#endif + +//////////////////////////////// + +typedef i32 Fusion_Mode; +enum{ + FusionMode_Command, + FusionMode_Insert, +}; + +Fusion_Mode fusion_mode = FusionMode_Command; + +//////////////////////////////// + +function void +fusion_set_mode(Fusion_Mode mode){ + fusion_mode = mode; + switch (mode){ + case FusionMode_Command: + { + global_config.highlight_line_at_cursor = true; + global_config.mark_thickness = 2.f; + }break; + + case FusionMode_Insert: + { + global_config.highlight_line_at_cursor = false; + global_config.mark_thickness = 0.f; + }break; + } +} + +CUSTOM_COMMAND_SIG(fusion_toggle_mode) +CUSTOM_DOC("TODO - document fusion mode") +{ + if (fusion_mode == FusionMode_Command){ + fusion_set_mode(FusionMode_Insert); + } + else{ + fusion_set_mode(FusionMode_Command); + } +} + +CUSTOM_COMMAND_SIG(fusion_input_handler) +CUSTOM_DOC("TODO - document fusion mode") +{ + Scratch_Block scratch(app); + default_input_handler_init(app, scratch); + + View_ID view = get_this_ctx_view(app, Access_Always); + Managed_Scope scope = view_get_managed_scope(app, view); + + for (;;){ + // NOTE(allen): Get input + User_Input input = get_next_input(app, EventPropertyGroup_Any, 0); + ProfileScopeNamed(app, "before view input", view_input_profile); + if (input.abort){ + break; + } + + // NOTE(allen): Get map_id + Command_Map_ID map_id = fusion_map_command; + if (fusion_mode == FusionMode_Insert){ + map_id = fusion_map_insert; + } + + // NOTE(allen): Get binding + Command_Binding binding = map_get_binding_recursive(&framework_mapping, map_id, &input.event); + if (binding.custom == 0){ + leave_current_input_unhandled(app); + continue; + } + + // NOTE(allen): Run the command + default_pre_command(app, scope); + ProfileCloseNow(view_input_profile); + + binding.custom(app); + + ProfileScope(app, "after view input"); + + default_post_command(app, scope); + } +} + + +function void +setup_fusion_mapping(Mapping *mapping){ + MappingScope(); + SelectMapping(mapping); + + SelectMap(mapid_global); + BindCore(default_startup, CoreCode_Startup); + BindCore(default_try_exit, CoreCode_TryExit); + BindCore(clipboard_record_clip, CoreCode_NewClipboardContents); + Bind(exit_4coder, KeyCode_F4, KeyCode_Alt); + Bind(project_fkey_command, KeyCode_F1); + Bind(project_fkey_command, KeyCode_F2); + Bind(project_fkey_command, KeyCode_F3); + Bind(project_fkey_command, KeyCode_F4); + Bind(project_fkey_command, KeyCode_F5); + Bind(project_fkey_command, KeyCode_F6); + Bind(project_fkey_command, KeyCode_F7); + Bind(project_fkey_command, KeyCode_F8); + Bind(project_fkey_command, KeyCode_F9); + Bind(project_fkey_command, KeyCode_F10); + Bind(project_fkey_command, KeyCode_F11); + Bind(project_fkey_command, KeyCode_F12); + Bind(project_fkey_command, KeyCode_F13); + Bind(project_fkey_command, KeyCode_F14); + Bind(project_fkey_command, KeyCode_F15); + Bind(project_fkey_command, KeyCode_F16); + Bind(fusion_toggle_mode, KeyCode_Insert); + Bind(fusion_toggle_mode, KeyCode_Escape); + + BindMouseWheel(mouse_wheel_scroll); + BindMouseWheel(mouse_wheel_change_face_size, KeyCode_Control); + BindMouse(click_set_cursor_and_mark, MouseCode_Left); + BindMouseRelease(click_set_cursor, MouseCode_Left); + BindCore(click_set_cursor_and_mark, CoreCode_ClickActivateView); + BindMouseMove(click_set_cursor_if_lbutton); + + SelectMap(fusion_map_command); + ParentMap(mapid_global); + Bind(set_mark, KeyCode_Space); + + Bind(move_up_to_blank_line_end, KeyCode_Up); + Bind(move_down_to_blank_line_end, KeyCode_Down); + Bind(move_line_up, KeyCode_Up, KeyCode_Shift); + Bind(move_line_down, KeyCode_Down, KeyCode_Shift); + Bind(move_left_alpha_numeric_boundary, KeyCode_Left); + Bind(move_right_alpha_numeric_boundary, KeyCode_Right); + Bind(move_left_alpha_numeric_or_camel_boundary, KeyCode_Left, KeyCode_Shift); + Bind(move_right_alpha_numeric_or_camel_boundary, KeyCode_Right, KeyCode_Shift); + Bind(page_up, KeyCode_PageUp); + Bind(page_down, KeyCode_PageDown); + + Bind(backspace_alpha_numeric_boundary, KeyCode_Backspace); + Bind(delete_alpha_numeric_boundary, KeyCode_Delete); + Bind(snipe_backward_whitespace_or_token_boundary, KeyCode_Backspace, KeyCode_Shift); + Bind(snipe_forward_whitespace_or_token_boundary, KeyCode_Delete, KeyCode_Shift); + + Bind(if_read_only_goto_position, KeyCode_Return); + Bind(if_read_only_goto_position_same_panel, KeyCode_Return, KeyCode_Shift); + + Bind(change_active_panel, KeyCode_Comma); + Bind(change_active_panel_backwards, KeyCode_Comma, KeyCode_Shift); + Bind(change_to_build_panel, KeyCode_Period); + Bind(close_build_panel, KeyCode_Period, KeyCode_Shift); + + Bind(comment_line_toggle, KeyCode_Semicolon); + + Bind(keyboard_macro_start_recording , KeyCode_Control); + Bind(keyboard_macro_finish_recording, KeyCode_Alt); + Bind(keyboard_macro_replay, KeyCode_U); + Bind(interactive_open_or_new, KeyCode_O); + Bind(interactive_switch_buffer, KeyCode_I); + Bind(goto_next_jump, KeyCode_N); + Bind(goto_prev_jump, KeyCode_N, KeyCode_Shift); + Bind(goto_first_jump, KeyCode_M); + Bind(command_lister, KeyCode_X); + Bind(jump_to_last_point, KeyCode_P); + Bind(replace_in_range, KeyCode_A); + Bind(copy, KeyCode_C); + Bind(paste_next_and_indent, KeyCode_V); + Bind(delete_range, KeyCode_D); + Bind(delete_line, KeyCode_D, KeyCode_Shift); + Bind(center_view, KeyCode_E); + Bind(search, KeyCode_F); + Bind(list_all_substring_locations_case_insensitive, KeyCode_S); + Bind(goto_line, KeyCode_G); + Bind(snippet_lister, KeyCode_J); + Bind(kill_buffer, KeyCode_K, KeyCode_Shift); + Bind(duplicate_line, KeyCode_L); + Bind(query_replace, KeyCode_Q); + Bind(query_replace_identifier, KeyCode_Q, KeyCode_Shift); + Bind(list_all_locations_of_identifier, KeyCode_T); + Bind(redo, KeyCode_Y); + Bind(undo, KeyCode_Z); + Bind(jump_to_definition_at_cursor, KeyCode_W); + + Bind(view_buffer_other_panel, KeyCode_1); + Bind(swap_panels, KeyCode_2); + Bind(open_matching_file_cpp, KeyCode_3); + + Bind(write_zero_struct, KeyCode_0); + Bind(open_long_braces, KeyCode_LeftBracket); + Bind(open_long_braces_semicolon, KeyCode_LeftBracket, KeyCode_Shift); + Bind(open_long_braces_break, KeyCode_RightBracket, KeyCode_Shift); + + Bind(select_surrounding_scope, KeyCode_RightBracket); + Bind(select_prev_top_most_scope, KeyCode_Quote); + Bind(select_next_scope_after_current, KeyCode_ForwardSlash); + Bind(place_in_scope, KeyCode_ForwardSlash, KeyCode_Shift); + Bind(delete_current_scope, KeyCode_Minus); + Bind(if0_off, KeyCode_9, KeyCode_Alt); + + SelectMap(fusion_map_insert); + ParentMap(mapid_global); + BindTextInput(write_text_and_auto_indent); + Bind(move_up, KeyCode_Up); + Bind(move_down, KeyCode_Down); + Bind(move_left, KeyCode_Left); + Bind(move_right, KeyCode_Right); + Bind(delete_char, KeyCode_Delete); + Bind(backspace_char, KeyCode_Backspace); + Bind(seek_end_of_line, KeyCode_End); + Bind(seek_beginning_of_line, KeyCode_Home); + Bind(page_up, KeyCode_PageUp); + Bind(page_down, KeyCode_PageDown); + Bind(word_complete, KeyCode_Tab); +} + +void +custom_layer_init(Application_Links *app){ + Thread_Context *tctx = get_thread_context(app); + + // NOTE(allen): setup for default framework + default_framework_init(app); + + // NOTE(allen): default hooks and command maps + set_all_default_hooks(app); + set_custom_hook(app, HookID_ViewEventHandler, fusion_input_handler); + + mapping_init(tctx, &framework_mapping); + setup_fusion_mapping(&framework_mapping); +} + +// BOTTOM + diff --git a/project.4coder b/project.4coder index d548b124..9be336b8 100644 --- a/project.4coder +++ b/project.4coder @@ -102,10 +102,14 @@ command_list = { { .name = "generate custom api master list", .out = "*run*", .footer_panel = false, .save_dirty_files = false, .cmd = { { "..\\build\\api_parser 4ed_api_implementation.cpp", .os = "win" }, }, }, + + { .name = "build fusion", + .out = "*compilation*", .footer_panel = true, .save_dirty_files = true, + .cmd = { { "pushd ..\\build && ..\\code\\custom\\bin\\buildsuper_x64-win.bat ..\\code\\fusion\\4coder_fusion.cpp", .os = "win" }, }, }, }; fkey_command[1] = "build x64"; -fkey_command[2] = "build custom api docs"; +fkey_command[2] = "build fusion"; fkey_command[3] = "build site render"; fkey_command[4] = "run one time"; fkey_command[5] = "build C++ lexer generator";