diff --git a/4coder_clipboard.cpp b/4coder_clipboard.cpp index 72a6f660..8092e625 100644 --- a/4coder_clipboard.cpp +++ b/4coder_clipboard.cpp @@ -5,57 +5,42 @@ // TOP static bool32 -clipboard_copy(Application_Links *app, int32_t start, int32_t end, Buffer_Summary *buffer_out, uint32_t access){ - View_Summary view = get_active_view(app, access); - Buffer_Summary buffer = get_buffer(app, view.buffer_id, access); - bool32 result = 0; - - if (buffer.exists){ - if (0 <= start && start <= end && end <= buffer.size){ - int32_t size = (end - start); - char *str = (char*)app->memory; - - if (size <= app->memory_size){ - buffer_read_range(app, &buffer, start, end, str); - clipboard_post(app, 0, str, size); - if (buffer_out){*buffer_out = buffer;} - result = 1; - } +post_buffer_range_to_clipboard(Application_Links *app, Partition *scratch, int32_t clipboard_index, + Buffer_Summary *buffer, int32_t first, int32_t one_past_last){ + bool32 success = false; + if (buffer->exists && + 0 <= first && first < one_past_last && one_past_last <= buffer->size){ + Temp_Memory temp = begin_temp_memory(scratch); + int32_t size = one_past_last - first; + char *str = push_array(scratch, char, size); + if (str != 0){ + buffer_read_range(app, buffer, first, one_past_last, str); + clipboard_post(app, clipboard_index, str, size); + success = true; } + end_temp_memory(temp); } - - return(result); -} - -static int32_t -clipboard_cut(Application_Links *app, int32_t start, int32_t end, Buffer_Summary *buffer_out, uint32_t access){ - Buffer_Summary buffer = {0}; - int32_t result = false; - - if (clipboard_copy(app, start, end, &buffer, access)){ - buffer_replace_range(app, &buffer, start, end, 0, 0); - if (buffer_out){*buffer_out = buffer;} - } - - return(result); + return(success); } CUSTOM_COMMAND_SIG(copy) CUSTOM_DOC("Copy the text in the range from the cursor to the mark onto the clipboard.") { - uint32_t access = AccessProtected; - View_Summary view = get_active_view(app, access); + View_Summary view = get_active_view(app, AccessProtected); + Buffer_Summary buffer = get_buffer(app, view.buffer_id, AccessProtected); Range range = get_range(&view); - clipboard_copy(app, range.min, range.max, 0, access); + post_buffer_range_to_clipboard(app, &global_part, 0, &buffer, range.min, range.max); } CUSTOM_COMMAND_SIG(cut) CUSTOM_DOC("Cut the text in the range from the cursor to the mark onto the clipboard.") { - uint32_t access = AccessOpen; - View_Summary view = get_active_view(app, access); + View_Summary view = get_active_view(app, AccessOpen); + Buffer_Summary buffer = get_buffer(app, view.buffer_id, AccessOpen); Range range = get_range(&view); - clipboard_cut(app, range.min, range.max, 0, access); + if (post_buffer_range_to_clipboard(app, &global_part, 0, &buffer, range.min, range.max)){ + buffer_replace_range(app, &buffer, range.min, range.max, 0, 0); + } } CUSTOM_COMMAND_SIG(paste) diff --git a/4coder_default_include.cpp b/4coder_default_include.cpp index 5d77afb3..96e730d9 100644 --- a/4coder_default_include.cpp +++ b/4coder_default_include.cpp @@ -7,14 +7,23 @@ #if !defined(FCODER_DEFAULT_INCLUDE_CPP) #define FCODER_DEFAULT_INCLUDE_CPP +// NOTE(allen): Define USE_OLD_STYLE_JUMPS before 4coder_default_include.cpp to get +// the direct jumps (instead of sticky jumps). + #include "4coder_API/custom.h" #include "4coder_os_comp_cracking.h" +#define FSTRING_IMPLEMENTATION +#include "4coder_lib/4coder_string.h" +#include "4coder_lib/4coder_table.h" +#include "4coder_lib/4coder_mem.h" +#include "4coder_lib/4coder_utf8.h" +#include "4coder_lib/4cpp_lexer.h" + +#include "4coder_helper/4coder_bind_helper.h" #include "4coder_helper/4coder_helper.h" #include "4coder_helper/4coder_streaming.h" #include "4coder_helper/4coder_long_seek.h" -#include "4coder_lib/4coder_mem.h" -#include "4coder_lib/4coder_utf8.h" #include "4coder_default_framework.h" #include "4coder_auto_indent.h" @@ -27,6 +36,7 @@ #include "4coder_base_commands.cpp" #include "4coder_default_framework.cpp" +#include "4coder_seek_commands.cpp" #include "4coder_auto_indent.cpp" #include "4coder_search.cpp" #include "4coder_jumping.cpp" @@ -39,213 +49,8 @@ #include "4coder_function_list.cpp" #include "4coder_scope_commands.cpp" -// NOTE(allen): Define USE_OLD_STYLE_JUMPS before 4coder_default_include.cpp to get -// the direct jumps (instead of sticky jumps). -#if defined(USE_OLD_STYLE_JUMPS) - -#define goto_jump_at_cursor CUSTOM_ALIAS(goto_jump_at_cursor_direct) -#define goto_jump_at_cursor_same_panel CUSTOM_ALIAS(goto_jump_at_cursor_same_panel_direct) -#define goto_next_jump CUSTOM_ALIAS(goto_next_jump_direct) -#define goto_prev_jump CUSTOM_ALIAS(goto_prev_jump_direct) -#define goto_next_jump_no_skips CUSTOM_ALIAS(goto_next_jump_no_skips_direct) -#define goto_prev_jump_no_skips CUSTOM_ALIAS(goto_prev_jump_no_skips_direct) -#define goto_first_jump CUSTOM_ALIAS(goto_first_jump_direct) -#define newline_or_goto_position CUSTOM_ALIAS(newline_or_goto_position_direct) -#define newline_or_goto_position_same_panel CUSTOM_ALIAS(newline_or_goto_position_same_panel_direct) - -#else - -#define goto_jump_at_cursor CUSTOM_ALIAS(goto_jump_at_cursor_sticky) -#define goto_jump_at_cursor_same_panel CUSTOM_ALIAS(goto_jump_at_cursor_same_panel_sticky) -#define goto_next_jump CUSTOM_ALIAS(goto_next_jump_sticky) -#define goto_prev_jump CUSTOM_ALIAS(goto_prev_jump_sticky) -#define goto_next_jump_no_skips CUSTOM_ALIAS(goto_next_jump_no_skips_sticky) -#define goto_prev_jump_no_skips CUSTOM_ALIAS(goto_prev_jump_no_skips_sticky) -#define goto_first_jump CUSTOM_ALIAS(goto_first_jump_sticky) -#define newline_or_goto_position CUSTOM_ALIAS(newline_or_goto_position_sticky) -#define newline_or_goto_position_same_panel CUSTOM_ALIAS(newline_or_goto_position_same_panel_sticky) - -#endif - -#define seek_error CUSTOM_ALIAS(seek_jump) -#define goto_next_error CUSTOM_ALIAS(goto_next_jump) -#define goto_prev_error CUSTOM_ALIAS(goto_prev_jump) -#define goto_next_error_no_skips CUSTOM_ALIAS(goto_next_jump_no_skips) -#define goto_prev_error_no_skips CUSTOM_ALIAS(goto_prev_jump_no_skips) -#define goto_first_error CUSTOM_ALIAS(goto_first_jump) - #include "4coder_default_hooks.cpp" -#include "4coder_helper/4coder_bind_helper.h" -#include "4coder_helper/4coder_helper.h" -#include "4coder_helper/4coder_streaming.h" -#include "4coder_helper/4coder_long_seek.h" - -#define FSTRING_IMPLEMENTATION -#include "4coder_lib/4coder_string.h" -#include "4coder_lib/4coder_table.h" -#include "4coder_lib/4coder_mem.h" -#include "4coder_lib/4coder_utf8.h" - -#include "4coder_lib/4cpp_lexer.h" - -// -// Seeks Using Default Framework Memory -// - -static int32_t -buffer_boundary_seek(Application_Links *app, Buffer_Summary *buffer, int32_t start_pos, bool32 seek_forward, Seek_Boundary_Flag flags){ - int32_t result = buffer_boundary_seek(app, buffer, &global_part, start_pos, seek_forward, flags); - return(result); -} - -static void -basic_seek(Application_Links *app, bool32 seek_forward, uint32_t flags){ - View_Summary view = get_active_view(app, AccessProtected); - Buffer_Summary buffer = get_buffer(app, view.buffer_id, AccessProtected); - int32_t pos = buffer_boundary_seek(app, &buffer, view.cursor.pos, seek_forward, flags); - view_set_cursor(app, &view, seek_pos(pos), true); -} - -#define right true -#define left false - -CUSTOM_COMMAND_SIG(seek_whitespace_right) -CUSTOM_DOC("Seek right for the next boundary between whitespace and non-whitespace.") -{ basic_seek(app, right, BoundaryWhitespace); } - -CUSTOM_COMMAND_SIG(seek_whitespace_left) -CUSTOM_DOC("Seek left for the next boundary between whitespace and non-whitespace.") -{ basic_seek(app, left, BoundaryWhitespace); } - -CUSTOM_COMMAND_SIG(seek_token_right) -CUSTOM_DOC("Seek right for the next end of a token.") -{ basic_seek(app, right, BoundaryToken); } - -CUSTOM_COMMAND_SIG(seek_token_left) -CUSTOM_DOC("Seek left for the next beginning of a token.") -{ basic_seek(app, left, BoundaryToken); } - -CUSTOM_COMMAND_SIG(seek_white_or_token_right) -CUSTOM_DOC("Seek right for the next end of a token or boundary between whitespace and non-whitespace.") -{basic_seek(app, right, BoundaryToken | BoundaryWhitespace);} - -CUSTOM_COMMAND_SIG(seek_white_or_token_left) -CUSTOM_DOC("Seek left for the next end of a token or boundary between whitespace and non-whitespace.") -{basic_seek(app, left, BoundaryToken | BoundaryWhitespace);} - -CUSTOM_COMMAND_SIG(seek_alphanumeric_right) -CUSTOM_DOC("Seek right for boundary between alphanumeric characters and non-alphanumeric characters.") -{ basic_seek(app, right, BoundaryAlphanumeric); } - -CUSTOM_COMMAND_SIG(seek_alphanumeric_left) -CUSTOM_DOC("Seek left for boundary between alphanumeric characters and non-alphanumeric characters.") -{ basic_seek(app, left, BoundaryAlphanumeric); } - -CUSTOM_COMMAND_SIG(seek_alphanumeric_or_camel_right) -CUSTOM_DOC("Seek right for boundary between alphanumeric characters or camel case word and non-alphanumeric characters.") -{ basic_seek(app, right, BoundaryAlphanumeric | BoundaryCamelCase); } - -CUSTOM_COMMAND_SIG(seek_alphanumeric_or_camel_left) -CUSTOM_DOC("Seek left for boundary between alphanumeric characters or camel case word and non-alphanumeric characters.") -{ basic_seek(app, left, BoundaryAlphanumeric | BoundaryCamelCase); } - -#undef right -#undef left - -// -// Fast Deletes -// - -CUSTOM_COMMAND_SIG(backspace_word) -CUSTOM_DOC("Delete characters between the cursor position and the first alphanumeric boundary to the left.") -{ - uint32_t access = AccessOpen; - - View_Summary view = get_active_view(app, access); - Buffer_Summary buffer = get_buffer(app, view.buffer_id, access); - - if (buffer.exists){ - int32_t pos2 = 0, pos1 = 0; - - pos2 = view.cursor.pos; - exec_command(app, seek_alphanumeric_left); - refresh_view(app, &view); - pos1 = view.cursor.pos; - - buffer_replace_range(app, &buffer, pos1, pos2, 0, 0); - } -} - -CUSTOM_COMMAND_SIG(delete_word) -CUSTOM_DOC("Delete characters between the cursor position and the first alphanumeric boundary to the right.") -{ - uint32_t access = AccessOpen; - - View_Summary view = get_active_view(app, access); - Buffer_Summary buffer = get_buffer(app, view.buffer_id, access); - - if (buffer.exists){ - int32_t pos2 = 0, pos1 = 0; - - pos1 = view.cursor.pos; - exec_command(app, seek_alphanumeric_right); - refresh_view(app, &view); - pos2 = view.cursor.pos; - - buffer_replace_range(app, &buffer, pos1, pos2, 0, 0); - } -} - -CUSTOM_COMMAND_SIG(snipe_token_or_word) -CUSTOM_DOC("Delete a single, whole token on or to the left of the cursor and post it to the clipboard.") -{ - uint32_t access = AccessOpen; - - View_Summary view = get_active_view(app, access); - Buffer_Summary buffer = get_buffer(app, view.buffer_id, access); - - int32_t pos1 = buffer_boundary_seek(app, &buffer, view.cursor.pos, false, BoundaryToken|BoundaryWhitespace); - int32_t pos2 = buffer_boundary_seek(app, &buffer, pos1, true, BoundaryToken|BoundaryWhitespace); - - Range range = make_range(pos1, pos2); - - Partition *part = &global_part; - Temp_Memory temp = begin_temp_memory(part); - int32_t len = range.end - range.start; - char *space = push_array(part, char, len); - buffer_read_range(app, &buffer, range.start, range.end, space); - clipboard_post(app, 0, space, len); - end_temp_memory(temp); - - buffer_replace_range(app, &buffer, range.start, range.end, 0, 0); -} - -CUSTOM_COMMAND_SIG(snipe_token_or_word_right) -CUSTOM_DOC("Delete a single, whole token on or to the right of the cursor and post it to the clipboard.") -{ - uint32_t access = AccessOpen; - - View_Summary view = get_active_view(app, access); - Buffer_Summary buffer = get_buffer(app, view.buffer_id, access); - - int32_t pos2 = buffer_boundary_seek(app, &buffer, view.cursor.pos, true, BoundaryToken|BoundaryWhitespace); - int32_t pos1 = buffer_boundary_seek(app, &buffer, pos2, false, BoundaryToken|BoundaryWhitespace); - - Range range = make_range(pos1, pos2); - - Partition *part = &global_part; - Temp_Memory temp = begin_temp_memory(part); - int32_t len = range.end - range.start; - char *space = push_array(part, char, len); - buffer_read_range(app, &buffer, range.start, range.end, space); - clipboard_post(app, 0, space, len); - end_temp_memory(temp); - - buffer_replace_range(app, &buffer, range.start, range.end, 0, 0); -} - - // // Query Replace Selection // diff --git a/4coder_generated/command_metadata.h b/4coder_generated/command_metadata.h index e1adac29..574f9cba 100644 --- a/4coder_generated/command_metadata.h +++ b/4coder_generated/command_metadata.h @@ -219,7 +219,7 @@ static Command_Metadata fcoder_metacmd_table[194] = { { PROC_LINKS(auto_tab_range, 0), "auto_tab_range", 14, "Auto-indents the range between the cursor and the mark.", 55, "C:\\work\\4ed\\code\\4coder_auto_indent.cpp", 43, 733 }, { PROC_LINKS(auto_tab_whole_file, 0), "auto_tab_whole_file", 19, "Audo-indents the entire current buffer.", 39, "C:\\work\\4ed\\code\\4coder_auto_indent.cpp", 43, 712 }, { PROC_LINKS(backspace_char, 0), "backspace_char", 14, "Deletes the character to the left of the cursor.", 48, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 71 }, -{ PROC_LINKS(backspace_word, 0), "backspace_word", 14, "Delete characters between the cursor position and the first alphanumeric boundary to the left.", 94, "C:\\work\\4ed\\code\\4coder_default_include.cpp", 47, 160 }, +{ PROC_LINKS(backspace_word, 0), "backspace_word", 14, "Delete characters between the cursor position and the first alphanumeric boundary to the left.", 94, "C:\\work\\4ed\\code\\4coder_seek_commands.cpp", 45, 160 }, { 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, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 533 }, { 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, "C:\\work\\4ed\\code\\4coder_build_commands.cpp", 46, 188 }, { 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, "C:\\work\\4ed\\code\\4coder_build_commands.cpp", 46, 154 }, @@ -233,22 +233,22 @@ static Command_Metadata fcoder_metacmd_table[194] = { { 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, "C:\\work\\4ed\\code\\4coder_project_commands.cpp", 48, 401 }, { PROC_LINKS(close_build_panel, 0), "close_build_panel", 17, "If the special build panel is open, closes it.", 46, "C:\\work\\4ed\\code\\4coder_build_commands.cpp", 46, 204 }, { PROC_LINKS(close_panel, 0), "close_panel", 11, "Closes the currently active panel if it is not the only panel open.", 67, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 541 }, -{ PROC_LINKS(copy, 0), "copy", 4, "Copy the text in the range from the cursor to the mark onto the clipboard.", 74, "C:\\work\\4ed\\code\\4coder_clipboard.cpp", 41, 43 }, +{ PROC_LINKS(copy, 0), "copy", 4, "Copy the text in the range from the cursor to the mark onto the clipboard.", 74, "C:\\work\\4ed\\code\\4coder_clipboard.cpp", 41, 26 }, { PROC_LINKS(cursor_mark_swap, 0), "cursor_mark_swap", 16, "Swaps the position of the cursor and the mark.", 46, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 99 }, -{ PROC_LINKS(cut, 0), "cut", 3, "Cut the text in the range from the cursor to the mark onto the clipboard.", 73, "C:\\work\\4ed\\code\\4coder_clipboard.cpp", 41, 52 }, +{ PROC_LINKS(cut, 0), "cut", 3, "Cut the text in the range from the cursor to the mark onto the clipboard.", 73, "C:\\work\\4ed\\code\\4coder_clipboard.cpp", 41, 35 }, { PROC_LINKS(decrease_face_size, 0), "decrease_face_size", 18, "Decrease the size of the face used by the current buffer.", 57, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 634 }, { PROC_LINKS(decrease_line_wrap, 0), "decrease_line_wrap", 18, "Decrases the current buffer's width for line wrapping.", 54, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 611 }, { PROC_LINKS(delete_char, 0), "delete_char", 11, "Deletes the character to the right of the cursor.", 49, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 53 }, { 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, "C:\\work\\4ed\\code\\4coder_scope_commands.cpp", 46, 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, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 1081 }, -{ PROC_LINKS(delete_line, 0), "delete_line", 11, "Delete the line the on which the cursor sits.", 45, "C:\\work\\4ed\\code\\4coder_default_include.cpp", 47, 404 }, +{ PROC_LINKS(delete_line, 0), "delete_line", 11, "Delete the line the on which the cursor sits.", 45, "C:\\work\\4ed\\code\\4coder_default_include.cpp", 47, 209 }, { PROC_LINKS(delete_range, 0), "delete_range", 12, "Deletes the text in the range between the cursor and the mark.", 62, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 111 }, -{ PROC_LINKS(delete_word, 0), "delete_word", 11, "Delete characters between the cursor position and the first alphanumeric boundary to the right.", 95, "C:\\work\\4ed\\code\\4coder_default_include.cpp", 47, 180 }, -{ PROC_LINKS(duplicate_line, 0), "duplicate_line", 14, "Create a copy of the line on which the cursor sits.", 51, "C:\\work\\4ed\\code\\4coder_default_include.cpp", 47, 382 }, +{ PROC_LINKS(delete_word, 0), "delete_word", 11, "Delete characters between the cursor position and the first alphanumeric boundary to the right.", 95, "C:\\work\\4ed\\code\\4coder_seek_commands.cpp", 45, 166 }, +{ PROC_LINKS(duplicate_line, 0), "duplicate_line", 14, "Create a copy of the line on which the cursor sits.", 51, "C:\\work\\4ed\\code\\4coder_default_include.cpp", 47, 187 }, { PROC_LINKS(eol_dosify, 0), "eol_dosify", 10, "Puts the buffer in DOS line ending mode.", 40, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 664 }, { PROC_LINKS(eol_nixify, 0), "eol_nixify", 10, "Puts the buffer in NIX line ending mode.", 40, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 672 }, { 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, "C:\\work\\4ed\\code\\4coder_system_command.cpp", 46, 23 }, -{ PROC_LINKS(execute_arbitrary_command, 0), "execute_arbitrary_command", 25, "Execute a 'long form' command.", 30, "C:\\work\\4ed\\code\\4coder_default_include.cpp", 47, 796 }, +{ PROC_LINKS(execute_arbitrary_command, 0), "execute_arbitrary_command", 25, "Execute a 'long form' command.", 30, "C:\\work\\4ed\\code\\4coder_default_include.cpp", 47, 601 }, { 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, "C:\\work\\4ed\\code\\4coder_system_command.cpp", 46, 7 }, { PROC_LINKS(exit_4coder, 0), "exit_4coder", 11, "Attempts to close 4coder.", 25, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 680 }, { PROC_LINKS(goto_beginning_of_file, 0), "goto_beginning_of_file", 22, "Sets the cursor to the beginning of the file.", 45, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 406 }, @@ -274,7 +274,7 @@ static Command_Metadata fcoder_metacmd_table[194] = { { 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, "C:\\work\\4ed\\code\\4coder_scope_commands.cpp", 46, 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, "C:\\work\\4ed\\code\\4coder_scope_commands.cpp", 46, 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, "C:\\work\\4ed\\code\\4coder_scope_commands.cpp", 46, 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, "C:\\work\\4ed\\code\\4coder_default_include.cpp", 47, 583 }, +{ PROC_LINKS(if0_off, 0), "if0_off", 7, "Surround the range between the cursor and mark with an '#if 0' and an '#endif'", 78, "C:\\work\\4ed\\code\\4coder_default_include.cpp", 47, 388 }, { PROC_LINKS(increase_face_size, 0), "increase_face_size", 18, "Increase the size of the face used by the current buffer.", 57, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 622 }, { PROC_LINKS(increase_line_wrap, 0), "increase_line_wrap", 18, "Increases the current buffer's width for line wrapping.", 55, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 600 }, { PROC_LINKS(interactive_kill_buffer, 0), "interactive_kill_buffer", 23, "Interactively kill an open buffer.", 34, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 1260 }, @@ -292,8 +292,8 @@ static Command_Metadata fcoder_metacmd_table[194] = { { PROC_LINKS(list_all_locations_of_identifier_case_insensitive, 0), "list_all_locations_of_identifier_case_insensitive", 49, "Reads a token or word under the cursor and lists all exact case-insensitive mathces in all open buffers.", 104, "C:\\work\\4ed\\code\\4coder_search.cpp", 38, 788 }, { PROC_LINKS(list_all_locations_of_selection, 0), "list_all_locations_of_selection", 31, "Reads the string in the selected range and lists all exact case-sensitive mathces in all open buffers.", 102, "C:\\work\\4ed\\code\\4coder_search.cpp", 38, 830 }, { PROC_LINKS(list_all_locations_of_selection_case_insensitive, 0), "list_all_locations_of_selection_case_insensitive", 48, "Reads the string in the selected range and lists all exact case-insensitive mathces in all open buffers.", 104, "C:\\work\\4ed\\code\\4coder_search.cpp", 38, 836 }, -{ PROC_LINKS(list_all_locations_of_type_definition, 0), "list_all_locations_of_type_definition", 37, "Queries user for string, lists all locations of strings that appear to define a type whose name matches the input string.", 121, "C:\\work\\4ed\\code\\4coder_default_include.cpp", 47, 498 }, -{ PROC_LINKS(list_all_locations_of_type_definition_of_identifier, 0), "list_all_locations_of_type_definition_of_identifier", 51, "Reads a token or word under the cursor and lists all locations of strings that appear to define a type whose name matches it.", 125, "C:\\work\\4ed\\code\\4coder_default_include.cpp", 47, 510 }, +{ PROC_LINKS(list_all_locations_of_type_definition, 0), "list_all_locations_of_type_definition", 37, "Queries user for string, lists all locations of strings that appear to define a type whose name matches the input string.", 121, "C:\\work\\4ed\\code\\4coder_default_include.cpp", 47, 303 }, +{ PROC_LINKS(list_all_locations_of_type_definition_of_identifier, 0), "list_all_locations_of_type_definition_of_identifier", 51, "Reads a token or word under the cursor and lists all locations of strings that appear to define a type whose name matches it.", 125, "C:\\work\\4ed\\code\\4coder_default_include.cpp", 47, 315 }, { PROC_LINKS(list_all_substring_locations, 0), "list_all_substring_locations", 28, "Queries the user for a string and lists all case-sensitive substring matches found in all open buffers.", 103, "C:\\work\\4ed\\code\\4coder_search.cpp", 38, 708 }, { PROC_LINKS(list_all_substring_locations_case_insensitive, 0), "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, "C:\\work\\4ed\\code\\4coder_search.cpp", 38, 728 }, { 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, "C:\\work\\4ed\\code\\4coder_project_commands.cpp", 48, 424 }, @@ -306,10 +306,10 @@ static Command_Metadata fcoder_metacmd_table[194] = { { PROC_LINKS(miblo_increment_time_stamp_minute, 0), "miblo_increment_time_stamp_minute", 33, "Increment a time stamp under the cursor by one minute. (format [m]m:ss or h:mm:ss", 81, "C:\\work\\4ed\\code\\power\\4coder_miblo_numbers.cpp", 52, 396 }, { PROC_LINKS(move_down, 0), "move_down", 9, "Moves the cursor down one line.", 31, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 238 }, { PROC_LINKS(move_down_10, 0), "move_down_10", 12, "Moves the cursor down ten lines.", 32, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 250 }, -{ PROC_LINKS(move_down_textual, 0), "move_down_textual", 17, "Moves down to the next line of actual text, regardless of line wrapping.", 72, "C:\\work\\4ed\\code\\4coder_default_include.cpp", 47, 348 }, +{ PROC_LINKS(move_down_textual, 0), "move_down_textual", 17, "Moves down to the next line of actual text, regardless of line wrapping.", 72, "C:\\work\\4ed\\code\\4coder_default_include.cpp", 47, 153 }, { PROC_LINKS(move_left, 0), "move_left", 9, "Moves the cursor one character to the left.", 43, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 291 }, -{ 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, "C:\\work\\4ed\\code\\4coder_default_include.cpp", 47, 359 }, -{ 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, "C:\\work\\4ed\\code\\4coder_default_include.cpp", 47, 284 }, +{ 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, "C:\\work\\4ed\\code\\4coder_default_include.cpp", 47, 164 }, +{ 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, "C:\\work\\4ed\\code\\4coder_default_include.cpp", 47, 89 }, { PROC_LINKS(move_right, 0), "move_right", 10, "Moves the cursor one character to the right.", 44, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 300 }, { PROC_LINKS(move_up, 0), "move_up", 7, "Moves the cursor up one line.", 29, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 232 }, { PROC_LINKS(move_up_10, 0), "move_up_10", 10, "Moves the cursor up ten lines.", 30, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 244 }, @@ -321,26 +321,26 @@ static Command_Metadata fcoder_metacmd_table[194] = { { 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, "C:\\work\\4ed\\code\\4coder_project_commands.cpp", 48, 408 }, { PROC_LINKS(open_all_code_recursive, 0), "open_all_code_recursive", 23, "Works as open_all_code but also runs in all subdirectories.", 59, "C:\\work\\4ed\\code\\4coder_project_commands.cpp", 48, 415 }, { PROC_LINKS(open_color_tweaker, 0), "open_color_tweaker", 18, "Opens the 4coder colors and fonts selector menu.", 48, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 1284 }, -{ 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, "C:\\work\\4ed\\code\\4coder_default_include.cpp", 47, 680 }, -{ PROC_LINKS(open_in_other, 0), "open_in_other", 13, "Reads a filename from surrounding '\"' characters and attempts to open the corresponding file, displaying it in the other view.", 127, "C:\\work\\4ed\\code\\4coder_default_include.cpp", 47, 697 }, -{ PROC_LINKS(open_long_braces, 0), "open_long_braces", 16, "At the cursor, insert a '{' and '}' separated by a blank line.", 62, "C:\\work\\4ed\\code\\4coder_default_include.cpp", 47, 559 }, -{ 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, "C:\\work\\4ed\\code\\4coder_default_include.cpp", 47, 575 }, -{ PROC_LINKS(open_long_braces_semicolon, 0), "open_long_braces_semicolon", 26, "At the cursor, insert a '{' and '};' separated by a blank line.", 63, "C:\\work\\4ed\\code\\4coder_default_include.cpp", 47, 567 }, -{ 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, "C:\\work\\4ed\\code\\4coder_default_include.cpp", 47, 753 }, +{ 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, "C:\\work\\4ed\\code\\4coder_default_include.cpp", 47, 485 }, +{ PROC_LINKS(open_in_other, 0), "open_in_other", 13, "Reads a filename from surrounding '\"' characters and attempts to open the corresponding file, displaying it in the other view.", 127, "C:\\work\\4ed\\code\\4coder_default_include.cpp", 47, 502 }, +{ PROC_LINKS(open_long_braces, 0), "open_long_braces", 16, "At the cursor, insert a '{' and '}' separated by a blank line.", 62, "C:\\work\\4ed\\code\\4coder_default_include.cpp", 47, 364 }, +{ 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, "C:\\work\\4ed\\code\\4coder_default_include.cpp", 47, 380 }, +{ PROC_LINKS(open_long_braces_semicolon, 0), "open_long_braces_semicolon", 26, "At the cursor, insert a '{' and '};' separated by a blank line.", 63, "C:\\work\\4ed\\code\\4coder_default_include.cpp", 47, 372 }, +{ 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, "C:\\work\\4ed\\code\\4coder_default_include.cpp", 47, 558 }, { PROC_LINKS(open_panel_hsplit, 0), "open_panel_hsplit", 17, "Create a new panel by horizontally splitting the active panel.", 62, "C:\\work\\4ed\\code\\4coder_default_framework.cpp", 49, 192 }, { PROC_LINKS(open_panel_vsplit, 0), "open_panel_vsplit", 17, "Create a new panel by vertically splitting the active panel.", 60, "C:\\work\\4ed\\code\\4coder_default_framework.cpp", 49, 183 }, { PROC_LINKS(page_down, 0), "page_down", 9, "Scrolls the view down one view height and moves the cursor down one view height.", 80, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 281 }, { PROC_LINKS(page_up, 0), "page_up", 7, "Scrolls the view up one view height and moves the cursor up one view height.", 76, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 272 }, -{ PROC_LINKS(paste, 0), "paste", 5, "At the cursor, insert the text at the top of the clipboard.", 59, "C:\\work\\4ed\\code\\4coder_clipboard.cpp", 41, 61 }, -{ 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, "C:\\work\\4ed\\code\\4coder_default_include.cpp", 47, 435 }, -{ 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, "C:\\work\\4ed\\code\\4coder_clipboard.cpp", 41, 99 }, -{ PROC_LINKS(paste_next_and_indent, 0), "paste_next_and_indent", 21, "Paste the next item on the clipboard and run auto-indent on the newly pasted text.", 82, "C:\\work\\4ed\\code\\4coder_default_include.cpp", 47, 442 }, +{ PROC_LINKS(paste, 0), "paste", 5, "At the cursor, insert the text at the top of the clipboard.", 59, "C:\\work\\4ed\\code\\4coder_clipboard.cpp", 41, 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, "C:\\work\\4ed\\code\\4coder_default_include.cpp", 47, 240 }, +{ 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, "C:\\work\\4ed\\code\\4coder_clipboard.cpp", 41, 84 }, +{ PROC_LINKS(paste_next_and_indent, 0), "paste_next_and_indent", 21, "Paste the next item on the clipboard and run auto-indent on the newly pasted text.", 82, "C:\\work\\4ed\\code\\4coder_default_include.cpp", 47, 247 }, { PROC_LINKS(place_in_scope, 0), "place_in_scope", 14, "Wraps the code contained in the range between cursor and mark with a new curly brace scope.", 91, "C:\\work\\4ed\\code\\4coder_scope_commands.cpp", 46, 481 }, { 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, "C:\\work\\4ed\\code\\4coder_project_commands.cpp", 48, 495 }, { 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, "C:\\work\\4ed\\code\\4coder_project_commands.cpp", 48, 520 }, { 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, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 1002 }, { 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, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 1023 }, -{ 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, "C:\\work\\4ed\\code\\4coder_default_include.cpp", 47, 253 }, +{ 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, "C:\\work\\4ed\\code\\4coder_default_include.cpp", 47, 58 }, { PROC_LINKS(redo, 0), "redo", 4, "Advances forewards through the undo history.", 44, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 1230 }, { PROC_LINKS(reload_current_project, 0), "reload_current_project", 22, "If a project file has already been loaded, reloads the same file. Useful for when the project configuration is changed.", 120, "C:\\work\\4ed\\code\\4coder_project_commands.cpp", 48, 463 }, { PROC_LINKS(remap_interactive, 0), "remap_interactive", 17, "Switch to a named key binding map.", 34, "C:\\work\\4ed\\code\\4coder_default_framework.cpp", 49, 578 }, @@ -357,22 +357,22 @@ static Command_Metadata fcoder_metacmd_table[194] = { { 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, "C:\\work\\4ed\\code\\4coder_scope_commands.cpp", 46, 738 }, { PROC_LINKS(search, 0), "search", 6, "Begins an incremental search down through the current buffer for a user specified string.", 89, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 863 }, { 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, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 877 }, -{ PROC_LINKS(seek_alphanumeric_left, 0), "seek_alphanumeric_left", 22, "Seek left for boundary between alphanumeric characters and non-alphanumeric characters.", 87, "C:\\work\\4ed\\code\\4coder_default_include.cpp", 47, 141 }, -{ 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, "C:\\work\\4ed\\code\\4coder_default_include.cpp", 47, 149 }, -{ 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, "C:\\work\\4ed\\code\\4coder_default_include.cpp", 47, 145 }, -{ PROC_LINKS(seek_alphanumeric_right, 0), "seek_alphanumeric_right", 23, "Seek right for boundary between alphanumeric characters and non-alphanumeric characters.", 88, "C:\\work\\4ed\\code\\4coder_default_include.cpp", 47, 137 }, +{ PROC_LINKS(seek_alphanumeric_left, 0), "seek_alphanumeric_left", 22, "Seek left for boundary between alphanumeric characters and non-alphanumeric characters.", 87, "C:\\work\\4ed\\code\\4coder_seek_commands.cpp", 45, 140 }, +{ 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, "C:\\work\\4ed\\code\\4coder_seek_commands.cpp", 45, 152 }, +{ 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, "C:\\work\\4ed\\code\\4coder_seek_commands.cpp", 45, 146 }, +{ PROC_LINKS(seek_alphanumeric_right, 0), "seek_alphanumeric_right", 23, "Seek right for boundary between alphanumeric characters and non-alphanumeric characters.", 88, "C:\\work\\4ed\\code\\4coder_seek_commands.cpp", 45, 134 }, { PROC_LINKS(seek_beginning_of_line, 0), "seek_beginning_of_line", 22, "Seeks the cursor to the beginning of the visual line.", 53, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 366 }, { PROC_LINKS(seek_beginning_of_textual_line, 0), "seek_beginning_of_textual_line", 30, "Seeks the cursor to the beginning of the line across all text.", 62, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 344 }, { PROC_LINKS(seek_end_of_line, 0), "seek_end_of_line", 16, "Seeks the cursor to the end of the visual line.", 47, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 379 }, { PROC_LINKS(seek_end_of_textual_line, 0), "seek_end_of_textual_line", 24, "Seeks the cursor to the end of the line across all text.", 56, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 355 }, -{ PROC_LINKS(seek_token_left, 0), "seek_token_left", 15, "Seek left for the next beginning of a token.", 44, "C:\\work\\4ed\\code\\4coder_default_include.cpp", 47, 125 }, -{ PROC_LINKS(seek_token_right, 0), "seek_token_right", 16, "Seek right for the next end of a token.", 39, "C:\\work\\4ed\\code\\4coder_default_include.cpp", 47, 121 }, -{ PROC_LINKS(seek_white_or_token_left, 0), "seek_white_or_token_left", 24, "Seek left for the next end of a token or boundary between whitespace and non-whitespace.", 88, "C:\\work\\4ed\\code\\4coder_default_include.cpp", 47, 133 }, -{ PROC_LINKS(seek_white_or_token_right, 0), "seek_white_or_token_right", 25, "Seek right for the next end of a token or boundary between whitespace and non-whitespace.", 89, "C:\\work\\4ed\\code\\4coder_default_include.cpp", 47, 129 }, +{ PROC_LINKS(seek_token_left, 0), "seek_token_left", 15, "Seek left for the next beginning of a token.", 44, "C:\\work\\4ed\\code\\4coder_seek_commands.cpp", 45, 116 }, +{ PROC_LINKS(seek_token_right, 0), "seek_token_right", 16, "Seek right for the next end of a token.", 39, "C:\\work\\4ed\\code\\4coder_seek_commands.cpp", 45, 110 }, +{ PROC_LINKS(seek_white_or_token_left, 0), "seek_white_or_token_left", 24, "Seek left for the next end of a token or boundary between whitespace and non-whitespace.", 88, "C:\\work\\4ed\\code\\4coder_seek_commands.cpp", 45, 128 }, +{ PROC_LINKS(seek_white_or_token_right, 0), "seek_white_or_token_right", 25, "Seek right for the next end of a token or boundary between whitespace and non-whitespace.", 89, "C:\\work\\4ed\\code\\4coder_seek_commands.cpp", 45, 122 }, { PROC_LINKS(seek_whitespace_down, 0), "seek_whitespace_down", 20, "Seeks the cursor down to the next blank line.", 45, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 333 }, { PROC_LINKS(seek_whitespace_down_end_line, 0), "seek_whitespace_down_end_line", 29, "Seeks the cursor down to the next blank line and places it at the end of the line.", 82, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 399 }, -{ PROC_LINKS(seek_whitespace_left, 0), "seek_whitespace_left", 20, "Seek left for the next boundary between whitespace and non-whitespace.", 70, "C:\\work\\4ed\\code\\4coder_default_include.cpp", 47, 117 }, -{ PROC_LINKS(seek_whitespace_right, 0), "seek_whitespace_right", 21, "Seek right for the next boundary between whitespace and non-whitespace.", 71, "C:\\work\\4ed\\code\\4coder_default_include.cpp", 47, 113 }, +{ PROC_LINKS(seek_whitespace_left, 0), "seek_whitespace_left", 20, "Seek left for the next boundary between whitespace and non-whitespace.", 70, "C:\\work\\4ed\\code\\4coder_seek_commands.cpp", 45, 104 }, +{ PROC_LINKS(seek_whitespace_right, 0), "seek_whitespace_right", 21, "Seek right for the next boundary between whitespace and non-whitespace.", 71, "C:\\work\\4ed\\code\\4coder_seek_commands.cpp", 45, 98 }, { PROC_LINKS(seek_whitespace_up, 0), "seek_whitespace_up", 18, "Seeks the cursor up to the next blank line.", 43, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 322 }, { 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, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 392 }, { 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, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 309 }, @@ -383,10 +383,10 @@ static Command_Metadata fcoder_metacmd_table[194] = { { 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, "C:\\work\\4ed\\code\\4coder_project_commands.cpp", 48, 567 }, { PROC_LINKS(show_filebar, 0), "show_filebar", 12, "Sets the current view to show it's filebar.", 43, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 567 }, { PROC_LINKS(show_scrollbar, 0), "show_scrollbar", 14, "Sets the current view to show it's scrollbar.", 45, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 553 }, -{ 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, "C:\\work\\4ed\\code\\4coder_default_include.cpp", 47, 200 }, -{ 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, "C:\\work\\4ed\\code\\4coder_default_include.cpp", 47, 224 }, +{ 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, "C:\\work\\4ed\\code\\4coder_seek_commands.cpp", 45, 172 }, +{ 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, "C:\\work\\4ed\\code\\4coder_seek_commands.cpp", 45, 178 }, { PROC_LINKS(suppress_mouse, 0), "suppress_mouse", 14, "Hides the mouse and causes all mosue input (clicks, position, wheel) to be ignored.", 83, "C:\\work\\4ed\\code\\4coder_default_framework.cpp", 49, 215 }, -{ 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, "C:\\work\\4ed\\code\\4coder_default_include.cpp", 47, 777 }, +{ 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, "C:\\work\\4ed\\code\\4coder_default_include.cpp", 47, 582 }, { PROC_LINKS(to_lowercase, 0), "to_lowercase", 12, "Converts all ascii text in the range between the cursor and the mark to lowercase.", 82, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 445 }, { PROC_LINKS(to_uppercase, 0), "to_uppercase", 12, "Converts all ascii text in the range between the cursor and the mark to uppercase.", 82, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 425 }, { PROC_LINKS(toggle_filebar, 0), "toggle_filebar", 14, "Toggles the visibility status of the current view's filebar.", 60, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 581 }, @@ -396,18 +396,18 @@ static Command_Metadata fcoder_metacmd_table[194] = { { PROC_LINKS(toggle_show_whitespace, 0), "toggle_show_whitespace", 22, "Toggles the current buffer's whitespace visibility status.", 58, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 657 }, { PROC_LINKS(toggle_virtual_whitespace, 0), "toggle_virtual_whitespace", 25, "Toggles the current buffer's virtual whitespace status.", 55, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 646 }, { PROC_LINKS(undo, 0), "undo", 4, "Advances backwards through the undo history.", 44, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 1224 }, -{ 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, "C:\\work\\4ed\\code\\4coder_default_include.cpp", 47, 767 }, +{ 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, "C:\\work\\4ed\\code\\4coder_default_include.cpp", 47, 572 }, { 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, "C:\\work\\4ed\\code\\4coder_search.cpp", 38, 859 }, { 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, "C:\\work\\4ed\\code\\4coder_auto_indent.cpp", 43, 745 }, -{ PROC_LINKS(write_block, 0), "write_block", 11, "At the cursor, insert a block comment.", 38, "C:\\work\\4ed\\code\\4coder_default_include.cpp", 47, 630 }, +{ PROC_LINKS(write_block, 0), "write_block", 11, "At the cursor, insert a block comment.", 38, "C:\\work\\4ed\\code\\4coder_default_include.cpp", 47, 435 }, { PROC_LINKS(write_character, 0), "write_character", 15, "Inserts whatever character was used to trigger this command.", 60, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 37 }, { PROC_LINKS(write_explicit_enum_flags, 0), "write_explicit_enum_flags", 25, "If the cursor is found to be on the '{' of an enum definition, the values of the enum will be filled in to give each a unique power of 2 value, starting from 1. Existing values are overwritten.", 194, "C:\\work\\4ed\\code\\power\\4coder_experiments.cpp", 50, 707 }, { PROC_LINKS(write_explicit_enum_values, 0), "write_explicit_enum_values", 26, "If the cursor is found to be on the '{' of an enum definition, the values of the enum will be filled in sequentially starting from zero. Existing values are overwritten.", 170, "C:\\work\\4ed\\code\\power\\4coder_experiments.cpp", 50, 701 }, -{ PROC_LINKS(write_hack, 0), "write_hack", 10, "At the cursor, insert a '// HACK' comment, includes user name if it was specified in config.4coder.", 99, "C:\\work\\4ed\\code\\4coder_default_include.cpp", 47, 618 }, -{ PROC_LINKS(write_note, 0), "write_note", 10, "At the cursor, insert a '// NOTE' comment, includes user name if it was specified in config.4coder.", 99, "C:\\work\\4ed\\code\\4coder_default_include.cpp", 47, 624 }, -{ PROC_LINKS(write_todo, 0), "write_todo", 10, "At the cursor, insert a '// TODO' comment, includes user name if it was specified in config.4coder.", 99, "C:\\work\\4ed\\code\\4coder_default_include.cpp", 47, 612 }, +{ PROC_LINKS(write_hack, 0), "write_hack", 10, "At the cursor, insert a '// HACK' comment, includes user name if it was specified in config.4coder.", 99, "C:\\work\\4ed\\code\\4coder_default_include.cpp", 47, 423 }, +{ PROC_LINKS(write_note, 0), "write_note", 10, "At the cursor, insert a '// NOTE' comment, includes user name if it was specified in config.4coder.", 99, "C:\\work\\4ed\\code\\4coder_default_include.cpp", 47, 429 }, +{ PROC_LINKS(write_todo, 0), "write_todo", 10, "At the cursor, insert a '// TODO' comment, includes user name if it was specified in config.4coder.", 99, "C:\\work\\4ed\\code\\4coder_default_include.cpp", 47, 417 }, { PROC_LINKS(write_underscore, 0), "write_underscore", 16, "Inserts an underscore.", 22, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 46 }, -{ PROC_LINKS(write_zero_struct, 0), "write_zero_struct", 17, "At the cursor, insert a ' = {0};'.", 34, "C:\\work\\4ed\\code\\4coder_default_include.cpp", 47, 636 }, +{ PROC_LINKS(write_zero_struct, 0), "write_zero_struct", 17, "At the cursor, insert a ' = {0};'.", 34, "C:\\work\\4ed\\code\\4coder_default_include.cpp", 47, 441 }, }; static int32_t fcoder_metacmd_ID_allow_mouse = 0; static int32_t fcoder_metacmd_ID_auto_tab_line_at_cursor = 1; diff --git a/4coder_jumping.cpp b/4coder_jumping.cpp index f899dd4d..cf694393 100644 --- a/4coder_jumping.cpp +++ b/4coder_jumping.cpp @@ -374,5 +374,40 @@ seek_jump(Application_Links *app, Partition *part, bool32 skip_repeats, bool32 s return(result); } +//////////////////////////////// + +#if defined(USE_OLD_STYLE_JUMPS) + +#define goto_jump_at_cursor CUSTOM_ALIAS(goto_jump_at_cursor_direct) +#define goto_jump_at_cursor_same_panel CUSTOM_ALIAS(goto_jump_at_cursor_same_panel_direct) +#define goto_next_jump CUSTOM_ALIAS(goto_next_jump_direct) +#define goto_prev_jump CUSTOM_ALIAS(goto_prev_jump_direct) +#define goto_next_jump_no_skips CUSTOM_ALIAS(goto_next_jump_no_skips_direct) +#define goto_prev_jump_no_skips CUSTOM_ALIAS(goto_prev_jump_no_skips_direct) +#define goto_first_jump CUSTOM_ALIAS(goto_first_jump_direct) +#define newline_or_goto_position CUSTOM_ALIAS(newline_or_goto_position_direct) +#define newline_or_goto_position_same_panel CUSTOM_ALIAS(newline_or_goto_position_same_panel_direct) + +#else + +#define goto_jump_at_cursor CUSTOM_ALIAS(goto_jump_at_cursor_sticky) +#define goto_jump_at_cursor_same_panel CUSTOM_ALIAS(goto_jump_at_cursor_same_panel_sticky) +#define goto_next_jump CUSTOM_ALIAS(goto_next_jump_sticky) +#define goto_prev_jump CUSTOM_ALIAS(goto_prev_jump_sticky) +#define goto_next_jump_no_skips CUSTOM_ALIAS(goto_next_jump_no_skips_sticky) +#define goto_prev_jump_no_skips CUSTOM_ALIAS(goto_prev_jump_no_skips_sticky) +#define goto_first_jump CUSTOM_ALIAS(goto_first_jump_sticky) +#define newline_or_goto_position CUSTOM_ALIAS(newline_or_goto_position_sticky) +#define newline_or_goto_position_same_panel CUSTOM_ALIAS(newline_or_goto_position_same_panel_sticky) + +#endif + +#define seek_error CUSTOM_ALIAS(seek_jump) +#define goto_next_error CUSTOM_ALIAS(goto_next_jump) +#define goto_prev_error CUSTOM_ALIAS(goto_prev_jump) +#define goto_next_error_no_skips CUSTOM_ALIAS(goto_next_jump_no_skips) +#define goto_prev_error_no_skips CUSTOM_ALIAS(goto_prev_jump_no_skips) +#define goto_first_error CUSTOM_ALIAS(goto_first_jump) + // BOTTOM diff --git a/4coder_seek_commands.cpp b/4coder_seek_commands.cpp new file mode 100644 index 00000000..fb5ba91e --- /dev/null +++ b/4coder_seek_commands.cpp @@ -0,0 +1,185 @@ +/* +4coder_seek_commands.cpp - Commands for jumping through code to useful stop boundaries. +*/ + +// TOP + +enum{ + DirLeft = 0, + DirRight = 1, +}; + +static int32_t +flip_dir(int32_t dir){ + if (dir == DirLeft){ + return(DirRight); + } + else{ + return(DirLeft); + } +} + +static int32_t +buffer_boundary_seek(Application_Links *app, Buffer_Summary *buffer, + int32_t start_pos, int32_t dir, Seek_Boundary_Flag flags){ + bool32 forward = (dir == DirRight); + return(buffer_boundary_seek(app, buffer, &global_part, start_pos, forward, flags)); +} + +static void +view_buffer_boundary_seek_set_pos(Application_Links *app, View_Summary *view, Buffer_Summary *buffer, + int32_t dir, uint32_t flags){ + int32_t pos = buffer_boundary_seek(app, buffer, &global_part, view->cursor.pos, dir, flags); + view_set_cursor(app, view, seek_pos(pos), true); +} + +static void +view_boundary_seek_set_pos(Application_Links *app, View_Summary *view, + int32_t dir, uint32_t flags){ + Buffer_Summary buffer = get_buffer(app, view->buffer_id, AccessProtected); + view_buffer_boundary_seek_set_pos(app, view, &buffer, dir, flags); +} + +static void +current_view_boundary_seek_set_pos(Application_Links *app, int32_t dir, uint32_t flags){ + View_Summary view = get_active_view(app, AccessProtected); + view_boundary_seek_set_pos(app, &view, dir, flags); +} + +static Range +view_buffer_boundary_range(Application_Links *app, View_Summary *view, Buffer_Summary *buffer, + int32_t dir, uint32_t flags){ + int32_t pos1 = view->cursor.pos; + int32_t pos2 = buffer_boundary_seek(app, buffer, pos1, dir, flags); + return(make_range(pos1, pos2)); +} + +static Range +view_buffer_snipe_range(Application_Links *app, View_Summary *view, Buffer_Summary *buffer, + int32_t dir, uint32_t flags){ + int32_t pos0 = view->cursor.pos; + int32_t pos1 = buffer_boundary_seek(app, buffer, pos0, dir , flags); + int32_t pos2 = buffer_boundary_seek(app, buffer, pos1, flip_dir(dir), flags); + if (dir == DirLeft){ + if (pos2 < pos0){ + pos2 = pos0; + } + } + else{ + if (pos2 > pos0){ + pos2 = pos0; + } + } + return(make_range(pos1, pos2)); +} + +static void +current_view_boundary_delete(Application_Links *app, int32_t dir, uint32_t flags){ + View_Summary view = get_active_view(app, AccessOpen); + Buffer_Summary buffer = get_buffer(app, view.buffer_id, AccessOpen); + if (buffer.exists){ + Range range = view_buffer_boundary_range(app, &view, &buffer, dir, flags); + buffer_replace_range(app, &buffer, range.min, range.max, 0, 0); + } +} + +static void +current_view_snipe_delete(Application_Links *app, int32_t dir, uint32_t flags){ + View_Summary view = get_active_view(app, AccessOpen); + Buffer_Summary buffer = get_buffer(app, view.buffer_id, AccessOpen); + if (buffer.exists){ + Range range = view_buffer_snipe_range(app, &view, &buffer, dir, flags); + buffer_replace_range(app, &buffer, range.min, range.max, 0, 0); + } +} + +//////////////////////////////// + +CUSTOM_COMMAND_SIG(seek_whitespace_right) +CUSTOM_DOC("Seek right for the next boundary between whitespace and non-whitespace.") +{ + current_view_boundary_seek_set_pos(app, DirRight, BoundaryWhitespace); +} + +CUSTOM_COMMAND_SIG(seek_whitespace_left) +CUSTOM_DOC("Seek left for the next boundary between whitespace and non-whitespace.") +{ + current_view_boundary_seek_set_pos(app, DirLeft, BoundaryWhitespace); +} + +CUSTOM_COMMAND_SIG(seek_token_right) +CUSTOM_DOC("Seek right for the next end of a token.") +{ + current_view_boundary_seek_set_pos(app, DirRight, BoundaryToken); +} + +CUSTOM_COMMAND_SIG(seek_token_left) +CUSTOM_DOC("Seek left for the next beginning of a token.") +{ + current_view_boundary_seek_set_pos(app, DirLeft, BoundaryToken); +} + +CUSTOM_COMMAND_SIG(seek_white_or_token_right) +CUSTOM_DOC("Seek right for the next end of a token or boundary between whitespace and non-whitespace.") +{ + current_view_boundary_seek_set_pos(app, DirRight, BoundaryToken|BoundaryWhitespace); +} + +CUSTOM_COMMAND_SIG(seek_white_or_token_left) +CUSTOM_DOC("Seek left for the next end of a token or boundary between whitespace and non-whitespace.") +{ + current_view_boundary_seek_set_pos(app, DirLeft, BoundaryToken|BoundaryWhitespace); +} + +CUSTOM_COMMAND_SIG(seek_alphanumeric_right) +CUSTOM_DOC("Seek right for boundary between alphanumeric characters and non-alphanumeric characters.") +{ + current_view_boundary_seek_set_pos(app, DirRight, BoundaryAlphanumeric); +} + +CUSTOM_COMMAND_SIG(seek_alphanumeric_left) +CUSTOM_DOC("Seek left for boundary between alphanumeric characters and non-alphanumeric characters.") +{ + current_view_boundary_seek_set_pos(app, DirLeft, BoundaryAlphanumeric); +} + +CUSTOM_COMMAND_SIG(seek_alphanumeric_or_camel_right) +CUSTOM_DOC("Seek right for boundary between alphanumeric characters or camel case word and non-alphanumeric characters.") +{ + current_view_boundary_seek_set_pos(app, DirRight, BoundaryAlphanumeric|BoundaryCamelCase); +} + +CUSTOM_COMMAND_SIG(seek_alphanumeric_or_camel_left) +CUSTOM_DOC("Seek left for boundary between alphanumeric characters or camel case word and non-alphanumeric characters.") +{ + current_view_boundary_seek_set_pos(app, DirLeft, BoundaryAlphanumeric|BoundaryCamelCase); +} + +//////////////////////////////// + +CUSTOM_COMMAND_SIG(backspace_word) +CUSTOM_DOC("Delete characters between the cursor position and the first alphanumeric boundary to the left.") +{ + current_view_boundary_delete(app, DirLeft, BoundaryAlphanumeric); +} + +CUSTOM_COMMAND_SIG(delete_word) +CUSTOM_DOC("Delete characters between the cursor position and the first alphanumeric boundary to the right.") +{ + current_view_boundary_delete(app, DirRight, BoundaryAlphanumeric); +} + +CUSTOM_COMMAND_SIG(snipe_token_or_word) +CUSTOM_DOC("Delete a single, whole token on or to the left of the cursor and post it to the clipboard.") +{ + current_view_snipe_delete(app, DirLeft, BoundaryToken|BoundaryWhitespace); +} + +CUSTOM_COMMAND_SIG(snipe_token_or_word_right) +CUSTOM_DOC("Delete a single, whole token on or to the right of the cursor and post it to the clipboard.") +{ + current_view_snipe_delete(app, DirRight, BoundaryToken|BoundaryWhitespace); +} + +// BOTTOM +