From dc06a1f46ca2df237be170a037946640f8684793 Mon Sep 17 00:00:00 2001 From: Allen Webster Date: Sat, 6 Oct 2018 11:24:44 -0700 Subject: [PATCH] Theme update --- 4coder_generated/remapping.h | 12 +++++--- themes/theme-handmade-hero.4coder | 2 ++ themes/theme-hjortshoej.4coder | 2 ++ themes/theme-strange.4coder | 2 ++ themes/theme-wombat.4coder | 50 +++++++++++++++++++++++++++++++ 5 files changed, 64 insertions(+), 4 deletions(-) create mode 100644 themes/theme-wombat.4coder diff --git a/4coder_generated/remapping.h b/4coder_generated/remapping.h index 16e8ff5b..46ed64d6 100644 --- a/4coder_generated/remapping.h +++ b/4coder_generated/remapping.h @@ -20,6 +20,7 @@ bind(context, 'b', MDFR_ALT, toggle_filebar); bind(context, 'z', MDFR_ALT, execute_any_cli); bind(context, 'Z', MDFR_ALT, execute_previous_cli); bind(context, 'x', MDFR_ALT, command_lister); +bind(context, 'X', MDFR_ALT, project_command_lister); bind(context, 'I', MDFR_CTRL, list_all_functions_current_buffer_lister); bind(context, 'E', MDFR_ALT, exit_4coder); bind(context, key_f1, MDFR_NONE, project_fkey_command); @@ -191,6 +192,7 @@ bind(context, 'b', MDFR_CTRL, toggle_filebar); bind(context, 'z', MDFR_CTRL, execute_any_cli); bind(context, 'Z', MDFR_CTRL, execute_previous_cli); bind(context, 'x', MDFR_CTRL, command_lister); +bind(context, 'X', MDFR_CTRL, project_command_lister); bind(context, 'I', MDFR_CMND, list_all_functions_current_buffer_lister); bind(context, 'E', MDFR_CTRL, exit_4coder); bind(context, key_f1, MDFR_NONE, project_fkey_command); @@ -373,7 +375,7 @@ Meta_Sub_Map *sub_maps; int32_t sub_map_count; LINK_PROCS(void (*fill_keys_proc)(Bind_Helper *context);) }; -static Meta_Key_Bind fcoder_binds_for_default_mapid_global[38] = { +static Meta_Key_Bind fcoder_binds_for_default_mapid_global[39] = { {0, 44, 1, "change_active_panel", 19, LINK_PROCS(change_active_panel)}, {0, 60, 1, "change_active_panel_backwards", 29, LINK_PROCS(change_active_panel_backwards)}, {0, 110, 1, "interactive_new", 15, LINK_PROCS(interactive_new)}, @@ -393,6 +395,7 @@ static Meta_Key_Bind fcoder_binds_for_default_mapid_global[38] = { {0, 122, 2, "execute_any_cli", 15, LINK_PROCS(execute_any_cli)}, {0, 90, 2, "execute_previous_cli", 20, LINK_PROCS(execute_previous_cli)}, {0, 120, 2, "command_lister", 14, LINK_PROCS(command_lister)}, +{0, 88, 2, "project_command_lister", 22, LINK_PROCS(project_command_lister)}, {0, 73, 1, "list_all_functions_current_buffer_lister", 40, LINK_PROCS(list_all_functions_current_buffer_lister)}, {0, 69, 2, "exit_4coder", 11, LINK_PROCS(exit_4coder)}, {0, 55315, 0, "project_fkey_command", 20, LINK_PROCS(project_fkey_command)}, @@ -542,12 +545,12 @@ static Meta_Key_Bind fcoder_binds_for_default_default_lister_ui_map[14] = { {0, 55314, 0, "lister__repaint", 15, LINK_PROCS(lister__repaint)}, }; static Meta_Sub_Map fcoder_submaps_for_default[4] = { -{"mapid_global", 12, "The following bindings apply in all situations.", 47, 0, 0, fcoder_binds_for_default_mapid_global, 38}, +{"mapid_global", 12, "The following bindings apply in all situations.", 47, 0, 0, fcoder_binds_for_default_mapid_global, 39}, {"mapid_file", 10, "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.", 145, 0, 0, fcoder_binds_for_default_mapid_file, 77}, {"default_code_map", 16, "The following commands only apply in files where the lexer (syntax highlighting) is turned on.", 94, "mapid_file", 10, fcoder_binds_for_default_default_code_map, 31}, {"default_lister_ui_map", 21, "These commands apply in 'lister mode' such as when you open a file.", 67, 0, 0, fcoder_binds_for_default_default_lister_ui_map, 14}, }; -static Meta_Key_Bind fcoder_binds_for_mac_default_mapid_global[38] = { +static Meta_Key_Bind fcoder_binds_for_mac_default_mapid_global[39] = { {0, 44, 4, "change_active_panel", 19, LINK_PROCS(change_active_panel)}, {0, 60, 4, "change_active_panel_backwards", 29, LINK_PROCS(change_active_panel_backwards)}, {0, 110, 4, "interactive_new", 15, LINK_PROCS(interactive_new)}, @@ -567,6 +570,7 @@ static Meta_Key_Bind fcoder_binds_for_mac_default_mapid_global[38] = { {0, 122, 1, "execute_any_cli", 15, LINK_PROCS(execute_any_cli)}, {0, 90, 1, "execute_previous_cli", 20, LINK_PROCS(execute_previous_cli)}, {0, 120, 1, "command_lister", 14, LINK_PROCS(command_lister)}, +{0, 88, 1, "project_command_lister", 22, LINK_PROCS(project_command_lister)}, {0, 73, 4, "list_all_functions_current_buffer_lister", 40, LINK_PROCS(list_all_functions_current_buffer_lister)}, {0, 69, 1, "exit_4coder", 11, LINK_PROCS(exit_4coder)}, {0, 55315, 0, "project_fkey_command", 20, LINK_PROCS(project_fkey_command)}, @@ -715,7 +719,7 @@ static Meta_Key_Bind fcoder_binds_for_mac_default_default_lister_ui_map[14] = { {0, 55314, 0, "lister__repaint", 15, LINK_PROCS(lister__repaint)}, }; static Meta_Sub_Map fcoder_submaps_for_mac_default[4] = { -{"mapid_global", 12, "The following bindings apply in all situations.", 47, 0, 0, fcoder_binds_for_mac_default_mapid_global, 38}, +{"mapid_global", 12, "The following bindings apply in all situations.", 47, 0, 0, fcoder_binds_for_mac_default_mapid_global, 39}, {"mapid_file", 10, "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.", 145, 0, 0, fcoder_binds_for_mac_default_mapid_file, 76}, {"default_code_map", 16, "The following commands only apply in files where the lexer (syntax highlighting) is turned on.", 94, "mapid_file", 10, fcoder_binds_for_mac_default_default_code_map, 31}, {"default_lister_ui_map", 21, "These commands apply in 'lister mode' such as when you open a file.", 67, 0, 0, fcoder_binds_for_mac_default_default_lister_ui_map, 14}, diff --git a/themes/theme-handmade-hero.4coder b/themes/theme-handmade-hero.4coder index 734f88f6..19e60ad6 100644 --- a/themes/theme-handmade-hero.4coder +++ b/themes/theme-handmade-hero.4coder @@ -1,3 +1,5 @@ +// Created by: Casey Muratori + name = "Handmade Hero"; Back = 0xFF161616; diff --git a/themes/theme-hjortshoej.4coder b/themes/theme-hjortshoej.4coder index 2a0e3d6b..dbc6d3ac 100644 --- a/themes/theme-hjortshoej.4coder +++ b/themes/theme-hjortshoej.4coder @@ -1,3 +1,5 @@ +// Created by: Mikkel Hjortshoej + name = "Hjortshoej"; Back = 0xFFF0F0F0; diff --git a/themes/theme-strange.4coder b/themes/theme-strange.4coder index 0e57f146..878851fc 100644 --- a/themes/theme-strange.4coder +++ b/themes/theme-strange.4coder @@ -1,3 +1,5 @@ +// Created by: Zack Strange + name = "Strange"; Back = 0xFF161616; diff --git a/themes/theme-wombat.4coder b/themes/theme-wombat.4coder new file mode 100644 index 00000000..d20b8493 --- /dev/null +++ b/themes/theme-wombat.4coder @@ -0,0 +1,50 @@ +// Created by: Jeremiah Goerdt + +name = "Wombat"; + +Back = 0xFF242424; +Margin = 0xFF181818; +Margin_Hover = 0xFF252525; +Margin_Active = 0xFF323232; +List_Item = Margin; +List_Item_Hover = Margin_Hover; +List_Item_Active = Margin_Active; +Cursor = 0xFF656565; +Highlight = 0xFF636066; +Mark = Cursor; +Default = 0xFFe3e0d7; +At_Cursor = Back; +At_Highlight = 0xFFd787ff; +Comment = 0xFF9c998e; +Keyword = 0xFF88b8f6; +Str_Constant = 0xFF95e454; +Char_Constant = 0xFFd4d987; +Int_Constant = 0xFFe5796d; +Float_Constant = Int_Constant; +Bool_Constant = 0xFFd4d987; +Include = Str_Constant; +Preproc = Int_Constant; +Special_Character = Int_Constant; +Ghost_Character = Char_Constant; + +Paste = Ghost_Character; + +Undo = Keyword; + +Highlight_Junk = 0xFF73186e; +Highlight_White = 0xFF3e3969; + +Bar = 0xFF888888; +Bar_Active = 0xFF666666; +Base = 0xFF000000; +Pop1 = 0xFF3C57DC; +Pop2 = Highlight_Junk; + +Back_Cycle_1 = 0x10A00000; +Back_Cycle_2 = 0x0C00A000; +Back_Cycle_3 = 0x0C0000A0; +Back_Cycle_4 = 0x0CA0A000; +Text_Cycle_1 = 0xFFA00000; +Text_Cycle_2 = 0xFF00A000; +Text_Cycle_3 = 0xFF0030B8; +Text_Cycle_4 = 0xFFA0A000;