doc: add font features/axes to the schema (#11066)

Add entries to the schema for font features and axes

* [x] Closes #11058

(cherry picked from commit e4c5e8bd2a)

doc/cascadia/profiles.schema.json

@@ -215,6 +215,22 @@
               "type": "integer"
             }
           ]
+        },
+        "features": {
+          "description": "Sets the DWrite font features for the given font. For example, { \"ss01\": 1, \"liga\":0 } will enable ss01 and disable ligatures.",
+          "type": "object",
+          "patternProperties": {
+            "^(([A-Za-z0-9]){4})$": { "type": "integer" }
+          },
+          "additionalProperties": false
+        },
+        "axes": {
+          "description": "Sets the DWrite font axes for the given font. For example, { \"wght\": 200 } will set the font weight to 200.",
+          "type": "object",
+          "patternProperties": {
+            "^([A-Za-z]{4})$": { "type": "number" }
+          },
+          "additionalProperties": false
         }
       },
       "type": "object"
@@ -299,7 +315,8 @@
         "down",
         "previous",
         "nextInOrder",
-        "previousInOrder"
+        "previousInOrder",
+        "first"
       ],
       "type": "string"
     },

res/fonts/README.md

@@ -8,5 +8,5 @@ Please consult the [license](https://raw.githubusercontent.com/microsoft/cascadi
 
 ### Fonts Included
 
-* Cascadia Code, Cascadia Mono (2106.17)
-   * from microsoft/cascadia-code@fb0bce69c1c12f6c298b8bc1c1d181868f5daa9a
+* Cascadia Code, Cascadia Mono (2108.26)
+   * from microsoft/cascadia-code@f91d08f703ee61cf4ae936b9700ca974de2748fe

src/cascadia/TerminalApp/AppCommandlineArgs.cpp

@@ -399,8 +399,10 @@ static const std::map<std::string, FocusDirection> focusDirectionMap = {
     { "right", FocusDirection::Right },
     { "up", FocusDirection::Up },
     { "down", FocusDirection::Down },
+    { "previous", FocusDirection::Previous },
     { "nextInOrder", FocusDirection::NextInOrder },
     { "previousInOrder", FocusDirection::PreviousInOrder },
+    { "first", FocusDirection::First },
 };
 
 // Method Description:

src/cascadia/TerminalApp/Pane.cpp

@@ -251,6 +251,27 @@ std::shared_ptr<Pane> Pane::NavigateDirection(const std::shared_ptr<Pane> source
         return PreviousPane(sourcePane);
     }
 
+    if (direction == FocusDirection::First)
+    {
+        std::shared_ptr<Pane> firstPane = nullptr;
+        WalkTree([&](auto p) {
+            if (p->_IsLeaf())
+            {
+                firstPane = p;
+                return true;
+            }
+
+            return false;
+        });
+
+        // Don't need to do any movement if we are the source and target pane.
+        if (firstPane == sourcePane)
+        {
+            return nullptr;
+        }
+        return firstPane;
+    }
+
     // We are left with directional traversal now
     // If the focus direction does not match the split direction, the source pane
     // and its neighbor must necessarily be contained within the same child.

src/cascadia/TerminalControl/ControlCore.cpp

@@ -414,6 +414,8 @@ namespace winrt::Microsoft::Terminal::Control::implementation
         // This is a scroll event that wasn't initiated by the terminal
         //      itself - it was initiated by the mouse wheel, or the scrollbar.
         _terminal->UserScrollViewport(viewTop);
+
+        _updatePatternLocations->Run();
     }
 
     void ControlCore::AdjustOpacity(const double adjustment)

src/cascadia/TerminalSettingsModel/ActionArgs.cpp

@@ -296,7 +296,10 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
             return RS_(L"MoveFocusNextInOrder");
         case FocusDirection::PreviousInOrder:
             return RS_(L"MoveFocusPreviousInOrder");
+        case FocusDirection::First:
+            return RS_(L"MoveFocusFirstPane");
         }
+
         return winrt::hstring{
             fmt::format(std::wstring_view(RS_(L"MoveFocusWithArgCommandKey")),
                         directionString)
@@ -326,7 +329,10 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
             return RS_(L"SwapPaneNextInOrder");
         case FocusDirection::PreviousInOrder:
             return RS_(L"SwapPanePreviousInOrder");
+        case FocusDirection::First:
+            return RS_(L"SwapPaneFirstPane");
         }
+
         return winrt::hstring{
             fmt::format(std::wstring_view(RS_(L"SwapPaneWithArgCommandKey")),
                         directionString)

src/cascadia/TerminalSettingsModel/ActionArgs.idl

@@ -35,7 +35,8 @@ namespace Microsoft.Terminal.Settings.Model
         Down,
         Previous,
         PreviousInOrder,
-        NextInOrder
+        NextInOrder,
+        First
     };
 
     enum SplitState

src/cascadia/TerminalSettingsModel/Resources/en-US/Resources.resw

@@ -246,6 +246,15 @@
   <data name="MoveFocusToLastUsedPane" xml:space="preserve">
     <value>Move focus to the last used pane</value>
   </data>
+  <data name="MoveFocusNextInOrder" xml:space="preserve">
+    <value>Move focus to the next pane in order</value>
+  </data>
+  <data name="MoveFocusPreviousInOrder" xml:space="preserve">
+    <value>Move focus to the previous pane in order</value>
+  </data>
+  <data name="MoveFocusFirstPane" xml:space="preserve">
+    <value>Move focus to the first pane</value>
+  </data>
   <data name="SwapPaneCommandKey" xml:space="preserve">
     <value>Swap pane</value>
   </data>
@@ -256,6 +265,15 @@
   <data name="SwapPaneToLastUsedPane" xml:space="preserve">
     <value>Swap panes with the last used pane</value>
   </data>
+  <data name="SwapPaneNextInOrder" xml:space="preserve">
+    <value>Swap panes with the next pane in order</value>
+  </data>
+  <data name="SwapPanePreviousInOrder" xml:space="preserve">
+    <value>Swap panes with the previous pane in order</value>
+  </data>
+  <data name="SwapPaneFirstPane" xml:space="preserve">
+    <value>Swap panes with the first pane</value>
+  </data>
   <data name="NewTabCommandKey" xml:space="preserve">
     <value>New tab</value>
   </data>
@@ -436,18 +454,6 @@
     <value>Windows Console Host</value>
     <comment>Name describing the usage of the classic windows console as the terminal UI. (`conhost.exe`)</comment>
   </data>
-  <data name="MoveFocusNextInOrder" xml:space="preserve">
-    <value>Move focus to the next pane in order</value>
-  </data>
-  <data name="MoveFocusPreviousInOrder" xml:space="preserve">
-    <value>Move focus to the previous pane in order</value>
-  </data>
-  <data name="SwapPaneNextInOrder" xml:space="preserve">
-    <value>Swap panes with the next pane in order</value>
-  </data>
-  <data name="SwapPanePreviousInOrder" xml:space="preserve">
-    <value>Swap panes with the previous pane in order</value>
-  </data>
   <data name="MinimizeToTrayCommandKey" xml:space="preserve">
     <value>Minimize current window to tray</value>
   </data>

src/cascadia/TerminalSettingsModel/TerminalSettingsSerializationHelpers.h

@@ -337,7 +337,7 @@ struct ::Microsoft::Terminal::Settings::Model::JsonUtils::ConversionTrait<::winr
 // Possible FocusDirection values
 JSON_ENUM_MAPPER(::winrt::Microsoft::Terminal::Settings::Model::FocusDirection)
 {
-    JSON_MAPPINGS(7) = {
+    JSON_MAPPINGS(8) = {
         pair_type{ "left", ValueType::Left },
         pair_type{ "right", ValueType::Right },
         pair_type{ "up", ValueType::Up },
@@ -345,6 +345,7 @@ JSON_ENUM_MAPPER(::winrt::Microsoft::Terminal::Settings::Model::FocusDirection)
         pair_type{ "previous", ValueType::Previous },
         pair_type{ "previousInOrder", ValueType::PreviousInOrder },
         pair_type{ "nextInOrder", ValueType::NextInOrder },
+        pair_type{ "first", ValueType::First },
     };
 };
 

src/cascadia/TerminalSettingsModel/defaults.json

@@ -348,6 +348,7 @@
         { "command": { "action": "moveFocus", "direction": "previous" }, "keys": "ctrl+alt+left"},
         { "command": { "action": "moveFocus", "direction": "previousInOrder" } },
         { "command": { "action": "moveFocus", "direction": "nextInOrder" } },
+        { "command": { "action": "moveFocus", "direction": "first" } },
         { "command": { "action": "swapPane", "direction": "down" } },
         { "command": { "action": "swapPane", "direction": "left" } },
         { "command": { "action": "swapPane", "direction": "right" } },
@@ -355,6 +356,7 @@
         { "command": { "action": "swapPane", "direction": "previous"} },
         { "command": { "action": "swapPane", "direction": "previousInOrder"} },
         { "command": { "action": "swapPane", "direction": "nextInOrder"} },
+        { "command": { "action": "swapPane", "direction": "first" } },
         { "command": "togglePaneZoom" },
         { "command": "toggleSplitOrientation" },
         { "command": "toggleReadOnlyMode" },

tools/PGODatabase/version.ps1

@@ -1,6 +1,6 @@
 function MakeVersion ( $major, $minor, $datetimeStamp )
 {
-    $revision, $branch = $datetimeStamp.Split("-")
+    $revision, $branch = $datetimeStamp.Split("-", 2)
 
     if ( $branch -eq $null )
     {
@@ -71,5 +71,5 @@ function GetDatetimeStamp ( $pgoBranch )
         throw "FAILED: Get forkDate"
     }
 
-    return $forkDate + "-" + $pgoBranch.Replace("/", "_").Replace("-", "_").Replace(".", "_")
+    return $forkDate + "-" + ( $pgoBranch -replace "(/|\.|@|>|<)", "-" )
 }