From 59d70950d6514b7fab3df40233e70dbdc727cb52 Mon Sep 17 00:00:00 2001 From: Allen Webster Date: Thu, 22 Nov 2018 10:34:11 -0800 Subject: [PATCH] Removed keycodes from 4ed_metagen.cpp --- 4coder_API/4coder_keycodes.h | 83 +++++++ 4coder_API/custom.h | 2 +- 4coder_function_list.cpp | 3 - 4coder_generated/command_metadata.h | 344 +++++++++++++++------------- 4coder_generated/keycodes.h | 83 ------- 4ed_api_implementation.cpp | 8 +- meta/4ed_metagen.cpp | 100 +------- platform_linux/linux_4ed.cpp | 2 +- platform_mac/mac_4ed.cpp | 2 +- platform_win32/win32_4ed.cpp | 2 +- 10 files changed, 285 insertions(+), 344 deletions(-) create mode 100644 4coder_API/4coder_keycodes.h delete mode 100644 4coder_generated/keycodes.h diff --git a/4coder_API/4coder_keycodes.h b/4coder_API/4coder_keycodes.h new file mode 100644 index 00000000..89b8ec8d --- /dev/null +++ b/4coder_API/4coder_keycodes.h @@ -0,0 +1,83 @@ +enum{ + key_back = 55296, + key_up = 55297, + key_down = 55298, + key_left = 55299, + key_right = 55300, + key_del = 55301, + key_insert = 55302, + key_home = 55303, + key_end = 55304, + key_page_up = 55305, + key_page_down = 55306, + key_esc = 55307, + key_mouse_left = 55308, + key_mouse_right = 55309, + key_mouse_left_release = 55310, + key_mouse_right_release = 55311, + key_mouse_wheel = 55312, + key_mouse_move = 55313, + key_animate = 55314, + key_click_activate_view = 55315, + key_click_deactivate_view = 55316, + key_f1 = 55317, + key_f2 = 55318, + key_f3 = 55319, + key_f4 = 55320, + key_f5 = 55321, + key_f6 = 55322, + key_f7 = 55323, + key_f8 = 55324, + key_f9 = 55325, + key_f10 = 55326, + key_f11 = 55327, + key_f12 = 55328, + key_f13 = 55329, + key_f14 = 55330, + key_f15 = 55331, + key_f16 = 55332, +}; +static char* +global_key_name(uint32_t key_code, int32_t *size){ + char *result = 0; + switch(key_code){ + case key_back: result = "key_back"; *size = sizeof("key_back")-1; break; + case key_up: result = "key_up"; *size = sizeof("key_up")-1; break; + case key_down: result = "key_down"; *size = sizeof("key_down")-1; break; + case key_left: result = "key_left"; *size = sizeof("key_left")-1; break; + case key_right: result = "key_right"; *size = sizeof("key_right")-1; break; + case key_del: result = "key_del"; *size = sizeof("key_del")-1; break; + case key_insert: result = "key_insert"; *size = sizeof("key_insert")-1; break; + case key_home: result = "key_home"; *size = sizeof("key_home")-1; break; + case key_end: result = "key_end"; *size = sizeof("key_end")-1; break; + case key_page_up: result = "key_page_up"; *size = sizeof("key_page_up")-1; break; + case key_page_down: result = "key_page_down"; *size = sizeof("key_page_down")-1; break; + case key_esc: result = "key_esc"; *size = sizeof("key_esc")-1; break; + case key_mouse_left: result = "key_mouse_left"; *size = sizeof("key_mouse_left")-1; break; + case key_mouse_right: result = "key_mouse_right"; *size = sizeof("key_mouse_right")-1; break; + case key_mouse_left_release: result = "key_mouse_left_release"; *size = sizeof("key_mouse_left_release")-1; break; + case key_mouse_right_release: result = "key_mouse_right_release"; *size = sizeof("key_mouse_right_release")-1; break; + case key_mouse_wheel: result = "key_mouse_wheel"; *size = sizeof("key_mouse_wheel")-1; break; + case key_mouse_move: result = "key_mouse_move"; *size = sizeof("key_mouse_move")-1; break; + case key_animate: result = "key_animate"; *size = sizeof("key_animate")-1; break; + case key_click_activate_view: result = "key_click_activate_view"; *size = sizeof("key_click_activate_view")-1; break; + case key_click_deactivate_view: result = "key_click_deactivate_view"; *size = sizeof("key_click_deactivate_view")-1; break; + case key_f1: result = "key_f1"; *size = sizeof("key_f1")-1; break; + case key_f2: result = "key_f2"; *size = sizeof("key_f2")-1; break; + case key_f3: result = "key_f3"; *size = sizeof("key_f3")-1; break; + case key_f4: result = "key_f4"; *size = sizeof("key_f4")-1; break; + case key_f5: result = "key_f5"; *size = sizeof("key_f5")-1; break; + case key_f6: result = "key_f6"; *size = sizeof("key_f6")-1; break; + case key_f7: result = "key_f7"; *size = sizeof("key_f7")-1; break; + case key_f8: result = "key_f8"; *size = sizeof("key_f8")-1; break; + case key_f9: result = "key_f9"; *size = sizeof("key_f9")-1; break; + case key_f10: result = "key_f10"; *size = sizeof("key_f10")-1; break; + case key_f11: result = "key_f11"; *size = sizeof("key_f11")-1; break; + case key_f12: result = "key_f12"; *size = sizeof("key_f12")-1; break; + case key_f13: result = "key_f13"; *size = sizeof("key_f13")-1; break; + case key_f14: result = "key_f14"; *size = sizeof("key_f14")-1; break; + case key_f15: result = "key_f15"; *size = sizeof("key_f15")-1; break; + case key_f16: result = "key_f16"; *size = sizeof("key_f16")-1; break; + } + return(result); +} diff --git a/4coder_API/custom.h b/4coder_API/custom.h index f7b258bf..42f4c6a5 100644 --- a/4coder_API/custom.h +++ b/4coder_API/custom.h @@ -12,7 +12,7 @@ custom.h #include "version.h" #include "4coder_lib/4coder_string.h" #include "4coder_lib/4cpp_lexer_types.h" -#include "4coder_generated/keycodes.h" +#include "4coder_keycodes.h" #include "4coder_generated/style.h" #include "types.h" #include "4coder_generated/app_functions.h" diff --git a/4coder_function_list.cpp b/4coder_function_list.cpp index b50ab076..e716917d 100644 --- a/4coder_function_list.cpp +++ b/4coder_function_list.cpp @@ -9,9 +9,6 @@ // through. Once I build a real parser this should become almost just as easy as // iterating tokens is now. // -// This version can be dropped anywhere underneath 4coder_default_include.cpp and -// will then provide the "list_all_functions_current_buffer" command. -// static Get_Positions_Results get_function_positions(Application_Links *app, Buffer_Summary *buffer, int32_t token_index, Function_Positions *positions_array, int32_t positions_max){ diff --git a/4coder_generated/command_metadata.h b/4coder_generated/command_metadata.h index 10086319..8ee7c589 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 216 +#define command_one_past_last_id 228 #if defined(CUSTOM_COMMAND_SIG) #define PROC_LINKS(x,y) x #else @@ -77,6 +77,7 @@ CUSTOM_COMMAND_SIG(interactive_open); CUSTOM_COMMAND_SIG(interactive_open_or_new); CUSTOM_COMMAND_SIG(interactive_switch_buffer); CUSTOM_COMMAND_SIG(kill_buffer); +CUSTOM_COMMAND_SIG(kill_rect); CUSTOM_COMMAND_SIG(left_adjust_view); CUSTOM_COMMAND_SIG(list_all_functions_all_buffers); CUSTOM_COMMAND_SIG(list_all_functions_all_buffers_lister); @@ -111,6 +112,12 @@ CUSTOM_COMMAND_SIG(lister__write_character__file_path); CUSTOM_COMMAND_SIG(lister__write_character__fixed_list); CUSTOM_COMMAND_SIG(load_project); CUSTOM_COMMAND_SIG(make_directory_query); +CUSTOM_COMMAND_SIG(miblo_decrement_basic); +CUSTOM_COMMAND_SIG(miblo_decrement_time_stamp); +CUSTOM_COMMAND_SIG(miblo_decrement_time_stamp_minute); +CUSTOM_COMMAND_SIG(miblo_increment_basic); +CUSTOM_COMMAND_SIG(miblo_increment_time_stamp); +CUSTOM_COMMAND_SIG(miblo_increment_time_stamp_minute); CUSTOM_COMMAND_SIG(mouse_wheel_scroll); CUSTOM_COMMAND_SIG(move_down); CUSTOM_COMMAND_SIG(move_down_10); @@ -121,6 +128,7 @@ CUSTOM_COMMAND_SIG(move_line_up); CUSTOM_COMMAND_SIG(move_right); CUSTOM_COMMAND_SIG(move_up); CUSTOM_COMMAND_SIG(move_up_10); +CUSTOM_COMMAND_SIG(multi_line_edit); CUSTOM_COMMAND_SIG(newline_or_goto_position_direct); CUSTOM_COMMAND_SIG(newline_or_goto_position_same_panel_direct); CUSTOM_COMMAND_SIG(newline_or_goto_position_same_panel_sticky); @@ -153,7 +161,9 @@ CUSTOM_COMMAND_SIG(redo); CUSTOM_COMMAND_SIG(reload_themes); CUSTOM_COMMAND_SIG(remap_interactive); CUSTOM_COMMAND_SIG(rename_file_query); +CUSTOM_COMMAND_SIG(rename_parameter); CUSTOM_COMMAND_SIG(reopen); +CUSTOM_COMMAND_SIG(replace_all_occurrences); CUSTOM_COMMAND_SIG(replace_in_range); CUSTOM_COMMAND_SIG(reverse_search); CUSTOM_COMMAND_SIG(reverse_search_identifier); @@ -220,6 +230,8 @@ CUSTOM_COMMAND_SIG(word_complete); CUSTOM_COMMAND_SIG(write_and_auto_tab); CUSTOM_COMMAND_SIG(write_block); CUSTOM_COMMAND_SIG(write_character); +CUSTOM_COMMAND_SIG(write_explicit_enum_flags); +CUSTOM_COMMAND_SIG(write_explicit_enum_values); CUSTOM_COMMAND_SIG(write_hack); CUSTOM_COMMAND_SIG(write_note); CUSTOM_COMMAND_SIG(write_todo); @@ -236,7 +248,7 @@ char *source_name; int32_t source_name_len; int32_t line_number; }; -static Command_Metadata fcoder_metacmd_table[216] = { +static Command_Metadata fcoder_metacmd_table[228] = { { 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 }, @@ -305,11 +317,12 @@ static Command_Metadata fcoder_metacmd_table[216] = { { 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, 822 }, { PROC_LINKS(interactive_switch_buffer, 0), "interactive_switch_buffer", 25, "Interactively switch to an open buffer.", 39, "w:\\4ed\\code\\4coder_lists.cpp", 28, 732 }, { PROC_LINKS(kill_buffer, 0), "kill_buffer", 11, "Kills the current buffer.", 25, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 1538 }, +{ PROC_LINKS(kill_rect, 0), "kill_rect", 9, "Delete characters in a rectangular region. Range testing is done by unwrapped-xy coordinates.", 93, "w:\\4ed\\code\\4coder_experiments.cpp", 34, 26 }, { 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, 133 }, -{ 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 }, -{ 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, "w:\\4ed\\code\\4coder_function_list.cpp", 36, 335 }, -{ PROC_LINKS(list_all_functions_current_buffer_lister, 0), "list_all_functions_current_buffer_lister", 40, "Creates a lister of locations that look like function definitions and declarations in the buffer.", 97, "w:\\4ed\\code\\4coder_function_list.cpp", 36, 345 }, +{ 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, 355 }, +{ 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, 361 }, +{ 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, "w:\\4ed\\code\\4coder_function_list.cpp", 36, 332 }, +{ PROC_LINKS(list_all_functions_current_buffer_lister, 0), "list_all_functions_current_buffer_lister", 40, "Creates a lister of locations that look like function definitions and declarations in the buffer.", 97, "w:\\4ed\\code\\4coder_function_list.cpp", 36, 342 }, { PROC_LINKS(list_all_locations, 0), "list_all_locations", 18, "Queries the user for a string and lists all exact case-sensitive matches found in all open buffers.", 99, "w:\\4ed\\code\\4coder_search.cpp", 29, 769 }, { PROC_LINKS(list_all_locations_case_insensitive, 0), "list_all_locations_case_insensitive", 35, "Queries the user for a string and lists all exact case-insensitive matches found in all open buffers.", 101, "w:\\4ed\\code\\4coder_search.cpp", 29, 783 }, { PROC_LINKS(list_all_locations_of_identifier, 0), "list_all_locations_of_identifier", 32, "Reads a token or word under the cursor and lists all exact case-sensitive mathces in all open buffers.", 102, "w:\\4ed\\code\\4coder_search.cpp", 29, 797 }, @@ -339,6 +352,12 @@ static Command_Metadata fcoder_metacmd_table[216] = { { 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, 1226 }, +{ PROC_LINKS(miblo_decrement_basic, 0), "miblo_decrement_basic", 21, "Decrement an integer under the cursor by one.", 45, "w:\\4ed\\code\\4coder_miblo_numbers.cpp", 36, 110 }, +{ PROC_LINKS(miblo_decrement_time_stamp, 0), "miblo_decrement_time_stamp", 26, "Decrement a time stamp under the cursor by one second. (format [m]m:ss or h:mm:ss", 81, "w:\\4ed\\code\\4coder_miblo_numbers.cpp", 36, 383 }, +{ PROC_LINKS(miblo_decrement_time_stamp_minute, 0), "miblo_decrement_time_stamp_minute", 33, "Decrement a time stamp under the cursor by one minute. (format [m]m:ss or h:mm:ss", 81, "w:\\4ed\\code\\4coder_miblo_numbers.cpp", 36, 395 }, +{ PROC_LINKS(miblo_increment_basic, 0), "miblo_increment_basic", 21, "Increment an integer under the cursor by one.", 45, "w:\\4ed\\code\\4coder_miblo_numbers.cpp", 36, 94 }, +{ PROC_LINKS(miblo_increment_time_stamp, 0), "miblo_increment_time_stamp", 26, "Increment a time stamp under the cursor by one second. (format [m]m:ss or h:mm:ss", 81, "w:\\4ed\\code\\4coder_miblo_numbers.cpp", 36, 377 }, +{ PROC_LINKS(miblo_increment_time_stamp_minute, 0), "miblo_increment_time_stamp_minute", 33, "Increment a time stamp under the cursor by one minute. (format [m]m:ss or h:mm:ss", 81, "w:\\4ed\\code\\4coder_miblo_numbers.cpp", 36, 389 }, { 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, 226 }, { PROC_LINKS(move_down, 0), "move_down", 9, "Moves the cursor down one line.", 31, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 290 }, { 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, 302 }, @@ -349,6 +368,7 @@ static Command_Metadata fcoder_metacmd_table[216] = { { 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, 349 }, { PROC_LINKS(move_up, 0), "move_up", 7, "Moves the cursor up one line.", 29, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 284 }, { 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, 296 }, +{ PROC_LINKS(multi_line_edit, 0), "multi_line_edit", 15, "Begin multi-line mode. In multi-line mode characters are inserted at every line between the mark and cursor. All characters are inserted at the same character offset into the line. This mode uses line_char coordinates.", 221, "w:\\4ed\\code\\4coder_experiments.cpp", 34, 117 }, { 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, 588 }, @@ -381,7 +401,9 @@ static Command_Metadata fcoder_metacmd_table[216] = { { 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, 1577 }, { PROC_LINKS(remap_interactive, 0), "remap_interactive", 17, "Switch to a named key binding map.", 34, "w:\\4ed\\code\\4coder_default_framework.cpp", 40, 290 }, { 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, 1184 }, +{ 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, "w:\\4ed\\code\\4coder_experiments.cpp", 34, 383 }, { PROC_LINKS(reopen, 0), "reopen", 6, "Reopen the current buffer from the hard drive.", 46, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 1553 }, +{ 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, "w:\\4ed\\code\\4coder_experiments.cpp", 34, 778 }, { 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, 883 }, { 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, 854 }, { 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, 872 }, @@ -448,6 +470,8 @@ static Command_Metadata fcoder_metacmd_table[216] = { { 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 }, { PROC_LINKS(write_block, 0), "write_block", 11, "At the cursor, insert a block comment.", 38, "w:\\4ed\\code\\4coder_combined_write_commands.cpp", 46, 105 }, { PROC_LINKS(write_character, 0), "write_character", 15, "Inserts whatever character was used to trigger this command.", 60, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 35 }, +{ PROC_LINKS(write_explicit_enum_flags, 0), "write_explicit_enum_flags", 25, "If the cursor is found to be on the '{' of an enum definition, the values of the enum will be filled in to give each a unique power of 2 value, starting from 1. Existing values are overwritten.", 194, "w:\\4ed\\code\\4coder_experiments.cpp", 34, 705 }, +{ PROC_LINKS(write_explicit_enum_values, 0), "write_explicit_enum_values", 26, "If the cursor is found to be on the '{' of an enum definition, the values of the enum will be filled in sequentially starting from zero. Existing values are overwritten.", 170, "w:\\4ed\\code\\4coder_experiments.cpp", 34, 699 }, { PROC_LINKS(write_hack, 0), "write_hack", 10, "At the cursor, insert a '// HACK' comment, includes user name if it was specified in config.4coder.", 99, "w:\\4ed\\code\\4coder_combined_write_commands.cpp", 46, 93 }, { PROC_LINKS(write_note, 0), "write_note", 10, "At the cursor, insert a '// NOTE' comment, includes user name if it was specified in config.4coder.", 99, "w:\\4ed\\code\\4coder_combined_write_commands.cpp", 46, 99 }, { PROC_LINKS(write_todo, 0), "write_todo", 10, "At the cursor, insert a '// TODO' comment, includes user name if it was specified in config.4coder.", 99, "w:\\4ed\\code\\4coder_combined_write_commands.cpp", 46, 87 }, @@ -522,152 +546,164 @@ static int32_t fcoder_metacmd_ID_interactive_open = 64; static int32_t fcoder_metacmd_ID_interactive_open_or_new = 65; static int32_t fcoder_metacmd_ID_interactive_switch_buffer = 66; static int32_t fcoder_metacmd_ID_kill_buffer = 67; -static int32_t fcoder_metacmd_ID_left_adjust_view = 68; -static int32_t fcoder_metacmd_ID_list_all_functions_all_buffers = 69; -static int32_t fcoder_metacmd_ID_list_all_functions_all_buffers_lister = 70; -static int32_t fcoder_metacmd_ID_list_all_functions_current_buffer = 71; -static int32_t fcoder_metacmd_ID_list_all_functions_current_buffer_lister = 72; -static int32_t fcoder_metacmd_ID_list_all_locations = 73; -static int32_t fcoder_metacmd_ID_list_all_locations_case_insensitive = 74; -static int32_t fcoder_metacmd_ID_list_all_locations_of_identifier = 75; -static int32_t fcoder_metacmd_ID_list_all_locations_of_identifier_case_insensitive = 76; -static int32_t fcoder_metacmd_ID_list_all_locations_of_selection = 77; -static int32_t fcoder_metacmd_ID_list_all_locations_of_selection_case_insensitive = 78; -static int32_t fcoder_metacmd_ID_list_all_locations_of_type_definition = 79; -static int32_t fcoder_metacmd_ID_list_all_locations_of_type_definition_of_identifier = 80; -static int32_t fcoder_metacmd_ID_list_all_substring_locations = 81; -static int32_t fcoder_metacmd_ID_list_all_substring_locations_case_insensitive = 82; -static int32_t fcoder_metacmd_ID_lister__activate = 83; -static int32_t fcoder_metacmd_ID_lister__backspace_text_field = 84; -static int32_t fcoder_metacmd_ID_lister__backspace_text_field__default = 85; -static int32_t fcoder_metacmd_ID_lister__backspace_text_field__file_path = 86; -static int32_t fcoder_metacmd_ID_lister__mouse_press = 87; -static int32_t fcoder_metacmd_ID_lister__mouse_release = 88; -static int32_t fcoder_metacmd_ID_lister__move_down = 89; -static int32_t fcoder_metacmd_ID_lister__move_down__default = 90; -static int32_t fcoder_metacmd_ID_lister__move_up = 91; -static int32_t fcoder_metacmd_ID_lister__move_up__default = 92; -static int32_t fcoder_metacmd_ID_lister__quit = 93; -static int32_t fcoder_metacmd_ID_lister__repaint = 94; -static int32_t fcoder_metacmd_ID_lister__wheel_scroll = 95; -static int32_t fcoder_metacmd_ID_lister__write_character = 96; -static int32_t fcoder_metacmd_ID_lister__write_character__default = 97; -static int32_t fcoder_metacmd_ID_lister__write_character__file_path = 98; -static int32_t fcoder_metacmd_ID_lister__write_character__fixed_list = 99; -static int32_t fcoder_metacmd_ID_load_project = 100; -static int32_t fcoder_metacmd_ID_make_directory_query = 101; -static int32_t fcoder_metacmd_ID_mouse_wheel_scroll = 102; -static int32_t fcoder_metacmd_ID_move_down = 103; -static int32_t fcoder_metacmd_ID_move_down_10 = 104; -static int32_t fcoder_metacmd_ID_move_down_textual = 105; -static int32_t fcoder_metacmd_ID_move_left = 106; -static int32_t fcoder_metacmd_ID_move_line_down = 107; -static int32_t fcoder_metacmd_ID_move_line_up = 108; -static int32_t fcoder_metacmd_ID_move_right = 109; -static int32_t fcoder_metacmd_ID_move_up = 110; -static int32_t fcoder_metacmd_ID_move_up_10 = 111; -static int32_t fcoder_metacmd_ID_newline_or_goto_position_direct = 112; -static int32_t fcoder_metacmd_ID_newline_or_goto_position_same_panel_direct = 113; -static int32_t fcoder_metacmd_ID_newline_or_goto_position_same_panel_sticky = 114; -static int32_t fcoder_metacmd_ID_newline_or_goto_position_sticky = 115; -static int32_t fcoder_metacmd_ID_open_all_code = 116; -static int32_t fcoder_metacmd_ID_open_all_code_recursive = 117; -static int32_t fcoder_metacmd_ID_open_color_tweaker = 118; -static int32_t fcoder_metacmd_ID_open_file_in_quotes = 119; -static int32_t fcoder_metacmd_ID_open_in_other = 120; -static int32_t fcoder_metacmd_ID_open_long_braces = 121; -static int32_t fcoder_metacmd_ID_open_long_braces_break = 122; -static int32_t fcoder_metacmd_ID_open_long_braces_semicolon = 123; -static int32_t fcoder_metacmd_ID_open_matching_file_cpp = 124; -static int32_t fcoder_metacmd_ID_open_panel_hsplit = 125; -static int32_t fcoder_metacmd_ID_open_panel_vsplit = 126; -static int32_t fcoder_metacmd_ID_page_down = 127; -static int32_t fcoder_metacmd_ID_page_up = 128; -static int32_t fcoder_metacmd_ID_paste = 129; -static int32_t fcoder_metacmd_ID_paste_and_indent = 130; -static int32_t fcoder_metacmd_ID_paste_next = 131; -static int32_t fcoder_metacmd_ID_paste_next_and_indent = 132; -static int32_t fcoder_metacmd_ID_place_in_scope = 133; -static int32_t fcoder_metacmd_ID_project_command_lister = 134; -static int32_t fcoder_metacmd_ID_project_fkey_command = 135; -static int32_t fcoder_metacmd_ID_project_go_to_root_directory = 136; -static int32_t fcoder_metacmd_ID_query_replace = 137; -static int32_t fcoder_metacmd_ID_query_replace_identifier = 138; -static int32_t fcoder_metacmd_ID_query_replace_selection = 139; -static int32_t fcoder_metacmd_ID_redo = 140; -static int32_t fcoder_metacmd_ID_reload_themes = 141; -static int32_t fcoder_metacmd_ID_remap_interactive = 142; -static int32_t fcoder_metacmd_ID_rename_file_query = 143; -static int32_t fcoder_metacmd_ID_reopen = 144; -static int32_t fcoder_metacmd_ID_replace_in_range = 145; -static int32_t fcoder_metacmd_ID_reverse_search = 146; -static int32_t fcoder_metacmd_ID_reverse_search_identifier = 147; -static int32_t fcoder_metacmd_ID_save = 148; -static int32_t fcoder_metacmd_ID_save_all_dirty_buffers = 149; -static int32_t fcoder_metacmd_ID_save_to_query = 150; -static int32_t fcoder_metacmd_ID_scope_absorb_down = 151; -static int32_t fcoder_metacmd_ID_search = 152; -static int32_t fcoder_metacmd_ID_search_identifier = 153; -static int32_t fcoder_metacmd_ID_seek_alphanumeric_left = 154; -static int32_t fcoder_metacmd_ID_seek_alphanumeric_or_camel_left = 155; -static int32_t fcoder_metacmd_ID_seek_alphanumeric_or_camel_right = 156; -static int32_t fcoder_metacmd_ID_seek_alphanumeric_right = 157; -static int32_t fcoder_metacmd_ID_seek_beginning_of_line = 158; -static int32_t fcoder_metacmd_ID_seek_beginning_of_textual_line = 159; -static int32_t fcoder_metacmd_ID_seek_end_of_line = 160; -static int32_t fcoder_metacmd_ID_seek_end_of_textual_line = 161; -static int32_t fcoder_metacmd_ID_seek_token_left = 162; -static int32_t fcoder_metacmd_ID_seek_token_right = 163; -static int32_t fcoder_metacmd_ID_seek_white_or_token_left = 164; -static int32_t fcoder_metacmd_ID_seek_white_or_token_right = 165; -static int32_t fcoder_metacmd_ID_seek_whitespace_down = 166; -static int32_t fcoder_metacmd_ID_seek_whitespace_down_end_line = 167; -static int32_t fcoder_metacmd_ID_seek_whitespace_left = 168; -static int32_t fcoder_metacmd_ID_seek_whitespace_right = 169; -static int32_t fcoder_metacmd_ID_seek_whitespace_up = 170; -static int32_t fcoder_metacmd_ID_seek_whitespace_up_end_line = 171; -static int32_t fcoder_metacmd_ID_select_all = 172; -static int32_t fcoder_metacmd_ID_select_next_scope_absolute = 173; -static int32_t fcoder_metacmd_ID_select_prev_scope_absolute = 174; -static int32_t fcoder_metacmd_ID_select_surrounding_scope = 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_set_mode_to_notepad_like = 180; -static int32_t fcoder_metacmd_ID_set_mode_to_original = 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_enclosing_scopes = 197; -static int32_t fcoder_metacmd_ID_toggle_highlight_line_at_cursor = 198; -static int32_t fcoder_metacmd_ID_toggle_line_wrap = 199; -static int32_t fcoder_metacmd_ID_toggle_mouse = 200; -static int32_t fcoder_metacmd_ID_toggle_paren_matching_helper = 201; -static int32_t fcoder_metacmd_ID_toggle_show_whitespace = 202; -static int32_t fcoder_metacmd_ID_toggle_virtual_whitespace = 203; -static int32_t fcoder_metacmd_ID_undo = 204; -static int32_t fcoder_metacmd_ID_view_buffer_other_panel = 205; -static int32_t fcoder_metacmd_ID_view_jump_list_with_lister = 206; -static int32_t fcoder_metacmd_ID_word_complete = 207; -static int32_t fcoder_metacmd_ID_write_and_auto_tab = 208; -static int32_t fcoder_metacmd_ID_write_block = 209; -static int32_t fcoder_metacmd_ID_write_character = 210; -static int32_t fcoder_metacmd_ID_write_hack = 211; -static int32_t fcoder_metacmd_ID_write_note = 212; -static int32_t fcoder_metacmd_ID_write_todo = 213; -static int32_t fcoder_metacmd_ID_write_underscore = 214; -static int32_t fcoder_metacmd_ID_write_zero_struct = 215; +static int32_t fcoder_metacmd_ID_kill_rect = 68; +static int32_t fcoder_metacmd_ID_left_adjust_view = 69; +static int32_t fcoder_metacmd_ID_list_all_functions_all_buffers = 70; +static int32_t fcoder_metacmd_ID_list_all_functions_all_buffers_lister = 71; +static int32_t fcoder_metacmd_ID_list_all_functions_current_buffer = 72; +static int32_t fcoder_metacmd_ID_list_all_functions_current_buffer_lister = 73; +static int32_t fcoder_metacmd_ID_list_all_locations = 74; +static int32_t fcoder_metacmd_ID_list_all_locations_case_insensitive = 75; +static int32_t fcoder_metacmd_ID_list_all_locations_of_identifier = 76; +static int32_t fcoder_metacmd_ID_list_all_locations_of_identifier_case_insensitive = 77; +static int32_t fcoder_metacmd_ID_list_all_locations_of_selection = 78; +static int32_t fcoder_metacmd_ID_list_all_locations_of_selection_case_insensitive = 79; +static int32_t fcoder_metacmd_ID_list_all_locations_of_type_definition = 80; +static int32_t fcoder_metacmd_ID_list_all_locations_of_type_definition_of_identifier = 81; +static int32_t fcoder_metacmd_ID_list_all_substring_locations = 82; +static int32_t fcoder_metacmd_ID_list_all_substring_locations_case_insensitive = 83; +static int32_t fcoder_metacmd_ID_lister__activate = 84; +static int32_t fcoder_metacmd_ID_lister__backspace_text_field = 85; +static int32_t fcoder_metacmd_ID_lister__backspace_text_field__default = 86; +static int32_t fcoder_metacmd_ID_lister__backspace_text_field__file_path = 87; +static int32_t fcoder_metacmd_ID_lister__mouse_press = 88; +static int32_t fcoder_metacmd_ID_lister__mouse_release = 89; +static int32_t fcoder_metacmd_ID_lister__move_down = 90; +static int32_t fcoder_metacmd_ID_lister__move_down__default = 91; +static int32_t fcoder_metacmd_ID_lister__move_up = 92; +static int32_t fcoder_metacmd_ID_lister__move_up__default = 93; +static int32_t fcoder_metacmd_ID_lister__quit = 94; +static int32_t fcoder_metacmd_ID_lister__repaint = 95; +static int32_t fcoder_metacmd_ID_lister__wheel_scroll = 96; +static int32_t fcoder_metacmd_ID_lister__write_character = 97; +static int32_t fcoder_metacmd_ID_lister__write_character__default = 98; +static int32_t fcoder_metacmd_ID_lister__write_character__file_path = 99; +static int32_t fcoder_metacmd_ID_lister__write_character__fixed_list = 100; +static int32_t fcoder_metacmd_ID_load_project = 101; +static int32_t fcoder_metacmd_ID_make_directory_query = 102; +static int32_t fcoder_metacmd_ID_miblo_decrement_basic = 103; +static int32_t fcoder_metacmd_ID_miblo_decrement_time_stamp = 104; +static int32_t fcoder_metacmd_ID_miblo_decrement_time_stamp_minute = 105; +static int32_t fcoder_metacmd_ID_miblo_increment_basic = 106; +static int32_t fcoder_metacmd_ID_miblo_increment_time_stamp = 107; +static int32_t fcoder_metacmd_ID_miblo_increment_time_stamp_minute = 108; +static int32_t fcoder_metacmd_ID_mouse_wheel_scroll = 109; +static int32_t fcoder_metacmd_ID_move_down = 110; +static int32_t fcoder_metacmd_ID_move_down_10 = 111; +static int32_t fcoder_metacmd_ID_move_down_textual = 112; +static int32_t fcoder_metacmd_ID_move_left = 113; +static int32_t fcoder_metacmd_ID_move_line_down = 114; +static int32_t fcoder_metacmd_ID_move_line_up = 115; +static int32_t fcoder_metacmd_ID_move_right = 116; +static int32_t fcoder_metacmd_ID_move_up = 117; +static int32_t fcoder_metacmd_ID_move_up_10 = 118; +static int32_t fcoder_metacmd_ID_multi_line_edit = 119; +static int32_t fcoder_metacmd_ID_newline_or_goto_position_direct = 120; +static int32_t fcoder_metacmd_ID_newline_or_goto_position_same_panel_direct = 121; +static int32_t fcoder_metacmd_ID_newline_or_goto_position_same_panel_sticky = 122; +static int32_t fcoder_metacmd_ID_newline_or_goto_position_sticky = 123; +static int32_t fcoder_metacmd_ID_open_all_code = 124; +static int32_t fcoder_metacmd_ID_open_all_code_recursive = 125; +static int32_t fcoder_metacmd_ID_open_color_tweaker = 126; +static int32_t fcoder_metacmd_ID_open_file_in_quotes = 127; +static int32_t fcoder_metacmd_ID_open_in_other = 128; +static int32_t fcoder_metacmd_ID_open_long_braces = 129; +static int32_t fcoder_metacmd_ID_open_long_braces_break = 130; +static int32_t fcoder_metacmd_ID_open_long_braces_semicolon = 131; +static int32_t fcoder_metacmd_ID_open_matching_file_cpp = 132; +static int32_t fcoder_metacmd_ID_open_panel_hsplit = 133; +static int32_t fcoder_metacmd_ID_open_panel_vsplit = 134; +static int32_t fcoder_metacmd_ID_page_down = 135; +static int32_t fcoder_metacmd_ID_page_up = 136; +static int32_t fcoder_metacmd_ID_paste = 137; +static int32_t fcoder_metacmd_ID_paste_and_indent = 138; +static int32_t fcoder_metacmd_ID_paste_next = 139; +static int32_t fcoder_metacmd_ID_paste_next_and_indent = 140; +static int32_t fcoder_metacmd_ID_place_in_scope = 141; +static int32_t fcoder_metacmd_ID_project_command_lister = 142; +static int32_t fcoder_metacmd_ID_project_fkey_command = 143; +static int32_t fcoder_metacmd_ID_project_go_to_root_directory = 144; +static int32_t fcoder_metacmd_ID_query_replace = 145; +static int32_t fcoder_metacmd_ID_query_replace_identifier = 146; +static int32_t fcoder_metacmd_ID_query_replace_selection = 147; +static int32_t fcoder_metacmd_ID_redo = 148; +static int32_t fcoder_metacmd_ID_reload_themes = 149; +static int32_t fcoder_metacmd_ID_remap_interactive = 150; +static int32_t fcoder_metacmd_ID_rename_file_query = 151; +static int32_t fcoder_metacmd_ID_rename_parameter = 152; +static int32_t fcoder_metacmd_ID_reopen = 153; +static int32_t fcoder_metacmd_ID_replace_all_occurrences = 154; +static int32_t fcoder_metacmd_ID_replace_in_range = 155; +static int32_t fcoder_metacmd_ID_reverse_search = 156; +static int32_t fcoder_metacmd_ID_reverse_search_identifier = 157; +static int32_t fcoder_metacmd_ID_save = 158; +static int32_t fcoder_metacmd_ID_save_all_dirty_buffers = 159; +static int32_t fcoder_metacmd_ID_save_to_query = 160; +static int32_t fcoder_metacmd_ID_scope_absorb_down = 161; +static int32_t fcoder_metacmd_ID_search = 162; +static int32_t fcoder_metacmd_ID_search_identifier = 163; +static int32_t fcoder_metacmd_ID_seek_alphanumeric_left = 164; +static int32_t fcoder_metacmd_ID_seek_alphanumeric_or_camel_left = 165; +static int32_t fcoder_metacmd_ID_seek_alphanumeric_or_camel_right = 166; +static int32_t fcoder_metacmd_ID_seek_alphanumeric_right = 167; +static int32_t fcoder_metacmd_ID_seek_beginning_of_line = 168; +static int32_t fcoder_metacmd_ID_seek_beginning_of_textual_line = 169; +static int32_t fcoder_metacmd_ID_seek_end_of_line = 170; +static int32_t fcoder_metacmd_ID_seek_end_of_textual_line = 171; +static int32_t fcoder_metacmd_ID_seek_token_left = 172; +static int32_t fcoder_metacmd_ID_seek_token_right = 173; +static int32_t fcoder_metacmd_ID_seek_white_or_token_left = 174; +static int32_t fcoder_metacmd_ID_seek_white_or_token_right = 175; +static int32_t fcoder_metacmd_ID_seek_whitespace_down = 176; +static int32_t fcoder_metacmd_ID_seek_whitespace_down_end_line = 177; +static int32_t fcoder_metacmd_ID_seek_whitespace_left = 178; +static int32_t fcoder_metacmd_ID_seek_whitespace_right = 179; +static int32_t fcoder_metacmd_ID_seek_whitespace_up = 180; +static int32_t fcoder_metacmd_ID_seek_whitespace_up_end_line = 181; +static int32_t fcoder_metacmd_ID_select_all = 182; +static int32_t fcoder_metacmd_ID_select_next_scope_absolute = 183; +static int32_t fcoder_metacmd_ID_select_prev_scope_absolute = 184; +static int32_t fcoder_metacmd_ID_select_surrounding_scope = 185; +static int32_t fcoder_metacmd_ID_set_bindings_choose = 186; +static int32_t fcoder_metacmd_ID_set_bindings_default = 187; +static int32_t fcoder_metacmd_ID_set_bindings_mac_default = 188; +static int32_t fcoder_metacmd_ID_set_mark = 189; +static int32_t fcoder_metacmd_ID_set_mode_to_notepad_like = 190; +static int32_t fcoder_metacmd_ID_set_mode_to_original = 191; +static int32_t fcoder_metacmd_ID_setup_build_bat = 192; +static int32_t fcoder_metacmd_ID_setup_build_bat_and_sh = 193; +static int32_t fcoder_metacmd_ID_setup_build_sh = 194; +static int32_t fcoder_metacmd_ID_setup_new_project = 195; +static int32_t fcoder_metacmd_ID_show_filebar = 196; +static int32_t fcoder_metacmd_ID_show_scrollbar = 197; +static int32_t fcoder_metacmd_ID_snipe_token_or_word = 198; +static int32_t fcoder_metacmd_ID_snipe_token_or_word_right = 199; +static int32_t fcoder_metacmd_ID_snippet_lister = 200; +static int32_t fcoder_metacmd_ID_suppress_mouse = 201; +static int32_t fcoder_metacmd_ID_swap_buffers_between_panels = 202; +static int32_t fcoder_metacmd_ID_to_lowercase = 203; +static int32_t fcoder_metacmd_ID_to_uppercase = 204; +static int32_t fcoder_metacmd_ID_toggle_filebar = 205; +static int32_t fcoder_metacmd_ID_toggle_fullscreen = 206; +static int32_t fcoder_metacmd_ID_toggle_highlight_enclosing_scopes = 207; +static int32_t fcoder_metacmd_ID_toggle_highlight_line_at_cursor = 208; +static int32_t fcoder_metacmd_ID_toggle_line_wrap = 209; +static int32_t fcoder_metacmd_ID_toggle_mouse = 210; +static int32_t fcoder_metacmd_ID_toggle_paren_matching_helper = 211; +static int32_t fcoder_metacmd_ID_toggle_show_whitespace = 212; +static int32_t fcoder_metacmd_ID_toggle_virtual_whitespace = 213; +static int32_t fcoder_metacmd_ID_undo = 214; +static int32_t fcoder_metacmd_ID_view_buffer_other_panel = 215; +static int32_t fcoder_metacmd_ID_view_jump_list_with_lister = 216; +static int32_t fcoder_metacmd_ID_word_complete = 217; +static int32_t fcoder_metacmd_ID_write_and_auto_tab = 218; +static int32_t fcoder_metacmd_ID_write_block = 219; +static int32_t fcoder_metacmd_ID_write_character = 220; +static int32_t fcoder_metacmd_ID_write_explicit_enum_flags = 221; +static int32_t fcoder_metacmd_ID_write_explicit_enum_values = 222; +static int32_t fcoder_metacmd_ID_write_hack = 223; +static int32_t fcoder_metacmd_ID_write_note = 224; +static int32_t fcoder_metacmd_ID_write_todo = 225; +static int32_t fcoder_metacmd_ID_write_underscore = 226; +static int32_t fcoder_metacmd_ID_write_zero_struct = 227; #endif diff --git a/4coder_generated/keycodes.h b/4coder_generated/keycodes.h deleted file mode 100644 index 55158d8f..00000000 --- a/4coder_generated/keycodes.h +++ /dev/null @@ -1,83 +0,0 @@ -enum{ -key_back = 55296, -key_up = 55297, -key_down = 55298, -key_left = 55299, -key_right = 55300, -key_del = 55301, -key_insert = 55302, -key_home = 55303, -key_end = 55304, -key_page_up = 55305, -key_page_down = 55306, -key_esc = 55307, -key_mouse_left = 55308, -key_mouse_right = 55309, -key_mouse_left_release = 55310, -key_mouse_right_release = 55311, -key_mouse_wheel = 55312, -key_mouse_move = 55313, -key_animate = 55314, -key_click_activate_view = 55315, -key_click_deactivate_view = 55316, -key_f1 = 55317, -key_f2 = 55318, -key_f3 = 55319, -key_f4 = 55320, -key_f5 = 55321, -key_f6 = 55322, -key_f7 = 55323, -key_f8 = 55324, -key_f9 = 55325, -key_f10 = 55326, -key_f11 = 55327, -key_f12 = 55328, -key_f13 = 55329, -key_f14 = 55330, -key_f15 = 55331, -key_f16 = 55332, -}; -static char* -global_key_name(uint32_t key_code, int32_t *size){ -char *result = 0; -switch(key_code){ -case key_back: result = "key_back"; *size = sizeof("key_back")-1; break; -case key_up: result = "key_up"; *size = sizeof("key_up")-1; break; -case key_down: result = "key_down"; *size = sizeof("key_down")-1; break; -case key_left: result = "key_left"; *size = sizeof("key_left")-1; break; -case key_right: result = "key_right"; *size = sizeof("key_right")-1; break; -case key_del: result = "key_del"; *size = sizeof("key_del")-1; break; -case key_insert: result = "key_insert"; *size = sizeof("key_insert")-1; break; -case key_home: result = "key_home"; *size = sizeof("key_home")-1; break; -case key_end: result = "key_end"; *size = sizeof("key_end")-1; break; -case key_page_up: result = "key_page_up"; *size = sizeof("key_page_up")-1; break; -case key_page_down: result = "key_page_down"; *size = sizeof("key_page_down")-1; break; -case key_esc: result = "key_esc"; *size = sizeof("key_esc")-1; break; -case key_mouse_left: result = "key_mouse_left"; *size = sizeof("key_mouse_left")-1; break; -case key_mouse_right: result = "key_mouse_right"; *size = sizeof("key_mouse_right")-1; break; -case key_mouse_left_release: result = "key_mouse_left_release"; *size = sizeof("key_mouse_left_release")-1; break; -case key_mouse_right_release: result = "key_mouse_right_release"; *size = sizeof("key_mouse_right_release")-1; break; -case key_mouse_wheel: result = "key_mouse_wheel"; *size = sizeof("key_mouse_wheel")-1; break; -case key_mouse_move: result = "key_mouse_move"; *size = sizeof("key_mouse_move")-1; break; -case key_animate: result = "key_animate"; *size = sizeof("key_animate")-1; break; -case key_click_activate_view: result = "key_click_activate_view"; *size = sizeof("key_click_activate_view")-1; break; -case key_click_deactivate_view: result = "key_click_deactivate_view"; *size = sizeof("key_click_deactivate_view")-1; break; -case key_f1: result = "key_f1"; *size = sizeof("key_f1")-1; break; -case key_f2: result = "key_f2"; *size = sizeof("key_f2")-1; break; -case key_f3: result = "key_f3"; *size = sizeof("key_f3")-1; break; -case key_f4: result = "key_f4"; *size = sizeof("key_f4")-1; break; -case key_f5: result = "key_f5"; *size = sizeof("key_f5")-1; break; -case key_f6: result = "key_f6"; *size = sizeof("key_f6")-1; break; -case key_f7: result = "key_f7"; *size = sizeof("key_f7")-1; break; -case key_f8: result = "key_f8"; *size = sizeof("key_f8")-1; break; -case key_f9: result = "key_f9"; *size = sizeof("key_f9")-1; break; -case key_f10: result = "key_f10"; *size = sizeof("key_f10")-1; break; -case key_f11: result = "key_f11"; *size = sizeof("key_f11")-1; break; -case key_f12: result = "key_f12"; *size = sizeof("key_f12")-1; break; -case key_f13: result = "key_f13"; *size = sizeof("key_f13")-1; break; -case key_f14: result = "key_f14"; *size = sizeof("key_f14")-1; break; -case key_f15: result = "key_f15"; *size = sizeof("key_f15")-1; break; -case key_f16: result = "key_f16"; *size = sizeof("key_f16")-1; break; -} -return(result); -} diff --git a/4ed_api_implementation.cpp b/4ed_api_implementation.cpp index 01d88d2a..947872f3 100644 --- a/4ed_api_implementation.cpp +++ b/4ed_api_implementation.cpp @@ -1396,10 +1396,10 @@ Reopen_Buffer(Application_Links *app, Buffer_Summary *buffer, Buffer_Reopen_Flag Partition *part = &models->mem.part; Temp_Memory temp = begin_temp_memory(part); - char *buffer = push_array(part, char, size); + char *file_memory = push_array(part, char, size); - if (buffer != 0){ - if (system->load_file(handle, buffer, size)){ + if (file_memory != 0){ + if (system->load_file(handle, file_memory, size)){ system->load_close(handle); // TODO(allen): try(perform a diff maybe apply edits in reopen) @@ -1428,7 +1428,7 @@ Reopen_Buffer(Application_Links *app, Buffer_Summary *buffer, Buffer_Reopen_Flag file_free(system, &models->app_links, &models->mem.heap, &models->lifetime_allocator, file); working_set_file_default_settings(&models->working_set, file); - init_normal_file(system, models, buffer, size, file); + init_normal_file(system, models, file_memory, size, file); for (i32 i = 0; i < vptr_count; ++i){ view_set_file(system, models, vptrs[i], file); diff --git a/meta/4ed_metagen.cpp b/meta/4ed_metagen.cpp index 04644e5d..65ceaf35 100644 --- a/meta/4ed_metagen.cpp +++ b/meta/4ed_metagen.cpp @@ -9,7 +9,6 @@ // TOP -#define KEYCODES_FILE "4coder_generated/keycodes.h" #define STYLE_FILE "4coder_generated/style.h" #define API_H "4coder_generated/app_functions.h" #define REMAPPING_FILE "4coder_generated/remapping.h" @@ -17,6 +16,7 @@ #include "../4ed_defines.h" #include "4ed_meta_defines.h" #include "../4coder_API/version.h" +#include "4coder_API/4coder_keycodes.h" #define FSTRING_IMPLEMENTATION #include "../4coder_lib/4coder_string.h" @@ -33,89 +33,6 @@ #include "4ed_meta_parser.cpp" #include "4ed_meta_keywords.h" -////////////////////////////////////////////////////////////////////////////////////////////////// -#define KEY_LIST(M)\ -M(back) \ -M(up) \ -M(down) \ -M(left) \ -M(right) \ -M(del) \ -M(insert) \ -M(home) \ -M(end) \ -M(page_up) \ -M(page_down) \ -M(esc) \ -M(mouse_left) \ -M(mouse_right) \ -M(mouse_left_release) \ -M(mouse_right_release) \ -M(mouse_wheel) \ -M(mouse_move) \ -M(animate) \ -M(click_activate_view) \ -M(click_deactivate_view) \ -M(f1) \ -M(f2) \ -M(f3) \ -M(f4) \ -M(f5) \ -M(f6) \ -M(f7) \ -M(f8) \ -M(f9) \ -M(f10) \ -M(f11) \ -M(f12) \ -M(f13) \ -M(f14) \ -M(f15) \ -M(f16) - - -enum{ - key_enum_kicker_offer = 0xD800 - 1, -#define DefKeyEnum(n) key_##n, - KEY_LIST(DefKeyEnum) -#undef DefKeyEnum -}; - -internal void -generate_keycode_enum(){ - Temp temp = fm_begin_temp(); - - char *filename_keycodes = KEYCODES_FILE; - - String out = str_alloc(10 << 20); - - append(&out, "enum{\n"); -#define DefKeyEnum(n) append(&out, "key_" #n " = "); append_int_to_str(&out, key_##n); append(&out, ",\n"); - KEY_LIST(DefKeyEnum); -#undef DefKeyEnum - append(&out, "};\n"); - - append(&out, - "static char*\n" - "global_key_name(uint32_t key_code, int32_t *size){\n" - "char *result = 0;\n" - "switch(key_code){\n"); - -#define KeyCase(n) append(&out, "case key_" #n ": result = \"key_" #n "\"; *size = sizeof(\"key_" #n "\")-1; break;\n"); - KEY_LIST(KeyCase); -#undef KeyCase - - append(&out, - "}\n" - "return(result);\n" - "}\n"); - - fm_write_file(filename_keycodes, out.str, out.size); - out.size = 0; - - fm_end_temp(temp); -} - ////////////////////////////////////////////////////////////////////////////////////////////////// internal void struct_begin(String *str, char *name){ @@ -1193,13 +1110,8 @@ generate_remapping_code_and_data(){ } else{ char key_str_space[16]; - char *key_str = 0; - switch (bind->keycode){ -#define KeyCase(n) case key_##n: key_str = "key_" #n; break; - KEY_LIST(KeyCase) -#undef KeyCase - } - + i32 size = 0; + char *key_str = global_key_name(bind->keycode, &size); if (key_str == 0){ key_str = key_str_space; if (bind->keycode == '\n'){ @@ -1223,10 +1135,7 @@ generate_remapping_code_and_data(){ } } - fprintf(out, "bind(context, %s, %s, %s);\n", - key_str, - mdfr_str, - bind->command); + fprintf(out, "bind(context, %s, %s, %s);\n", key_str, mdfr_str, bind->command); } } @@ -1345,7 +1254,6 @@ int main(int argc, char **argv){ META_BEGIN(); fm_init_system(); - generate_keycode_enum(); generate_style(); generate_custom_headers(); generate_remapping_code_and_data(); diff --git a/platform_linux/linux_4ed.cpp b/platform_linux/linux_4ed.cpp index 7c2e2621..09d8dbad 100644 --- a/platform_linux/linux_4ed.cpp +++ b/platform_linux/linux_4ed.cpp @@ -20,7 +20,7 @@ #include "4coder_lib/4coder_utf8.h" #if defined(FRED_SUPER) -# include "4coder_generated/keycodes.h" +# include "4coder_API/4coder_keycodes.h" # include "4coder_generated/style.h" # define FSTRING_IMPLEMENTATION diff --git a/platform_mac/mac_4ed.cpp b/platform_mac/mac_4ed.cpp index d3db1703..54649391 100644 --- a/platform_mac/mac_4ed.cpp +++ b/platform_mac/mac_4ed.cpp @@ -17,7 +17,7 @@ #include "4coder_lib/4coder_utf8.h" #if defined(FRED_SUPER) -# include "4coder_generated/keycodes.h" +# include "4coder_API/4coder_keycodes.h" # include "4coder_generated/style.h" # define FSTRING_IMPLEMENTATION diff --git a/platform_win32/win32_4ed.cpp b/platform_win32/win32_4ed.cpp index f7723f29..271376d0 100644 --- a/platform_win32/win32_4ed.cpp +++ b/platform_win32/win32_4ed.cpp @@ -28,7 +28,7 @@ #include "4coder_lib/4coder_utf8.h" #if defined(FRED_SUPER) -# include "4coder_generated/keycodes.h" +# include "4coder_API/4coder_keycodes.h" # include "4coder_generated/style.h" # define FSTRING_IMPLEMENTATION