From ca2afce6e36dc3f40e4ef2d493f121b3452a5df4 Mon Sep 17 00:00:00 2001 From: Allen Webster Date: Thu, 27 Sep 2018 13:15:32 -0700 Subject: [PATCH] Cursor rendering for ibar-highlight, wireframe the cursor in inactive views. --- 4coder_base_commands.cpp | 50 ++- 4coder_default_framework_variables.cpp | 7 + 4coder_default_hooks.cpp | 70 +++- 4coder_generated/command_metadata.h | 528 +++++++++++++------------ 4coder_generated/remapping.h | 24 +- 4ed.cpp | 3 +- 4ed_view.cpp | 5 +- meta/4ed_metagen.cpp | 12 +- site/source_material/binding_list.txt | 119 +----- 9 files changed, 390 insertions(+), 428 deletions(-) diff --git a/4coder_base_commands.cpp b/4coder_base_commands.cpp index 66be5bd0..a9ba3b8e 100644 --- a/4coder_base_commands.cpp +++ b/4coder_base_commands.cpp @@ -177,14 +177,42 @@ global_point_to_view_point(View_Summary *view, int32_t x, int32_t y, float *x_ou return(result); } +CUSTOM_COMMAND_SIG(click_set_cursor_and_mark) +CUSTOM_DOC("Sets the cursor position and mark to the mouse position.") +{ + View_Summary view = get_active_view(app, AccessProtected); + Mouse_State mouse = get_mouse_state(app); + float rx = 0; + float ry = 0; + if (global_point_to_view_point(&view, mouse.x, mouse.y, &rx, &ry)){ + view_set_cursor(app, &view, seek_xy(rx, ry, true, view.unwrapped_lines), true); + view_set_mark(app, &view, seek_pos(view.cursor.pos)); + } +} + CUSTOM_COMMAND_SIG(click_set_cursor) CUSTOM_DOC("Sets the cursor position to the mouse position.") { View_Summary view = get_active_view(app, AccessProtected); Mouse_State mouse = get_mouse_state(app); - float rx = 0, ry = 0; + float rx = 0; + float ry = 0; if (global_point_to_view_point(&view, mouse.x, mouse.y, &rx, &ry)){ - view_set_cursor(app, &view, seek_xy(rx, ry, 1, view.unwrapped_lines), 1); + view_set_cursor(app, &view, seek_xy(rx, ry, true, view.unwrapped_lines), true); + } +} + +CUSTOM_COMMAND_SIG(click_set_cursor_if_lbutton) +CUSTOM_DOC("If the mouse left button is pressed, sets the cursor position to the mouse position.") +{ + Mouse_State mouse = get_mouse_state(app); + if (mouse.l){ + View_Summary view = get_active_view(app, AccessProtected); + float rx = 0; + float ry = 0; + if (global_point_to_view_point(&view, mouse.x, mouse.y, &rx, &ry)){ + view_set_cursor(app, &view, seek_xy(rx, ry, true, view.unwrapped_lines), true); + } } } @@ -193,9 +221,10 @@ CUSTOM_DOC("Sets the mark position to the mouse position.") { View_Summary view = get_active_view(app, AccessProtected); Mouse_State mouse = get_mouse_state(app); - float rx = 0, ry = 0; + float rx = 0; + float ry = 0; if (global_point_to_view_point(&view, mouse.x, mouse.y, &rx, &ry)){ - view_set_mark(app, &view, seek_xy(rx, ry, 1, view.unwrapped_lines)); + view_set_mark(app, &view, seek_xy(rx, ry, true, view.unwrapped_lines)); } } @@ -632,10 +661,14 @@ static void isearch(Application_Links *app, bool32 start_reversed, String query_init, bool32 on_the_query_init_string){ View_Summary view = get_active_view(app, AccessProtected); Buffer_Summary buffer = get_buffer(app, view.buffer_id, AccessProtected); - if (!buffer.exists) return; + if (!buffer.exists){ + return; + } Query_Bar bar = {0}; - if (start_query_bar(app, &bar, 0) == 0) return; + if (start_query_bar(app, &bar, 0) == 0){ + return; + } bool32 reverse = start_reversed; int32_t first_pos = view.cursor.pos; @@ -667,6 +700,8 @@ isearch(Application_Links *app, bool32 start_reversed, String query_init, bool32 buffer_markers_set_visuals(app, highlight, marker_type, color.color, 0, view.view_id); isearch__update_highlight(app, &view, highlight, match.start, match.end); + int32_t original_cursor_render_mode = cursor_render_mode; + cursor_render_mode = CursorRenderMode_Hidden; User_Input in = {0}; for (;;){ @@ -804,12 +839,13 @@ isearch(Application_Links *app, bool32 start_reversed, String query_init, bool32 managed_object_free(app, highlight); + cursor_render_mode = original_cursor_render_mode; + if (in.abort){ String previous_isearch_query_str = make_fixed_width_string(previous_isearch_query); append(&previous_isearch_query_str, bar.string); terminate_with_null(&previous_isearch_query_str); view_set_cursor(app, &view, seek_pos(first_pos), true); - return; } } diff --git a/4coder_default_framework_variables.cpp b/4coder_default_framework_variables.cpp index 2583fea1..73482de4 100644 --- a/4coder_default_framework_variables.cpp +++ b/4coder_default_framework_variables.cpp @@ -48,6 +48,13 @@ static char hot_directory_space[1024]; static bool32 highlight_line_at_cursor = false; static bool32 suppressing_mouse = false; +enum{ + CursorRenderMode_Hidden = 0, + CursorRenderMode_BlockCursorAndWireMark = 1, + CursorRenderMode_IBarOrHighlightRange = 2, +}; +static int32_t cursor_render_mode = CursorRenderMode_IBarOrHighlightRange; + static ID_Line_Column_Jump_Location prev_location = {0}; diff --git a/4coder_default_hooks.cpp b/4coder_default_hooks.cpp index 0ef6629a..dc17c355 100644 --- a/4coder_default_hooks.cpp +++ b/4coder_default_hooks.cpp @@ -54,6 +54,8 @@ COMMAND_CALLER_HOOK(default_command_caller){ RENDER_CALLER_SIG(default_render_caller){ View_Summary view = get_view(app, view_id, AccessAll); Buffer_Summary buffer = get_buffer(app, view.buffer_id, AccessAll); + View_Summary active_view = get_active_view(app, AccessAll); + bool32 is_active_view = (active_view.view_id == view_id); static Managed_Scope render_scope = 0; if (render_scope == 0){ @@ -61,27 +63,57 @@ RENDER_CALLER_SIG(default_render_caller){ } // NOTE(allen): Cursor and mark - { - Theme_Color colors[2] = {0}; - colors[0].tag = Stag_Cursor; - colors[1].tag = Stag_Mark; - get_theme_colors(app, colors, 2); - uint32_t cursor_color = colors[0].color; - uint32_t mark_color = colors[1].color; + switch (cursor_render_mode){ + case CursorRenderMode_BlockCursorAndWireMark: { - Managed_Object o = alloc_buffer_markers_on_buffer(app, buffer.buffer_id, 1, &render_scope); - buffer_markers_set_visuals(app, o, BufferMarkersType_CharacterBlocks, cursor_color, 0, 0); - Marker marker = {0}; - marker.pos = view.cursor.pos; - managed_object_store_data(app, o, 0, 1, &marker); - } + Theme_Color colors[2] = {0}; + colors[0].tag = Stag_Cursor; + colors[1].tag = Stag_Mark; + get_theme_colors(app, colors, 2); + uint32_t cursor_color = colors[0].color; + uint32_t mark_color = colors[1].color; + { + Managed_Object o = alloc_buffer_markers_on_buffer(app, buffer.buffer_id, 1, &render_scope); + Managed_Buffer_Markers_Type type = is_active_view?BufferMarkersType_CharacterBlocks:BufferMarkersType_CharacterWireFrames; + buffer_markers_set_visuals(app, o, type, cursor_color, 0, 0); + Marker marker = {0}; + marker.pos = view.cursor.pos; + managed_object_store_data(app, o, 0, 1, &marker); + } + { + Managed_Object o = alloc_buffer_markers_on_buffer(app, buffer.buffer_id, 1, &render_scope); + buffer_markers_set_visuals(app, o, BufferMarkersType_CharacterWireFrames, mark_color, 0, 0); + Marker marker = {0}; + marker.pos = view.mark.pos; + managed_object_store_data(app, o, 0, 1, &marker); + } + }break; + + case CursorRenderMode_IBarOrHighlightRange: { - Managed_Object o = alloc_buffer_markers_on_buffer(app, buffer.buffer_id, 1, &render_scope); - buffer_markers_set_visuals(app, o, BufferMarkersType_CharacterWireFrames, mark_color, 0, 0); - Marker marker = {0}; - marker.pos = view.mark.pos; - managed_object_store_data(app, o, 0, 1, &marker); - } + Theme_Color colors[2] = {0}; + colors[0].tag = Stag_Cursor; + colors[1].tag = Stag_Highlight; + get_theme_colors(app, colors, 2); + uint32_t cursor_color = colors[0].color; + uint32_t highlight_color = colors[1].color; + { + Managed_Object o = alloc_buffer_markers_on_buffer(app, buffer.buffer_id, 1, &render_scope); + buffer_markers_set_visuals(app, o, BufferMarkersType_CharacterIBars, cursor_color, 0, 0); + Marker marker = {0}; + marker.pos = view.cursor.pos; + managed_object_store_data(app, o, 0, 1, &marker); + } + if (view.cursor.pos != view.mark.pos){ + Managed_Object o = alloc_buffer_markers_on_buffer(app, buffer.buffer_id, 2, &render_scope); + buffer_markers_set_visuals(app, o, BufferMarkersType_CharacterHighlightRanges, highlight_color, 0, 0); + Range range = make_range(view.cursor.pos, view.mark.pos); + Marker markers[2] = {0}; + markers[0].pos = range.first; + markers[1].pos = range.one_past_last; + managed_object_store_data(app, o, 0, 2, markers); + } + }break; } // NOTE(allen): Line highlight setup diff --git a/4coder_generated/command_metadata.h b/4coder_generated/command_metadata.h index 21476d4d..f02b2a12 100644 --- a/4coder_generated/command_metadata.h +++ b/4coder_generated/command_metadata.h @@ -2,7 +2,7 @@ #define command_id(c) (fcoder_metacmd_ID_##c) #define command_metadata(c) (&fcoder_metacmd_table[command_id(c)]) #define command_metadata_by_id(id) (&fcoder_metacmd_table[id]) -#define command_one_past_last_id 212 +#define command_one_past_last_id 214 #if defined(CUSTOM_COMMAND_SIG) #define PROC_LINKS(x,y) x #else @@ -24,6 +24,8 @@ CUSTOM_COMMAND_SIG(change_active_panel_backwards); CUSTOM_COMMAND_SIG(change_to_build_panel); CUSTOM_COMMAND_SIG(clean_all_lines); CUSTOM_COMMAND_SIG(click_set_cursor); +CUSTOM_COMMAND_SIG(click_set_cursor_and_mark); +CUSTOM_COMMAND_SIG(click_set_cursor_if_lbutton); CUSTOM_COMMAND_SIG(click_set_mark); CUSTOM_COMMAND_SIG(close_all_code); CUSTOM_COMMAND_SIG(close_build_panel); @@ -232,46 +234,48 @@ char *source_name; int32_t source_name_len; int32_t line_number; }; -static Command_Metadata fcoder_metacmd_table[212] = { +static Command_Metadata fcoder_metacmd_table[214] = { { PROC_LINKS(allow_mouse, 0), "allow_mouse", 11, "Shows the mouse and causes all mouse input to be processed normally.", 68, "w:\\4ed\\code\\4coder_default_framework.cpp", 40, 240 }, { PROC_LINKS(auto_tab_line_at_cursor, 0), "auto_tab_line_at_cursor", 23, "Auto-indents the line on which the cursor sits.", 47, "w:\\4ed\\code\\4coder_auto_indent.cpp", 34, 722 }, { PROC_LINKS(auto_tab_range, 0), "auto_tab_range", 14, "Auto-indents the range between the cursor and the mark.", 55, "w:\\4ed\\code\\4coder_auto_indent.cpp", 34, 733 }, { PROC_LINKS(auto_tab_whole_file, 0), "auto_tab_whole_file", 19, "Audo-indents the entire current buffer.", 39, "w:\\4ed\\code\\4coder_auto_indent.cpp", 34, 712 }, { PROC_LINKS(backspace_char, 0), "backspace_char", 14, "Deletes the character to the left of the cursor.", 48, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 73 }, { PROC_LINKS(backspace_word, 0), "backspace_word", 14, "Delete characters between the cursor position and the first alphanumeric boundary to the left.", 94, "w:\\4ed\\code\\4coder_seek.cpp", 27, 1247 }, -{ PROC_LINKS(basic_change_active_panel, 0), "basic_change_active_panel", 25, "Change the currently active panel, moving to the panel with the next highest view_id. Will not skipe the build panel if it is open.", 132, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 447 }, +{ PROC_LINKS(basic_change_active_panel, 0), "basic_change_active_panel", 25, "Change the currently active panel, moving to the panel with the next highest view_id. Will not skipe the build panel if it is open.", 132, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 476 }, { PROC_LINKS(build_in_build_panel, 0), "build_in_build_panel", 20, "Looks for a build.bat, build.sh, or makefile in the current and parent directories. Runs the first that it finds and prints the output to *compilation*. Puts the *compilation* buffer in a panel at the footer of the current view.", 230, "w:\\4ed\\code\\4coder_build_commands.cpp", 37, 187 }, { PROC_LINKS(build_search, 0), "build_search", 12, "Looks for a build.bat, build.sh, or makefile in the current and parent directories. Runs the first that it finds and prints the output to *compilation*.", 153, "w:\\4ed\\code\\4coder_build_commands.cpp", 37, 155 }, { PROC_LINKS(center_view, 0), "center_view", 11, "Centers the view vertically on the line on which the cursor sits.", 65, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 126 }, { PROC_LINKS(change_active_panel, 0), "change_active_panel", 19, "Change the currently active panel, moving to the panel with the next highest view_id.", 85, "w:\\4ed\\code\\4coder_default_framework.cpp", 40, 144 }, { PROC_LINKS(change_active_panel_backwards, 0), "change_active_panel_backwards", 29, "Change the currently active panel, moving to the panel with the next lowest view_id.", 84, "w:\\4ed\\code\\4coder_default_framework.cpp", 40, 154 }, { PROC_LINKS(change_to_build_panel, 0), "change_to_build_panel", 21, "If the special build panel is open, makes the build panel the active panel.", 75, "w:\\4ed\\code\\4coder_build_commands.cpp", 37, 209 }, -{ PROC_LINKS(clean_all_lines, 0), "clean_all_lines", 15, "Removes trailing whitespace from all lines in the current buffer.", 65, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 382 }, -{ PROC_LINKS(click_set_cursor, 0), "click_set_cursor", 16, "Sets the cursor position to the mouse position.", 47, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 180 }, -{ PROC_LINKS(click_set_mark, 0), "click_set_mark", 14, "Sets the mark position to the mouse position.", 45, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 191 }, +{ PROC_LINKS(clean_all_lines, 0), "clean_all_lines", 15, "Removes trailing whitespace from all lines in the current buffer.", 65, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 411 }, +{ PROC_LINKS(click_set_cursor, 0), "click_set_cursor", 16, "Sets the cursor position to the mouse position.", 47, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 193 }, +{ PROC_LINKS(click_set_cursor_and_mark, 0), "click_set_cursor_and_mark", 25, "Sets the cursor position and mark to the mouse position.", 56, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 180 }, +{ PROC_LINKS(click_set_cursor_if_lbutton, 0), "click_set_cursor_if_lbutton", 27, "If the mouse left button is pressed, sets the cursor position to the mouse position.", 84, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 205 }, +{ PROC_LINKS(click_set_mark, 0), "click_set_mark", 14, "Sets the mark position to the mouse position.", 45, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 219 }, { PROC_LINKS(close_all_code, 0), "close_all_code", 14, "Closes any buffer with a filename ending with an extension configured to be recognized as a code file type.", 107, "w:\\4ed\\code\\4coder_project_commands.cpp", 39, 1060 }, { PROC_LINKS(close_build_panel, 0), "close_build_panel", 17, "If the special build panel is open, closes it.", 46, "w:\\4ed\\code\\4coder_build_commands.cpp", 37, 203 }, -{ PROC_LINKS(close_panel, 0), "close_panel", 11, "Closes the currently active panel if it is not the only panel open.", 67, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 455 }, +{ PROC_LINKS(close_panel, 0), "close_panel", 11, "Closes the currently active panel if it is not the only panel open.", 67, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 484 }, { PROC_LINKS(command_lister, 0), "command_lister", 14, "Opens an interactive list of all registered commands.", 53, "w:\\4ed\\code\\4coder_lists.cpp", 28, 935 }, { PROC_LINKS(copy, 0), "copy", 4, "Copy the text in the range from the cursor to the mark onto the clipboard.", 74, "w:\\4ed\\code\\4coder_clipboard.cpp", 32, 26 }, { PROC_LINKS(cursor_mark_swap, 0), "cursor_mark_swap", 16, "Swaps the position of the cursor and the mark.", 46, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 101 }, { PROC_LINKS(cut, 0), "cut", 3, "Cut the text in the range from the cursor to the mark onto the clipboard.", 73, "w:\\4ed\\code\\4coder_clipboard.cpp", 32, 35 }, -{ PROC_LINKS(decrease_face_size, 0), "decrease_face_size", 18, "Decrease the size of the face used by the current buffer.", 57, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 545 }, -{ PROC_LINKS(decrease_line_wrap, 0), "decrease_line_wrap", 18, "Decrases the current buffer's width for line wrapping.", 54, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 522 }, +{ PROC_LINKS(decrease_face_size, 0), "decrease_face_size", 18, "Decrease the size of the face used by the current buffer.", 57, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 574 }, +{ PROC_LINKS(decrease_line_wrap, 0), "decrease_line_wrap", 18, "Decrases the current buffer's width for line wrapping.", 54, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 551 }, { PROC_LINKS(delete_char, 0), "delete_char", 11, "Deletes the character to the right of the cursor.", 49, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 55 }, { PROC_LINKS(delete_current_scope, 0), "delete_current_scope", 20, "Deletes the braces surrounding the currently selected scope. Leaves the contents within the scope.", 99, "w:\\4ed\\code\\4coder_scope_commands.cpp", 37, 492 }, -{ PROC_LINKS(delete_file_query, 0), "delete_file_query", 17, "Deletes the file of the current buffer if 4coder has the appropriate access rights. Will ask the user for confirmation first.", 125, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 1066 }, -{ PROC_LINKS(delete_line, 0), "delete_line", 11, "Delete the line the on which the cursor sits.", 45, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 1316 }, +{ PROC_LINKS(delete_file_query, 0), "delete_file_query", 17, "Deletes the file of the current buffer if 4coder has the appropriate access rights. Will ask the user for confirmation first.", 125, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 1102 }, +{ PROC_LINKS(delete_line, 0), "delete_line", 11, "Delete the line the on which the cursor sits.", 45, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 1352 }, { PROC_LINKS(delete_range, 0), "delete_range", 12, "Deletes the text in the range between the cursor and the mark.", 62, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 113 }, { PROC_LINKS(delete_word, 0), "delete_word", 11, "Delete characters between the cursor position and the first alphanumeric boundary to the right.", 95, "w:\\4ed\\code\\4coder_seek.cpp", 27, 1253 }, { PROC_LINKS(disable_highlight_line_at_cursor, 0), "disable_highlight_line_at_cursor", 32, "Disables the line highlight at the cursor.", 42, "w:\\4ed\\code\\4coder_default_framework.cpp", 40, 252 }, -{ PROC_LINKS(duplicate_line, 0), "duplicate_line", 14, "Create a copy of the line on which the cursor sits.", 51, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 1294 }, +{ PROC_LINKS(duplicate_line, 0), "duplicate_line", 14, "Create a copy of the line on which the cursor sits.", 51, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 1330 }, { PROC_LINKS(enable_highlight_line_at_cursor, 0), "enable_highlight_line_at_cursor", 31, "Enables the line highlight at the cursor.", 41, "w:\\4ed\\code\\4coder_default_framework.cpp", 40, 258 }, -{ PROC_LINKS(eol_dosify, 0), "eol_dosify", 10, "Puts the buffer in DOS line ending mode.", 40, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 575 }, -{ PROC_LINKS(eol_nixify, 0), "eol_nixify", 10, "Puts the buffer in NIX line ending mode.", 40, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 583 }, +{ PROC_LINKS(eol_dosify, 0), "eol_dosify", 10, "Puts the buffer in DOS line ending mode.", 40, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 604 }, +{ PROC_LINKS(eol_nixify, 0), "eol_nixify", 10, "Puts the buffer in NIX line ending mode.", 40, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 612 }, { PROC_LINKS(execute_any_cli, 0), "execute_any_cli", 15, "Queries for an output buffer name and system command, runs the system command as a CLI and prints the output to the specified buffer.", 133, "w:\\4ed\\code\\4coder_system_command.cpp", 37, 23 }, { PROC_LINKS(execute_previous_cli, 0), "execute_previous_cli", 20, "If the command execute_any_cli has already been used, this will execute a CLI reusing the most recent buffer name and command.", 126, "w:\\4ed\\code\\4coder_system_command.cpp", 37, 7 }, -{ PROC_LINKS(exit_4coder, 0), "exit_4coder", 11, "Attempts to close 4coder.", 25, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 591 }, +{ PROC_LINKS(exit_4coder, 0), "exit_4coder", 11, "Attempts to close 4coder.", 25, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 620 }, { PROC_LINKS(goto_beginning_of_file, 0), "goto_beginning_of_file", 22, "Sets the cursor to the beginning of the file.", 45, "w:\\4ed\\code\\4coder_seek.cpp", 27, 1168 }, { PROC_LINKS(goto_end_of_file, 0), "goto_end_of_file", 16, "Sets the cursor to the end of the file.", 39, "w:\\4ed\\code\\4coder_seek.cpp", 27, 1175 }, { PROC_LINKS(goto_first_jump_direct, 0), "goto_first_jump_direct", 22, "If a buffer containing jump locations has been locked in, goes to the first jump in the buffer.", 95, "w:\\4ed\\code\\4coder_jump_direct.cpp", 34, 84 }, @@ -281,7 +285,7 @@ static Command_Metadata fcoder_metacmd_table[212] = { { PROC_LINKS(goto_jump_at_cursor_same_panel_direct, 0), "goto_jump_at_cursor_same_panel_direct", 37, "If the cursor is found to be on a jump location, parses the jump location and brings up the file and position in this view, losing the compilation output or jump list..", 168, "w:\\4ed\\code\\4coder_jump_direct.cpp", 34, 29 }, { PROC_LINKS(goto_jump_at_cursor_same_panel_sticky, 0), "goto_jump_at_cursor_same_panel_sticky", 37, "If the cursor is found to be on a jump location, parses the jump location and brings up the file and position in this view, losing the compilation output or jump list.", 167, "w:\\4ed\\code\\4coder_jump_sticky.cpp", 34, 383 }, { PROC_LINKS(goto_jump_at_cursor_sticky, 0), "goto_jump_at_cursor_sticky", 26, "If the cursor is found to be on a jump location, parses the jump location and brings up the file and position in another view and changes the active panel to the view containing the jump.", 187, "w:\\4ed\\code\\4coder_jump_sticky.cpp", 34, 355 }, -{ PROC_LINKS(goto_line, 0), "goto_line", 9, "Queries the user for a number, and jumps the cursor to the corresponding line.", 78, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 599 }, +{ PROC_LINKS(goto_line, 0), "goto_line", 9, "Queries the user for a number, and jumps the cursor to the corresponding line.", 78, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 628 }, { PROC_LINKS(goto_next_jump_direct, 0), "goto_next_jump_direct", 21, "If a buffer containing jump locations has been locked in, goes to the next jump in the buffer, skipping sub jump locations.", 123, "w:\\4ed\\code\\4coder_jump_direct.cpp", 34, 48 }, { PROC_LINKS(goto_next_jump_no_skips_direct, 0), "goto_next_jump_no_skips_direct", 30, "If a buffer containing jump locations has been locked in, goes to the next jump in the buffer, and does not skip sub jump locations.", 132, "w:\\4ed\\code\\4coder_jump_direct.cpp", 34, 66 }, { PROC_LINKS(goto_next_jump_no_skips_sticky, 0), "goto_next_jump_no_skips_sticky", 30, "If a buffer containing jump locations has been locked in, goes to the next jump in the buffer, and does not skip sub jump locations.", 132, "w:\\4ed\\code\\4coder_jump_sticky.cpp", 34, 508 }, @@ -290,20 +294,20 @@ static Command_Metadata fcoder_metacmd_table[212] = { { PROC_LINKS(goto_prev_jump_no_skips_direct, 0), "goto_prev_jump_no_skips_direct", 30, "If a buffer containing jump locations has been locked in, goes to the previous jump in the buffer, and does not skip sub jump locations.", 136, "w:\\4ed\\code\\4coder_jump_direct.cpp", 34, 75 }, { PROC_LINKS(goto_prev_jump_no_skips_sticky, 0), "goto_prev_jump_no_skips_sticky", 30, "If a buffer containing jump locations has been locked in, goes to the previous jump in the buffer, and does not skip sub jump locations.", 136, "w:\\4ed\\code\\4coder_jump_sticky.cpp", 34, 524 }, { PROC_LINKS(goto_prev_jump_sticky, 0), "goto_prev_jump_sticky", 21, "If a buffer containing jump locations has been locked in, goes to the previous jump in the buffer, skipping sub jump locations.", 127, "w:\\4ed\\code\\4coder_jump_sticky.cpp", 34, 494 }, -{ PROC_LINKS(hide_filebar, 0), "hide_filebar", 12, "Sets the current view to hide it's filebar.", 43, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 485 }, -{ PROC_LINKS(hide_scrollbar, 0), "hide_scrollbar", 14, "Sets the current view to hide it's scrollbar.", 45, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 471 }, +{ PROC_LINKS(hide_filebar, 0), "hide_filebar", 12, "Sets the current view to hide it's filebar.", 43, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 514 }, +{ PROC_LINKS(hide_scrollbar, 0), "hide_scrollbar", 14, "Sets the current view to hide it's scrollbar.", 45, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 500 }, { PROC_LINKS(highlight_next_scope_absolute, 0), "highlight_next_scope_absolute", 29, "Finds the first scope started by '{' after the cursor and puts the cursor and mark on the '{' and '}'.", 102, "w:\\4ed\\code\\4coder_scope_commands.cpp", 37, 368 }, { PROC_LINKS(highlight_prev_scope_absolute, 0), "highlight_prev_scope_absolute", 29, "Finds the first scope started by '{' before the cursor and puts the cursor and mark on the '{' and '}'.", 103, "w:\\4ed\\code\\4coder_scope_commands.cpp", 37, 387 }, { PROC_LINKS(highlight_surrounding_scope, 0), "highlight_surrounding_scope", 27, "Finds the scope enclosed by '{' '}' surrounding the cursor and puts the cursor and mark on the '{' and '}'.", 107, "w:\\4ed\\code\\4coder_scope_commands.cpp", 37, 353 }, { PROC_LINKS(if0_off, 0), "if0_off", 7, "Surround the range between the cursor and mark with an '#if 0' and an '#endif'", 78, "w:\\4ed\\code\\4coder_combined_write_commands.cpp", 46, 81 }, -{ PROC_LINKS(increase_face_size, 0), "increase_face_size", 18, "Increase the size of the face used by the current buffer.", 57, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 533 }, -{ PROC_LINKS(increase_line_wrap, 0), "increase_line_wrap", 18, "Increases the current buffer's width for line wrapping.", 55, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 511 }, +{ PROC_LINKS(increase_face_size, 0), "increase_face_size", 18, "Increase the size of the face used by the current buffer.", 57, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 562 }, +{ PROC_LINKS(increase_line_wrap, 0), "increase_line_wrap", 18, "Increases the current buffer's width for line wrapping.", 55, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 540 }, { PROC_LINKS(interactive_kill_buffer, 0), "interactive_kill_buffer", 23, "Interactively kill an open buffer.", 34, "w:\\4ed\\code\\4coder_lists.cpp", 28, 749 }, { PROC_LINKS(interactive_new, 0), "interactive_new", 15, "Interactively creates a new file.", 33, "w:\\4ed\\code\\4coder_lists.cpp", 28, 853 }, { PROC_LINKS(interactive_open, 0), "interactive_open", 16, "Interactively opens a file.", 27, "w:\\4ed\\code\\4coder_lists.cpp", 28, 881 }, { PROC_LINKS(interactive_open_or_new, 0), "interactive_open_or_new", 23, "Interactively open a file out of the file system.", 49, "w:\\4ed\\code\\4coder_lists.cpp", 28, 819 }, { PROC_LINKS(interactive_switch_buffer, 0), "interactive_switch_buffer", 25, "Interactively switch to an open buffer.", 39, "w:\\4ed\\code\\4coder_lists.cpp", 28, 730 }, -{ PROC_LINKS(kill_buffer, 0), "kill_buffer", 11, "Kills the current buffer.", 25, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 1486 }, +{ PROC_LINKS(kill_buffer, 0), "kill_buffer", 11, "Kills the current buffer.", 25, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 1522 }, { PROC_LINKS(left_adjust_view, 0), "left_adjust_view", 16, "Sets the left size of the view near the x position of the cursor.", 65, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 141 }, { PROC_LINKS(list_all_functions_all_buffers, 0), "list_all_functions_all_buffers", 30, "Creates a jump list of lines from all buffers that appear to define or declare functions.", 89, "w:\\4ed\\code\\4coder_function_list.cpp", 36, 358 }, { PROC_LINKS(list_all_functions_all_buffers_lister, 0), "list_all_functions_all_buffers_lister", 37, "Creates a lister of locations that look like function definitions and declarations all buffers.", 95, "w:\\4ed\\code\\4coder_function_list.cpp", 36, 364 }, @@ -337,17 +341,17 @@ static Command_Metadata fcoder_metacmd_table[212] = { { PROC_LINKS(lister__write_character__file_path, 0), "lister__write_character__file_path", 34, "A lister mode command that inserts a character into the text field of a file system list.", 89, "w:\\4ed\\code\\4coder_lists.cpp", 28, 193 }, { PROC_LINKS(lister__write_character__fixed_list, 0), "lister__write_character__fixed_list", 35, "A lister mode command that handles input for the fixed sure to kill list.", 73, "w:\\4ed\\code\\4coder_lists.cpp", 28, 253 }, { PROC_LINKS(load_project, 0), "load_project", 12, "Looks for a project.4coder file in the current directory and tries to load it. Looks in parent directories until a project file is found or there are no more parents.", 167, "w:\\4ed\\code\\4coder_project_commands.cpp", 39, 1083 }, -{ PROC_LINKS(make_directory_query, 0), "make_directory_query", 20, "Queries the user for a name and creates a new directory with the given name.", 76, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 1174 }, -{ PROC_LINKS(mouse_wheel_scroll, 0), "mouse_wheel_scroll", 18, "Reads the scroll wheel value from the mouse state and scrolls accordingly.", 74, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 202 }, -{ PROC_LINKS(move_down, 0), "move_down", 9, "Moves the cursor down one line.", 31, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 264 }, -{ PROC_LINKS(move_down_10, 0), "move_down_10", 12, "Moves the cursor down ten lines.", 32, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 276 }, -{ PROC_LINKS(move_down_textual, 0), "move_down_textual", 17, "Moves down to the next line of actual text, regardless of line wrapping.", 72, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 282 }, -{ PROC_LINKS(move_left, 0), "move_left", 9, "Moves the cursor one character to the left.", 43, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 313 }, -{ PROC_LINKS(move_line_down, 0), "move_line_down", 14, "Swaps the line under the cursor with the line below it, and moves the cursor down with it.", 90, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 1271 }, -{ PROC_LINKS(move_line_up, 0), "move_line_up", 12, "Swaps the line under the cursor with the line above it, and moves the cursor up with it.", 88, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 1207 }, -{ PROC_LINKS(move_right, 0), "move_right", 10, "Moves the cursor one character to the right.", 44, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 322 }, -{ PROC_LINKS(move_up, 0), "move_up", 7, "Moves the cursor up one line.", 29, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 258 }, -{ PROC_LINKS(move_up_10, 0), "move_up_10", 10, "Moves the cursor up ten lines.", 30, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 270 }, +{ PROC_LINKS(make_directory_query, 0), "make_directory_query", 20, "Queries the user for a name and creates a new directory with the given name.", 76, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 1210 }, +{ PROC_LINKS(mouse_wheel_scroll, 0), "mouse_wheel_scroll", 18, "Reads the scroll wheel value from the mouse state and scrolls accordingly.", 74, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 231 }, +{ PROC_LINKS(move_down, 0), "move_down", 9, "Moves the cursor down one line.", 31, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 293 }, +{ PROC_LINKS(move_down_10, 0), "move_down_10", 12, "Moves the cursor down ten lines.", 32, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 305 }, +{ PROC_LINKS(move_down_textual, 0), "move_down_textual", 17, "Moves down to the next line of actual text, regardless of line wrapping.", 72, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 311 }, +{ PROC_LINKS(move_left, 0), "move_left", 9, "Moves the cursor one character to the left.", 43, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 342 }, +{ PROC_LINKS(move_line_down, 0), "move_line_down", 14, "Swaps the line under the cursor with the line below it, and moves the cursor down with it.", 90, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 1307 }, +{ PROC_LINKS(move_line_up, 0), "move_line_up", 12, "Swaps the line under the cursor with the line above it, and moves the cursor up with it.", 88, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 1243 }, +{ PROC_LINKS(move_right, 0), "move_right", 10, "Moves the cursor one character to the right.", 44, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 351 }, +{ PROC_LINKS(move_up, 0), "move_up", 7, "Moves the cursor up one line.", 29, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 287 }, +{ PROC_LINKS(move_up_10, 0), "move_up_10", 10, "Moves the cursor up ten lines.", 30, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 299 }, { PROC_LINKS(newline_or_goto_position_direct, 0), "newline_or_goto_position_direct", 31, "If the buffer in the active view is writable, inserts a character, otherwise performs goto_jump_at_cursor.", 106, "w:\\4ed\\code\\4coder_jump_direct.cpp", 34, 101 }, { PROC_LINKS(newline_or_goto_position_same_panel_direct, 0), "newline_or_goto_position_same_panel_direct", 42, "If the buffer in the active view is writable, inserts a character, otherwise performs goto_jump_at_cursor_same_panel.", 117, "w:\\4ed\\code\\4coder_jump_direct.cpp", 34, 116 }, { PROC_LINKS(newline_or_goto_position_same_panel_sticky, 0), "newline_or_goto_position_same_panel_sticky", 42, "If the buffer in the active view is writable, inserts a character, otherwise performs goto_jump_at_cursor_same_panel.", 117, "w:\\4ed\\code\\4coder_jump_sticky.cpp", 34, 595 }, @@ -355,16 +359,16 @@ static Command_Metadata fcoder_metacmd_table[212] = { { PROC_LINKS(open_all_code, 0), "open_all_code", 13, "Open all code in the current directory. File types are determined by extensions. An extension is considered code based on the extensions specified in 4coder.config.", 164, "w:\\4ed\\code\\4coder_project_commands.cpp", 39, 1067 }, { PROC_LINKS(open_all_code_recursive, 0), "open_all_code_recursive", 23, "Works as open_all_code but also runs in all subdirectories.", 59, "w:\\4ed\\code\\4coder_project_commands.cpp", 39, 1074 }, { PROC_LINKS(open_color_tweaker, 0), "open_color_tweaker", 18, "Opens the 4coder theme selector list.", 37, "w:\\4ed\\code\\4coder_lists.cpp", 28, 897 }, -{ PROC_LINKS(open_file_in_quotes, 0), "open_file_in_quotes", 19, "Reads a filename from surrounding '\"' characters and attempts to open the corresponding file.", 94, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 1393 }, -{ PROC_LINKS(open_in_other, 0), "open_in_other", 13, "Interactively opens a file in the other panel.", 46, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 1544 }, +{ PROC_LINKS(open_file_in_quotes, 0), "open_file_in_quotes", 19, "Reads a filename from surrounding '\"' characters and attempts to open the corresponding file.", 94, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 1429 }, +{ PROC_LINKS(open_in_other, 0), "open_in_other", 13, "Interactively opens a file in the other panel.", 46, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 1580 }, { PROC_LINKS(open_long_braces, 0), "open_long_braces", 16, "At the cursor, insert a '{' and '}' separated by a blank line.", 62, "w:\\4ed\\code\\4coder_combined_write_commands.cpp", 46, 57 }, { PROC_LINKS(open_long_braces_break, 0), "open_long_braces_break", 22, "At the cursor, insert a '{' and '}break;' separated by a blank line.", 68, "w:\\4ed\\code\\4coder_combined_write_commands.cpp", 46, 73 }, { PROC_LINKS(open_long_braces_semicolon, 0), "open_long_braces_semicolon", 26, "At the cursor, insert a '{' and '};' separated by a blank line.", 63, "w:\\4ed\\code\\4coder_combined_write_commands.cpp", 46, 65 }, -{ PROC_LINKS(open_matching_file_cpp, 0), "open_matching_file_cpp", 22, "If the current file is a *.cpp or *.h, attempts to open the corresponding *.h or *.cpp file in the other view.", 110, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 1429 }, +{ PROC_LINKS(open_matching_file_cpp, 0), "open_matching_file_cpp", 22, "If the current file is a *.cpp or *.h, attempts to open the corresponding *.h or *.cpp file in the other view.", 110, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 1465 }, { PROC_LINKS(open_panel_hsplit, 0), "open_panel_hsplit", 17, "Create a new panel by horizontally splitting the active panel.", 62, "w:\\4ed\\code\\4coder_default_framework.cpp", 40, 173 }, { PROC_LINKS(open_panel_vsplit, 0), "open_panel_vsplit", 17, "Create a new panel by vertically splitting the active panel.", 60, "w:\\4ed\\code\\4coder_default_framework.cpp", 40, 164 }, -{ PROC_LINKS(page_down, 0), "page_down", 9, "Scrolls the view down one view height and moves the cursor down one view height.", 80, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 302 }, -{ PROC_LINKS(page_up, 0), "page_up", 7, "Scrolls the view up one view height and moves the cursor up one view height.", 76, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 293 }, +{ PROC_LINKS(page_down, 0), "page_down", 9, "Scrolls the view down one view height and moves the cursor down one view height.", 80, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 331 }, +{ PROC_LINKS(page_up, 0), "page_up", 7, "Scrolls the view up one view height and moves the cursor up one view height.", 76, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 322 }, { PROC_LINKS(paste, 0), "paste", 5, "At the cursor, insert the text at the top of the clipboard.", 59, "w:\\4ed\\code\\4coder_clipboard.cpp", 32, 46 }, { PROC_LINKS(paste_and_indent, 0), "paste_and_indent", 16, "Paste from the top of clipboard and run auto-indent on the newly pasted text.", 77, "w:\\4ed\\code\\4coder_clipboard.cpp", 32, 131 }, { PROC_LINKS(paste_next, 0), "paste_next", 10, "If the previous command was paste or paste_next, replaces the paste range with the next text down on the clipboard, otherwise operates as the paste command.", 156, "w:\\4ed\\code\\4coder_clipboard.cpp", 32, 83 }, @@ -373,23 +377,23 @@ static Command_Metadata fcoder_metacmd_table[212] = { { PROC_LINKS(project_command_lister, 0), "project_command_lister", 22, "Open a lister of all commands in the currently loaded project.", 62, "w:\\4ed\\code\\4coder_project_commands.cpp", 39, 1529 }, { PROC_LINKS(project_fkey_command, 0), "project_fkey_command", 20, "Run an 'fkey command' configured in a project.4coder file. Determines the index of the 'fkey command' by which function key or numeric key was pressed to trigger the command.", 175, "w:\\4ed\\code\\4coder_project_commands.cpp", 39, 1090 }, { PROC_LINKS(project_go_to_root_directory, 0), "project_go_to_root_directory", 28, "Changes 4coder's hot directory to the root directory of the currently loaded project. With no loaded project nothing hapepns.", 125, "w:\\4ed\\code\\4coder_project_commands.cpp", 39, 1115 }, -{ PROC_LINKS(query_replace, 0), "query_replace", 13, "Queries the user for two strings, and incrementally replaces every occurence of the first string with the second string.", 120, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 954 }, -{ PROC_LINKS(query_replace_identifier, 0), "query_replace_identifier", 24, "Queries the user for a string, and incrementally replace every occurence of the word or token found at the cursor with the specified string.", 140, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 974 }, -{ PROC_LINKS(query_replace_selection, 0), "query_replace_selection", 23, "Queries the user for a string, and incrementally replace every occurence of the string found in the selected range with the specified string.", 141, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 992 }, -{ PROC_LINKS(redo, 0), "redo", 4, "Advances forewards through the undo history.", 44, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 1501 }, -{ PROC_LINKS(reload_themes, 0), "reload_themes", 13, "Loads all the theme files in the theme folder, replacing duplicates with the new theme data.", 92, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 1521 }, +{ PROC_LINKS(query_replace, 0), "query_replace", 13, "Queries the user for two strings, and incrementally replaces every occurence of the first string with the second string.", 120, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 990 }, +{ PROC_LINKS(query_replace_identifier, 0), "query_replace_identifier", 24, "Queries the user for a string, and incrementally replace every occurence of the word or token found at the cursor with the specified string.", 140, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 1010 }, +{ PROC_LINKS(query_replace_selection, 0), "query_replace_selection", 23, "Queries the user for a string, and incrementally replace every occurence of the string found in the selected range with the specified string.", 141, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 1028 }, +{ PROC_LINKS(redo, 0), "redo", 4, "Advances forewards through the undo history.", 44, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 1537 }, +{ PROC_LINKS(reload_themes, 0), "reload_themes", 13, "Loads all the theme files in the theme folder, replacing duplicates with the new theme data.", 92, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 1557 }, { PROC_LINKS(remap_interactive, 0), "remap_interactive", 17, "Switch to a named key binding map.", 34, "w:\\4ed\\code\\4coder_default_framework.cpp", 40, 278 }, -{ PROC_LINKS(rename_file_query, 0), "rename_file_query", 17, "Queries the user for a new name and renames the file of the current buffer, altering the buffer's name too.", 107, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 1132 }, -{ PROC_LINKS(reopen, 0), "reopen", 6, "Reopen the current buffer from the hard drive.", 46, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 1507 }, -{ PROC_LINKS(replace_in_range, 0), "replace_in_range", 16, "Queries the user for two strings, and replaces all occurences of the first string in the range between the cursor and the mark with the second string.", 150, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 852 }, -{ PROC_LINKS(reverse_search, 0), "reverse_search", 14, "Begins an incremental search up through the current buffer for a user specified string.", 87, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 823 }, -{ PROC_LINKS(reverse_search_identifier, 0), "reverse_search_identifier", 25, "Begins an incremental search up through the current buffer for the word or token under the cursor.", 98, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 841 }, -{ PROC_LINKS(save, 0), "save", 4, "Saves the current buffer.", 25, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 1513 }, -{ PROC_LINKS(save_all_dirty_buffers, 0), "save_all_dirty_buffers", 22, "Saves all buffers marked dirty (showing the '*' indicator).", 59, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 1036 }, -{ PROC_LINKS(save_to_query, 0), "save_to_query", 13, "Queries the user for a file name and saves the contents of the current buffer, altering the buffer's name too.", 110, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 1092 }, +{ PROC_LINKS(rename_file_query, 0), "rename_file_query", 17, "Queries the user for a new name and renames the file of the current buffer, altering the buffer's name too.", 107, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 1168 }, +{ PROC_LINKS(reopen, 0), "reopen", 6, "Reopen the current buffer from the hard drive.", 46, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 1543 }, +{ PROC_LINKS(replace_in_range, 0), "replace_in_range", 16, "Queries the user for two strings, and replaces all occurences of the first string in the range between the cursor and the mark with the second string.", 150, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 888 }, +{ PROC_LINKS(reverse_search, 0), "reverse_search", 14, "Begins an incremental search up through the current buffer for a user specified string.", 87, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 859 }, +{ PROC_LINKS(reverse_search_identifier, 0), "reverse_search_identifier", 25, "Begins an incremental search up through the current buffer for the word or token under the cursor.", 98, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 877 }, +{ PROC_LINKS(save, 0), "save", 4, "Saves the current buffer.", 25, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 1549 }, +{ PROC_LINKS(save_all_dirty_buffers, 0), "save_all_dirty_buffers", 22, "Saves all buffers marked dirty (showing the '*' indicator).", 59, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 1072 }, +{ PROC_LINKS(save_to_query, 0), "save_to_query", 13, "Queries the user for a file name and saves the contents of the current buffer, altering the buffer's name too.", 110, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 1128 }, { PROC_LINKS(scope_absorb_down, 0), "scope_absorb_down", 17, "If a scope is currently selected, and a statement or block statement is present below the current scope, the statement is moved into the scope.", 143, "w:\\4ed\\code\\4coder_scope_commands.cpp", 37, 743 }, -{ PROC_LINKS(search, 0), "search", 6, "Begins an incremental search down through the current buffer for a user specified string.", 89, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 816 }, -{ PROC_LINKS(search_identifier, 0), "search_identifier", 17, "Begins an incremental search down through the current buffer for the word or token under the cursor.", 100, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 830 }, +{ PROC_LINKS(search, 0), "search", 6, "Begins an incremental search down through the current buffer for a user specified string.", 89, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 852 }, +{ PROC_LINKS(search_identifier, 0), "search_identifier", 17, "Begins an incremental search down through the current buffer for the word or token under the cursor.", 100, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 866 }, { PROC_LINKS(seek_alphanumeric_left, 0), "seek_alphanumeric_left", 22, "Seek left for boundary between alphanumeric characters and non-alphanumeric characters.", 87, "w:\\4ed\\code\\4coder_seek.cpp", 27, 1227 }, { PROC_LINKS(seek_alphanumeric_or_camel_left, 0), "seek_alphanumeric_or_camel_left", 31, "Seek left for boundary between alphanumeric characters or camel case word and non-alphanumeric characters.", 106, "w:\\4ed\\code\\4coder_seek.cpp", 27, 1239 }, { PROC_LINKS(seek_alphanumeric_or_camel_right, 0), "seek_alphanumeric_or_camel_right", 32, "Seek right for boundary between alphanumeric characters or camel case word and non-alphanumeric characters.", 107, "w:\\4ed\\code\\4coder_seek.cpp", 27, 1233 }, @@ -408,7 +412,7 @@ static Command_Metadata fcoder_metacmd_table[212] = { { PROC_LINKS(seek_whitespace_right, 0), "seek_whitespace_right", 21, "Seek right for the next boundary between whitespace and non-whitespace.", 71, "w:\\4ed\\code\\4coder_seek.cpp", 27, 1185 }, { PROC_LINKS(seek_whitespace_up, 0), "seek_whitespace_up", 18, "Seeks the cursor up to the next blank line.", 43, "w:\\4ed\\code\\4coder_seek.cpp", 27, 1090 }, { PROC_LINKS(seek_whitespace_up_end_line, 0), "seek_whitespace_up_end_line", 27, "Seeks the cursor up to the next blank line and places it at the end of the line.", 80, "w:\\4ed\\code\\4coder_seek.cpp", 27, 1148 }, -{ PROC_LINKS(select_all, 0), "select_all", 10, "Puts the cursor at the top of the file, and the mark at the bottom of the file.", 79, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 331 }, +{ PROC_LINKS(select_all, 0), "select_all", 10, "Puts the cursor at the top of the file, and the mark at the bottom of the file.", 79, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 360 }, { PROC_LINKS(set_bindings_choose, 0), "set_bindings_choose", 19, "Remap keybindings using the 'choose' mapping rule.", 50, "w:\\4ed\\code\\4coder_remapping_commands.cpp", 41, 47 }, { PROC_LINKS(set_bindings_default, 0), "set_bindings_default", 20, "Remap keybindings using the 'default' mapping rule.", 51, "w:\\4ed\\code\\4coder_remapping_commands.cpp", 41, 61 }, { PROC_LINKS(set_bindings_mac_default, 0), "set_bindings_mac_default", 24, "Remap keybindings using the 'mac-default' mapping rule.", 55, "w:\\4ed\\code\\4coder_remapping_commands.cpp", 41, 75 }, @@ -417,24 +421,24 @@ static Command_Metadata fcoder_metacmd_table[212] = { { PROC_LINKS(setup_build_bat_and_sh, 0), "setup_build_bat_and_sh", 22, "Queries the user for several configuration options and initializes a new build batch script.", 92, "w:\\4ed\\code\\4coder_project_commands.cpp", 39, 1512 }, { PROC_LINKS(setup_build_sh, 0), "setup_build_sh", 14, "Queries the user for several configuration options and initializes a new build shell script.", 92, "w:\\4ed\\code\\4coder_project_commands.cpp", 39, 1506 }, { PROC_LINKS(setup_new_project, 0), "setup_new_project", 17, "Queries the user for several configuration options and initializes a new 4coder project with build scripts for every OS.", 120, "w:\\4ed\\code\\4coder_project_commands.cpp", 39, 1493 }, -{ PROC_LINKS(show_filebar, 0), "show_filebar", 12, "Sets the current view to show it's filebar.", 43, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 478 }, -{ PROC_LINKS(show_scrollbar, 0), "show_scrollbar", 14, "Sets the current view to show it's scrollbar.", 45, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 464 }, +{ PROC_LINKS(show_filebar, 0), "show_filebar", 12, "Sets the current view to show it's filebar.", 43, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 507 }, +{ PROC_LINKS(show_scrollbar, 0), "show_scrollbar", 14, "Sets the current view to show it's scrollbar.", 45, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 493 }, { PROC_LINKS(snipe_token_or_word, 0), "snipe_token_or_word", 19, "Delete a single, whole token on or to the left of the cursor and post it to the clipboard.", 90, "w:\\4ed\\code\\4coder_seek.cpp", 27, 1259 }, { PROC_LINKS(snipe_token_or_word_right, 0), "snipe_token_or_word_right", 25, "Delete a single, whole token on or to the right of the cursor and post it to the clipboard.", 91, "w:\\4ed\\code\\4coder_seek.cpp", 27, 1265 }, { PROC_LINKS(snippet_lister, 0), "snippet_lister", 14, "Opens a snippet lister for inserting whole pre-written snippets of text.", 72, "w:\\4ed\\code\\4coder_combined_write_commands.cpp", 46, 193 }, { PROC_LINKS(suppress_mouse, 0), "suppress_mouse", 14, "Hides the mouse and causes all mosue input (clicks, position, wheel) to be ignored.", 83, "w:\\4ed\\code\\4coder_default_framework.cpp", 40, 234 }, -{ PROC_LINKS(swap_buffers_between_panels, 0), "swap_buffers_between_panels", 27, "Set the other non-active panel to view the buffer that the active panel views, and switch to that panel.", 104, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 1453 }, -{ PROC_LINKS(to_lowercase, 0), "to_lowercase", 12, "Converts all ascii text in the range between the cursor and the mark to lowercase.", 82, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 362 }, -{ PROC_LINKS(to_uppercase, 0), "to_uppercase", 12, "Converts all ascii text in the range between the cursor and the mark to uppercase.", 82, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 342 }, -{ PROC_LINKS(toggle_filebar, 0), "toggle_filebar", 14, "Toggles the visibility status of the current view's filebar.", 60, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 492 }, +{ PROC_LINKS(swap_buffers_between_panels, 0), "swap_buffers_between_panels", 27, "Set the other non-active panel to view the buffer that the active panel views, and switch to that panel.", 104, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 1489 }, +{ PROC_LINKS(to_lowercase, 0), "to_lowercase", 12, "Converts all ascii text in the range between the cursor and the mark to lowercase.", 82, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 391 }, +{ PROC_LINKS(to_uppercase, 0), "to_uppercase", 12, "Converts all ascii text in the range between the cursor and the mark to uppercase.", 82, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 371 }, +{ PROC_LINKS(toggle_filebar, 0), "toggle_filebar", 14, "Toggles the visibility status of the current view's filebar.", 60, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 521 }, { PROC_LINKS(toggle_fullscreen, 0), "toggle_fullscreen", 17, "Toggle fullscreen mode on or off. The change(s) do not take effect until the next frame.", 89, "w:\\4ed\\code\\4coder_default_framework.cpp", 40, 270 }, { PROC_LINKS(toggle_highlight_line_at_cursor, 0), "toggle_highlight_line_at_cursor", 31, "Toggles the line highlight at the cursor.", 41, "w:\\4ed\\code\\4coder_default_framework.cpp", 40, 264 }, -{ PROC_LINKS(toggle_line_wrap, 0), "toggle_line_wrap", 16, "Toggles the current buffer's line wrapping status.", 50, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 501 }, +{ PROC_LINKS(toggle_line_wrap, 0), "toggle_line_wrap", 16, "Toggles the current buffer's line wrapping status.", 50, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 530 }, { PROC_LINKS(toggle_mouse, 0), "toggle_mouse", 12, "Toggles the mouse suppression mode, see suppress_mouse and allow_mouse.", 71, "w:\\4ed\\code\\4coder_default_framework.cpp", 40, 246 }, -{ PROC_LINKS(toggle_show_whitespace, 0), "toggle_show_whitespace", 22, "Toggles the current buffer's whitespace visibility status.", 58, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 568 }, -{ PROC_LINKS(toggle_virtual_whitespace, 0), "toggle_virtual_whitespace", 25, "Toggles the current buffer's virtual whitespace status.", 55, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 557 }, -{ PROC_LINKS(undo, 0), "undo", 4, "Advances backwards through the undo history.", 44, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 1495 }, -{ PROC_LINKS(view_buffer_other_panel, 0), "view_buffer_other_panel", 23, "Set the other non-active panel to view the buffer that the active panel views, and switch to that panel.", 104, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 1443 }, +{ PROC_LINKS(toggle_show_whitespace, 0), "toggle_show_whitespace", 22, "Toggles the current buffer's whitespace visibility status.", 58, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 597 }, +{ PROC_LINKS(toggle_virtual_whitespace, 0), "toggle_virtual_whitespace", 25, "Toggles the current buffer's virtual whitespace status.", 55, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 586 }, +{ PROC_LINKS(undo, 0), "undo", 4, "Advances backwards through the undo history.", 44, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 1531 }, +{ PROC_LINKS(view_buffer_other_panel, 0), "view_buffer_other_panel", 23, "Set the other non-active panel to view the buffer that the active panel views, and switch to that panel.", 104, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 1479 }, { PROC_LINKS(view_jump_list_with_lister, 0), "view_jump_list_with_lister", 26, "When executed on a buffer with jumps, creates a persistent lister for all the jumps", 83, "w:\\4ed\\code\\4coder_jump_lister.cpp", 34, 108 }, { PROC_LINKS(word_complete, 0), "word_complete", 13, "Iteratively tries completing the word to the left of the cursor with other words in open buffers that have the same prefix string.", 130, "w:\\4ed\\code\\4coder_search.cpp", 29, 856 }, { PROC_LINKS(write_and_auto_tab, 0), "write_and_auto_tab", 18, "Inserts a character and auto-indents the line on which the cursor sits.", 71, "w:\\4ed\\code\\4coder_auto_indent.cpp", 34, 745 }, @@ -461,201 +465,203 @@ static int32_t fcoder_metacmd_ID_change_active_panel_backwards = 11; static int32_t fcoder_metacmd_ID_change_to_build_panel = 12; static int32_t fcoder_metacmd_ID_clean_all_lines = 13; static int32_t fcoder_metacmd_ID_click_set_cursor = 14; -static int32_t fcoder_metacmd_ID_click_set_mark = 15; -static int32_t fcoder_metacmd_ID_close_all_code = 16; -static int32_t fcoder_metacmd_ID_close_build_panel = 17; -static int32_t fcoder_metacmd_ID_close_panel = 18; -static int32_t fcoder_metacmd_ID_command_lister = 19; -static int32_t fcoder_metacmd_ID_copy = 20; -static int32_t fcoder_metacmd_ID_cursor_mark_swap = 21; -static int32_t fcoder_metacmd_ID_cut = 22; -static int32_t fcoder_metacmd_ID_decrease_face_size = 23; -static int32_t fcoder_metacmd_ID_decrease_line_wrap = 24; -static int32_t fcoder_metacmd_ID_delete_char = 25; -static int32_t fcoder_metacmd_ID_delete_current_scope = 26; -static int32_t fcoder_metacmd_ID_delete_file_query = 27; -static int32_t fcoder_metacmd_ID_delete_line = 28; -static int32_t fcoder_metacmd_ID_delete_range = 29; -static int32_t fcoder_metacmd_ID_delete_word = 30; -static int32_t fcoder_metacmd_ID_disable_highlight_line_at_cursor = 31; -static int32_t fcoder_metacmd_ID_duplicate_line = 32; -static int32_t fcoder_metacmd_ID_enable_highlight_line_at_cursor = 33; -static int32_t fcoder_metacmd_ID_eol_dosify = 34; -static int32_t fcoder_metacmd_ID_eol_nixify = 35; -static int32_t fcoder_metacmd_ID_execute_any_cli = 36; -static int32_t fcoder_metacmd_ID_execute_previous_cli = 37; -static int32_t fcoder_metacmd_ID_exit_4coder = 38; -static int32_t fcoder_metacmd_ID_goto_beginning_of_file = 39; -static int32_t fcoder_metacmd_ID_goto_end_of_file = 40; -static int32_t fcoder_metacmd_ID_goto_first_jump_direct = 41; -static int32_t fcoder_metacmd_ID_goto_first_jump_same_panel_sticky = 42; -static int32_t fcoder_metacmd_ID_goto_first_jump_sticky = 43; -static int32_t fcoder_metacmd_ID_goto_jump_at_cursor_direct = 44; -static int32_t fcoder_metacmd_ID_goto_jump_at_cursor_same_panel_direct = 45; -static int32_t fcoder_metacmd_ID_goto_jump_at_cursor_same_panel_sticky = 46; -static int32_t fcoder_metacmd_ID_goto_jump_at_cursor_sticky = 47; -static int32_t fcoder_metacmd_ID_goto_line = 48; -static int32_t fcoder_metacmd_ID_goto_next_jump_direct = 49; -static int32_t fcoder_metacmd_ID_goto_next_jump_no_skips_direct = 50; -static int32_t fcoder_metacmd_ID_goto_next_jump_no_skips_sticky = 51; -static int32_t fcoder_metacmd_ID_goto_next_jump_sticky = 52; -static int32_t fcoder_metacmd_ID_goto_prev_jump_direct = 53; -static int32_t fcoder_metacmd_ID_goto_prev_jump_no_skips_direct = 54; -static int32_t fcoder_metacmd_ID_goto_prev_jump_no_skips_sticky = 55; -static int32_t fcoder_metacmd_ID_goto_prev_jump_sticky = 56; -static int32_t fcoder_metacmd_ID_hide_filebar = 57; -static int32_t fcoder_metacmd_ID_hide_scrollbar = 58; -static int32_t fcoder_metacmd_ID_highlight_next_scope_absolute = 59; -static int32_t fcoder_metacmd_ID_highlight_prev_scope_absolute = 60; -static int32_t fcoder_metacmd_ID_highlight_surrounding_scope = 61; -static int32_t fcoder_metacmd_ID_if0_off = 62; -static int32_t fcoder_metacmd_ID_increase_face_size = 63; -static int32_t fcoder_metacmd_ID_increase_line_wrap = 64; -static int32_t fcoder_metacmd_ID_interactive_kill_buffer = 65; -static int32_t fcoder_metacmd_ID_interactive_new = 66; -static int32_t fcoder_metacmd_ID_interactive_open = 67; -static int32_t fcoder_metacmd_ID_interactive_open_or_new = 68; -static int32_t fcoder_metacmd_ID_interactive_switch_buffer = 69; -static int32_t fcoder_metacmd_ID_kill_buffer = 70; -static int32_t fcoder_metacmd_ID_left_adjust_view = 71; -static int32_t fcoder_metacmd_ID_list_all_functions_all_buffers = 72; -static int32_t fcoder_metacmd_ID_list_all_functions_all_buffers_lister = 73; -static int32_t fcoder_metacmd_ID_list_all_functions_current_buffer = 74; -static int32_t fcoder_metacmd_ID_list_all_functions_current_buffer_lister = 75; -static int32_t fcoder_metacmd_ID_list_all_locations = 76; -static int32_t fcoder_metacmd_ID_list_all_locations_case_insensitive = 77; -static int32_t fcoder_metacmd_ID_list_all_locations_of_identifier = 78; -static int32_t fcoder_metacmd_ID_list_all_locations_of_identifier_case_insensitive = 79; -static int32_t fcoder_metacmd_ID_list_all_locations_of_selection = 80; -static int32_t fcoder_metacmd_ID_list_all_locations_of_selection_case_insensitive = 81; -static int32_t fcoder_metacmd_ID_list_all_locations_of_type_definition = 82; -static int32_t fcoder_metacmd_ID_list_all_locations_of_type_definition_of_identifier = 83; -static int32_t fcoder_metacmd_ID_list_all_substring_locations = 84; -static int32_t fcoder_metacmd_ID_list_all_substring_locations_case_insensitive = 85; -static int32_t fcoder_metacmd_ID_lister__activate = 86; -static int32_t fcoder_metacmd_ID_lister__backspace_text_field = 87; -static int32_t fcoder_metacmd_ID_lister__backspace_text_field__default = 88; -static int32_t fcoder_metacmd_ID_lister__backspace_text_field__file_path = 89; -static int32_t fcoder_metacmd_ID_lister__mouse_press = 90; -static int32_t fcoder_metacmd_ID_lister__mouse_release = 91; -static int32_t fcoder_metacmd_ID_lister__move_down = 92; -static int32_t fcoder_metacmd_ID_lister__move_down__default = 93; -static int32_t fcoder_metacmd_ID_lister__move_up = 94; -static int32_t fcoder_metacmd_ID_lister__move_up__default = 95; -static int32_t fcoder_metacmd_ID_lister__quit = 96; -static int32_t fcoder_metacmd_ID_lister__repaint = 97; -static int32_t fcoder_metacmd_ID_lister__wheel_scroll = 98; -static int32_t fcoder_metacmd_ID_lister__write_character = 99; -static int32_t fcoder_metacmd_ID_lister__write_character__default = 100; -static int32_t fcoder_metacmd_ID_lister__write_character__file_path = 101; -static int32_t fcoder_metacmd_ID_lister__write_character__fixed_list = 102; -static int32_t fcoder_metacmd_ID_load_project = 103; -static int32_t fcoder_metacmd_ID_make_directory_query = 104; -static int32_t fcoder_metacmd_ID_mouse_wheel_scroll = 105; -static int32_t fcoder_metacmd_ID_move_down = 106; -static int32_t fcoder_metacmd_ID_move_down_10 = 107; -static int32_t fcoder_metacmd_ID_move_down_textual = 108; -static int32_t fcoder_metacmd_ID_move_left = 109; -static int32_t fcoder_metacmd_ID_move_line_down = 110; -static int32_t fcoder_metacmd_ID_move_line_up = 111; -static int32_t fcoder_metacmd_ID_move_right = 112; -static int32_t fcoder_metacmd_ID_move_up = 113; -static int32_t fcoder_metacmd_ID_move_up_10 = 114; -static int32_t fcoder_metacmd_ID_newline_or_goto_position_direct = 115; -static int32_t fcoder_metacmd_ID_newline_or_goto_position_same_panel_direct = 116; -static int32_t fcoder_metacmd_ID_newline_or_goto_position_same_panel_sticky = 117; -static int32_t fcoder_metacmd_ID_newline_or_goto_position_sticky = 118; -static int32_t fcoder_metacmd_ID_open_all_code = 119; -static int32_t fcoder_metacmd_ID_open_all_code_recursive = 120; -static int32_t fcoder_metacmd_ID_open_color_tweaker = 121; -static int32_t fcoder_metacmd_ID_open_file_in_quotes = 122; -static int32_t fcoder_metacmd_ID_open_in_other = 123; -static int32_t fcoder_metacmd_ID_open_long_braces = 124; -static int32_t fcoder_metacmd_ID_open_long_braces_break = 125; -static int32_t fcoder_metacmd_ID_open_long_braces_semicolon = 126; -static int32_t fcoder_metacmd_ID_open_matching_file_cpp = 127; -static int32_t fcoder_metacmd_ID_open_panel_hsplit = 128; -static int32_t fcoder_metacmd_ID_open_panel_vsplit = 129; -static int32_t fcoder_metacmd_ID_page_down = 130; -static int32_t fcoder_metacmd_ID_page_up = 131; -static int32_t fcoder_metacmd_ID_paste = 132; -static int32_t fcoder_metacmd_ID_paste_and_indent = 133; -static int32_t fcoder_metacmd_ID_paste_next = 134; -static int32_t fcoder_metacmd_ID_paste_next_and_indent = 135; -static int32_t fcoder_metacmd_ID_place_in_scope = 136; -static int32_t fcoder_metacmd_ID_project_command_lister = 137; -static int32_t fcoder_metacmd_ID_project_fkey_command = 138; -static int32_t fcoder_metacmd_ID_project_go_to_root_directory = 139; -static int32_t fcoder_metacmd_ID_query_replace = 140; -static int32_t fcoder_metacmd_ID_query_replace_identifier = 141; -static int32_t fcoder_metacmd_ID_query_replace_selection = 142; -static int32_t fcoder_metacmd_ID_redo = 143; -static int32_t fcoder_metacmd_ID_reload_themes = 144; -static int32_t fcoder_metacmd_ID_remap_interactive = 145; -static int32_t fcoder_metacmd_ID_rename_file_query = 146; -static int32_t fcoder_metacmd_ID_reopen = 147; -static int32_t fcoder_metacmd_ID_replace_in_range = 148; -static int32_t fcoder_metacmd_ID_reverse_search = 149; -static int32_t fcoder_metacmd_ID_reverse_search_identifier = 150; -static int32_t fcoder_metacmd_ID_save = 151; -static int32_t fcoder_metacmd_ID_save_all_dirty_buffers = 152; -static int32_t fcoder_metacmd_ID_save_to_query = 153; -static int32_t fcoder_metacmd_ID_scope_absorb_down = 154; -static int32_t fcoder_metacmd_ID_search = 155; -static int32_t fcoder_metacmd_ID_search_identifier = 156; -static int32_t fcoder_metacmd_ID_seek_alphanumeric_left = 157; -static int32_t fcoder_metacmd_ID_seek_alphanumeric_or_camel_left = 158; -static int32_t fcoder_metacmd_ID_seek_alphanumeric_or_camel_right = 159; -static int32_t fcoder_metacmd_ID_seek_alphanumeric_right = 160; -static int32_t fcoder_metacmd_ID_seek_beginning_of_line = 161; -static int32_t fcoder_metacmd_ID_seek_beginning_of_textual_line = 162; -static int32_t fcoder_metacmd_ID_seek_end_of_line = 163; -static int32_t fcoder_metacmd_ID_seek_end_of_textual_line = 164; -static int32_t fcoder_metacmd_ID_seek_token_left = 165; -static int32_t fcoder_metacmd_ID_seek_token_right = 166; -static int32_t fcoder_metacmd_ID_seek_white_or_token_left = 167; -static int32_t fcoder_metacmd_ID_seek_white_or_token_right = 168; -static int32_t fcoder_metacmd_ID_seek_whitespace_down = 169; -static int32_t fcoder_metacmd_ID_seek_whitespace_down_end_line = 170; -static int32_t fcoder_metacmd_ID_seek_whitespace_left = 171; -static int32_t fcoder_metacmd_ID_seek_whitespace_right = 172; -static int32_t fcoder_metacmd_ID_seek_whitespace_up = 173; -static int32_t fcoder_metacmd_ID_seek_whitespace_up_end_line = 174; -static int32_t fcoder_metacmd_ID_select_all = 175; -static int32_t fcoder_metacmd_ID_set_bindings_choose = 176; -static int32_t fcoder_metacmd_ID_set_bindings_default = 177; -static int32_t fcoder_metacmd_ID_set_bindings_mac_default = 178; -static int32_t fcoder_metacmd_ID_set_mark = 179; -static int32_t fcoder_metacmd_ID_setup_build_bat = 180; -static int32_t fcoder_metacmd_ID_setup_build_bat_and_sh = 181; -static int32_t fcoder_metacmd_ID_setup_build_sh = 182; -static int32_t fcoder_metacmd_ID_setup_new_project = 183; -static int32_t fcoder_metacmd_ID_show_filebar = 184; -static int32_t fcoder_metacmd_ID_show_scrollbar = 185; -static int32_t fcoder_metacmd_ID_snipe_token_or_word = 186; -static int32_t fcoder_metacmd_ID_snipe_token_or_word_right = 187; -static int32_t fcoder_metacmd_ID_snippet_lister = 188; -static int32_t fcoder_metacmd_ID_suppress_mouse = 189; -static int32_t fcoder_metacmd_ID_swap_buffers_between_panels = 190; -static int32_t fcoder_metacmd_ID_to_lowercase = 191; -static int32_t fcoder_metacmd_ID_to_uppercase = 192; -static int32_t fcoder_metacmd_ID_toggle_filebar = 193; -static int32_t fcoder_metacmd_ID_toggle_fullscreen = 194; -static int32_t fcoder_metacmd_ID_toggle_highlight_line_at_cursor = 195; -static int32_t fcoder_metacmd_ID_toggle_line_wrap = 196; -static int32_t fcoder_metacmd_ID_toggle_mouse = 197; -static int32_t fcoder_metacmd_ID_toggle_show_whitespace = 198; -static int32_t fcoder_metacmd_ID_toggle_virtual_whitespace = 199; -static int32_t fcoder_metacmd_ID_undo = 200; -static int32_t fcoder_metacmd_ID_view_buffer_other_panel = 201; -static int32_t fcoder_metacmd_ID_view_jump_list_with_lister = 202; -static int32_t fcoder_metacmd_ID_word_complete = 203; -static int32_t fcoder_metacmd_ID_write_and_auto_tab = 204; -static int32_t fcoder_metacmd_ID_write_block = 205; -static int32_t fcoder_metacmd_ID_write_character = 206; -static int32_t fcoder_metacmd_ID_write_hack = 207; -static int32_t fcoder_metacmd_ID_write_note = 208; -static int32_t fcoder_metacmd_ID_write_todo = 209; -static int32_t fcoder_metacmd_ID_write_underscore = 210; -static int32_t fcoder_metacmd_ID_write_zero_struct = 211; +static int32_t fcoder_metacmd_ID_click_set_cursor_and_mark = 15; +static int32_t fcoder_metacmd_ID_click_set_cursor_if_lbutton = 16; +static int32_t fcoder_metacmd_ID_click_set_mark = 17; +static int32_t fcoder_metacmd_ID_close_all_code = 18; +static int32_t fcoder_metacmd_ID_close_build_panel = 19; +static int32_t fcoder_metacmd_ID_close_panel = 20; +static int32_t fcoder_metacmd_ID_command_lister = 21; +static int32_t fcoder_metacmd_ID_copy = 22; +static int32_t fcoder_metacmd_ID_cursor_mark_swap = 23; +static int32_t fcoder_metacmd_ID_cut = 24; +static int32_t fcoder_metacmd_ID_decrease_face_size = 25; +static int32_t fcoder_metacmd_ID_decrease_line_wrap = 26; +static int32_t fcoder_metacmd_ID_delete_char = 27; +static int32_t fcoder_metacmd_ID_delete_current_scope = 28; +static int32_t fcoder_metacmd_ID_delete_file_query = 29; +static int32_t fcoder_metacmd_ID_delete_line = 30; +static int32_t fcoder_metacmd_ID_delete_range = 31; +static int32_t fcoder_metacmd_ID_delete_word = 32; +static int32_t fcoder_metacmd_ID_disable_highlight_line_at_cursor = 33; +static int32_t fcoder_metacmd_ID_duplicate_line = 34; +static int32_t fcoder_metacmd_ID_enable_highlight_line_at_cursor = 35; +static int32_t fcoder_metacmd_ID_eol_dosify = 36; +static int32_t fcoder_metacmd_ID_eol_nixify = 37; +static int32_t fcoder_metacmd_ID_execute_any_cli = 38; +static int32_t fcoder_metacmd_ID_execute_previous_cli = 39; +static int32_t fcoder_metacmd_ID_exit_4coder = 40; +static int32_t fcoder_metacmd_ID_goto_beginning_of_file = 41; +static int32_t fcoder_metacmd_ID_goto_end_of_file = 42; +static int32_t fcoder_metacmd_ID_goto_first_jump_direct = 43; +static int32_t fcoder_metacmd_ID_goto_first_jump_same_panel_sticky = 44; +static int32_t fcoder_metacmd_ID_goto_first_jump_sticky = 45; +static int32_t fcoder_metacmd_ID_goto_jump_at_cursor_direct = 46; +static int32_t fcoder_metacmd_ID_goto_jump_at_cursor_same_panel_direct = 47; +static int32_t fcoder_metacmd_ID_goto_jump_at_cursor_same_panel_sticky = 48; +static int32_t fcoder_metacmd_ID_goto_jump_at_cursor_sticky = 49; +static int32_t fcoder_metacmd_ID_goto_line = 50; +static int32_t fcoder_metacmd_ID_goto_next_jump_direct = 51; +static int32_t fcoder_metacmd_ID_goto_next_jump_no_skips_direct = 52; +static int32_t fcoder_metacmd_ID_goto_next_jump_no_skips_sticky = 53; +static int32_t fcoder_metacmd_ID_goto_next_jump_sticky = 54; +static int32_t fcoder_metacmd_ID_goto_prev_jump_direct = 55; +static int32_t fcoder_metacmd_ID_goto_prev_jump_no_skips_direct = 56; +static int32_t fcoder_metacmd_ID_goto_prev_jump_no_skips_sticky = 57; +static int32_t fcoder_metacmd_ID_goto_prev_jump_sticky = 58; +static int32_t fcoder_metacmd_ID_hide_filebar = 59; +static int32_t fcoder_metacmd_ID_hide_scrollbar = 60; +static int32_t fcoder_metacmd_ID_highlight_next_scope_absolute = 61; +static int32_t fcoder_metacmd_ID_highlight_prev_scope_absolute = 62; +static int32_t fcoder_metacmd_ID_highlight_surrounding_scope = 63; +static int32_t fcoder_metacmd_ID_if0_off = 64; +static int32_t fcoder_metacmd_ID_increase_face_size = 65; +static int32_t fcoder_metacmd_ID_increase_line_wrap = 66; +static int32_t fcoder_metacmd_ID_interactive_kill_buffer = 67; +static int32_t fcoder_metacmd_ID_interactive_new = 68; +static int32_t fcoder_metacmd_ID_interactive_open = 69; +static int32_t fcoder_metacmd_ID_interactive_open_or_new = 70; +static int32_t fcoder_metacmd_ID_interactive_switch_buffer = 71; +static int32_t fcoder_metacmd_ID_kill_buffer = 72; +static int32_t fcoder_metacmd_ID_left_adjust_view = 73; +static int32_t fcoder_metacmd_ID_list_all_functions_all_buffers = 74; +static int32_t fcoder_metacmd_ID_list_all_functions_all_buffers_lister = 75; +static int32_t fcoder_metacmd_ID_list_all_functions_current_buffer = 76; +static int32_t fcoder_metacmd_ID_list_all_functions_current_buffer_lister = 77; +static int32_t fcoder_metacmd_ID_list_all_locations = 78; +static int32_t fcoder_metacmd_ID_list_all_locations_case_insensitive = 79; +static int32_t fcoder_metacmd_ID_list_all_locations_of_identifier = 80; +static int32_t fcoder_metacmd_ID_list_all_locations_of_identifier_case_insensitive = 81; +static int32_t fcoder_metacmd_ID_list_all_locations_of_selection = 82; +static int32_t fcoder_metacmd_ID_list_all_locations_of_selection_case_insensitive = 83; +static int32_t fcoder_metacmd_ID_list_all_locations_of_type_definition = 84; +static int32_t fcoder_metacmd_ID_list_all_locations_of_type_definition_of_identifier = 85; +static int32_t fcoder_metacmd_ID_list_all_substring_locations = 86; +static int32_t fcoder_metacmd_ID_list_all_substring_locations_case_insensitive = 87; +static int32_t fcoder_metacmd_ID_lister__activate = 88; +static int32_t fcoder_metacmd_ID_lister__backspace_text_field = 89; +static int32_t fcoder_metacmd_ID_lister__backspace_text_field__default = 90; +static int32_t fcoder_metacmd_ID_lister__backspace_text_field__file_path = 91; +static int32_t fcoder_metacmd_ID_lister__mouse_press = 92; +static int32_t fcoder_metacmd_ID_lister__mouse_release = 93; +static int32_t fcoder_metacmd_ID_lister__move_down = 94; +static int32_t fcoder_metacmd_ID_lister__move_down__default = 95; +static int32_t fcoder_metacmd_ID_lister__move_up = 96; +static int32_t fcoder_metacmd_ID_lister__move_up__default = 97; +static int32_t fcoder_metacmd_ID_lister__quit = 98; +static int32_t fcoder_metacmd_ID_lister__repaint = 99; +static int32_t fcoder_metacmd_ID_lister__wheel_scroll = 100; +static int32_t fcoder_metacmd_ID_lister__write_character = 101; +static int32_t fcoder_metacmd_ID_lister__write_character__default = 102; +static int32_t fcoder_metacmd_ID_lister__write_character__file_path = 103; +static int32_t fcoder_metacmd_ID_lister__write_character__fixed_list = 104; +static int32_t fcoder_metacmd_ID_load_project = 105; +static int32_t fcoder_metacmd_ID_make_directory_query = 106; +static int32_t fcoder_metacmd_ID_mouse_wheel_scroll = 107; +static int32_t fcoder_metacmd_ID_move_down = 108; +static int32_t fcoder_metacmd_ID_move_down_10 = 109; +static int32_t fcoder_metacmd_ID_move_down_textual = 110; +static int32_t fcoder_metacmd_ID_move_left = 111; +static int32_t fcoder_metacmd_ID_move_line_down = 112; +static int32_t fcoder_metacmd_ID_move_line_up = 113; +static int32_t fcoder_metacmd_ID_move_right = 114; +static int32_t fcoder_metacmd_ID_move_up = 115; +static int32_t fcoder_metacmd_ID_move_up_10 = 116; +static int32_t fcoder_metacmd_ID_newline_or_goto_position_direct = 117; +static int32_t fcoder_metacmd_ID_newline_or_goto_position_same_panel_direct = 118; +static int32_t fcoder_metacmd_ID_newline_or_goto_position_same_panel_sticky = 119; +static int32_t fcoder_metacmd_ID_newline_or_goto_position_sticky = 120; +static int32_t fcoder_metacmd_ID_open_all_code = 121; +static int32_t fcoder_metacmd_ID_open_all_code_recursive = 122; +static int32_t fcoder_metacmd_ID_open_color_tweaker = 123; +static int32_t fcoder_metacmd_ID_open_file_in_quotes = 124; +static int32_t fcoder_metacmd_ID_open_in_other = 125; +static int32_t fcoder_metacmd_ID_open_long_braces = 126; +static int32_t fcoder_metacmd_ID_open_long_braces_break = 127; +static int32_t fcoder_metacmd_ID_open_long_braces_semicolon = 128; +static int32_t fcoder_metacmd_ID_open_matching_file_cpp = 129; +static int32_t fcoder_metacmd_ID_open_panel_hsplit = 130; +static int32_t fcoder_metacmd_ID_open_panel_vsplit = 131; +static int32_t fcoder_metacmd_ID_page_down = 132; +static int32_t fcoder_metacmd_ID_page_up = 133; +static int32_t fcoder_metacmd_ID_paste = 134; +static int32_t fcoder_metacmd_ID_paste_and_indent = 135; +static int32_t fcoder_metacmd_ID_paste_next = 136; +static int32_t fcoder_metacmd_ID_paste_next_and_indent = 137; +static int32_t fcoder_metacmd_ID_place_in_scope = 138; +static int32_t fcoder_metacmd_ID_project_command_lister = 139; +static int32_t fcoder_metacmd_ID_project_fkey_command = 140; +static int32_t fcoder_metacmd_ID_project_go_to_root_directory = 141; +static int32_t fcoder_metacmd_ID_query_replace = 142; +static int32_t fcoder_metacmd_ID_query_replace_identifier = 143; +static int32_t fcoder_metacmd_ID_query_replace_selection = 144; +static int32_t fcoder_metacmd_ID_redo = 145; +static int32_t fcoder_metacmd_ID_reload_themes = 146; +static int32_t fcoder_metacmd_ID_remap_interactive = 147; +static int32_t fcoder_metacmd_ID_rename_file_query = 148; +static int32_t fcoder_metacmd_ID_reopen = 149; +static int32_t fcoder_metacmd_ID_replace_in_range = 150; +static int32_t fcoder_metacmd_ID_reverse_search = 151; +static int32_t fcoder_metacmd_ID_reverse_search_identifier = 152; +static int32_t fcoder_metacmd_ID_save = 153; +static int32_t fcoder_metacmd_ID_save_all_dirty_buffers = 154; +static int32_t fcoder_metacmd_ID_save_to_query = 155; +static int32_t fcoder_metacmd_ID_scope_absorb_down = 156; +static int32_t fcoder_metacmd_ID_search = 157; +static int32_t fcoder_metacmd_ID_search_identifier = 158; +static int32_t fcoder_metacmd_ID_seek_alphanumeric_left = 159; +static int32_t fcoder_metacmd_ID_seek_alphanumeric_or_camel_left = 160; +static int32_t fcoder_metacmd_ID_seek_alphanumeric_or_camel_right = 161; +static int32_t fcoder_metacmd_ID_seek_alphanumeric_right = 162; +static int32_t fcoder_metacmd_ID_seek_beginning_of_line = 163; +static int32_t fcoder_metacmd_ID_seek_beginning_of_textual_line = 164; +static int32_t fcoder_metacmd_ID_seek_end_of_line = 165; +static int32_t fcoder_metacmd_ID_seek_end_of_textual_line = 166; +static int32_t fcoder_metacmd_ID_seek_token_left = 167; +static int32_t fcoder_metacmd_ID_seek_token_right = 168; +static int32_t fcoder_metacmd_ID_seek_white_or_token_left = 169; +static int32_t fcoder_metacmd_ID_seek_white_or_token_right = 170; +static int32_t fcoder_metacmd_ID_seek_whitespace_down = 171; +static int32_t fcoder_metacmd_ID_seek_whitespace_down_end_line = 172; +static int32_t fcoder_metacmd_ID_seek_whitespace_left = 173; +static int32_t fcoder_metacmd_ID_seek_whitespace_right = 174; +static int32_t fcoder_metacmd_ID_seek_whitespace_up = 175; +static int32_t fcoder_metacmd_ID_seek_whitespace_up_end_line = 176; +static int32_t fcoder_metacmd_ID_select_all = 177; +static int32_t fcoder_metacmd_ID_set_bindings_choose = 178; +static int32_t fcoder_metacmd_ID_set_bindings_default = 179; +static int32_t fcoder_metacmd_ID_set_bindings_mac_default = 180; +static int32_t fcoder_metacmd_ID_set_mark = 181; +static int32_t fcoder_metacmd_ID_setup_build_bat = 182; +static int32_t fcoder_metacmd_ID_setup_build_bat_and_sh = 183; +static int32_t fcoder_metacmd_ID_setup_build_sh = 184; +static int32_t fcoder_metacmd_ID_setup_new_project = 185; +static int32_t fcoder_metacmd_ID_show_filebar = 186; +static int32_t fcoder_metacmd_ID_show_scrollbar = 187; +static int32_t fcoder_metacmd_ID_snipe_token_or_word = 188; +static int32_t fcoder_metacmd_ID_snipe_token_or_word_right = 189; +static int32_t fcoder_metacmd_ID_snippet_lister = 190; +static int32_t fcoder_metacmd_ID_suppress_mouse = 191; +static int32_t fcoder_metacmd_ID_swap_buffers_between_panels = 192; +static int32_t fcoder_metacmd_ID_to_lowercase = 193; +static int32_t fcoder_metacmd_ID_to_uppercase = 194; +static int32_t fcoder_metacmd_ID_toggle_filebar = 195; +static int32_t fcoder_metacmd_ID_toggle_fullscreen = 196; +static int32_t fcoder_metacmd_ID_toggle_highlight_line_at_cursor = 197; +static int32_t fcoder_metacmd_ID_toggle_line_wrap = 198; +static int32_t fcoder_metacmd_ID_toggle_mouse = 199; +static int32_t fcoder_metacmd_ID_toggle_show_whitespace = 200; +static int32_t fcoder_metacmd_ID_toggle_virtual_whitespace = 201; +static int32_t fcoder_metacmd_ID_undo = 202; +static int32_t fcoder_metacmd_ID_view_buffer_other_panel = 203; +static int32_t fcoder_metacmd_ID_view_jump_list_with_lister = 204; +static int32_t fcoder_metacmd_ID_word_complete = 205; +static int32_t fcoder_metacmd_ID_write_and_auto_tab = 206; +static int32_t fcoder_metacmd_ID_write_block = 207; +static int32_t fcoder_metacmd_ID_write_character = 208; +static int32_t fcoder_metacmd_ID_write_hack = 209; +static int32_t fcoder_metacmd_ID_write_note = 210; +static int32_t fcoder_metacmd_ID_write_todo = 211; +static int32_t fcoder_metacmd_ID_write_underscore = 212; +static int32_t fcoder_metacmd_ID_write_zero_struct = 213; #endif diff --git a/4coder_generated/remapping.h b/4coder_generated/remapping.h index de984254..e1ce6758 100644 --- a/4coder_generated/remapping.h +++ b/4coder_generated/remapping.h @@ -42,9 +42,9 @@ bind(context, key_mouse_wheel, MDFR_NONE, mouse_wheel_scroll); end_map(context); begin_map(context, mapid_file); bind_vanilla_keys(context, write_character); -bind(context, key_mouse_left, MDFR_NONE, click_set_cursor); -bind(context, key_mouse_left_release, MDFR_NONE, click_set_mark); -bind(context, key_mouse_right, MDFR_NONE, click_set_mark); +bind(context, key_mouse_left, MDFR_NONE, click_set_cursor_and_mark); +bind(context, key_mouse_left_release, MDFR_NONE, click_set_cursor); +bind(context, key_mouse_move, MDFR_NONE, click_set_cursor_if_lbutton); bind(context, key_left, MDFR_NONE, move_left); bind(context, key_right, MDFR_NONE, move_right); bind(context, key_del, MDFR_NONE, delete_char); @@ -200,9 +200,9 @@ end_map(context); begin_map(context, mapid_file); bind_vanilla_keys(context, write_character); bind_vanilla_keys(context, MDFR_ALT, write_character); -bind(context, key_mouse_left, MDFR_NONE, click_set_cursor); -bind(context, key_mouse_left_release, MDFR_NONE, click_set_mark); -bind(context, key_mouse_right, MDFR_NONE, click_set_mark); +bind(context, key_mouse_left, MDFR_NONE, click_set_cursor_and_mark); +bind(context, key_mouse_left_release, MDFR_NONE, click_set_cursor); +bind(context, key_mouse_move, MDFR_NONE, click_set_cursor_if_lbutton); bind(context, key_left, MDFR_NONE, move_left); bind(context, key_right, MDFR_NONE, move_right); bind(context, key_del, MDFR_NONE, delete_char); @@ -387,9 +387,9 @@ static Meta_Key_Bind fcoder_binds_for_default_mapid_global[38] = { }; static Meta_Key_Bind fcoder_binds_for_default_mapid_file[63] = { {1, 0, 0, "write_character", 15, LINK_PROCS(write_character)}, -{0, 55308, 0, "click_set_cursor", 16, LINK_PROCS(click_set_cursor)}, -{0, 55310, 0, "click_set_mark", 14, LINK_PROCS(click_set_mark)}, -{0, 55309, 0, "click_set_mark", 14, LINK_PROCS(click_set_mark)}, +{0, 55308, 0, "click_set_cursor_and_mark", 25, LINK_PROCS(click_set_cursor_and_mark)}, +{0, 55310, 0, "click_set_cursor", 16, LINK_PROCS(click_set_cursor)}, +{0, 55313, 0, "click_set_cursor_if_lbutton", 27, LINK_PROCS(click_set_cursor_if_lbutton)}, {0, 55299, 0, "move_left", 9, LINK_PROCS(move_left)}, {0, 55300, 0, "move_right", 10, LINK_PROCS(move_right)}, {0, 55301, 0, "delete_char", 11, LINK_PROCS(delete_char)}, @@ -548,9 +548,9 @@ static Meta_Key_Bind fcoder_binds_for_mac_default_mapid_global[38] = { static Meta_Key_Bind fcoder_binds_for_mac_default_mapid_file[62] = { {1, 0, 0, "write_character", 15, LINK_PROCS(write_character)}, {1, 0, 2, "write_character", 15, LINK_PROCS(write_character)}, -{0, 55308, 0, "click_set_cursor", 16, LINK_PROCS(click_set_cursor)}, -{0, 55310, 0, "click_set_mark", 14, LINK_PROCS(click_set_mark)}, -{0, 55309, 0, "click_set_mark", 14, LINK_PROCS(click_set_mark)}, +{0, 55308, 0, "click_set_cursor_and_mark", 25, LINK_PROCS(click_set_cursor_and_mark)}, +{0, 55310, 0, "click_set_cursor", 16, LINK_PROCS(click_set_cursor)}, +{0, 55313, 0, "click_set_cursor_if_lbutton", 27, LINK_PROCS(click_set_cursor_if_lbutton)}, {0, 55299, 0, "move_left", 9, LINK_PROCS(move_left)}, {0, 55300, 0, "move_right", 10, LINK_PROCS(move_right)}, {0, 55301, 0, "delete_char", 11, LINK_PROCS(delete_char)}, diff --git a/4ed.cpp b/4ed.cpp index 17424a27..09e4b11b 100644 --- a/4ed.cpp +++ b/4ed.cpp @@ -1242,8 +1242,7 @@ App_Step_Sig(app_step){ input->keys.keys[input->keys.count++] = mouse_event; } - if (input->mouse.x != models->prev_x && - input->mouse.y != models->prev_y){ + if (input->mouse.x != models->prev_x || input->mouse.y != models->prev_y){ mouse_event.keycode = key_mouse_move; input->keys.keys[input->keys.count++] = mouse_event; } diff --git a/4ed_view.cpp b/4ed_view.cpp index 94bd9c7d..f158590c 100644 --- a/4ed_view.cpp +++ b/4ed_view.cpp @@ -995,10 +995,8 @@ render_loaded_file_in_view(System_Functions *system, View *view, Models *models, }break; } } - if (visual_markers_range_id != -1 && - marker_highlight == 0){ + if (visual_markers_range_id != -1 && marker_highlight == 0){ marker_highlight = visual_markers_range_color; - char_color = at_cursor_color; } // NOTE(allen): Perform highlight, wireframe, and ibar renders @@ -1033,6 +1031,7 @@ render_loaded_file_in_view(System_Functions *system, View *view, Models *models, } if (color_highlight != 0){ draw_rectangle(target, char_rect, color_highlight); + char_color = style->main.at_cursor_color; } u32 fade_color = 0xFFFF00FF; diff --git a/meta/4ed_metagen.cpp b/meta/4ed_metagen.cpp index 6fd2b531..0ac0aa81 100644 --- a/meta/4ed_metagen.cpp +++ b/meta/4ed_metagen.cpp @@ -733,9 +733,9 @@ generate_remapping_code_and_data(){ bind_vanilla_keys(mappings, MDFR_NONE, write_character); - bind(mappings, key_mouse_left, MDFR_NONE, click_set_cursor); - bind(mappings, key_mouse_left_release, MDFR_NONE, click_set_mark); - bind(mappings, key_mouse_right, MDFR_NONE, click_set_mark); + bind(mappings, key_mouse_left, MDFR_NONE, click_set_cursor_and_mark); + bind(mappings, key_mouse_left_release, MDFR_NONE, click_set_cursor); + bind(mappings, key_mouse_move, MDFR_NONE, click_set_cursor_if_lbutton); bind(mappings, key_left, MDFR_NONE, move_left); bind(mappings, key_right, MDFR_NONE, move_right); @@ -937,9 +937,9 @@ generate_remapping_code_and_data(){ bind_vanilla_keys(mappings, MDFR_NONE, write_character); bind_vanilla_keys(mappings, MDFR_ALT, write_character); - bind(mappings, key_mouse_left, MDFR_NONE, click_set_cursor); - bind(mappings, key_mouse_left_release, MDFR_NONE, click_set_mark); - bind(mappings, key_mouse_right, MDFR_NONE, click_set_mark); + bind(mappings, key_mouse_left, MDFR_NONE, click_set_cursor_and_mark); + bind(mappings, key_mouse_left_release, MDFR_NONE, click_set_cursor); + bind(mappings, key_mouse_move, MDFR_NONE, click_set_cursor_if_lbutton); bind(mappings, key_left, MDFR_NONE, move_left); bind(mappings, key_right, MDFR_NONE, move_right); diff --git a/site/source_material/binding_list.txt b/site/source_material/binding_list.txt index db0d7b73..36734a91 100644 --- a/site/source_material/binding_list.txt +++ b/site/source_material/binding_list.txt @@ -42,6 +42,7 @@ The following bindings apply in all situations. \ITEM \STYLE{code} \END If a buffer containing jump locations has been locked in, goes to the previous jump in the buffer, and does not skip sub jump locations. \ITEM \STYLE{code} \END If a buffer containing jump locations has been locked in, goes to the first jump in the buffer. \ITEM \STYLE{code} \END 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. +\ITEM \STYLE{code} \END Toggles the visibility status of the current view's filebar. \ITEM \STYLE{code} \END Queries for an output buffer name and system command, runs the system command as a CLI and prints the output to the specified buffer. \ITEM \STYLE{code} \END If the command execute_any_cli has already been used, this will execute a CLI reusing the most recent buffer name and command. \ITEM \STYLE{code} \END Opens an interactive list of all registered commands. @@ -63,121 +64,3 @@ The following bindings apply in all situations. \ITEM \STYLE{code} \END Run an 'fkey command' configured in a project.4coder file. Determines the index of the 'fkey command' by which function key or numeric key was pressed to trigger the command. \ITEM \STYLE{code} \END Run an 'fkey command' configured in a project.4coder file. Determines the index of the 'fkey command' by which function key or numeric key was pressed to trigger the command. \ITEM \STYLE{code} \END Run an 'fkey command' configured in a project.4coder file. Determines the index of the 'fkey command' by which function key or numeric key was pressed to trigger the command. -\END -\END -\SECTION{mapid-file} -The following bindings apply in general text files and most apply in code files, but some are overriden by other commands specific to code files. -\LIST -\ITEM \STYLE{code} \END Inserts whatever character was used to trigger this command. -\ITEM \STYLE{code} \END Sets the cursor position to the mouse position. -\ITEM \STYLE{code} \END Sets the mark position to the mouse position. -\ITEM \STYLE{code} \END Sets the mark position to the mouse position. -\ITEM \STYLE{code} \END Moves the cursor one character to the left. -\ITEM \STYLE{code} \END Moves the cursor one character to the right. -\ITEM \STYLE{code} \END Deletes the character to the right of the cursor. -\ITEM \STYLE{code} \END Deletes the character to the right of the cursor. -\ITEM \STYLE{code} \END Deletes the character to the left of the cursor. -\ITEM \STYLE{code} \END Deletes the character to the left of the cursor. -\ITEM \STYLE{code} \END Moves the cursor up one line. -\ITEM \STYLE{code} \END Moves the cursor down one line. -\ITEM \STYLE{code} \END Seeks the cursor to the end of the visual line. -\ITEM \STYLE{code} \END Seeks the cursor to the beginning of the visual line. -\ITEM \STYLE{code} \END Sets the cursor to the beginning of the file. -\ITEM \STYLE{code} \END Sets the cursor to the end of the file. -\ITEM \STYLE{code} \END Scrolls the view up one view height and moves the cursor up one view height. -\ITEM \STYLE{code} \END Scrolls the view down one view height and moves the cursor down one view height. -\ITEM \STYLE{code} \END Seek right for the next boundary between whitespace and non-whitespace. -\ITEM \STYLE{code} \END Seek left for the next boundary between whitespace and non-whitespace. -\ITEM \STYLE{code} \END Seeks the cursor up to the next blank line and places it at the end of the line. -\ITEM \STYLE{code} \END Seeks the cursor down to the next blank line and places it at the end of the line. -\ITEM \STYLE{code} \END Swaps the line under the cursor with the line above it, and moves the cursor up with it. -\ITEM \STYLE{code} \END Swaps the line under the cursor with the line below it, and moves the cursor down with it. -\ITEM \STYLE{code} \END Delete characters between the cursor position and the first alphanumeric boundary to the left. -\ITEM \STYLE{code} \END Delete characters between the cursor position and the first alphanumeric boundary to the right. -\ITEM \STYLE{code} \END Delete a single, whole token on or to the left of the cursor and post it to the clipboard. -\ITEM \STYLE{code} \END Delete a single, whole token on or to the right of the cursor and post it to the clipboard. -\ITEM \STYLE{code} \END Sets the mark to the current position of the cursor. -\ITEM \STYLE{code} \END Queries the user for two strings, and replaces all occurences of the first string in the range between the cursor and the mark with the second string. -\ITEM \STYLE{code} \END Copy the text in the range from the cursor to the mark onto the clipboard. -\ITEM \STYLE{code} \END Deletes the text in the range between the cursor and the mark. -\ITEM \STYLE{code} \END Delete the line the on which the cursor sits. -\ITEM \STYLE{code} \END Centers the view vertically on the line on which the cursor sits. -\ITEM \STYLE{code} \END Sets the left size of the view near the x position of the cursor. -\ITEM \STYLE{code} \END Begins an incremental search down through the current buffer for a user specified string. -\ITEM \STYLE{code} \END Queries the user for a string and lists all exact case-sensitive matches found in all open buffers. -\ITEM \STYLE{code} \END Queries the user for a string and lists all case-insensitive substring matches found in all open buffers. -\ITEM \STYLE{code} \END Queries the user for a number, and jumps the cursor to the corresponding line. -\ITEM \STYLE{code} \END Reads the string in the selected range and lists all exact case-sensitive mathces in all open buffers. -\ITEM \STYLE{code} \END Opens a snippet lister for inserting whole pre-written snippets of text. -\ITEM \STYLE{code} \END Kills the current buffer. -\ITEM \STYLE{code} \END Create a copy of the line on which the cursor sits. -\ITEM \STYLE{code} \END Swaps the position of the cursor and the mark. -\ITEM \STYLE{code} \END Reopen the current buffer from the hard drive. -\ITEM \STYLE{code} \END Queries the user for two strings, and incrementally replaces every occurence of the first string with the second string. -\ITEM \STYLE{code} \END Queries the user for a string, and incrementally replace every occurence of the word or token found at the cursor with the specified string. -\ITEM \STYLE{code} \END Queries the user for a string, and incrementally replace every occurence of the string found in the selected range with the specified string. -\ITEM \STYLE{code} \END Begins an incremental search up through the current buffer for a user specified string. -\ITEM \STYLE{code} \END Saves the current buffer. -\ITEM \STYLE{code} \END Begins an incremental search down through the current buffer for the word or token under the cursor. -\ITEM \STYLE{code} \END Reads a token or word under the cursor and lists all exact case-sensitive mathces in all open buffers. -\ITEM \STYLE{code} \END Paste from the top of clipboard and run auto-indent on the newly pasted text. -\ITEM \STYLE{code} \END Paste the next item on the clipboard and run auto-indent on the newly pasted text. -\ITEM \STYLE{code} \END Cut the text in the range from the cursor to the mark onto the clipboard. -\ITEM \STYLE{code} \END Advances forewards through the undo history. -\ITEM \STYLE{code} \END Advances backwards through the undo history. -\ITEM \STYLE{code} \END Set the other non-active panel to view the buffer that the active panel views, and switch to that panel. -\ITEM \STYLE{code} \END Set the other non-active panel to view the buffer that the active panel views, and switch to that panel. -\ITEM \STYLE{code} \END If the buffer in the active view is writable, inserts a character, otherwise performs goto_jump_at_cursor. -\ITEM \STYLE{code} \END If the buffer in the active view is writable, inserts a character, otherwise performs goto_jump_at_cursor_same_panel. -\ITEM \STYLE{code} > \END When executed on a buffer with jumps, creates a persistent lister for all the jumps -\ITEM \STYLE{code} \END Inserts whatever character was used to trigger this command. -\END -\END -\SECTION{default-code-map} -The following commands only apply in files where the lexer (syntax highlighting) is turned on. -\LIST -\ITEM \STYLE{code} \END Seek right for boundary between alphanumeric characters or camel case word and non-alphanumeric characters. -\ITEM \STYLE{code} \END Seek left for boundary between alphanumeric characters or camel case word and non-alphanumeric characters. -\ITEM \STYLE{code} \END Inserts a character and auto-indents the line on which the cursor sits. -\ITEM \STYLE{code} \END Inserts a character and auto-indents the line on which the cursor sits. -\ITEM \STYLE{code} <}> \END Inserts a character and auto-indents the line on which the cursor sits. -\ITEM \STYLE{code} <)> \END Inserts a character and auto-indents the line on which the cursor sits. -\ITEM \STYLE{code} <]> \END Inserts a character and auto-indents the line on which the cursor sits. -\ITEM \STYLE{code} <;> \END Inserts a character and auto-indents the line on which the cursor sits. -\ITEM \STYLE{code} <#> \END Inserts a character and auto-indents the line on which the cursor sits. -\ITEM \STYLE{code} \END Iteratively tries completing the word to the left of the cursor with other words in open buffers that have the same prefix string. -\ITEM \STYLE{code} \END Auto-indents the range between the cursor and the mark. -\ITEM \STYLE{code} \END Auto-indents the line on which the cursor sits. -\ITEM \STYLE{code} \END At the cursor, insert a '// HACK' comment, includes user name if it was specified in config.4coder. -\ITEM \STYLE{code} \END At the cursor, insert a block comment. -\ITEM \STYLE{code} \END At the cursor, insert a '// TODO' comment, includes user name if it was specified in config.4coder. -\ITEM \STYLE{code} \END At the cursor, insert a '// NOTE' comment, includes user name if it was specified in config.4coder. -\ITEM \STYLE{code} \END Queries user for string, lists all locations of strings that appear to define a type whose name matches the input string. -\ITEM \STYLE{code} \END Reads a token or word under the cursor and lists all locations of strings that appear to define a type whose name matches it. -\ITEM \STYLE{code} \END At the cursor, insert a '{' and '}' separated by a blank line. -\ITEM \STYLE{code} \END At the cursor, insert a '{' and '};' separated by a blank line. -\ITEM \STYLE{code} \END At the cursor, insert a '{' and '}break;' separated by a blank line. -\ITEM \STYLE{code} \END Finds the scope enclosed by '{' '}' surrounding the cursor and puts the cursor and mark on the '{' and '}'. -\ITEM \STYLE{code} \END Finds the first scope started by '{' before the cursor and puts the cursor and mark on the '{' and '}'. -\ITEM \STYLE{code} \END Finds the first scope started by '{' after the cursor and puts the cursor and mark on the '{' and '}'. -\ITEM \STYLE{code} \END Wraps the code contained in the range between cursor and mark with a new curly brace scope. -\ITEM \STYLE{code} \END Deletes the braces surrounding the currently selected scope. Leaves the contents within the scope. -\ITEM \STYLE{code} \END 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. -\ITEM \STYLE{code} \END Surround the range between the cursor and mark with an '#if 0' and an '#endif' -\ITEM \STYLE{code} \END Reads a filename from surrounding '"' characters and attempts to open the corresponding file. -\ITEM \STYLE{code} \END If the current file is a *.cpp or *.h, attempts to open the corresponding *.h or *.cpp file in the other view. -\ITEM \STYLE{code} \END At the cursor, insert a ' = {0};'. -\END -\END -\SECTION{default-lister-ui-map} -These commands apply in 'lister mode' such as when you open a file. -\LIST -\ITEM \STYLE{code} \END A lister mode command that dispatches to the lister's write character handler. -\ITEM \STYLE{code} \END A lister mode command that quits the list without executing any actions. -\ITEM \STYLE{code} \END A lister mode command that activates the list's action on the highlighted item. -\ITEM \STYLE{code} \END A lister mode command that activates the list's action on the highlighted item. -\ITEM \STYLE{code} \END A lister mode command that dispatches to the lister's backspace text field handler. -\ITEM \STYLE{code} \END A lister mode command that dispatches to the lister's navigate up handler. -\ITEM \STYLE{code} \END A lister mode command that dispatches to the lister's navigate up handler. -\ITEM \STYLE{code} \END A lister mode command that dispatches to the lister's navigate down handler. -\ITEM \STYLE{code} \END A lister mode command that dispatches to the lister's navigate down handler.