From d024f5b6c420474fe22d99f2a0d85c81e2a7566a Mon Sep 17 00:00:00 2001 From: Allen Webster Date: Fri, 8 Jun 2018 15:51:36 -0700 Subject: [PATCH] Upgraded/cleaned up some minor config stuff, and improved behavior of swap panels. --- 4coder_base_commands.cpp | 20 +++++++++-- 4coder_config.cpp | 3 ++ 4coder_config.h | 1 + 4coder_default_framework.cpp | 46 +++----------------------- 4coder_default_framework_variables.cpp | 28 ++++++++++++++++ 4coder_default_hooks.cpp | 42 +++++++++++++---------- 4coder_generated/command_metadata.h | 42 +++++++++++------------ release-config.4coder | 1 + 8 files changed, 101 insertions(+), 82 deletions(-) diff --git a/4coder_base_commands.cpp b/4coder_base_commands.cpp index 5047b984..bdb0087d 100644 --- a/4coder_base_commands.cpp +++ b/4coder_base_commands.cpp @@ -1387,8 +1387,24 @@ CUSTOM_DOC("Set the other non-active panel to view the buffer that the active pa if (view1.view_id != view2.view_id){ int32_t buffer_id1 = view1.buffer_id; int32_t buffer_id2 = view2.buffer_id; - view_set_buffer(app, &view1, buffer_id2, 0); - view_set_buffer(app, &view2, buffer_id1, 0); + if (buffer_id1 != buffer_id2){ + view_set_buffer(app, &view1, buffer_id2, 0); + view_set_buffer(app, &view2, buffer_id1, 0); + } + else{ + Full_Cursor v1_c = view1.cursor; + Full_Cursor v1_m = view1.mark; + GUI_Scroll_Vars v1_r = view1.scroll_vars; + Full_Cursor v2_c = view2.cursor; + Full_Cursor v2_m = view2.mark; + GUI_Scroll_Vars v2_r = view2.scroll_vars; + view_set_cursor(app, &view1, seek_pos(v2_c.pos), true); + view_set_mark (app, &view1, seek_pos(v2_m.pos)); + view_set_scroll(app, &view1, v2_r); + view_set_cursor(app, &view2, seek_pos(v1_c.pos), true); + view_set_mark (app, &view2, seek_pos(v1_m.pos)); + view_set_scroll(app, &view2, v1_r); + } } } diff --git a/4coder_config.cpp b/4coder_config.cpp index 380b25c1..00902f11 100644 --- a/4coder_config.cpp +++ b/4coder_config.cpp @@ -1330,6 +1330,7 @@ config_init_default(Config_Data *config){ config->use_scroll_bars = false; config->use_file_bars = true; + config->enable_virtual_whitespace = true; config->enable_code_wrapping = true; config->automatically_adjust_wrapping = true; config->automatically_indent_text_on_save = true; @@ -1388,6 +1389,7 @@ config_parse__data(Partition *arena, String file_name, String data, Config_Data config_bool_var(parsed, "use_scroll_bars", 0, &config->use_scroll_bars); config_bool_var(parsed, "use_file_bars", 0, &config->use_file_bars); + config_bool_var(parsed, "enable_virtual_whitespace", 0, &config->enable_virtual_whitespace); config_bool_var(parsed, "enable_code_wrapping", 0, &config->enable_code_wrapping); config_bool_var(parsed, "automatically_adjust_wrapping", 0, &config->automatically_adjust_wrapping); config_bool_var(parsed, "automatically_indent_text_on_save", 0, &config->automatically_indent_text_on_save); @@ -1597,6 +1599,7 @@ load_config_and_apply(Application_Links *app, Partition *scratch, Config_Data *c config_feedback_bool(&space, "use_scroll_bars", config->use_scroll_bars); config_feedback_bool(&space, "use_file_bars", config->use_file_bars); + config_feedback_bool(&space, "enable_virtual_whitespace", config->enable_virtual_whitespace); config_feedback_bool(&space, "enable_code_wrapping", config->enable_code_wrapping); config_feedback_bool(&space, "automatically_indent_text_on_save", config->automatically_indent_text_on_save); config_feedback_bool(&space, "automatically_save_changes_on_build", config->automatically_save_changes_on_build); diff --git a/4coder_config.h b/4coder_config.h index abfa5209..e8df2664 100644 --- a/4coder_config.h +++ b/4coder_config.h @@ -201,6 +201,7 @@ struct Config_Data{ bool32 use_scroll_bars; bool32 use_file_bars; + bool32 enable_virtual_whitespace; bool32 enable_code_wrapping; bool32 automatically_indent_text_on_save; bool32 automatically_save_changes_on_build; diff --git a/4coder_default_framework.cpp b/4coder_default_framework.cpp index 218764da..0e9427b7 100644 --- a/4coder_default_framework.cpp +++ b/4coder_default_framework.cpp @@ -8,37 +8,6 @@ static Partition global_part; static General_Memory global_general; - -#if !defined(AUTO_CENTER_AFTER_JUMPS) -#define AUTO_CENTER_AFTER_JUMPS true -#endif -static bool32 auto_center_after_jumps = AUTO_CENTER_AFTER_JUMPS; -static char locked_buffer_space[256]; -static String locked_buffer = make_fixed_width_string(locked_buffer_space); - - -static View_ID special_note_view_id = 0; - - -View_Paste_Index view_paste_index_[16]; -View_Paste_Index *view_paste_index = view_paste_index_ - 1; - - -static char out_buffer_space[1024]; -static char command_space[1024]; -static char hot_directory_space[1024]; - - -static bool32 suppressing_mouse = false; - - -static ID_Based_Jump_Location prev_location = {0}; - - -static Config_Data global_config = {0}; - -//////////////////////////////// - static void unlock_jump_buffer(void){ locked_buffer.size = 0; @@ -230,7 +199,7 @@ CUSTOM_DOC("Switch to a named key binding map.") //////////////////////////////// static void -init_memory(Application_Links *app){ +default_4coder_initialize(Application_Links *app, int32_t override_font_size, bool32 override_hinting){ int32_t part_size = (32 << 20); int32_t general_size = (4 << 20); @@ -239,11 +208,6 @@ init_memory(Application_Links *app){ void *general_mem = memory_allocate(app, general_size); general_memory_open(&global_general, general_mem, general_size); -} - -static void -default_4coder_initialize(Application_Links *app, int32_t override_font_size, bool32 override_hinting){ - init_memory(app); static const char message[] = "" "Welcome to " VERSION "\n" @@ -260,11 +224,9 @@ default_4coder_initialize(Application_Links *app, int32_t override_font_size, bo } static void -default_4coder_initialize(Application_Links *app, int32_t override_font_size, bool32 override_hinting, - bool32 use_scroll_bars, bool32 use_file_bars){ - default_4coder_initialize(app, override_font_size, override_hinting); - global_config.use_scroll_bars = use_scroll_bars; - global_config.use_file_bars = use_file_bars; +default_4coder_initialize(Application_Links *app){ + Face_Description command_line_description = get_face_description(app, 0); + default_4coder_initialize(app, command_line_description.pt_size, command_line_description.hinting); } static void diff --git a/4coder_default_framework_variables.cpp b/4coder_default_framework_variables.cpp index 9ea829e9..44d544d4 100644 --- a/4coder_default_framework_variables.cpp +++ b/4coder_default_framework_variables.cpp @@ -17,4 +17,32 @@ static char *default_extensions[] = { "cs", }; +#if !defined(AUTO_CENTER_AFTER_JUMPS) +#define AUTO_CENTER_AFTER_JUMPS true +#endif +static bool32 auto_center_after_jumps = AUTO_CENTER_AFTER_JUMPS; +static char locked_buffer_space[256]; +static String locked_buffer = make_fixed_width_string(locked_buffer_space); + + +static View_ID special_note_view_id = 0; + + +View_Paste_Index view_paste_index_[16]; +View_Paste_Index *view_paste_index = view_paste_index_ - 1; + + +static char out_buffer_space[1024]; +static char command_space[1024]; +static char hot_directory_space[1024]; + + +static bool32 suppressing_mouse = false; + + +static ID_Based_Jump_Location prev_location = {0}; + + +static Config_Data global_config = {0}; + // BOTTOM \ No newline at end of file diff --git a/4coder_default_hooks.cpp b/4coder_default_hooks.cpp index 3363ff58..82af7d2e 100644 --- a/4coder_default_hooks.cpp +++ b/4coder_default_hooks.cpp @@ -23,8 +23,7 @@ START_HOOK_SIG(default_start){ named_maps = named_maps_values; named_map_count = ArrayCount(named_maps_values); - Face_Description command_line_description = get_face_description(app, 0); - default_4coder_initialize(app, command_line_description.pt_size, command_line_description.hinting); + default_4coder_initialize(app); default_4coder_side_by_side_panels(app, files, file_count); if (global_config.automatically_load_project){ @@ -274,10 +273,8 @@ OPEN_FILE_HOOK_SIG(default_file_settings){ int32_t map_id = (treat_as_code)?((int32_t)default_code_map):((int32_t)mapid_file); - buffer_set_setting(app, &buffer, BufferSetting_WrapPosition, - global_config.default_wrap_width); - buffer_set_setting(app, &buffer, BufferSetting_MinimumBaseWrapPosition, - global_config.default_min_base_width); + buffer_set_setting(app, &buffer, BufferSetting_WrapPosition, global_config.default_wrap_width); + buffer_set_setting(app, &buffer, BufferSetting_MinimumBaseWrapPosition, global_config.default_min_base_width); buffer_set_setting(app, &buffer, BufferSetting_MapID, map_id); buffer_set_setting(app, &buffer, BufferSetting_ParserContext, parse_context_id); @@ -286,18 +283,29 @@ OPEN_FILE_HOOK_SIG(default_file_settings){ buffer_set_setting(app, &buffer, BufferSetting_LexWithoutStrings, true); buffer_set_setting(app, &buffer, BufferSetting_VirtualWhitespace, true); } - else if (treat_as_code && global_config.enable_code_wrapping && buffer.size < (128 << 10)){ - // NOTE(allen|a4.0.12): There is a little bit of grossness going on here. - // If we set BufferSetting_Lex to true, it will launch a lexing job. - // If a lexing job is active when we set BufferSetting_VirtualWhitespace, the call can fail. - // Unfortunantely without tokens virtual whitespace doesn't really make sense. - // So for now I have it automatically turning on lexing when virtual whitespace is turned on. - // Cleaning some of that up is a goal for future versions. - if (lex_without_strings){ - buffer_set_setting(app, &buffer, BufferSetting_LexWithoutStrings, true); + else if (treat_as_code && buffer.size < (128 << 10)){ + if (global_config.enable_virtual_whitespace){ + // NOTE(allen|a4.0.12): There is a little bit of grossness going on here. + // If we set BufferSetting_Lex to true, it will launch a lexing job. + // If a lexing job is active when we set BufferSetting_VirtualWhitespace, the call can fail. + // Unfortunantely without tokens virtual whitespace doesn't really make sense. + // So for now I have it automatically turning on lexing when virtual whitespace is turned on. + // Cleaning some of that up is a goal for future versions. + if (lex_without_strings){ + buffer_set_setting(app, &buffer, BufferSetting_LexWithoutStrings, true); + } + if (global_config.enable_code_wrapping){ + buffer_set_setting(app, &buffer, BufferSetting_WrapLine, true); + } + buffer_set_setting(app, &buffer, BufferSetting_VirtualWhitespace, true); + } + else if (global_config.enable_code_wrapping){ + if (lex_without_strings){ + buffer_set_setting(app, &buffer, BufferSetting_LexWithoutStrings, true); + } + buffer_set_setting(app, &buffer, BufferSetting_Lex, true); + buffer_set_setting(app, &buffer, BufferSetting_WrapLine, true); } - buffer_set_setting(app, &buffer, BufferSetting_WrapLine, true); - buffer_set_setting(app, &buffer, BufferSetting_VirtualWhitespace, true); } else{ buffer_set_setting(app, &buffer, BufferSetting_WrapLine, wrap_lines); diff --git a/4coder_generated/command_metadata.h b/4coder_generated/command_metadata.h index caeb1d77..95009c8c 100644 --- a/4coder_generated/command_metadata.h +++ b/4coder_generated/command_metadata.h @@ -216,7 +216,7 @@ int32_t source_name_len; int32_t line_number; }; static Command_Metadata fcoder_metacmd_table[196] = { -{ PROC_LINKS(allow_mouse, 0), "allow_mouse", 11, "Shows the mouse and causes all mouse input to be processed normally.", 68, "C:\\work\\4ed\\code\\4coder_default_framework.cpp", 49, 199 }, +{ PROC_LINKS(allow_mouse, 0), "allow_mouse", 11, "Shows the mouse and causes all mouse input to be processed normally.", 68, "C:\\work\\4ed\\code\\4coder_default_framework.cpp", 49, 168 }, { PROC_LINKS(auto_tab_line_at_cursor, 0), "auto_tab_line_at_cursor", 23, "Auto-indents the line on which the cursor sits.", 47, "C:\\work\\4ed\\code\\4coder_auto_indent.cpp", 43, 722 }, { PROC_LINKS(auto_tab_range, 0), "auto_tab_range", 14, "Auto-indents the range between the cursor and the mark.", 55, "C:\\work\\4ed\\code\\4coder_auto_indent.cpp", 43, 733 }, { PROC_LINKS(auto_tab_whole_file, 0), "auto_tab_whole_file", 19, "Audo-indents the entire current buffer.", 39, "C:\\work\\4ed\\code\\4coder_auto_indent.cpp", 43, 712 }, @@ -226,8 +226,8 @@ static Command_Metadata fcoder_metacmd_table[196] = { { PROC_LINKS(build_in_build_panel, 0), "build_in_build_panel", 20, "Looks for a build.bat, build.sh, or makefile in the current and parent directories. Runs the first that it finds and prints the output to *compilation*. Puts the *compilation* buffer in a panel at the footer of the current view.", 230, "C:\\work\\4ed\\code\\4coder_build_commands.cpp", 46, 189 }, { PROC_LINKS(build_search, 0), "build_search", 12, "Looks for a build.bat, build.sh, or makefile in the current and parent directories. Runs the first that it finds and prints the output to *compilation*.", 153, "C:\\work\\4ed\\code\\4coder_build_commands.cpp", 46, 155 }, { PROC_LINKS(center_view, 0), "center_view", 11, "Centers the view vertically on the line on which the cursor sits.", 65, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 120 }, -{ 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, "C:\\work\\4ed\\code\\4coder_default_framework.cpp", 49, 141 }, -{ 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, "C:\\work\\4ed\\code\\4coder_default_framework.cpp", 49, 151 }, +{ 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, "C:\\work\\4ed\\code\\4coder_default_framework.cpp", 49, 110 }, +{ 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, "C:\\work\\4ed\\code\\4coder_default_framework.cpp", 49, 120 }, { 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, "C:\\work\\4ed\\code\\4coder_build_commands.cpp", 46, 211 }, { PROC_LINKS(clean_all_lines, 0), "clean_all_lines", 15, "Removes trailing whitespace from all lines in the current buffer.", 65, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 368 }, { PROC_LINKS(click_set_cursor, 0), "click_set_cursor", 16, "Sets the cursor position to the mouse position.", 47, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 174 }, @@ -279,12 +279,12 @@ static Command_Metadata fcoder_metacmd_table[196] = { { PROC_LINKS(if0_off, 0), "if0_off", 7, "Surround the range between the cursor and mark with an '#if 0' and an '#endif'", 78, "C:\\work\\4ed\\code\\4coder_combined_write_commands.cpp", 55, 82 }, { PROC_LINKS(increase_face_size, 0), "increase_face_size", 18, "Increase the size of the face used by the current buffer.", 57, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 519 }, { PROC_LINKS(increase_line_wrap, 0), "increase_line_wrap", 18, "Increases the current buffer's width for line wrapping.", 55, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 497 }, -{ PROC_LINKS(interactive_kill_buffer, 0), "interactive_kill_buffer", 23, "Interactively kill an open buffer.", 34, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 1433 }, -{ PROC_LINKS(interactive_new, 0), "interactive_new", 15, "Interactively creates a new file.", 33, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 1409 }, -{ PROC_LINKS(interactive_open, 0), "interactive_open", 16, "Interactively opens a file.", 27, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 1415 }, -{ PROC_LINKS(interactive_open_or_new, 0), "interactive_open_or_new", 23, "Interactively opens or creates a new file.", 42, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 1421 }, -{ PROC_LINKS(interactive_switch_buffer, 0), "interactive_switch_buffer", 25, "Interactively switch to an open buffer.", 39, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 1427 }, -{ PROC_LINKS(kill_buffer, 0), "kill_buffer", 11, "Kills the current buffer.", 25, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 1451 }, +{ PROC_LINKS(interactive_kill_buffer, 0), "interactive_kill_buffer", 23, "Interactively kill an open buffer.", 34, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 1449 }, +{ PROC_LINKS(interactive_new, 0), "interactive_new", 15, "Interactively creates a new file.", 33, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 1425 }, +{ PROC_LINKS(interactive_open, 0), "interactive_open", 16, "Interactively opens a file.", 27, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 1431 }, +{ PROC_LINKS(interactive_open_or_new, 0), "interactive_open_or_new", 23, "Interactively opens or creates a new file.", 42, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 1437 }, +{ PROC_LINKS(interactive_switch_buffer, 0), "interactive_switch_buffer", 25, "Interactively switch to an open buffer.", 39, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 1443 }, +{ PROC_LINKS(kill_buffer, 0), "kill_buffer", 11, "Kills the current buffer.", 25, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 1467 }, { PROC_LINKS(kill_rect, 0), "kill_rect", 9, "Delete characters in a rectangular region. Range testing is done by unwrapped-xy coordinates.", 93, "C:\\work\\4ed\\code\\4coder_experiments.cpp", 43, 29 }, { 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, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 135 }, { PROC_LINKS(list_all_functions_current_buffer, 0), "list_all_functions_current_buffer", 33, "Creates a jump list of lines of the current buffer that appear to define or declare functions.", 94, "C:\\work\\4ed\\code\\4coder_function_list.cpp", 45, 318 }, @@ -322,15 +322,15 @@ static Command_Metadata fcoder_metacmd_table[196] = { { PROC_LINKS(newline_or_goto_position_sticky, 0), "newline_or_goto_position_sticky", 31, "If the buffer in the active view is writable, inserts a character, otherwise performs goto_jump_at_cursor.", 106, "C:\\work\\4ed\\code\\4coder_jump_sticky.cpp", 43, 556 }, { PROC_LINKS(open_all_code, 0), "open_all_code", 13, "Open all code in the current directory. File types are determined by extensions. An extension is considered code based on the extensions specified in 4coder.config.", 164, "C:\\work\\4ed\\code\\4coder_project_commands.cpp", 48, 1010 }, { PROC_LINKS(open_all_code_recursive, 0), "open_all_code_recursive", 23, "Works as open_all_code but also runs in all subdirectories.", 59, "C:\\work\\4ed\\code\\4coder_project_commands.cpp", 48, 1017 }, -{ PROC_LINKS(open_color_tweaker, 0), "open_color_tweaker", 18, "Opens the 4coder colors and fonts selector menu.", 48, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 1457 }, +{ PROC_LINKS(open_color_tweaker, 0), "open_color_tweaker", 18, "Opens the 4coder colors and fonts selector menu.", 48, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 1473 }, { PROC_LINKS(open_file_in_quotes, 0), "open_file_in_quotes", 19, "Reads a filename from surrounding '\"' characters and attempts to open the corresponding file.", 94, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 1320 }, -{ PROC_LINKS(open_in_other, 0), "open_in_other", 13, "Interactively opens a file in the other panel.", 46, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 1465 }, +{ PROC_LINKS(open_in_other, 0), "open_in_other", 13, "Interactively opens a file in the other panel.", 46, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 1481 }, { PROC_LINKS(open_long_braces, 0), "open_long_braces", 16, "At the cursor, insert a '{' and '}' separated by a blank line.", 62, "C:\\work\\4ed\\code\\4coder_combined_write_commands.cpp", 55, 58 }, { PROC_LINKS(open_long_braces_break, 0), "open_long_braces_break", 22, "At the cursor, insert a '{' and '}break;' separated by a blank line.", 68, "C:\\work\\4ed\\code\\4coder_combined_write_commands.cpp", 55, 74 }, { PROC_LINKS(open_long_braces_semicolon, 0), "open_long_braces_semicolon", 26, "At the cursor, insert a '{' and '};' separated by a blank line.", 63, "C:\\work\\4ed\\code\\4coder_combined_write_commands.cpp", 55, 66 }, { PROC_LINKS(open_matching_file_cpp, 0), "open_matching_file_cpp", 22, "If the current file is a *.cpp or *.h, attempts to open the corresponding *.h or *.cpp file in the other view.", 110, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 1356 }, -{ PROC_LINKS(open_panel_hsplit, 0), "open_panel_hsplit", 17, "Create a new panel by horizontally splitting the active panel.", 62, "C:\\work\\4ed\\code\\4coder_default_framework.cpp", 49, 170 }, -{ PROC_LINKS(open_panel_vsplit, 0), "open_panel_vsplit", 17, "Create a new panel by vertically splitting the active panel.", 60, "C:\\work\\4ed\\code\\4coder_default_framework.cpp", 49, 161 }, +{ PROC_LINKS(open_panel_hsplit, 0), "open_panel_hsplit", 17, "Create a new panel by horizontally splitting the active panel.", 62, "C:\\work\\4ed\\code\\4coder_default_framework.cpp", 49, 139 }, +{ PROC_LINKS(open_panel_vsplit, 0), "open_panel_vsplit", 17, "Create a new panel by vertically splitting the active panel.", 60, "C:\\work\\4ed\\code\\4coder_default_framework.cpp", 49, 130 }, { PROC_LINKS(page_down, 0), "page_down", 9, "Scrolls the view down one view height and moves the cursor down one view height.", 80, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 288 }, { PROC_LINKS(page_up, 0), "page_up", 7, "Scrolls the view up one view height and moves the cursor up one view height.", 76, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 279 }, { PROC_LINKS(paste, 0), "paste", 5, "At the cursor, insert the text at the top of the clipboard.", 59, "C:\\work\\4ed\\code\\4coder_clipboard.cpp", 41, 46 }, @@ -343,16 +343,16 @@ static Command_Metadata fcoder_metacmd_table[196] = { { PROC_LINKS(query_replace, 0), "query_replace", 13, "Queries the user for two strings, and incrementally replaces every occurence of the first string with the second string.", 120, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 893 }, { PROC_LINKS(query_replace_identifier, 0), "query_replace_identifier", 24, "Queries the user for a string, and incrementally replace every occurence of the word or token found at the cursor with the specified string.", 140, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 913 }, { PROC_LINKS(query_replace_selection, 0), "query_replace_selection", 23, "Queries the user for a string, and incrementally replace every occurence of the string found in the selected range with the specified string.", 141, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 931 }, -{ PROC_LINKS(redo, 0), "redo", 4, "Advances forewards through the undo history.", 44, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 1403 }, -{ PROC_LINKS(remap_interactive, 0), "remap_interactive", 17, "Switch to a named key binding map.", 34, "C:\\work\\4ed\\code\\4coder_default_framework.cpp", 49, 219 }, +{ PROC_LINKS(redo, 0), "redo", 4, "Advances forewards through the undo history.", 44, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 1419 }, +{ PROC_LINKS(remap_interactive, 0), "remap_interactive", 17, "Switch to a named key binding map.", 34, "C:\\work\\4ed\\code\\4coder_default_framework.cpp", 49, 188 }, { 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, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 1059 }, { PROC_LINKS(rename_parameter, 0), "rename_parameter", 16, "If the cursor is found to be on the name of a function parameter in the signature of a function definition, all occurences within the scope of the function will be replaced with a new provided string.", 200, "C:\\work\\4ed\\code\\4coder_experiments.cpp", 43, 385 }, -{ PROC_LINKS(reopen, 0), "reopen", 6, "Reopen the current buffer from the hard drive.", 46, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 1439 }, +{ PROC_LINKS(reopen, 0), "reopen", 6, "Reopen the current buffer from the hard drive.", 46, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 1455 }, { PROC_LINKS(replace_all_occurrences, 0), "replace_all_occurrences", 23, "Queries the user for two strings, and replaces all occurrences of the first string with the second string in all open buffers.", 126, "C:\\work\\4ed\\code\\4coder_experiments.cpp", 43, 771 }, { 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, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 791 }, { PROC_LINKS(reverse_search, 0), "reverse_search", 14, "Begins an incremental search up through the current buffer for a user specified string.", 87, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 762 }, { 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, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 780 }, -{ PROC_LINKS(save, 0), "save", 4, "Saves the current buffer.", 25, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 1445 }, +{ PROC_LINKS(save, 0), "save", 4, "Saves the current buffer.", 25, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 1461 }, { PROC_LINKS(save_all_dirty_buffers, 0), "save_all_dirty_buffers", 22, "Saves all buffers marked dirty (showing the '*' indicator).", 59, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 958 }, { PROC_LINKS(save_to_query, 0), "save_to_query", 13, "Queries the user for a name and saves the contents of the current buffer, altering the buffer's name too.", 105, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 1019 }, { PROC_LINKS(scope_absorb_down, 0), "scope_absorb_down", 17, "If a scope is currently selected, and a statement or block statement is present below the current scope, the statement is moved into the scope.", 143, "C:\\work\\4ed\\code\\4coder_scope_commands.cpp", 46, 738 }, @@ -389,17 +389,17 @@ static Command_Metadata fcoder_metacmd_table[196] = { { PROC_LINKS(show_scrollbar, 0), "show_scrollbar", 14, "Sets the current view to show it's scrollbar.", 45, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 450 }, { PROC_LINKS(snipe_token_or_word, 0), "snipe_token_or_word", 19, "Delete a single, whole token on or to the left of the cursor and post it to the clipboard.", 90, "C:\\work\\4ed\\code\\4coder_seek.cpp", 36, 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, "C:\\work\\4ed\\code\\4coder_seek.cpp", 36, 1265 }, -{ PROC_LINKS(suppress_mouse, 0), "suppress_mouse", 14, "Hides the mouse and causes all mosue input (clicks, position, wheel) to be ignored.", 83, "C:\\work\\4ed\\code\\4coder_default_framework.cpp", 49, 193 }, +{ PROC_LINKS(suppress_mouse, 0), "suppress_mouse", 14, "Hides the mouse and causes all mosue input (clicks, position, wheel) to be ignored.", 83, "C:\\work\\4ed\\code\\4coder_default_framework.cpp", 49, 162 }, { PROC_LINKS(swap_buffers_between_panels, 0), "swap_buffers_between_panels", 27, "Set the other non-active panel to view the buffer that the active panel views, and switch to that panel.", 104, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 1380 }, { PROC_LINKS(to_lowercase, 0), "to_lowercase", 12, "Converts all ascii text in the range between the cursor and the mark to lowercase.", 82, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 348 }, { PROC_LINKS(to_uppercase, 0), "to_uppercase", 12, "Converts all ascii text in the range between the cursor and the mark to uppercase.", 82, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 328 }, { PROC_LINKS(toggle_filebar, 0), "toggle_filebar", 14, "Toggles the visibility status of the current view's filebar.", 60, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 478 }, -{ 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, "C:\\work\\4ed\\code\\4coder_default_framework.cpp", 49, 211 }, +{ 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, "C:\\work\\4ed\\code\\4coder_default_framework.cpp", 49, 180 }, { PROC_LINKS(toggle_line_wrap, 0), "toggle_line_wrap", 16, "Toggles the current buffer's line wrapping status.", 50, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 487 }, -{ PROC_LINKS(toggle_mouse, 0), "toggle_mouse", 12, "Toggles the mouse suppression mode, see suppress_mouse and allow_mouse.", 71, "C:\\work\\4ed\\code\\4coder_default_framework.cpp", 49, 205 }, +{ PROC_LINKS(toggle_mouse, 0), "toggle_mouse", 12, "Toggles the mouse suppression mode, see suppress_mouse and allow_mouse.", 71, "C:\\work\\4ed\\code\\4coder_default_framework.cpp", 49, 174 }, { PROC_LINKS(toggle_show_whitespace, 0), "toggle_show_whitespace", 22, "Toggles the current buffer's whitespace visibility status.", 58, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 554 }, { PROC_LINKS(toggle_virtual_whitespace, 0), "toggle_virtual_whitespace", 25, "Toggles the current buffer's virtual whitespace status.", 55, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 543 }, -{ PROC_LINKS(undo, 0), "undo", 4, "Advances backwards through the undo history.", 44, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 1397 }, +{ PROC_LINKS(undo, 0), "undo", 4, "Advances backwards through the undo history.", 44, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 1413 }, { PROC_LINKS(view_buffer_other_panel, 0), "view_buffer_other_panel", 23, "Set the other non-active panel to view the buffer that the active panel views, and switch to that panel.", 104, "C:\\work\\4ed\\code\\4coder_base_commands.cpp", 45, 1370 }, { PROC_LINKS(word_complete, 0), "word_complete", 13, "Iteratively tries completing the word to the left of the cursor with other words in open buffers that have the same prefix string.", 130, "C:\\work\\4ed\\code\\4coder_search.cpp", 38, 820 }, { PROC_LINKS(write_and_auto_tab, 0), "write_and_auto_tab", 18, "Inserts a character and auto-indents the line on which the cursor sits.", 71, "C:\\work\\4ed\\code\\4coder_auto_indent.cpp", 43, 745 }, diff --git a/release-config.4coder b/release-config.4coder index 6de0c703..cea56a1a 100644 --- a/release-config.4coder +++ b/release-config.4coder @@ -11,6 +11,7 @@ use_scroll_bars = false; use_file_bars = true; // Code Wrapping +enable_virtual_whitespace = true; enable_code_wrapping = true; automatically_adjust_wrapping = true; default_wrap_width = 672;