feat: add a reduced defaults list that is used by default

gwatcha · Aug 12, 2021 · 80ff793 · 80ff793
1 parent 75f8c49
commit 80ff793
Show file tree

Hide file tree

Showing 9 changed files with 1,198 additions and 119 deletions.
diff --git a/definitions/config.lua b/definitions/config.lua
@@ -2,6 +2,7 @@
 -- https://gwatcha.github.io/reaper-keys/configuration/behaviour.html
 
 return {
+  use_extended_defaults = false,
   show_start_up_message = true,
   -- should the auto-complete menu display?
   show_feedback_window = true,

diff --git a/definitions/defaults/actions.lua b/definitions/defaults/actions.lua
@@ -80,6 +80,7 @@ return {
       EnterTrackBelow = {"InsertTrackBelow", "ColorTrackWithTrackAbove", "RenameTrack"},
       EventSelectionEnd = {40639, midiCommand=true},
       EventSelectionStart = {40440, midiCommand=true},
+      AddTimeSignatureMarker = 40256,
       EditTimeSignatureMarker = 40618,
       DeleteTimeSignatureMarker = 40617,
       NextTimeSignatureMarker = 41821,

diff --git a/definitions/defaults/global.lua b/definitions/defaults/global.lua
@@ -1,27 +1,16 @@
 return {
   timeline_motion = {
     ["0"] = "ProjectStart",
-    ["<C-$>"] = "ProjectEnd",
     ["f"] = "PlayPosition",
     ["x"] = "MousePosition",
-    ["["] = "LoopStart",
-    ["]"] = "LoopEnd",
     ["<left>"] = "PrevMarker",
     ["<right>"] = "NextMarker",
-    ["<M-left>"] = "PrevTimeSignatureMarker",
-    ["<M-right>"] = "NextTimeSignatureMarker",
     ["<M-h>"] = "Left10Pix",
     ["<M-l>"] = "Right10Pix",
-    ["<M-H>"] = "Left40Pix",
-    ["<M-L>"] = "Right40Pix",
     ["h"] = "LeftGridDivision",
     ["l"] = "RightGridDivision",
     ["H"] = "PrevMeasure",
     ["L"] = "NextMeasure",
-    ["<C-i>"] = "MoveRedo",
-    ["<C-o>"] = "MoveUndo",
-    ["<C-h>"] = "Prev4Beats",
-    ["<C-l>"] = "Next4Beats",
     ["<C-H>"] = "Prev4Measures",
     ["<C-L>"] = "Next4Measures",
     ["`"] = "MarkedTimelinePosition",
@@ -30,16 +19,14 @@ return {
     ["r"] = "Record",
     ["<C-p>"] = "DuplicateTimeline",
     ["t"] = "PlayAndLoop",
-    ["%"] = "CreateMeasures",
-    ["<C-%>"] = "CreateProjectTempo"
+    ["|"] = "CreateMeasures",
+    ["<C-|>"] = "CreateProjectTempo"
   },
   timeline_selector = {
     ["~"] = "MarkedRegion",
-    ["!"] = "LoopSelection",
     ["<S-right>"] = "NextRegion",
     ["<S-left>"] = "PrevRegion",
-    ["<CS-right>"] = "TimeSelectionShiftedRight",
-    ["<CS-left>"] = "TimeSelectionShiftedLeft",
+    ["!"] = "LoopSelection",
     ["i"] = {"+inner", {
                ["<M-w>"] = "AutomationItem",
                ["l"] = "AllTrackItems",
@@ -56,7 +43,7 @@ return {
   command = {
     ["."] = "RepeatLastCommand",
     ["@"] = "PlayMacro",
-    ["q"] = "RecordMacro",
+    [","] = "RecordMacro",
     ["m"] = "Mark",
     ["~"] = "MarkedRegion",
     ["<C-'>"] = "DeleteMark",
@@ -66,11 +53,9 @@ return {
     ["u"] = "Undo",
     ["R"] = "ToggleRecord",
     ["T"] = "Play",
-    ["<C-T>"] = "PlayAndSkipTimeSelection",
-    ["<M-t>"] = "PlayFromMousePosition",
-    ["<CM-t>"] = "PlayFromMouseAndSoloTrack",
-    ["<C-t>"] = "PlayFromEditCursorAndSoloTrackUnderMouse",
     ["tt"] = "PlayFromTimeSelectionStart",
+    ["<M-t>"] = "PlayFromMousePosition",
+    ["<M-T>"] = "PlayFromMouseAndSoloTrack",
     ["F"] = "Pause",
     ["<C-z>"] = "ZoomUndo",
     ["<C-Z>"] = "ZoomRedo",
@@ -82,37 +67,16 @@ return {
     ["X"] = "MoveToMousePositionAndPlay",
     ["dr"] = "RemoveRegion",
     ["!"] = "ToggleLoop",
-    ["<C-a>"] = "ToggleBetweenReadAndTouchAutomationMode",
     ["<M-n>"] = "ShowNextFx",
     ["<M-N>"] = "ShowPrevFx",
     ["<M-g>"] = "FocusMain",
     ["<M-f>"] = "ToggleShowFx",
     ["<M-F>"] = "CloseFx",
     ["<CM-f>"] = "MidiLearnLastTouchedFxParam",
-    ["<CM-F>"] = "ModulateLastTouchedFxParam",
+    ["<CM-m>"] = "ModulateLastTouchedFxParam",
     ["<M-x>"] = "ShowBindingList",
     ["<C-m>"] = "TapTempo",
-    ['"'] = {"+snapshots", {
-            ["j"] = "RecallNextSnapshot",
-            ["k"] = "RecallPreviousSnapshot",
-            ["D"] = "DeleteAllSnapshots",
-            ["t"] = "ToggleSnapshotsWindow",
-            ["y"] = "CopyCurrentSnapshot",
-            ["p"] = "PasteSnapshot",
-            ["r"] = "RecallCurrentSnapshot",
-            ["#"] = {"+recall #", {
-                        ["1"] = "RecallSnapshot1",
-                        ["2"] = "RecallSnapshot2",
-                        ["3"] = "RecallSnapshot3",
-                        ["4"] = "RecallSnapshot4",
-                        ["5"] = "RecallSnapshot5",
-                        ["6"] = "RecallSnapshot6",
-                        ["7"] = "RecallSnapshot7",
-                        ["8"] = "RecallSnapshot8",
-                        ["9"] = "RecallSnapshot9",
-            }},
-    }},
-    [","] = {"+options", {
+    ["q"] = {"+options", {
                ["p"] = "TogglePlaybackPreroll",
                ["r"] = "ToggleRecordingPreroll",
                ["z"] = "TogglePlaybackAutoScroll",
@@ -127,17 +91,9 @@ return {
     }},
     ["<SPC>"] = { "+leader commands", {
       ["<SPC>"] = "ShowActionList",
-      ["z"] = { "+zoom/scroll", {
-                  ["t"] = "ScrollToPlayPosition",
-                  ["e"] = "ScrollToEditCursor",
-      }},
       ["m"] = { "+midi", {
                   ["g"] = "SetMidiGridDivision",
                   ["q"] = "Quantize",
-                  [","] = {"+options", {
-                             ["g"] = "ToggleMidiEditorUsesMainGridDivision",
-                             ["s"] = "ToggleMidiSnap",
-                  }},
       }},
       ["r"] = { "+recording", {
                   ["o"] = "SetRecordMidiOutput",
@@ -172,20 +128,11 @@ return {
                   ["c"] = "CropToActiveTake",
                   ["o"] = "OpenInMidiEditor",
                   ["n"] = "ItemNormalize",
-                  ["g"] = "GroupItems",
-                  ["q"] = "QuantizeItems",
-                  ["h"] = "HealItemsSplits",
-                  ["s"] = "ToggleSoloItem",
-                  ["b"] = "MoveItemContentToEditCursor",
                   ["x"] = {"+explode takes", {
                              ["p"] = "ExplodeTakesInPlace",
                              ["o"] = "ExplodeTakesInOrder",
                              ["a"] = "ExplodeTakesInAcrossTracks"
                   }},
-                  ["S"] = {"+stretch", {
-                             ["a"] = "AddStretchMarker",
-                             ["d"] = "DeleteStretchMarker",
-                  }},
                   ["#"] = {"+fade", {
                              ["i"] = "CycleItemFadeInShape",
                              ["o"] = "CycleItemFadeOutShape",
@@ -224,25 +171,18 @@ return {
                   }},
       }},
       ["t"] = { "+track", {
-                  ["n"] = "ResetTrackToNormal",
                   ["R"] = "RenderTrack",
                   ["r"] = "RenameTrack",
-                  ["z"] = "MinimizeTracks",
                   ["m"] = "CycleRecordMonitor",
                   ["f"] = "CycleFolderState",
-                  ["i"] = "SetTrackInputToMatchFirstSelected",
                   ["y"] = "SaveTrackAsTemplate",
-                  ["i"] = {"+insert", {
-                             ["c"] = "InsertClickTrack",
-                             ["t"] = "InsertTrackFromTemplate",
-                             ["o"] = "InsertTrackBelow",
-                             ["O"] = "InsertTrackAbove",
-                             ["i"] = "InsertVirtualInstrumentTrack",
-                             ["1"] = "InsertTrackFromTemplateSlot1",
-                             ["2"] = "InsertTrackFromTemplateSlot2",
-                             ["3"] = "InsertTrackFromTemplateSlot3",
-                             ["4"] = "InsertTrackFromTemplateSlot4",
-                  }},
+                  ["p"] = "InsertTrackFromTemplate",
+                  ["1"] = "InsertTrackFromTemplateSlot1",
+                  ["2"] = "InsertTrackFromTemplateSlot2",
+                  ["3"] = "InsertTrackFromTemplateSlot3",
+                  ["4"] = "InsertTrackFromTemplateSlot4",
+                  ["c"] = "InsertClickTrack",
+                  ["v"] = "InsertVirtualInstrumentTrack",
                   ["x"] = {"+routing", {
                             ["p"] = "TrackToggleSendToParent",
                             ["s"] = "ToggleShowTrackRouting",
@@ -264,29 +204,16 @@ return {
                  ["s"] = {"+selected", {
                             ["d"] = "ClearEnvelope",
                             ["a"] = "ToggleArmEnvelope",
-                            ["y"] = "CopyEnvelope",
                             ["t"] = "ToggleShowSelectedEnvelope",
-                            ["b"] = "ToggleEnvelopeBypass",
-                            ["s"] = {"+shape", {
-                                       ["b"] = "SetEnvelopeShapeBezier",
-                                       ["e"] = "SetEnvelopeShapeFastEnd",
-                                       ["f"] = "SetEnvelopeShapeFastStart",
-                                       ["l"] = "SetEnvelopeShapeLinear",
-                                       ["s"] = "SetEnvelopeShapeSlowStart",
-                                       ["S"] = "SetEnvelopeShapeSquare",
-                            }},
                  }},
       }},
       ["f"] = { "+fx", {
                   ["a"] = "AddFx",
                   ["c"] = "ToggleShowFxChain",
-                  ["x"] = "CloseFx",
                   ["d"] = "CutFxChain",
                   ["y"] = "CopyFxChain",
                   ["p"] = "PasteFxChain",
                   ["b"] = "ToggleFxBypass",
-                  ["M"] = "ModulateLastTouchedFxParam",
-                  ["m"] = "MidiLearnLastTouchedFxParam",
                   ["i"] = {"+input", {
                              ["s"] = "ToggleShowInputFxChain",
                              ["d"] = "CutInputFxChain",
@@ -302,11 +229,6 @@ return {
                              ["8"] = "ToggleShowFx8"
                   }},
       }},
-      ["T"] = { "+timeline", {
-                  ["e"] = "EditTimeSignatureMarker",
-                  ["d"] = "DeleteTimeSignatureMarker",
-                  ["s"] = "ToggleShowTempoEnvelope"
-      }},
       ["g"] = { "+global", {
                   ["g"] = "SetGridDivision",
                   ["r"] = "ResetControlDevices",
@@ -353,11 +275,6 @@ return {
                   ["x"] = "CloseProject",
                   ["C"] = "CleanProjectDirectory",
                   ["S"] = "SaveProjectWithNewVersion",
-                  ["t"] = { "+timebase", {
-                              ["t"] = "SetProjectTimebaseToTime",
-                              ["b"] = "SetProjectTimebaseToBeatsPos",
-                              ["r"] = "SetProjectTimebaseToBeatsPosLengthAndRate",
-                  }},
                   ["r"] = { "+render", {
                               ["."] = "RenderProjectWithLastSetting",
                               ["r"] = "RenderProject",

diff --git a/definitions/defaults/main.lua b/definitions/defaults/main.lua
@@ -8,11 +8,8 @@ return {
     ["?"] = "MatchedTrackBackward",
     ["n"] = "NextTrackMatchForward",
     ["N"] = "NextTrackMatchBackward",
-    [":"] = "TrackWithNumber",
     ["j"] = "NextTrack",
     ["k"] = "PrevTrack",
-    ["<C-b>"] = "Prev10Track",
-    ["<C-f>"] = "Next10Track",
     ["<C-d>"] = "Next5Track",
     ["<C-u>"] = "Prev5Track",
   },
@@ -25,9 +22,7 @@ return {
   },
   track_selector = {
     ["'"] = "MarkedTracks",
-    ["c"] = "FolderChildren",
     ["F"] = "FolderParent",
-    ["F"] = "Folder",
     ["i"] = {"+inner", {
                ["c"] = "InnerFolder",
                ["f"] = "InnerFolderAndParent",
@@ -54,7 +49,7 @@ return {
   timeline_operator = {
     ["s"] = "SelectItemsAndSplit",
     ["<M-p>"] = "CopyAndFitByLooping",
-    ["<M-s>"] = "SeletEnvelopePoints",
+    ["<M-s>"] = "SelectEnvelopePoints",
     ["d"] = "CutItems",
     ["y"] = "CopyItems",
     ["<C-c>"] = "CopyItems",
@@ -65,7 +60,6 @@ return {
     ["#"] = "SetItemFadeBoundaries",
     ["z"] = "ZoomTimeSelection",
     ["Z"] = "ZoomTimeAndTrackSelection",
-    ["<M-a>"] = "InsertAutomationItem",
     ["c"] = {"+change/fit", {
                ["a"] = "InsertOrExtendMidiItem",
                ["c"] = "FitByLoopingNoExtend",
@@ -78,25 +72,15 @@ return {
     ["s"] = "SelectedItems",
   },
   timeline_motion = {
-    ["<CM-l>"] = "NextTransientInItem",
-    ["<CM-h>"] = "PrevTransientInItem",
-    ["<CM-L>"] = "NextTransientInItemMinusFadeTime",
-    ["<CM-H>"] = "PrevTransientInItemMinusFadeTime",
     ["B"] = "PrevBigItemStart",
     ["E"] = "NextBigItemEnd",
     ["W"] = "NextBigItemStart",
     ["b"] = "PrevItemStart",
-    ["<M-b>"] = "PrevEnvelopePoint",
     ["e"] = "NextItemEnd",
     ["w"] = "NextItemStart",
-    ["<M-w>"] = "NextEnvelopePoint",
     ["$"] = "LastItemEnd",
-    ["("] = "TimeSelectionStart",
-    [")"] = "TimeSelectionEnd",
   },
   command = {
-    [">"] = "TrimItemRightEdge",
-    ["<"] = "TrimItemLeftEdge",
     ["<TAB>"] = "CycleFolderCollapsedState",
     ["zp"] = "ZoomProject",
     ["D"] = "CutSelectedItems",
@@ -117,7 +101,7 @@ return {
     ["<C-v>"] = "Paste",
     ["yy"] = "CopyTrack",
     ["zz"] = "ScrollToSelectedTracks",
-    ["|"] = "SplitItemsAtEditCursor",
+    ["%"] = "SplitItemsAtEditCursor",
     ["~"] = "MarkedTracks",
     ["<C-j>"] = "NudgeTrackVolumeDownBy1Tenth",
     ["<C-k>"] = "NudgeTrackVolumeUpBy1Tenth",