wip

.github/actions/spelling/allow/apis.txt

@@ -96,7 +96,6 @@ IGraphics
 IImage
 IInheritable
 IMap
-imm
 IMonarch
 IObject
 iosfwd

.github/actions/spelling/expect/expect.txt

@@ -864,7 +864,6 @@ INLINEPREFIX
 inproc
 Inputkeyinfo
 Inputreadhandledata
-INPUTSCOPE
 INSERTMODE
 INTERACTIVITYBASE
 INTERCEPTCOPYPASTE
@@ -1291,7 +1290,6 @@ parms
 PATCOPY
 pathcch
 PATTERNID
-pbstr
 pcb
 pcch
 PCCHAR
@@ -1377,11 +1375,9 @@ POSTCHARBREAKS
 POSX
 POSXSCROLL
 POSYSCROLL
-ppbstr
 PPEB
 ppf
 ppidl
-pprg
 PPROC
 ppropvar
 ppsi
@@ -1697,7 +1693,6 @@ srcsrv
 SRCSRVTRG
 srctool
 srect
-SRGS
 srvinit
 srvpipe
 ssa
@@ -1844,6 +1839,7 @@ triaging
 TRIMZEROHEADINGS
 trx
 tsa
+tsattrs
 tsgr
 tsm
 TStr
@@ -1971,8 +1967,10 @@ vswhere
 vtapp
 VTE
 VTID
+vtio
 vtmode
 vtpipeterm
+vtpt
 VTRGB
 VTRGBTo
 vtseq

build/config/tsa.json

@@ -1,6 +1,6 @@
 {
     "instanceUrl": "https://microsoft.visualstudio.com",
     "projectName": "OS",
-    "areaPath": "OS\\Windows Client and Services\\WinPD\\DEEP-Developer Experience, Ecosystem and Partnerships\\SHINE\\Terminal",
+    "areaPath": "OS\\Windows Client and Services\\ADEPT\\E4D-Engineered for Developers\\SHINE\\Terminal",
     "notificationAliases": ["condev@microsoft.com", "duhowett@microsoft.com"]
 }

build/pipelines/templates-v2/job-check-code-format.yml

@@ -10,6 +10,6 @@ jobs:
     submodules: false
     clean: true
 
-  - pwsh: |-
+  - powershell: |-
       .\build\scripts\Invoke-FormattingCheck.ps1
     displayName: 'Run formatters'

doc/cascadia/profiles.schema.json

@@ -2340,7 +2340,7 @@
           "description": "When set to `true`, the terminal window will auto-center itself on the display it opens on. The terminal will use the \"initialPosition\" to determine which display to open on.",
           "type": "boolean"
         },
-        "warning.inputService": {
+        "inputServiceWarning": {
           "default": true,
           "description": "Warning if 'Touch Keyboard and Handwriting Panel Service' is disabled.",
           "type": "boolean"
@@ -2355,21 +2355,11 @@
           "description": "When set to true, the terminal will focus the pane on mouse hover.",
           "type": "boolean"
         },
-        "compatibility.allowHeadless": {
-          "default": false,
-          "description": "When set to true, Windows Terminal will run in the background. This allows globalSummon and quakeMode actions to work even when no windows are open.",
-          "type": "boolean"
-        },
         "compatibility.isolatedMode": {
           "default": false,
           "description": "When set to true, Terminal windows will not be able to interact with each other (including global hotkeys, tab drag/drop, running commandlines in existing windows, etc.). This is a compatibility escape hatch for users who are running into certain windowing issues.",
           "type": "boolean"
         },
-        "compatibility.allowDECRQCRA": {
-          "default": false,
-          "description": "When set to true, the terminal will support the DECRQCRA (Request Checksum of Rectangular Area) escape sequence.",
-          "type": "boolean"
-        },
         "copyFormatting": {
           "default": true,
           "description": "When set to `true`, the color and font formatting of selected text is also copied to your clipboard. When set to `false`, only plain text is copied to your clipboard. An array of specific formats can also be used. Supported array values include `html` and `rtf`. Plain text is always copied.",
@@ -2400,12 +2390,12 @@
           "description": "When set to `true`, visual animations will be disabled across the application.",
           "type": "boolean"
         },
-        "warning.largePaste": {
+        "largePasteWarning": {
           "default": true,
           "description": "When set to true, trying to paste text with more than 5 KiB of characters will display a warning asking you whether to continue or not with the paste.",
           "type": "boolean"
         },
-        "warning.multiLinePaste": {
+        "multiLinePasteWarning": {
           "default": true,
           "description": "When set to true, trying to paste text with a \"new line\" character will display a warning asking you whether to continue or not with the paste.",
           "type": "boolean"
@@ -2603,7 +2593,7 @@
           "description": "Determines the delimiters used in a double click selection.",
           "type": "string"
         },
-        "warning.confirmCloseAllTabs": {
+        "confirmCloseAllTabs": {
           "default": true,
           "description": "When set to \"true\" closing a window with multiple tabs open will require confirmation.  When set to \"false\", the confirmation dialog will not appear.",
           "type": "boolean"

doc/theme_colors.html

@@ -0,0 +1,527 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>Theme Color Quality Tests</title>
+    <script src="https://colorjs.io/dist/color.global.min.js"></script>
+    <script src="https://cdn.plot.ly/plotly-2.34.0.min.js"></script>
+    <style>
+        html {
+            background: #000;
+            color: #fff;
+        }
+
+        h2 {
+            font-family: monospace;
+        }
+
+        h2 > button {
+            float: right;
+        }
+
+        #container {
+            display: flex;
+            gap: 20px;
+            flex-wrap: wrap;
+        }
+
+        #container > div {
+            width: 418px;
+        }
+
+        .swatch {
+            display: grid;
+            grid-template-columns: repeat(8, 50px);
+            gap: 2px;
+            border: 2px solid black;
+            background: black;
+        }
+
+        .swatch > div {
+            width: 50px;
+            height: 50px;
+        }
+
+        .swatch span {
+            display: block;
+            font-family: monospace;
+            line-height: 2;
+            text-align: center;
+        }
+    </style>
+</head>
+<body>
+<div id="container"></div>
+<script>(() => {
+    const themes = {
+        // Find the optimal selection color (e.g. #92a4fd):
+        //
+        // theme = ["#000000", "#be2c21", "#3fae3a", "#be9a4a", "#204dbe", "#bb54be", "#00a7b2", "#bebebe", "#808080", "#ff3e30", "#58ea51", "#ffd166", "#2f6aff", "#fc74ff", "#00e1f0", "#ffffff"]
+        // theme = theme.map(t => Color.to(t, "oklab"))
+        //
+        // optD = 0;
+        // opt = null;
+        //
+        // for (let h = 264-10; h <= 264+10; h += 1) {
+        //     for (let c = 10; c <= 100; c += 1) {
+        //         for (let l = 40; l <= 90; l += 1) {
+        //             const col = Color.to(`color(--okhsl ${h} ${c}% ${l}%)`, "oklab");
+        //         }
+        //     }
+        // }
+        "Prototype Bright": (() => {
+            const bright_red = new Color(`color(--okhsl ${Color.to("#f00", "okhsl").h} 100% 60.15%)`);
+            const bright_green = new Color(`color(--okhsl ${Color.to("#0f0", "okhsl").h} 92.5% 80%)`);
+            const bright_blue = new Color(`color(--okhsl ${Color.to("#00f", "okhsl").h} 100% 51.2%)`);
+
+            const mixOpts = { space: "oklab", outputSpace: "okhsl" };
+            const bright_yellow = new Color(`color(--okhsl ${bright_red.mix(bright_green, 0.5, mixOpts).h} 100% 84%)`);
+            const bright_purple = new Color(`color(--okhsl ${bright_blue.mix(bright_red, 0.5, mixOpts).h} 100% 73%)`);
+            const bright_cyan = new Color(`color(--okhsl ${bright_green.mix(bright_blue, 0.5, mixOpts).h} 100% 80%)`);
+
+            const bright = [
+                new Color("oklch(60% 0 0)"),
+                bright_red,
+                bright_green,
+                bright_yellow,
+                bright_blue,
+                bright_purple,
+                bright_cyan,
+                new Color("oklch(100% 0 0)"),
+            ];
+            const dark = [
+                new Color("oklch(0% 0 0)"),
+                ...bright.slice(1, 8).map(c => c.mix("#000", 0.2, { space: "oklab" })),
+            ];
+            return dark.concat(...bright).map(c => c.to("sRGB").toString({
+                format: "hex",
+                collapse: false
+            }))
+        })(),
+        // https://oklch.com/
+        "Prototype Symmetric": [
+            new Color("oklch(0% 0 0)"), // Black
+            new Color("oklch(60% 0.098 30)"), // Red
+            new Color("oklch(60% 0.098 150)"), // Green
+            new Color("oklch(60% 0.098 90)"), // Yellow
+            new Color("oklch(60% 0.098 270)"), // Blue
+            new Color("oklch(60% 0.098 330)"), // Purple
+            new Color("oklch(60% 0.098 210)"), // Cyan
+            new Color("oklch(80% 0 0)"), // White
+
+            new Color("oklch(40% 0 0)"), // Bright Black
+            new Color("oklch(80% 0.098 30)"), // Bright Red
+            new Color("oklch(80% 0.098 150)"), // Bright Green
+            new Color("oklch(80% 0.098 90)"), // Bright Yellow
+            new Color("oklch(80% 0.098 270)"), // Bright Blue
+            new Color("oklch(80% 0.098 330)"), // Bright Purple
+            new Color("oklch(80% 0.098 210)"), // Bright Cyan
+            new Color("oklch(100% 0 0)"), // Bright White
+        ].map(c => c.to("sRGB").toString({ format: "hex", collapse: false })),
+        "Terminal.app": [
+            "#000000",
+            "#990000",
+            "#00a600",
+            "#999900",
+            "#0000b2",
+            "#b200b2",
+            "#00a6b2",
+            "#bfbfbf",
+            "#666666",
+            "#e50000",
+            "#00d900",
+            "#e5e500",
+            "#0000ff",
+            "#e500e5",
+            "#00e5e5",
+            "#e5e5e5",
+        ],
+        "Windows NT": [
+            "#000000",
+            "#800000",
+            "#008000",
+            "#808000",
+            "#000080",
+            "#800080",
+            "#008080",
+            "#C0C0C0",
+            "#808080",
+            "#FF0000",
+            "#00FF00",
+            "#FFFF00",
+            "#0000FF",
+            "#FF00FF",
+            "#00FFFF",
+            "#FFFFFF",
+        ],
+        "Windows XP": [
+            "#000000",
+            "#A80000",
+            "#00A800",
+            "#A85400",
+            "#0000A8",
+            "#A800A8",
+            "#61D6D6",
+            "#A8A8A8",
+            "#545454",
+            "#FF0000",
+            "#00FF00",
+            "#FFFF00",
+            "#0000FF",
+            "#FF00FF",
+            "#00FFFF",
+            "#FFFFFF",
+        ],
+        "URXVT": [
+            "#000000",
+            "#BE0000",
+            "#00BE00",
+            "#BEBE00",
+            "#0000BE",
+            "#BE00BE",
+            "#00BEBE",
+            "#BEBEBE",
+            "#424242",
+            "#FF0000",
+            "#00FF00",
+            "#FFFF00",
+            "#0000FF",
+            "#FF00FF",
+            "#00FFFF",
+            "#FFFFFF",
+        ],
+        "Campbell": [
+            "#0C0C0C",
+            "#C50F1F",
+            "#13A10E",
+            "#C19C00",
+            "#0037DA",
+            "#881798",
+            "#3A96DD",
+            "#CCCCCC",
+            "#767676",
+            "#E74856",
+            "#16C60C",
+            "#F9F1A5",
+            "#3B78FF",
+            "#B4009E",
+            "#61D6D6",
+            "#F2F2F2",
+        ],
+        "Campbell Powershell": [
+            "#0C0C0C",
+            "#C50F1F",
+            "#13A10E",
+            "#C19C00",
+            "#0037DA",
+            "#881798",
+            "#3A96DD",
+            "#CCCCCC",
+            "#767676",
+            "#E74856",
+            "#16C60C",
+            "#F9F1A5",
+            "#3B78FF",
+            "#B4009E",
+            "#61D6D6",
+            "#F2F2F2",
+        ],
+        "One Half Dark": [
+            "#282C34",
+            "#E06C75",
+            "#98C379",
+            "#E5C07B",
+            "#61AFEF",
+            "#C678DD",
+            "#56B6C2",
+            "#DCDFE4",
+            "#5A6374",
+            "#E06C75",
+            "#98C379",
+            "#E5C07B",
+            "#61AFEF",
+            "#C678DD",
+            "#56B6C2",
+            "#DCDFE4",
+        ],
+        "One Half Light": [
+            "#383A42",
+            "#E45649",
+            "#50A14F",
+            "#C18301",
+            "#0184BC",
+            "#A626A4",
+            "#0997B3",
+            "#FAFAFA",
+            "#4F525D",
+            "#DF6C75",
+            "#98C379",
+            "#E4C07A",
+            "#61AFEF",
+            "#C577DD",
+            "#56B5C1",
+            "#FFFFFF",
+        ],
+        "Solarized Dark": [
+            "#002B36",
+            "#DC322F",
+            "#859900",
+            "#B58900",
+            "#268BD2",
+            "#D33682",
+            "#2AA198",
+            "#EEE8D5",
+            "#073642",
+            "#CB4B16",
+            "#586E75",
+            "#657B83",
+            "#839496",
+            "#6C71C4",
+            "#93A1A1",
+            "#FDF6E3",
+        ],
+        "Solarized Light": [
+            "#002B36",
+            "#DC322F",
+            "#859900",
+            "#B58900",
+            "#268BD2",
+            "#D33682",
+            "#2AA198",
+            "#EEE8D5",
+            "#073642",
+            "#CB4B16",
+            "#586E75",
+            "#657B83",
+            "#839496",
+            "#6C71C4",
+            "#93A1A1",
+            "#FDF6E3",
+        ],
+        "Tango Dark": [
+            "#000000",
+            "#CC0000",
+            "#4E9A06",
+            "#C4A000",
+            "#3465A4",
+            "#75507B",
+            "#06989A",
+            "#D3D7CF",
+            "#555753",
+            "#EF2929",
+            "#8AE234",
+            "#FCE94F",
+            "#729FCF",
+            "#AD7FA8",
+            "#34E2E2",
+            "#EEEEEC",
+        ],
+        "Tango Light": [
+            "#000000",
+            "#CC0000",
+            "#4E9A06",
+            "#C4A000",
+            "#3465A4",
+            "#75507B",
+            "#06989A",
+            "#D3D7CF",
+            "#555753",
+            "#EF2929",
+            "#8AE234",
+            "#FCE94F",
+            "#729FCF",
+            "#AD7FA8",
+            "#34E2E2",
+            "#EEEEEC",
+        ],
+        "Dark+": [
+            "#000000",
+            "#cd3131",
+            "#0dbc79",
+            "#e5e510",
+            "#2472c8",
+            "#bc3fbc",
+            "#11a8cd",
+            "#e5e5e5",
+            "#666666",
+            "#f14c4c",
+            "#23d18b",
+            "#f5f543",
+            "#3b8eea",
+            "#d670d6",
+            "#29b8db",
+            "#e5e5e5",
+        ],
+        "CGA": [
+            "#000000",
+            "#AA0000",
+            "#00AA00",
+            "#AA5500",
+            "#0000AA",
+            "#AA00AA",
+            "#00AAAA",
+            "#AAAAAA",
+            "#555555",
+            "#FF5555",
+            "#55FF55",
+            "#FFFF55",
+            "#5555FF",
+            "#FF55FF",
+            "#55FFFF",
+            "#FFFFFF",
+        ],
+        "IBM 5153": [
+            "#000000",
+            "#AA0000",
+            "#00AA00",
+            "#C47E00",
+            "#0000AA",
+            "#AA00AA",
+            "#00AAAA",
+            "#AAAAAA",
+            "#555555",
+            "#FF5555",
+            "#55FF55",
+            "#FFFF55",
+            "#5555FF",
+            "#FF55FF",
+            "#55FFFF",
+            "#FFFFFF",
+        ],
+    };
+
+    Object.entries(themes).forEach(([name, srgb]) => {
+        const oklch = srgb.map(c => Color.to(c, "Oklch"));
+
+        const title = document.createElement("h2");
+        title.innerText = name;
+
+        const download = document.createElement("button");
+        download.type = "button";
+        download.innerText = "Copy";
+        download.onclick = () => {
+            navigator.clipboard.writeText(JSON.stringify({
+                name,
+                background: srgb[0],
+                foreground: srgb[7],
+                cursorColor: "#ffffff",
+                black: srgb[0],
+                red: srgb[1],
+                green: srgb[2],
+                yellow: srgb[3],
+                blue: srgb[4],
+                purple: srgb[5],
+                cyan: srgb[6],
+                white: srgb[7],
+                brightBlack: srgb[8],
+                brightRed: srgb[9],
+                brightGreen: srgb[10],
+                brightYellow: srgb[11],
+                brightBlue: srgb[12],
+                brightPurple: srgb[13],
+                brightCyan: srgb[14],
+                brightWhite: srgb[15],
+            }, null, 4));
+
+            download.innerText = "Copied!";
+            download.disabled = true;
+
+            setTimeout(() => {
+                download.innerText = "Copy";
+                download.disabled = false;
+            }, 1000);
+        }
+        title.appendChild(download);
+
+        const swatch = document.createElement("div");
+        swatch.className = "swatch";
+
+        for (let i = 0; i < 16; ++i) {
+            const span = document.createElement("span");
+            span.innerText = oklch[i].l.toFixed(3);
+            span.style.color = srgb[i];
+            span.style.background = srgb[0];
+
+            const div = document.createElement("div");
+            div.style.background = srgb[i];
+            div.appendChild(span);
+
+            swatch.appendChild(div);
+        }
+
+        const plot = document.createElement("div");
+        Plotly.newPlot(plot, [{
+            type: "scatterpolar",
+            mode: "lines",
+            hoverinfo: "skip",
+            showlegend: false,
+            theta: Array.from({ length: 360 }, (x, i) => i),
+            // Pre-calculated max. chroma per hue for sRGB colors.
+            r: [0.260, 0.258, 0.258, 0.257, 0.257, 0.257, 0.256, 0.256, 0.256, 0.255, 0.254, 0.253, 0.252, 0.251, 0.251, 0.251, 0.252, 0.252, 0.252, 0.252, 0.253, 0.253, 0.253, 0.254, 0.254, 0.255, 0.255, 0.255, 0.255, 0.255, 0.252, 0.246, 0.242, 0.237, 0.233, 0.229, 0.226, 0.221, 0.219, 0.214, 0.213, 0.209, 0.207, 0.204, 0.201, 0.200, 0.196, 0.196, 0.193, 0.190, 0.190, 0.187, 0.185, 0.185, 0.182, 0.182, 0.181, 0.179, 0.179, 0.177, 0.175, 0.176, 0.174, 0.173, 0.174, 0.172, 0.171, 0.172, 0.171, 0.170, 0.171, 0.170, 0.169, 0.170, 0.169, 0.168, 0.170, 0.169, 0.168, 0.170, 0.169, 0.170, 0.171, 0.170, 0.172, 0.172, 0.171, 0.173, 0.173, 0.175, 0.175, 0.175, 0.177, 0.178, 0.180, 0.180, 0.182, 0.183, 0.184, 0.186, 0.187, 0.189, 0.192, 0.193, 0.196, 0.197, 0.200, 0.201, 0.204, 0.208, 0.209, 0.210, 0.212, 0.211, 0.213, 0.215, 0.217, 0.216, 0.218, 0.220, 0.221, 0.223, 0.225, 0.228, 0.228, 0.231, 0.234, 0.234, 0.237, 0.241, 0.244, 0.245, 0.249, 0.253, 0.255, 0.259, 0.264, 0.266, 0.271, 0.276, 0.280, 0.286, 0.289, 0.287, 0.278, 0.271, 0.265, 0.258, 0.251, 0.245, 0.239, 0.234, 0.228, 0.223, 0.219, 0.215, 0.211, 0.209, 0.205, 0.202, 0.199, 0.195, 0.192, 0.190, 0.187, 0.185, 0.182, 0.180, 0.178, 0.176, 0.175, 0.174, 0.172, 0.170, 0.169, 0.167, 0.166, 0.165, 0.163, 0.162, 0.161, 0.160, 0.159, 0.158, 0.157, 0.156, 0.157, 0.157, 0.156, 0.155, 0.155, 0.154, 0.154, 0.154, 0.153, 0.153, 0.153, 0.151, 0.151, 0.149, 0.149, 0.147, 0.148, 0.147, 0.146, 0.146, 0.145, 0.145, 0.145, 0.144, 0.145, 0.144, 0.144, 0.144, 0.144, 0.144, 0.143, 0.144, 0.145, 0.144, 0.145, 0.145, 0.145, 0.147, 0.146, 0.147, 0.147, 0.148, 0.15, 0.149, 0.151, 0.151, 0.153, 0.154, 0.154, 0.156, 0.157, 0.159, 0.159, 0.162, 0.162, 0.165, 0.166, 0.169, 0.17, 0.173, 0.174, 0.178, 0.18, 0.182, 0.186, 0.189, 0.192, 0.197, 0.2, 0.204, 0.208, 0.213, 0.219, 0.224, 0.232, 0.242, 0.249, 0.262, 0.284, 0.308, 0.307, 0.307, 0.306, 0.304, 0.301, 0.301, 0.302, 0.3, 0.297, 0.297, 0.298, 0.296, 0.294, 0.294, 0.295, 0.294, 0.292, 0.292, 0.294, 0.292, 0.290, 0.292, 0.292, 0.29, 0.291, 0.292, 0.290, 0.291, 0.292, 0.291, 0.291, 0.293, 0.291, 0.293, 0.293, 0.292, 0.295, 0.294, 0.295, 0.296, 0.295, 0.298, 0.296, 0.299, 0.298, 0.301, 0.300, 0.303, 0.302, 0.305, 0.303, 0.307, 0.305, 0.308, 0.308, 0.310, 0.313, 0.311, 0.314, 0.316, 0.316, 0.319, 0.320, 0.320, 0.314, 0.312, 0.311, 0.309, 0.303, 0.302, 0.300, 0.299, 0.296, 0.292, 0.291, 0.289, 0.288, 0.287, 0.283, 0.280, 0.279, 0.278, 0.277, 0.276, 0.274, 0.271, 0.269, 0.268, 0.267, 0.266, 0.266, 0.265, 0.264, 0.262],
+            marker: {
+                color: srgb[7],
+            },
+        }, {
+            type: "scatterpolar",
+            mode: "markers+text",
+            hoverinfo: "r+theta+text",
+            showlegend: false,
+            hovertext: [
+                "Black",
+                "Red",
+                "Green",
+                "Yellow",
+                "Blue",
+                "Purple",
+                "Cyan",
+                "White",
+                "Bright Black",
+                "Bright Red",
+                "Bright Green",
+                "Bright Yellow",
+                "Bright Blue",
+                "Bright Purple",
+                "Bright Cyan",
+                "Bright White",
+            ],
+            marker: {
+                color: srgb,
+                size: 12,
+            },
+            theta: oklch.map(c => c.h),
+            r: oklch.map(c => c.c),
+        }], {
+            width: 418,
+            height: 418,
+            margin: {
+                l: 40,
+                r: 40,
+                b: 40,
+                t: 40,
+            },
+            paper_bgcolor: "#000",
+            polar: {
+                bgcolor: srgb[0],
+                angularaxis: {
+                    color: srgb[7],
+                    gridcolor: srgb[8],
+                },
+                radialaxis: {
+                    color: srgb[7],
+                    gridcolor: srgb[8],
+                    range: [0, 0.4],
+                },
+            },
+        });
+
+        const theme = document.createElement("div");
+        theme.appendChild(title);
+        theme.appendChild(swatch);
+        theme.appendChild(plot);
+
+        document.getElementById("container").appendChild(theme);
+    });
+})()</script>
+</body>
+</html>

src/buffer/out/search.cpp

@@ -16,7 +16,7 @@ bool Search::IsStale(const Microsoft::Console::Render::IRenderData& renderData,
            _lastMutationId != renderData.GetTextBuffer().GetLastMutationId();
 }
 
-void Search::Reset(Microsoft::Console::Render::IRenderData& renderData, const std::wstring_view& needle, SearchFlag flags, bool reverse)
+bool Search::Reset(Microsoft::Console::Render::IRenderData& renderData, const std::wstring_view& needle, SearchFlag flags, bool reverse)
 {
     const auto& textBuffer = renderData.GetTextBuffer();
 
@@ -30,15 +30,15 @@ void Search::Reset(Microsoft::Console::Render::IRenderData& renderData, const st
     _results = std::move(result).value_or(std::vector<til::point_span>{});
     _index = reverse ? gsl::narrow_cast<ptrdiff_t>(_results.size()) - 1 : 0;
     _step = reverse ? -1 : 1;
+    return true;
+}
 
+void Search::MoveToCurrentSelection()
+{
     if (_renderData->IsSelectionActive())
     {
         MoveToPoint(_renderData->GetTextBuffer().ScreenToBufferPosition(_renderData->GetSelectionAnchor()));
     }
-    else if (const auto span = _renderData->GetSearchHighlightFocused())
-    {
-        MoveToPoint(_step > 0 ? span->start : span->end);
-    }
 }
 
 void Search::MoveToPoint(const til::point anchor) noexcept

src/buffer/out/search.h

@@ -36,8 +36,9 @@ public:
     Search() = default;
 
     bool IsStale(const Microsoft::Console::Render::IRenderData& renderData, const std::wstring_view& needle, SearchFlag flags) const noexcept;
-    void Reset(Microsoft::Console::Render::IRenderData& renderData, const std::wstring_view& needle, SearchFlag flags, bool reverse);
+    bool Reset(Microsoft::Console::Render::IRenderData& renderData, const std::wstring_view& needle, SearchFlag flags, bool reverse);
 
+    void MoveToCurrentSelection();
     void MoveToPoint(til::point anchor) noexcept;
     void MovePastPoint(til::point anchor) noexcept;
     void FindNext(bool reverse) noexcept;

src/buffer/out/textBuffer.cpp

@@ -451,9 +451,14 @@ size_t TextBuffer::FitTextIntoColumns(const std::wstring_view& chars, til::Coord
         cwd.GraphemeNext(state, chars);
         col += state.width;
 
+        // If we ran out of columns, we need to always return `columnLimit` and not `cols`,
+        // because if we tried inserting a wide glyph into just 1 remaining column it will
+        // fail to fit, but that remaining column still has been used up. When the caller sees
+        // `columns == columnLimit` they will line-wrap and continue inserting into the next row.
         if (col > columnLimit)
         {
-            break;
+            columns = columnLimit;
+            return dist;
         }
 
         dist += state.len;
@@ -461,7 +466,7 @@ size_t TextBuffer::FitTextIntoColumns(const std::wstring_view& chars, til::Coord
 
     // But if we simply ran out of text we just need to return the actual number of columns.
     columns = col;
-    return dist;
+    return chars.size();
 }
 
 // Pretend as if `position` is a regular cursor in the TextBuffer.

src/cascadia/CascadiaPackage/Resources/cs-CZ/Resources.resw

@@ -154,7 +154,7 @@
     <comment>{Locked=qps-ploc,qps-ploca,qps-plocm}</comment>
   </data>
   <data name="AppDescription" xml:space="preserve">
-    <value>Nový Terminál Windows</value>
+    <value>Nová Terminál Windows</value>
   </data>
   <data name="AppDescriptionPre" xml:space="preserve">
     <value>Terminál Windows s náhledem připravovaných funkcí</value>
@@ -164,7 +164,7 @@
     <comment>This is a menu item that will be displayed in the Windows File Explorer that launches the Canary version of Windows Terminal. Please mark one of the characters to be an accelerator key.</comment>
   </data>
   <data name="ShellExtension_OpenInTerminalMenuItem_Preview" xml:space="preserve">
-    <value>Otevřít &amp;náhled Terminálu</value>
+    <value>Otevřít náhled &amp;aplikace Terminal</value>
     <comment>This is a menu item that will be displayed in the Windows File Explorer that launches the Preview version of Windows Terminal. Please mark one of the characters to be an accelerator key.</comment>
   </data>
   <data name="ShellExtension_OpenInTerminalMenuItem" xml:space="preserve">

src/cascadia/TerminalApp/Pane.cpp

@@ -2956,13 +2956,13 @@ bool Pane::ContainsReadOnly() const
 // - <none>
 void Pane::CollectTaskbarStates(std::vector<winrt::TerminalApp::TaskbarState>& states)
 {
-    if (_content)
+    if (_IsLeaf())
     {
         auto tbState{ winrt::make<winrt::TerminalApp::implementation::TaskbarState>(_content.TaskbarState(),
                                                                                     _content.TaskbarProgress()) };
         states.push_back(tbState);
     }
-    else if (_firstChild && _secondChild)
+    else
     {
         _firstChild->CollectTaskbarStates(states);
         _secondChild->CollectTaskbarStates(states);

src/cascadia/TerminalApp/Resources/cs-CZ/ContextMenu.resw

@@ -154,7 +154,7 @@
     <comment>{Locked=qps-ploc,qps-ploca,qps-plocm}</comment>
   </data>
   <data name="AppDescription" xml:space="preserve">
-    <value>Nový Terminál Windows</value>
+    <value>Nová Terminál Windows</value>
   </data>
   <data name="AppDescriptionPre" xml:space="preserve">
     <value>Terminál Windows s náhledem připravovaných funkcí</value>
@@ -164,7 +164,7 @@
     <comment>This is a menu item that will be displayed in the Windows File Explorer that launches the Canary version of Windows Terminal. Please mark one of the characters to be an accelerator key.</comment>
   </data>
   <data name="ShellExtension_OpenInTerminalMenuItem_Preview" xml:space="preserve">
-    <value>Otevřít &amp;náhled Terminálu</value>
+    <value>Otevřít náhled &amp;aplikace Terminal</value>
     <comment>This is a menu item that will be displayed in the Windows File Explorer that launches the Preview version of Windows Terminal. Please mark one of the characters to be an accelerator key.</comment>
   </data>
   <data name="ShellExtension_OpenInTerminalMenuItem" xml:space="preserve">

src/cascadia/TerminalApp/Resources/ko-KR/Resources.resw

@@ -118,7 +118,7 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="InitialJsonParseErrorText" xml:space="preserve">
-    <value>파일에서 설정을 로드하지 못했습니다. 후행 쉼표를 포함하여 구문 오류가 있는지 확인합니다.</value>
+    <value>파일에서 설정을 로드 하지 못했습니다. 후행 쉼표를 포함 하 여 구문 오류가 있는지 확인 합니다.</value>
   </data>
   <data name="MissingDefaultProfileText" xml:space="preserve">
     <value>첫 번째 프로필을 사용하여 프로필 목록에서 기본 프로필을 찾을 수 없습니다. "defaultProfile"이 프로필 중 하나의 GUID와 일치하는지 확인합니다.</value>
@@ -319,7 +319,7 @@
     <value>상위 창의 백분율로 크기를 지정합니다. (0,1) 사이 값만 유효합니다.</value>
   </data>
   <data name="CmdNewTabDesc" xml:space="preserve">
-    <value>새 탭 만들기</value>
+    <value>새 작업 만들기</value>
   </data>
   <data name="CmdNTDesc" xml:space="preserve">
     <value>"new-tab" 하위 명령의 별칭입니다.</value>
@@ -524,7 +524,7 @@
     <value>경고</value>
   </data>
   <data name="CloseReadOnlyDialog.Content" xml:space="preserve">
-    <value>읽기 전용 터미널을 닫으려고 합니다. 계속하시겠습니까?</value>
+    <value>읽기 전용 터미널을 닫으려고 합니다. 계속하시겠어요?</value>
   </data>
   <data name="LargePasteDialog.CloseButtonText" xml:space="preserve">
     <value>취소</value>
@@ -616,7 +616,7 @@
     <comment>{0} will be replaced with a number.</comment>
   </data>
   <data name="CrimsonColorButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
-    <value>진홍</value>
+    <value>심홍</value>
   </data>
   <data name="SteelBlueColorButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
     <value>강철색</value>

src/cascadia/TerminalApp/TabManagement.cpp

@@ -491,14 +491,14 @@ namespace winrt::TerminalApp::implementation
                 // Because this will always return -1 in this scenario unfortunately.
                 //
                 // So, what we're going to try to do is move the focus to the tab
-                // to the right, within the bounds of how many tabs we have.
+                // to the left, within the bounds of how many tabs we have.
                 //
                 // EX: we have 4 tabs: [A, B, C, D]. If we close:
                 // * A (tabIndex=0): We'll want to focus tab B (now in index 0)
-                // * B (tabIndex=1): We'll want to focus tab C (now in index 1)
-                // * C (tabIndex=2): We'll want to focus tab D (now in index 2)
+                // * B (tabIndex=1): We'll want to focus tab A (now in index 0)
+                // * C (tabIndex=2): We'll want to focus tab B (now in index 1)
                 // * D (tabIndex=3): We'll want to focus tab C (now in index 2)
-                const auto newSelectedIndex = std::clamp<int32_t>(tabIndex, 0, _tabs.Size() - 1);
+                const auto newSelectedIndex = std::clamp<int32_t>(tabIndex - 1, 0, _tabs.Size() - 1);
                 // _UpdatedSelectedTab will do the work of setting up the new tab as
                 // the focused one, and unfocusing all the others.
                 auto newSelectedTab{ _tabs.GetAt(newSelectedIndex) };

src/cascadia/TerminalControl/ControlCore.cpp

@@ -201,17 +201,6 @@ namespace winrt::Microsoft::Terminal::Control::implementation
                 }
             });
 
-        // If you rapidly show/hide Windows Terminal, something about GotFocus()/LostFocus() gets broken.
-        // We'll then receive easily 10+ such calls from WinUI the next time the application is shown.
-        shared->focusChanged = std::make_unique<til::debounced_func_trailing<bool>>(
-            std::chrono::milliseconds{ 25 },
-            [weakThis = get_weak()](const bool focused) {
-                if (const auto core{ weakThis.get() })
-                {
-                    core->_focusChanged(focused);
-                }
-            });
-
         // Scrollbar updates are also expensive (XAML), so we'll throttle them as well.
         shared->updateScrollBar = std::make_shared<ThrottledFuncTrailing<Control::ScrollPositionChangedArgs>>(
             _dispatcher,
@@ -1708,41 +1697,38 @@ namespace winrt::Microsoft::Terminal::Control::implementation
     SearchResults ControlCore::Search(SearchRequest request)
     {
         const auto lock = _terminal->LockForWriting();
-
         SearchFlag flags{};
         WI_SetFlagIf(flags, SearchFlag::CaseInsensitive, !request.CaseSensitive);
         WI_SetFlagIf(flags, SearchFlag::RegularExpression, request.RegularExpression);
         const auto searchInvalidated = _searcher.IsStale(*_terminal.get(), request.Text, flags);
 
-        if (searchInvalidated || !request.ResetOnly)
+        if (searchInvalidated || !request.Reset)
         {
             std::vector<til::point_span> oldResults;
-            til::point_span oldFocused;
-
-            if (const auto focused = _terminal->GetSearchHighlightFocused())
-            {
-                oldFocused = *focused;
-            }
 
             if (searchInvalidated)
             {
                 oldResults = _searcher.ExtractResults();
                 _searcher.Reset(*_terminal.get(), request.Text, flags, !request.GoForward);
+
+                if (SnapSearchResultToSelection())
+                {
+                    _searcher.MoveToCurrentSelection();
+                    SnapSearchResultToSelection(false);
+                }
+
                 _terminal->SetSearchHighlights(_searcher.Results());
             }
-
-            if (!request.ResetOnly)
+            else
             {
                 _searcher.FindNext(!request.GoForward);
             }
 
-            _terminal->SetSearchHighlightFocused(gsl::narrow<size_t>(std::max<ptrdiff_t>(0, _searcher.CurrentMatch())));
-            _renderer->TriggerSearchHighlight(oldResults);
-
-            if (const auto focused = _terminal->GetSearchHighlightFocused(); focused && *focused != oldFocused)
+            if (const auto idx = _searcher.CurrentMatch(); idx >= 0)
             {
-                _terminal->ScrollToSearchHighlight(request.ScrollOffset);
+                _terminal->SetSearchHighlightFocused(gsl::narrow<size_t>(idx), request.ScrollOffset);
             }
+            _renderer->TriggerSearchHighlight(oldResults);
         }
 
         int32_t totalMatches = 0;
@@ -1770,11 +1756,27 @@ namespace winrt::Microsoft::Terminal::Control::implementation
     {
         const auto lock = _terminal->LockForWriting();
         _terminal->SetSearchHighlights({});
-        _terminal->SetSearchHighlightFocused(0);
+        _terminal->SetSearchHighlightFocused({}, 0);
         _renderer->TriggerSearchHighlight(_searcher.Results());
         _searcher = {};
     }
 
+    // Method Description:
+    // - Tells ControlCore to snap the current search result index to currently
+    //   selected text if the search was started using it.
+    void ControlCore::SnapSearchResultToSelection(bool shouldSnap) noexcept
+    {
+        _snapSearchResultToSelection = shouldSnap;
+    }
+
+    // Method Description:
+    // - Returns true, if we should snap the current search result index to
+    //   the currently selected text after a new search is started, else false.
+    bool ControlCore::SnapSearchResultToSelection() const noexcept
+    {
+        return _snapSearchResultToSelection;
+    }
+
     void ControlCore::Close()
     {
         if (!_IsClosing())
@@ -2219,32 +2221,19 @@ namespace winrt::Microsoft::Terminal::Control::implementation
     // - <none>
     void ControlCore::ClearBuffer(Control::ClearBufferType clearType)
     {
-        std::wstring_view command;
-        switch (clearType)
-        {
-        case ClearBufferType::Screen:
-            command = L"\x1b[H\x1b[2J";
-            break;
-        case ClearBufferType::Scrollback:
-            command = L"\x1b[3J";
-            break;
-        case ClearBufferType::All:
-            command = L"\x1b[H\x1b[2J\x1b[3J";
-            break;
-        }
-
+        if (clearType == Control::ClearBufferType::Scrollback || clearType == Control::ClearBufferType::All)
         {
             const auto lock = _terminal->LockForWriting();
-            _terminal->Write(command);
+            _terminal->EraseScrollback();
         }
 
         if (clearType == Control::ClearBufferType::Screen || clearType == Control::ClearBufferType::All)
         {
+            // Send a signal to conpty to clear the buffer.
             if (auto conpty{ _connection.try_as<TerminalConnection::ConptyConnection>() })
             {
-                // Since the clearing of ConPTY occurs asynchronously, this call can result weird issues,
-                // where a console application still sees contents that we've already deleted, etc.
-                // The correct way would be for ConPTY to emit the appropriate CSI n J sequences.
+                // ConPTY will emit sequences to sync up our buffer with its new
+                // contents.
                 conpty.ClearBuffer();
             }
         }
@@ -2491,21 +2480,13 @@ namespace winrt::Microsoft::Terminal::Control::implementation
     // - This is related to work done for GH#2988.
     void ControlCore::GotFocus()
     {
-        const auto shared = _shared.lock_shared();
-        if (shared->focusChanged)
-        {
-            (*shared->focusChanged)(true);
-        }
+        _focusChanged(true);
     }
 
     // See GotFocus.
     void ControlCore::LostFocus()
     {
-        const auto shared = _shared.lock_shared();
-        if (shared->focusChanged)
-        {
-            (*shared->focusChanged)(false);
-        }
+        _focusChanged(false);
     }
 
     void ControlCore::_focusChanged(bool focused)

src/cascadia/TerminalControl/ControlCore.h

@@ -228,6 +228,8 @@ namespace winrt::Microsoft::Terminal::Control::implementation
         SearchResults Search(SearchRequest request);
         const std::vector<til::point_span>& SearchResultRows() const noexcept;
         void ClearSearch();
+        void SnapSearchResultToSelection(bool snap) noexcept;
+        bool SnapSearchResultToSelection() const noexcept;
 
         void LeftClickOnTerminal(const til::point terminalPosition,
                                  const int numberOfClicks,
@@ -305,7 +307,6 @@ namespace winrt::Microsoft::Terminal::Control::implementation
         struct SharedState
         {
             std::unique_ptr<til::debounced_func_trailing<>> outputIdle;
-            std::unique_ptr<til::debounced_func_trailing<bool>> focusChanged;
             std::shared_ptr<ThrottledFuncTrailing<Control::ScrollPositionChangedArgs>> updateScrollBar;
         };
 

src/cascadia/TerminalControl/ControlCore.idl

@@ -55,7 +55,7 @@ namespace Microsoft.Terminal.Control
         Boolean GoForward;
         Boolean CaseSensitive;
         Boolean RegularExpression;
-        Boolean ResetOnly;
+        Boolean Reset;
         Int32 ScrollOffset;
     };
 
@@ -148,6 +148,7 @@ namespace Microsoft.Terminal.Control
 
         SearchResults Search(SearchRequest request);
         void ClearSearch();
+        Boolean SnapSearchResultToSelection;
 
         Microsoft.Terminal.Core.Color ForegroundColor { get; };
         Microsoft.Terminal.Core.Color BackgroundColor { get; };

src/cascadia/TerminalControl/EventArgs.idl

@@ -25,12 +25,6 @@ namespace Microsoft.Terminal.Control
         Console,
     };
 
-    enum DefaultInputScope
-    {
-        Default,
-        AlphanumericHalfWidth,
-    };
-
     runtimeclass FontSizeChangedArgs
     {
         Int32 Width { get; };

src/cascadia/TerminalControl/HwndTerminal.cpp

@@ -891,9 +891,6 @@ void _stdcall TerminalSetTheme(void* terminal, TerminalTheme theme, LPCWSTR font
             renderSettings.SetColorTableEntry(tableIndex, gsl::at(theme.ColorTable, tableIndex));
         }
 
-        // Save these values as the new default render settings.
-        renderSettings.SaveDefaultSettings();
-
         publicTerminal->_terminal->SetCursorStyle(static_cast<Microsoft::Console::VirtualTerminal::DispatchTypes::CursorStyle>(theme.CursorStyle));
 
         publicTerminal->_desiredFont = { fontFamily, 0, DEFAULT_FONT_WEIGHT, static_cast<float>(fontSize), CP_UTF8 };

src/cascadia/TerminalControl/IControlSettings.idl

@@ -63,7 +63,6 @@ namespace Microsoft.Terminal.Control
         Boolean DisablePartialInvalidation { get; };
         Boolean SoftwareRendering { get; };
         Microsoft.Terminal.Control.TextMeasurement TextMeasurement { get; };
-        Microsoft.Terminal.Control.DefaultInputScope DefaultInputScope { get; };
         Boolean ShowMarks { get; };
         Boolean UseBackgroundImageForWindow { get; };
         Boolean RightClickContextMenu { get; };

src/cascadia/TerminalControl/TermControl.cpp

@@ -576,6 +576,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
                     // but since code paths differ, extra work is required to ensure correctness.
                     if (!_core.HasMultiLineSelection())
                     {
+                        _core.SnapSearchResultToSelection(true);
                         const auto selectedLine{ _core.SelectedText(true) };
                         _searchBox->PopulateTextbox(selectedLine);
                     }
@@ -862,11 +863,6 @@ namespace winrt::Microsoft::Terminal::Control::implementation
         }
 
         _interactivity.UpdateSettings();
-        {
-            const auto inputScope = settings.DefaultInputScope();
-            const auto alpha = inputScope == DefaultInputScope::AlphanumericHalfWidth;
-            ::Microsoft::Console::TSF::Handle::SetDefaultScopeAlphanumericHalfWidth(alpha);
-        }
         if (_automationPeer)
         {
             _automationPeer.SetControlPadding(Core::Padding{
@@ -1635,29 +1631,12 @@ namespace winrt::Microsoft::Terminal::Control::implementation
                 {
                     if (vkey == VK_ADD)
                     {
-                        static const auto enabled = []() {
-                            wchar_t buffer[4]{};
-                            DWORD size = sizeof(buffer);
-                            RegGetValueW(
-                                HKEY_CURRENT_USER,
-                                L"Control Panel\\Input Method",
-                                L"EnableHexNumpad",
-                                RRF_RT_REG_SZ,
-                                nullptr,
-                                &buffer[0],
-                                &size);
-                            return size == 4 && memcmp(&buffer[0], L"1", 4) == 0;
-                        }();
-
-                        if (enabled)
-                        {
-                            // Alt '+' <number> is used to input Unicode code points.
-                            // Every time you press + it resets the entire state
-                            // in the original OS implementation as well.
-                            s.encoding = AltNumpadEncoding::Unicode;
-                            s.accumulator = 0;
-                            s.active = true;
-                        }
+                        // Alt '+' <number> is used to input Unicode code points.
+                        // Every time you press + it resets the entire state
+                        // in the original OS implementation as well.
+                        s.encoding = AltNumpadEncoding::Unicode;
+                        s.accumulator = 0;
+                        s.active = true;
                     }
                     else if (vkey == VK_NUMPAD0 && s.encoding == AltNumpadEncoding::OEM && s.accumulator == 0)
                     {
@@ -3865,7 +3844,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
         const auto goForward = _searchBox->GoForward();
         const auto caseSensitive = _searchBox->CaseSensitive();
         const auto regularExpression = _searchBox->RegularExpression();
-        const auto request = SearchRequest{ text, goForward, caseSensitive, regularExpression, true, _searchScrollOffset };
+        const auto request = SearchRequest{ text, goForward, caseSensitive, regularExpression, true, _calculateSearchScrollOffset() };
         _handleSearchResults(_core.Search(request));
     }
 

src/cascadia/TerminalCore/ICoreSettings.idl

@@ -21,7 +21,6 @@ namespace Microsoft.Terminal.Core
         String WordDelimiters;
 
         Boolean ForceVTInput;
-        Boolean AllowVtChecksumReport;
         Boolean TrimBlockSelection;
         Boolean DetectURLs;
 

src/cascadia/TerminalCore/Terminal.cpp

@@ -90,11 +90,6 @@ void Terminal::UpdateSettings(ICoreSettings settings)
     _autoMarkPrompts = settings.AutoMarkPrompts();
     _rainbowSuggestions = settings.RainbowSuggestions();
 
-    if (_stateMachine)
-    {
-        SetVtChecksumReportSupport(settings.AllowVtChecksumReport());
-    }
-
     _getTerminalInput().ForceDisableWin32InputMode(settings.ForceVTInput());
 
     if (settings.TabColor() == nullptr)
@@ -106,9 +101,6 @@ void Terminal::UpdateSettings(ICoreSettings settings)
         GetRenderSettings().SetColorTableEntry(TextColor::FRAME_BACKGROUND, til::color{ settings.TabColor().Value() });
     }
 
-    // Save the changes made above and in UpdateAppearance as the new default render settings.
-    GetRenderSettings().SaveDefaultSettings();
-
     if (!_startingTabColor && settings.StartingTabColor())
     {
         _startingTabColor = settings.StartingTabColor().Value();
@@ -217,10 +209,10 @@ void Terminal::SetCursorStyle(const DispatchTypes::CursorStyle cursorStyle)
     engine.Dispatch().SetCursorStyle(cursorStyle);
 }
 
-void Terminal::SetVtChecksumReportSupport(const bool enabled)
+void Terminal::EraseScrollback()
 {
     auto& engine = reinterpret_cast<OutputStateMachineEngine&>(_stateMachine->Engine());
-    engine.Dispatch().SetVtChecksumReportSupport(enabled);
+    engine.Dispatch().EraseInDisplay(DispatchTypes::EraseType::Scrollback);
 }
 
 bool Terminal::IsXtermBracketedPasteModeEnabled() const noexcept
@@ -1267,17 +1259,15 @@ void Terminal::SetSearchHighlights(const std::vector<til::point_span>& highlight
 // Method Description:
 // - Stores the focused search highlighted region in the terminal
 // - If the region isn't empty, it will be brought into view
-void Terminal::SetSearchHighlightFocused(const size_t focusedIdx) noexcept
+void Terminal::SetSearchHighlightFocused(const size_t focusedIdx, til::CoordType searchScrollOffset)
 {
     _assertLocked();
     _searchHighlightFocused = focusedIdx;
-}
 
-void Terminal::ScrollToSearchHighlight(til::CoordType searchScrollOffset)
-{
-    if (_searchHighlightFocused < _searchHighlights.size())
+    // bring the focused region into the view if the index is in valid range
+    if (focusedIdx < _searchHighlights.size())
     {
-        const auto focused = til::at(_searchHighlights, _searchHighlightFocused);
+        const auto focused = til::at(_searchHighlights, focusedIdx);
         const auto adjustedStart = til::point{ focused.start.x, std::max(0, focused.start.y - searchScrollOffset) };
         const auto adjustedEnd = til::point{ focused.end.x, std::max(0, focused.end.y - searchScrollOffset) };
         _ScrollToPoints(adjustedStart, adjustedEnd);

src/cascadia/TerminalCore/Terminal.hpp

@@ -94,7 +94,7 @@ public:
     void UpdateAppearance(const winrt::Microsoft::Terminal::Core::ICoreAppearance& appearance);
     void SetFontInfo(const FontInfo& fontInfo);
     void SetCursorStyle(const ::Microsoft::Console::VirtualTerminal::DispatchTypes::CursorStyle cursorStyle);
-    void SetVtChecksumReportSupport(const bool enabled);
+    void EraseScrollback();
     bool IsXtermBracketedPasteModeEnabled() const noexcept;
     std::wstring_view GetWorkingDirectory() noexcept;
 
@@ -140,10 +140,8 @@ public:
     void SetWindowTitle(const std::wstring_view title) override;
     CursorType GetUserDefaultCursorStyle() const noexcept override;
     bool ResizeWindow(const til::CoordType width, const til::CoordType height) override;
-    void SetCodePage(const unsigned int codepage) noexcept override;
-    void ResetCodePage() noexcept override;
-    unsigned int GetOutputCodePage() const noexcept override;
-    unsigned int GetInputCodePage() const noexcept override;
+    void SetConsoleOutputCP(const unsigned int codepage) noexcept override;
+    unsigned int GetConsoleOutputCP() const noexcept override;
     void CopyToClipboard(wil::zwstring_view content) override;
     void SetTaskbarProgress(const ::Microsoft::Console::VirtualTerminal::DispatchTypes::TaskbarState state, const size_t progress) override;
     void SetWorkingDirectory(std::wstring_view uri) override;
@@ -236,8 +234,7 @@ public:
     void SetClearQuickFixCallback(std::function<void()> pfn) noexcept;
     void SetWindowSizeChangedCallback(std::function<void(int32_t, int32_t)> pfn) noexcept;
     void SetSearchHighlights(const std::vector<til::point_span>& highlights) noexcept;
-    void SetSearchHighlightFocused(size_t focusedIdx) noexcept;
-    void ScrollToSearchHighlight(til::CoordType searchScrollOffset);
+    void SetSearchHighlightFocused(const size_t focusedIdx, til::CoordType searchScrollOffset);
 
     void BlinkCursor() noexcept;
     void SetCursorOn(const bool isOn) noexcept;

src/cascadia/TerminalCore/TerminalApi.cpp

@@ -116,25 +116,14 @@ bool Terminal::ResizeWindow(const til::CoordType width, const til::CoordType hei
     return false;
 }
 
-void Terminal::SetCodePage(const unsigned int /*codepage*/) noexcept
+void Terminal::SetConsoleOutputCP(const unsigned int /*codepage*/) noexcept
 {
-    // Code pages are dealt with in ConHost, so this isn't needed.
+    // TODO: This will be needed to support 8-bit charsets and DOCS sequences.
 }
 
-void Terminal::ResetCodePage() noexcept
+unsigned int Terminal::GetConsoleOutputCP() const noexcept
 {
-    // There is nothing to reset, since the code page never changes.
-}
-
-unsigned int Terminal::GetOutputCodePage() const noexcept
-{
-    // See above. The code page is always UTF-8.
-    return CP_UTF8;
-}
-
-unsigned int Terminal::GetInputCodePage() const noexcept
-{
-    // See above. The code page is always UTF-8.
+    // TODO: See SetConsoleOutputCP above.
     return CP_UTF8;
 }
 

src/cascadia/TerminalSettingsEditor/Actions.xaml

@@ -178,7 +178,7 @@
                             <!--  command name  -->
                             <ColumnDefinition Width="*" />
                             <!--  key chord  -->
-                            <ColumnDefinition Width="auto" />
+                            <ColumnDefinition Width="150" />
                             <!--  edit buttons  -->
                             <!--
                                 This needs to be 112 because that is the width of the row of buttons in edit mode + padding.
@@ -307,7 +307,7 @@
                                               Glyph="&#xE74D;" />
                                 </Button.Content>
                                 <Button.Flyout>
-                                    <Flyout FlyoutPresenterStyle="{StaticResource CustomFlyoutPresenterStyle}">
+                                    <Flyout>
                                         <StackPanel>
                                             <TextBlock x:Uid="Actions_DeleteConfirmationMessage"
                                                        Style="{StaticResource CustomFlyoutTextStyle}" />

src/cascadia/TerminalSettingsEditor/ActionsViewModel.cpp

@@ -289,17 +289,14 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
                 // Display a confirmation dialog.
                 TextBlock errorMessageTB{};
                 errorMessageTB.Text(RS_(L"Actions_RenameConflictConfirmationMessage"));
-                errorMessageTB.TextWrapping(TextWrapping::Wrap);
 
                 const auto conflictingCmdName{ conflictingCmd.Name() };
                 TextBlock conflictingCommandNameTB{};
                 conflictingCommandNameTB.Text(fmt::format(L"\"{}\"", conflictingCmdName.empty() ? RS_(L"Actions_UnnamedCommandName") : conflictingCmdName));
                 conflictingCommandNameTB.FontStyle(Windows::UI::Text::FontStyle::Italic);
-                conflictingCommandNameTB.TextWrapping(TextWrapping::Wrap);
 
                 TextBlock confirmationQuestionTB{};
                 confirmationQuestionTB.Text(RS_(L"Actions_RenameConflictConfirmationQuestion"));
-                confirmationQuestionTB.TextWrapping(TextWrapping::Wrap);
 
                 Button acceptBTN{};
                 acceptBTN.Content(box_value(RS_(L"Actions_RenameConflictConfirmationAcceptButton")));
@@ -323,17 +320,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
                 flyoutStack.Children().Append(confirmationQuestionTB);
                 flyoutStack.Children().Append(acceptBTN);
 
-                // This should match CustomFlyoutPresenterStyle in CommonResources.xaml!
-                // We don't have access to those resources here, so it's easier to just copy them over.
-                // This allows the flyout text to wrap
-                Style acceptChangesFlyoutStyle{ winrt::xaml_typename<FlyoutPresenter>() };
-                Setter horizontalScrollModeStyleSetter{ ScrollViewer::HorizontalScrollModeProperty(), box_value(ScrollMode::Disabled) };
-                Setter horizontalScrollBarVisibilityStyleSetter{ ScrollViewer::HorizontalScrollBarVisibilityProperty(), box_value(ScrollBarVisibility::Disabled) };
-                acceptChangesFlyoutStyle.Setters().Append(horizontalScrollModeStyleSetter);
-                acceptChangesFlyoutStyle.Setters().Append(horizontalScrollBarVisibilityStyleSetter);
-
                 Flyout acceptChangesFlyout{};
-                acceptChangesFlyout.FlyoutPresenterStyle(acceptChangesFlyoutStyle);
                 acceptChangesFlyout.Content(flyoutStack);
                 senderVM.AcceptChangesFlyout(acceptChangesFlyout);
             }

src/cascadia/TerminalSettingsEditor/Appearances.cpp

@@ -573,9 +573,11 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         }
     }
 
-    double AppearanceViewModel::_parseCellSizeValue(const hstring& val) const
+    double AppearanceViewModel::LineHeight() const
     {
-        const auto str = val.c_str();
+        const auto fontInfo = _appearance.SourceProfile().FontInfo();
+        const auto cellHeight = fontInfo.CellHeight();
+        const auto str = cellHeight.c_str();
 
         auto& errnoRef = errno; // Nonzero cost, pay it once.
         errnoRef = 0;
@@ -586,49 +588,29 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         return str == end || errnoRef == ERANGE ? NAN : value;
     }
 
-    double AppearanceViewModel::LineHeight() const
-    {
-        const auto cellHeight = _appearance.SourceProfile().FontInfo().CellHeight();
-        return _parseCellSizeValue(cellHeight);
-    }
-
-    double AppearanceViewModel::CellWidth() const
-    {
-        const auto cellWidth = _appearance.SourceProfile().FontInfo().CellWidth();
-        return _parseCellSizeValue(cellWidth);
-    }
-
-#define CELL_SIZE_SETTER(modelName, viewModelName)                 \
-    std::wstring str;                                              \
-                                                                   \
-    if (value >= 0.1 && value <= 10.0)                             \
-    {                                                              \
-        str = fmt::format(FMT_COMPILE(L"{:.6g}"), value);          \
-    }                                                              \
-                                                                   \
-    const auto fontInfo = _appearance.SourceProfile().FontInfo();  \
-                                                                   \
-    if (fontInfo.modelName() != str)                               \
-    {                                                              \
-        if (str.empty())                                           \
-        {                                                          \
-            fontInfo.Clear##modelName();                           \
-        }                                                          \
-        else                                                       \
-        {                                                          \
-            fontInfo.modelName(str);                               \
-        }                                                          \
-        _NotifyChanges(L"Has" #viewModelName, L## #viewModelName); \
-    }
-
     void AppearanceViewModel::LineHeight(const double value)
     {
-        CELL_SIZE_SETTER(CellHeight, LineHeight);
-    }
+        std::wstring str;
 
-    void AppearanceViewModel::CellWidth(const double value)
-    {
-        CELL_SIZE_SETTER(CellWidth, CellWidth);
+        if (value >= 0.1 && value <= 10.0)
+        {
+            str = fmt::format(FMT_STRING(L"{:.6g}"), value);
+        }
+
+        const auto fontInfo = _appearance.SourceProfile().FontInfo();
+
+        if (fontInfo.CellHeight() != str)
+        {
+            if (str.empty())
+            {
+                fontInfo.ClearCellHeight();
+            }
+            else
+            {
+                fontInfo.CellHeight(str);
+            }
+            _NotifyChanges(L"HasLineHeight", L"LineHeight");
+        }
     }
 
     bool AppearanceViewModel::HasLineHeight() const
@@ -637,34 +619,17 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         return fontInfo.HasCellHeight();
     }
 
-    bool AppearanceViewModel::HasCellWidth() const
-    {
-        const auto fontInfo = _appearance.SourceProfile().FontInfo();
-        return fontInfo.HasCellWidth();
-    }
-
     void AppearanceViewModel::ClearLineHeight()
     {
         LineHeight(NAN);
     }
 
-    void AppearanceViewModel::ClearCellWidth()
-    {
-        CellWidth(NAN);
-    }
-
     Model::FontConfig AppearanceViewModel::LineHeightOverrideSource() const
     {
         const auto fontInfo = _appearance.SourceProfile().FontInfo();
         return fontInfo.CellHeightOverrideSource();
     }
 
-    Model::FontConfig AppearanceViewModel::CellWidthOverrideSource() const
-    {
-        const auto fontInfo = _appearance.SourceProfile().FontInfo();
-        return fontInfo.CellWidthOverrideSource();
-    }
-
     void AppearanceViewModel::SetFontWeightFromDouble(double fontWeight)
     {
         FontWeight(winrt::Microsoft::Terminal::UI::Converters::DoubleToFontWeight(fontWeight));

src/cascadia/TerminalSettingsEditor/Appearances.h

@@ -92,12 +92,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         void ClearLineHeight();
         Model::FontConfig LineHeightOverrideSource() const;
 
-        double CellWidth() const;
-        void CellWidth(const double value);
-        bool HasCellWidth() const;
-        void ClearCellWidth();
-        Model::FontConfig CellWidthOverrideSource() const;
-
         void SetFontWeightFromDouble(double fontWeight);
 
         const FontFaceDependentsData& FontFaceDependents();
@@ -167,8 +161,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         void _deleteAllFontKeyValuePairs(FontSettingIndex index);
         void _addMenuFlyoutItemToUnused(FontSettingIndex index, Windows::UI::Xaml::Controls::MenuFlyoutItemBase item);
 
-        double _parseCellSizeValue(const hstring& val) const;
-
         Model::AppearanceConfig _appearance;
         winrt::hstring _lastBgImagePath;
         std::optional<FontFaceDependentsData> _fontFaceDependents;

src/cascadia/TerminalSettingsEditor/Appearances.idl

@@ -62,7 +62,6 @@ namespace Microsoft.Terminal.Settings.Editor
         OBSERVABLE_PROJECTED_APPEARANCE_SETTING(String, FontFace);
         OBSERVABLE_PROJECTED_APPEARANCE_SETTING(Single, FontSize);
         OBSERVABLE_PROJECTED_APPEARANCE_SETTING(Double, LineHeight);
-        OBSERVABLE_PROJECTED_APPEARANCE_SETTING(Double, CellWidth);
         OBSERVABLE_PROJECTED_APPEARANCE_SETTING(Windows.UI.Text.FontWeight, FontWeight);
         OBSERVABLE_PROJECTED_APPEARANCE_SETTING(Boolean, EnableBuiltinGlyphs);
         OBSERVABLE_PROJECTED_APPEARANCE_SETTING(Boolean, EnableColorGlyphs);

src/cascadia/TerminalSettingsEditor/Appearances.xaml

@@ -264,22 +264,6 @@
                                 Value="{x:Bind Appearance.LineHeight, Mode=TwoWay}" />
             </local:SettingContainer>
 
-            <!--  Cell Width  -->
-            <local:SettingContainer x:Uid="Profile_CellWidth"
-                                    ClearSettingValue="{x:Bind Appearance.ClearCellWidth}"
-                                    HasSettingValue="{x:Bind Appearance.HasCellWidth, Mode=OneWay}"
-                                    SettingOverrideSource="{x:Bind Appearance.CellWidthOverrideSource, Mode=OneWay}"
-                                    Visibility="{x:Bind Appearance.IsDefault, Mode=OneWay}">
-                <muxc:NumberBox x:Name="_cellWidthBox"
-                                x:Uid="Profile_CellWidthBox"
-                                LargeChange="0.1"
-                                Maximum="10"
-                                Minimum="0.1"
-                                SmallChange="0.1"
-                                Style="{StaticResource NumberBoxSettingStyle}"
-                                Value="{x:Bind Appearance.CellWidth, Mode=TwoWay}" />
-            </local:SettingContainer>
-
             <!--  Font Weight  -->
             <local:SettingContainer x:Uid="Profile_FontWeight"
                                     ClearSettingValue="{x:Bind Appearance.ClearFontWeight}"

src/cascadia/TerminalSettingsEditor/CommonResources.xaml

@@ -115,7 +115,7 @@
     <!--  Used for disclaimers  -->
     <Style x:Key="DisclaimerStyle"
            TargetType="TextBlock">
-        <Setter Property="TextWrapping" Value="Wrap" />
+        <Setter Property="TextWrapping" Value="WrapWholeWords" />
         <Setter Property="MaxWidth" Value="1000" />
     </Style>
 
@@ -125,14 +125,6 @@
            TargetType="TextBlock">
         <Setter Property="FontWeight" Value="Bold" />
         <Setter Property="Margin" Value="0,0,0,10" />
-        <Setter Property="TextWrapping" Value="Wrap" />
-    </Style>
-
-    <!--  Used for the flyout itself. Removes scroll bar to allow for text wrapping.  -->
-    <Style x:Key="CustomFlyoutPresenterStyle"
-           TargetType="FlyoutPresenter">
-        <Setter Property="ScrollViewer.HorizontalScrollMode" Value="Disabled" />
-        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" />
     </Style>
 
     <!--  Number Box  -->
@@ -153,7 +145,7 @@
            BasedOn="{StaticResource BaseButtonStyle}"
            TargetType="Button">
         <Setter Property="Margin" Value="10,0,0,0" />
-        <Setter Property="MinHeight" Value="33" />
+        <Setter Property="Height" Value="33" />
     </Style>
 
     <!--  Delete button based on Accent button template  -->

src/cascadia/TerminalSettingsEditor/Compatibility.cpp

@@ -1,35 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-#include "pch.h"
-#include "Compatibility.h"
-#include "EnumEntry.h"
-#include "Compatibility.g.cpp"
-#include "CompatibilityViewModel.g.cpp"
-
-using namespace winrt::Windows::UI::Xaml::Navigation;
-using namespace winrt::Microsoft::Terminal::Settings::Model;
-
-namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
-{
-    CompatibilityViewModel::CompatibilityViewModel(Model::GlobalAppSettings globalSettings) :
-        _GlobalSettings{ globalSettings }
-    {
-        INITIALIZE_BINDABLE_ENUM_SETTING(TextMeasurement, TextMeasurement, winrt::Microsoft::Terminal::Control::TextMeasurement, L"Globals_TextMeasurement_", L"Text");
-    }
-
-    bool CompatibilityViewModel::DebugFeaturesAvailable() const noexcept
-    {
-        return Feature_DebugModeUI::IsEnabled();
-    }
-
-    Compatibility::Compatibility()
-    {
-        InitializeComponent();
-    }
-
-    void Compatibility::OnNavigatedTo(const NavigationEventArgs& e)
-    {
-        _ViewModel = e.Parameter().as<Editor::CompatibilityViewModel>();
-    }
-}

src/cascadia/TerminalSettingsEditor/Compatibility.h

@@ -1,47 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-#pragma once
-
-#include "Compatibility.g.h"
-#include "CompatibilityViewModel.g.h"
-#include "ViewModelHelpers.h"
-#include "Utils.h"
-
-namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
-{
-    struct CompatibilityViewModel : CompatibilityViewModelT<CompatibilityViewModel>, ViewModelHelper<CompatibilityViewModel>
-    {
-    public:
-        CompatibilityViewModel(Model::GlobalAppSettings globalSettings);
-
-        bool DebugFeaturesAvailable() const noexcept;
-
-        // DON'T YOU DARE ADD A `WINRT_CALLBACK(PropertyChanged` TO A CLASS DERIVED FROM ViewModelHelper. Do this instead:
-        using ViewModelHelper<CompatibilityViewModel>::PropertyChanged;
-
-        PERMANENT_OBSERVABLE_PROJECTED_SETTING(_GlobalSettings, AllowHeadless);
-        PERMANENT_OBSERVABLE_PROJECTED_SETTING(_GlobalSettings, IsolatedMode);
-        PERMANENT_OBSERVABLE_PROJECTED_SETTING(_GlobalSettings, DebugFeaturesEnabled);
-        GETSET_BINDABLE_ENUM_SETTING(TextMeasurement, winrt::Microsoft::Terminal::Control::TextMeasurement, _GlobalSettings.TextMeasurement);
-
-    private:
-        Model::GlobalAppSettings _GlobalSettings;
-    };
-
-    struct Compatibility : public HasScrollViewer<Compatibility>, CompatibilityT<Compatibility>
-    {
-        Compatibility();
-
-        void OnNavigatedTo(const winrt::Windows::UI::Xaml::Navigation::NavigationEventArgs& e);
-
-        til::property_changed_event PropertyChanged;
-        WINRT_OBSERVABLE_PROPERTY(Editor::CompatibilityViewModel, ViewModel, PropertyChanged.raise, nullptr);
-    };
-}
-
-namespace winrt::Microsoft::Terminal::Settings::Editor::factory_implementation
-{
-    BASIC_FACTORY(Compatibility);
-    BASIC_FACTORY(CompatibilityViewModel);
-}

src/cascadia/TerminalSettingsEditor/Compatibility.idl

@@ -1,29 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-import "EnumEntry.idl";
-
-#include "ViewModelHelpers.idl.h"
-
-namespace Microsoft.Terminal.Settings.Editor
-{
-    runtimeclass CompatibilityViewModel : Windows.UI.Xaml.Data.INotifyPropertyChanged
-    {
-        CompatibilityViewModel(Microsoft.Terminal.Settings.Model.GlobalAppSettings globalSettings);
-
-        Boolean DebugFeaturesAvailable { get; };
-
-        PERMANENT_OBSERVABLE_PROJECTED_SETTING(Boolean, AllowHeadless);
-        PERMANENT_OBSERVABLE_PROJECTED_SETTING(Boolean, IsolatedMode);
-        PERMANENT_OBSERVABLE_PROJECTED_SETTING(Boolean, DebugFeaturesEnabled);
-
-        IInspectable CurrentTextMeasurement;
-        Windows.Foundation.Collections.IObservableVector<Microsoft.Terminal.Settings.Editor.EnumEntry> TextMeasurementList { get; };
-    }
-
-    [default_interface] runtimeclass Compatibility : Windows.UI.Xaml.Controls.Page
-    {
-        Compatibility();
-        CompatibilityViewModel ViewModel { get; };
-    }
-}

src/cascadia/TerminalSettingsEditor/Compatibility.xaml

@@ -1,56 +0,0 @@
-<!--
-    Copyright (c) Microsoft Corporation. All rights reserved. Licensed under
-    the MIT License. See LICENSE in the project root for license information.
--->
-<Page x:Class="Microsoft.Terminal.Settings.Editor.Compatibility"
-      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-      xmlns:local="using:Microsoft.Terminal.Settings.Editor"
-      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-      xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
-      mc:Ignorable="d">
-
-    <Page.Resources>
-        <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="CommonResources.xaml" />
-            </ResourceDictionary.MergedDictionaries>
-
-            <DataTemplate x:Key="EnumComboBoxTemplate"
-                          x:DataType="local:EnumEntry">
-                <TextBlock Text="{x:Bind EnumName}" />
-            </DataTemplate>
-        </ResourceDictionary>
-    </Page.Resources>
-
-    <StackPanel Style="{StaticResource SettingsStackStyle}">
-        <!--  Allow Headless  -->
-        <local:SettingContainer x:Uid="Globals_AllowHeadless">
-            <ToggleSwitch IsOn="{x:Bind ViewModel.AllowHeadless, Mode=TwoWay}"
-                          Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-        </local:SettingContainer>
-
-        <!--  Isolated Mode  -->
-        <local:SettingContainer x:Uid="Globals_IsolatedMode">
-            <ToggleSwitch IsOn="{x:Bind ViewModel.IsolatedMode, Mode=TwoWay}"
-                          Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-        </local:SettingContainer>
-
-        <!--  Text Measurement  -->
-        <local:SettingContainer x:Uid="Globals_TextMeasurement">
-            <ComboBox AutomationProperties.AccessibilityView="Content"
-                      ItemTemplate="{StaticResource EnumComboBoxTemplate}"
-                      ItemsSource="{x:Bind ViewModel.TextMeasurementList}"
-                      SelectedItem="{x:Bind ViewModel.CurrentTextMeasurement, Mode=TwoWay}"
-                      Style="{StaticResource ComboBoxSettingStyle}" />
-        </local:SettingContainer>
-
-        <!--  Debug Features  -->
-        <local:SettingContainer x:Uid="Globals_DebugFeaturesEnabled"
-                                Visibility="{x:Bind ViewModel.DebugFeaturesAvailable}">
-            <ToggleSwitch IsOn="{x:Bind ViewModel.DebugFeaturesEnabled, Mode=TwoWay}"
-                          Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-        </local:SettingContainer>
-    </StackPanel>
-</Page>

src/cascadia/TerminalSettingsEditor/EditColorScheme.xaml

@@ -488,7 +488,7 @@
                     </StackPanel>
                 </Button.Content>
                 <Button.Flyout>
-                    <Flyout FlyoutPresenterStyle="{StaticResource CustomFlyoutPresenterStyle}">
+                    <Flyout>
                         <StackPanel>
                             <TextBlock x:Uid="ColorScheme_DeleteConfirmationMessage"
                                        Style="{StaticResource CustomFlyoutTextStyle}" />

src/cascadia/TerminalSettingsEditor/GlobalAppearance.xaml

@@ -27,6 +27,20 @@
     </Page.Resources>
 
     <StackPanel Style="{StaticResource SettingsStackStyle}">
+        <!--  Language  -->
+        <local:SettingContainer x:Uid="Globals_Language"
+                                Visibility="{x:Bind ViewModel.LanguageSelectorAvailable}">
+            <ComboBox ItemsSource="{x:Bind ViewModel.LanguageList}"
+                      SelectedItem="{x:Bind ViewModel.CurrentLanguage, Mode=TwoWay}"
+                      Style="{StaticResource ComboBoxSettingStyle}">
+                <ComboBox.ItemTemplate>
+                    <DataTemplate x:DataType="x:String">
+                        <TextBlock Text="{x:Bind local:GlobalAppearanceViewModel.LanguageDisplayConverter((x:String))}" />
+                    </DataTemplate>
+                </ComboBox.ItemTemplate>
+            </ComboBox>
+        </local:SettingContainer>
+
         <!--  Theme  -->
         <local:SettingContainer x:Uid="Globals_Theme">
             <ComboBox AutomationProperties.AccessibilityView="Content"
@@ -115,17 +129,5 @@
             <ToggleSwitch IsOn="{x:Bind ViewModel.AutoHideWindow, Mode=TwoWay}"
                           Style="{StaticResource ToggleSwitchInExpanderStyle}" />
         </local:SettingContainer>
-
-        <!--  Show Admin Shield  -->
-        <local:SettingContainer x:Uid="Globals_ShowAdminShield">
-            <ToggleSwitch IsOn="{x:Bind ViewModel.ShowAdminShield, Mode=TwoWay}"
-                          Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-        </local:SettingContainer>
-
-        <!--  Enable Unfocused Acrylic  -->
-        <local:SettingContainer x:Uid="Globals_EnableUnfocusedAcrylic">
-            <ToggleSwitch IsOn="{x:Bind ViewModel.EnableUnfocusedAcrylic, Mode=TwoWay}"
-                          Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-        </local:SettingContainer>
     </StackPanel>
 </Page>

src/cascadia/TerminalSettingsEditor/GlobalAppearanceViewModel.cpp

@@ -7,6 +7,7 @@
 #include "EnumEntry.h"
 
 #include <LibraryResources.h>
+#include <WtExeUtils.h>
 
 using namespace winrt;
 using namespace winrt::Windows::UI::Xaml;
@@ -17,6 +18,28 @@ using namespace winrt::Windows::Foundation::Collections;
 
 namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 {
+    // For ComboBox an empty SelectedItem string denotes no selection.
+    // What we want instead is for "Use system language" to be selected by default.
+    // --> "und" is synonymous for "Use system language".
+    constexpr std::wstring_view systemLanguageTag{ L"und" };
+
+    static constexpr std::array appLanguageTags{
+        L"en-US",
+        L"de-DE",
+        L"es-ES",
+        L"fr-FR",
+        L"it-IT",
+        L"ja",
+        L"ko",
+        L"pt-BR",
+        L"qps-PLOC",
+        L"qps-PLOCA",
+        L"qps-PLOCM",
+        L"ru",
+        L"zh-Hans",
+        L"zh-Hant",
+    };
+
     constexpr std::wstring_view systemThemeName{ L"system" };
     constexpr std::wstring_view darkThemeName{ L"dark" };
     constexpr std::wstring_view lightThemeName{ L"light" };
@@ -33,6 +56,146 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         _UpdateThemeList();
     }
 
+    winrt::hstring GlobalAppearanceViewModel::LanguageDisplayConverter(const winrt::hstring& tag)
+    {
+        if (tag == systemLanguageTag)
+        {
+            return RS_(L"Globals_LanguageDefault");
+        }
+
+        winrt::Windows::Globalization::Language language{ tag };
+        return language.NativeName();
+    }
+
+    // Returns whether the language selector is available/shown.
+    //
+    // winrt::Windows::Globalization::ApplicationLanguages::PrimaryLanguageOverride()
+    // doesn't work for unpackaged applications. The corresponding code in TerminalApp is disabled.
+    // It would be confusing for our users if we presented a dysfunctional language selector.
+    bool GlobalAppearanceViewModel::LanguageSelectorAvailable()
+    {
+        return IsPackaged();
+    }
+
+    // Returns the list of languages the user may override the application language with.
+    // The returned list are BCP 47 language tags like {"und", "en-US", "de-DE", "es-ES", ...}.
+    // "und" is short for "undefined" and is synonymous for "Use system language" in this code.
+    winrt::Windows::Foundation::Collections::IObservableVector<winrt::hstring> GlobalAppearanceViewModel::LanguageList()
+    {
+        if (_languageList)
+        {
+            return _languageList;
+        }
+
+        if (!LanguageSelectorAvailable())
+        {
+            _languageList = {};
+            return _languageList;
+        }
+
+        // In order to return the language list this code does the following:
+        // [1] Get all possible languages we want to allow the user to choose.
+        //     We have to acquire languages from multiple sources, creating duplicates. See below at [1].
+        // [2] Sort languages by their ASCII tags, forcing the UI in a consistent/stable order.
+        //     I wanted to sort the localized language names initially, but it turned out to be complex.
+        // [3] Remove potential duplicates in our language list from [1].
+        //     We don't want to have en-US twice in the list, do we?
+        // [4] Optionally remove unwanted language tags (like pseudo-localizations).
+
+        std::vector<winrt::hstring> tags;
+
+        // [1]:
+        {
+            // ManifestLanguages contains languages the app ships with.
+            // Unfortunately, we cannot use this source. Our manifest must contain the
+            // ~100 languages that are localized for the shell extension and start menu
+            // presentation so we align with Windows display languages for those surfaces.
+            // However, the actual content of our application is limited to a much smaller
+            // subset of approximately 14 languages. As such, we will code the limited
+            // subset of languages that we support for selection within the Settings
+            // dropdown to steer users towards the ones that we can display in the app.
+
+            // As per the function definition, the first item
+            // is always "Use system language" ("und").
+            tags.emplace_back(systemLanguageTag);
+
+            // Add our hard-coded languages after the system definition.
+            for (const auto& v : appLanguageTags)
+            {
+                tags.push_back(v);
+            }
+        }
+
+        // NOTE: The size of tags is always >0, due to tags[0] being hard-coded to "und".
+        const auto tagsBegin = ++tags.begin();
+        const auto tagsEnd = tags.end();
+
+        // [2]:
+        std::sort(tagsBegin, tagsEnd);
+
+        // I'd love for both, std::unique and std::remove_if, to occur in a single loop,
+        // but the code turned out to be complex and even less maintainable, so I gave up.
+        {
+            // [3] part 1:
+            auto it = std::unique(tagsBegin, tagsEnd);
+
+            // The qps- languages are useful for testing ("pseudo-localization").
+            // --> Leave them in if debug features are enabled.
+            if (!_GlobalSettings.DebugFeaturesEnabled())
+            {
+                // [4] part 1:
+                it = std::remove_if(tagsBegin, it, [](const winrt::hstring& tag) -> bool {
+                    return til::starts_with(tag, L"qps-");
+                });
+            }
+
+            // [3], [4] part 2 (completing the so called "erase-remove idiom"):
+            tags.erase(it, tagsEnd);
+        }
+
+        _languageList = winrt::single_threaded_observable_vector(std::move(tags));
+        return _languageList;
+    }
+
+    winrt::Windows::Foundation::IInspectable GlobalAppearanceViewModel::CurrentLanguage()
+    {
+        if (_currentLanguage)
+        {
+            return _currentLanguage;
+        }
+
+        if (!LanguageSelectorAvailable())
+        {
+            _currentLanguage = {};
+            return _currentLanguage;
+        }
+
+        // NOTE: PrimaryLanguageOverride throws if this instance is unpackaged.
+        auto currentLanguage = winrt::Windows::Globalization::ApplicationLanguages::PrimaryLanguageOverride();
+        if (currentLanguage.empty())
+        {
+            currentLanguage = systemLanguageTag;
+        }
+
+        _currentLanguage = winrt::box_value(currentLanguage);
+        return _currentLanguage;
+    }
+
+    void GlobalAppearanceViewModel::CurrentLanguage(const winrt::Windows::Foundation::IInspectable& tag)
+    {
+        _currentLanguage = tag;
+
+        const auto currentLanguage = winrt::unbox_value<winrt::hstring>(_currentLanguage);
+        if (currentLanguage == systemLanguageTag)
+        {
+            _GlobalSettings.ClearLanguage();
+        }
+        else
+        {
+            _GlobalSettings.Language(currentLanguage);
+        }
+    }
+
     // Function Description:
     // - Updates the list of all themes available to choose from.
     void GlobalAppearanceViewModel::_UpdateThemeList()

src/cascadia/TerminalSettingsEditor/GlobalAppearanceViewModel.h

@@ -22,6 +22,16 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         GETSET_BINDABLE_ENUM_SETTING(TabWidthMode, winrt::Microsoft::UI::Xaml::Controls::TabViewWidthMode, _GlobalSettings.TabWidthMode);
 
     public:
+        // LanguageDisplayConverter maps the given BCP 47 tag to a localized string.
+        // For instance "en-US" produces "English (United States)", while "de-DE" produces
+        // "Deutsch (Deutschland)". This works independently of the user's locale.
+        static winrt::hstring LanguageDisplayConverter(const winrt::hstring& tag);
+
+        bool LanguageSelectorAvailable();
+        winrt::Windows::Foundation::Collections::IObservableVector<winrt::hstring> LanguageList();
+        winrt::Windows::Foundation::IInspectable CurrentLanguage();
+        void CurrentLanguage(const winrt::Windows::Foundation::IInspectable& tag);
+
         winrt::Windows::Foundation::IInspectable CurrentTheme();
         void CurrentTheme(const winrt::Windows::Foundation::IInspectable& tag);
         static winrt::hstring ThemeNameConverter(const Model::Theme& theme);
@@ -39,11 +49,11 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         PERMANENT_OBSERVABLE_PROJECTED_SETTING(_GlobalSettings, AutoHideWindow);
         PERMANENT_OBSERVABLE_PROJECTED_SETTING(_GlobalSettings, AlwaysShowNotificationIcon);
         PERMANENT_OBSERVABLE_PROJECTED_SETTING(_GlobalSettings, MinimizeToNotificationArea);
-        PERMANENT_OBSERVABLE_PROJECTED_SETTING(_GlobalSettings, ShowAdminShield);
-        PERMANENT_OBSERVABLE_PROJECTED_SETTING(_GlobalSettings, EnableUnfocusedAcrylic);
 
     private:
         Model::GlobalAppSettings _GlobalSettings;
+        winrt::Windows::Foundation::Collections::IObservableVector<winrt::hstring> _languageList;
+        winrt::Windows::Foundation::IInspectable _currentLanguage;
         winrt::Windows::Foundation::IInspectable _currentTheme;
 
         void _UpdateThemeList();

src/cascadia/TerminalSettingsEditor/GlobalAppearanceViewModel.idl

@@ -11,6 +11,11 @@ namespace Microsoft.Terminal.Settings.Editor
     {
         GlobalAppearanceViewModel(Microsoft.Terminal.Settings.Model.GlobalAppSettings globalSettings);
 
+        static String LanguageDisplayConverter(String tag);
+        Boolean LanguageSelectorAvailable { get; };
+        Windows.Foundation.Collections.IObservableVector<String> LanguageList { get; };
+        IInspectable CurrentLanguage;
+
         IInspectable CurrentTheme;
         static String ThemeNameConverter(Microsoft.Terminal.Settings.Model.Theme theme);
         Windows.Foundation.Collections.IObservableVector<Microsoft.Terminal.Settings.Model.Theme> ThemeList { get; };
@@ -33,7 +38,5 @@ namespace Microsoft.Terminal.Settings.Editor
         PERMANENT_OBSERVABLE_PROJECTED_SETTING(Boolean, AutoHideWindow);
         PERMANENT_OBSERVABLE_PROJECTED_SETTING(Boolean, AlwaysShowNotificationIcon);
         PERMANENT_OBSERVABLE_PROJECTED_SETTING(Boolean, MinimizeToNotificationArea);
-        PERMANENT_OBSERVABLE_PROJECTED_SETTING(Boolean, ShowAdminShield);
-        PERMANENT_OBSERVABLE_PROJECTED_SETTING(Boolean, EnableUnfocusedAcrylic);
     }
 }

src/cascadia/TerminalSettingsEditor/Interaction.xaml

@@ -24,116 +24,73 @@
         </ResourceDictionary>
     </Page.Resources>
 
-    <StackPanel>
-        <StackPanel Style="{StaticResource SettingsStackStyle}">
-            <!--  Copy On Select  -->
-            <local:SettingContainer x:Uid="Globals_CopyOnSelect">
-                <ToggleSwitch IsOn="{x:Bind ViewModel.CopyOnSelect, Mode=TwoWay}"
-                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
+    <StackPanel Style="{StaticResource SettingsStackStyle}">
+        <!--  Copy On Select  -->
+        <local:SettingContainer x:Uid="Globals_CopyOnSelect">
+            <ToggleSwitch IsOn="{x:Bind ViewModel.CopyOnSelect, Mode=TwoWay}"
+                          Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+        </local:SettingContainer>
 
-            <!--  Copy Format  -->
-            <local:SettingContainer x:Uid="Globals_CopyFormat">
-                <ComboBox AutomationProperties.AccessibilityView="Content"
-                          ItemTemplate="{StaticResource EnumComboBoxTemplate}"
-                          ItemsSource="{x:Bind ViewModel.CopyFormatList, Mode=OneWay}"
-                          SelectedItem="{x:Bind ViewModel.CurrentCopyFormat, Mode=TwoWay}"
-                          Style="{StaticResource ComboBoxSettingStyle}" />
-            </local:SettingContainer>
+        <!--  Copy Format  -->
+        <local:SettingContainer x:Uid="Globals_CopyFormat">
+            <ComboBox AutomationProperties.AccessibilityView="Content"
+                      ItemTemplate="{StaticResource EnumComboBoxTemplate}"
+                      ItemsSource="{x:Bind ViewModel.CopyFormatList, Mode=OneWay}"
+                      SelectedItem="{x:Bind ViewModel.CurrentCopyFormat, Mode=TwoWay}"
+                      Style="{StaticResource ComboBoxSettingStyle}" />
+        </local:SettingContainer>
 
-            <!--  Trim Block Selection  -->
-            <local:SettingContainer x:Uid="Globals_TrimBlockSelection">
-                <ToggleSwitch IsOn="{x:Bind ViewModel.TrimBlockSelection, Mode=TwoWay}"
-                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
+        <!--  Trim Block Selection  -->
+        <local:SettingContainer x:Uid="Globals_TrimBlockSelection">
+            <ToggleSwitch IsOn="{x:Bind ViewModel.TrimBlockSelection, Mode=TwoWay}"
+                          Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+        </local:SettingContainer>
 
-            <!--  Trim Paste  -->
-            <local:SettingContainer x:Uid="Globals_TrimPaste">
-                <ToggleSwitch IsOn="{x:Bind ViewModel.TrimPaste, Mode=TwoWay}"
-                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
+        <!--  Trim Paste  -->
+        <local:SettingContainer x:Uid="Globals_TrimPaste">
+            <ToggleSwitch IsOn="{x:Bind ViewModel.TrimPaste, Mode=TwoWay}"
+                          Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+        </local:SettingContainer>
 
-            <!--  Word Delimiters  -->
-            <local:SettingContainer x:Uid="Globals_WordDelimiters"
-                                    CurrentValue="{x:Bind ViewModel.WordDelimiters, Mode=OneWay}"
-                                    Style="{StaticResource ExpanderSettingContainerStyle}">
-                <TextBox IsSpellCheckEnabled="False"
-                         Style="{StaticResource TextBoxSettingStyle}"
-                         Text="{x:Bind ViewModel.WordDelimiters, Mode=TwoWay}" />
-            </local:SettingContainer>
+        <!--  Word Delimiters  -->
+        <local:SettingContainer x:Uid="Globals_WordDelimiters"
+                                CurrentValue="{x:Bind ViewModel.WordDelimiters, Mode=OneWay}"
+                                Style="{StaticResource ExpanderSettingContainerStyle}">
+            <TextBox IsSpellCheckEnabled="False"
+                     Style="{StaticResource TextBoxSettingStyle}"
+                     Text="{x:Bind ViewModel.WordDelimiters, Mode=TwoWay}" />
+        </local:SettingContainer>
 
-            <!--  Snap On Resize  -->
-            <local:SettingContainer x:Uid="Globals_SnapToGridOnResize">
-                <ToggleSwitch IsOn="{x:Bind ViewModel.SnapToGridOnResize, Mode=TwoWay}"
-                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
+        <!--  Snap On Resize  -->
+        <local:SettingContainer x:Uid="Globals_SnapToGridOnResize">
+            <ToggleSwitch IsOn="{x:Bind ViewModel.SnapToGridOnResize, Mode=TwoWay}"
+                          Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+        </local:SettingContainer>
 
-            <!--  Tab Switcher Mode  -->
-            <local:SettingContainer x:Uid="Globals_TabSwitcherMode">
-                <ComboBox AutomationProperties.AccessibilityView="Content"
-                          ItemTemplate="{StaticResource EnumComboBoxTemplate}"
-                          ItemsSource="{x:Bind ViewModel.TabSwitcherModeList}"
-                          SelectedItem="{x:Bind ViewModel.CurrentTabSwitcherMode, Mode=TwoWay}"
-                          Style="{StaticResource ComboBoxSettingStyle}" />
-            </local:SettingContainer>
+        <!--  Tab Switcher Mode  -->
+        <local:SettingContainer x:Uid="Globals_TabSwitcherMode">
+            <ComboBox AutomationProperties.AccessibilityView="Content"
+                      ItemTemplate="{StaticResource EnumComboBoxTemplate}"
+                      ItemsSource="{x:Bind ViewModel.TabSwitcherModeList}"
+                      SelectedItem="{x:Bind ViewModel.CurrentTabSwitcherMode, Mode=TwoWay}"
+                      Style="{StaticResource ComboBoxSettingStyle}" />
+        </local:SettingContainer>
 
-            <!--  Focus Follow Mouse Mode  -->
-            <local:SettingContainer x:Uid="Globals_FocusFollowMouse">
-                <ToggleSwitch IsOn="{x:Bind ViewModel.FocusFollowMouse, Mode=TwoWay}"
-                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
+        <!--  Focus Follow Mouse Mode  -->
+        <local:SettingContainer x:Uid="Globals_FocusFollowMouse">
+            <ToggleSwitch IsOn="{x:Bind ViewModel.FocusFollowMouse, Mode=TwoWay}"
+                          Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+        </local:SettingContainer>
 
-            <!--  Detect URLs  -->
-            <local:SettingContainer x:Uid="Globals_DetectURLs">
-                <ToggleSwitch IsOn="{x:Bind ViewModel.DetectURLs, Mode=TwoWay}"
-                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
+        <!--  Detect URLs  -->
+        <local:SettingContainer x:Uid="Globals_DetectURLs">
+            <ToggleSwitch IsOn="{x:Bind ViewModel.DetectURLs, Mode=TwoWay}"
+                          Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+        </local:SettingContainer>
 
-            <!--  Search Web Default Query URL  -->
-            <local:SettingContainer x:Uid="Globals_SearchWebDefaultQueryUrl"
-                                    CurrentValue="{x:Bind ViewModel.SearchWebDefaultQueryUrl, Mode=OneWay}"
-                                    Style="{StaticResource ExpanderSettingContainerStyle}">
-                <TextBox IsSpellCheckEnabled="False"
-                         Style="{StaticResource TextBoxSettingStyle}"
-                         Text="{x:Bind ViewModel.SearchWebDefaultQueryUrl, Mode=TwoWay}" />
-            </local:SettingContainer>
-
-            <!--  Enable Color Selection  -->
-            <local:SettingContainer x:Uid="Globals_EnableColorSelection">
-                <ToggleSwitch IsOn="{x:Bind ViewModel.EnableColorSelection, Mode=TwoWay}"
-                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
-        </StackPanel>
-
-        <StackPanel Style="{StaticResource SettingsStackStyle}">
-            <!--  Grouping: Warnings  -->
-            <TextBlock x:Uid="Globals_WarningsHeader"
-                       Style="{StaticResource TextBlockSubHeaderStyle}" />
-
-            <!--  Close All Tabs Warning  -->
-            <local:SettingContainer x:Uid="Globals_ConfirmCloseAllTabs">
-                <ToggleSwitch IsOn="{x:Bind ViewModel.ConfirmCloseAllTabs, Mode=TwoWay}"
-                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
-
-            <!--  Input Service Warning  -->
-            <local:SettingContainer x:Uid="Globals_InputServiceWarning">
-                <ToggleSwitch IsOn="{x:Bind ViewModel.InputServiceWarning, Mode=TwoWay}"
-                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
-
-            <!--  Large Paste Warning  -->
-            <local:SettingContainer x:Uid="Globals_WarnAboutLargePaste">
-                <ToggleSwitch IsOn="{x:Bind ViewModel.WarnAboutLargePaste, Mode=TwoWay}"
-                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
-
-            <!--  Multi Line Paste Warning  -->
-            <local:SettingContainer x:Uid="Globals_WarnAboutMultiLinePaste">
-                <ToggleSwitch IsOn="{x:Bind ViewModel.WarnAboutMultiLinePaste, Mode=TwoWay}"
-                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
-
-        </StackPanel>
+        <local:SettingContainer x:Uid="Globals_ConfirmCloseAllTabs">
+            <ToggleSwitch IsOn="{x:Bind ViewModel.ConfirmCloseAllTabs, Mode=TwoWay}"
+                          Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+        </local:SettingContainer>
     </StackPanel>
 </Page>

src/cascadia/TerminalSettingsEditor/InteractionViewModel.h

@@ -26,13 +26,8 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         PERMANENT_OBSERVABLE_PROJECTED_SETTING(_GlobalSettings, SnapToGridOnResize);
         PERMANENT_OBSERVABLE_PROJECTED_SETTING(_GlobalSettings, FocusFollowMouse);
         PERMANENT_OBSERVABLE_PROJECTED_SETTING(_GlobalSettings, DetectURLs);
-        PERMANENT_OBSERVABLE_PROJECTED_SETTING(_GlobalSettings, SearchWebDefaultQueryUrl);
         PERMANENT_OBSERVABLE_PROJECTED_SETTING(_GlobalSettings, WordDelimiters);
         PERMANENT_OBSERVABLE_PROJECTED_SETTING(_GlobalSettings, ConfirmCloseAllTabs);
-        PERMANENT_OBSERVABLE_PROJECTED_SETTING(_GlobalSettings, InputServiceWarning);
-        PERMANENT_OBSERVABLE_PROJECTED_SETTING(_GlobalSettings, WarnAboutLargePaste);
-        PERMANENT_OBSERVABLE_PROJECTED_SETTING(_GlobalSettings, WarnAboutMultiLinePaste);
-        PERMANENT_OBSERVABLE_PROJECTED_SETTING(_GlobalSettings, EnableColorSelection);
 
     private:
         Model::GlobalAppSettings _GlobalSettings;

src/cascadia/TerminalSettingsEditor/InteractionViewModel.idl

@@ -23,12 +23,7 @@ namespace Microsoft.Terminal.Settings.Editor
         PERMANENT_OBSERVABLE_PROJECTED_SETTING(Boolean, SnapToGridOnResize);
         PERMANENT_OBSERVABLE_PROJECTED_SETTING(Boolean, FocusFollowMouse);
         PERMANENT_OBSERVABLE_PROJECTED_SETTING(Boolean, DetectURLs);
-        PERMANENT_OBSERVABLE_PROJECTED_SETTING(String, SearchWebDefaultQueryUrl);
         PERMANENT_OBSERVABLE_PROJECTED_SETTING(String, WordDelimiters);
         PERMANENT_OBSERVABLE_PROJECTED_SETTING(Boolean, ConfirmCloseAllTabs);
-        PERMANENT_OBSERVABLE_PROJECTED_SETTING(Boolean, InputServiceWarning);
-        PERMANENT_OBSERVABLE_PROJECTED_SETTING(Boolean, WarnAboutLargePaste);
-        PERMANENT_OBSERVABLE_PROJECTED_SETTING(Boolean, WarnAboutMultiLinePaste);
-        PERMANENT_OBSERVABLE_PROJECTED_SETTING(Boolean, EnableColorSelection);
     }
 }

src/cascadia/TerminalSettingsEditor/Launch.xaml

@@ -139,29 +139,6 @@
                 </ComboBox>
             </local:SettingContainer>
 
-            <!--  Language  -->
-            <local:SettingContainer x:Uid="Globals_Language"
-                                    Visibility="{x:Bind ViewModel.LanguageSelectorAvailable}">
-                <ComboBox ItemsSource="{x:Bind ViewModel.LanguageList}"
-                          SelectedItem="{x:Bind ViewModel.CurrentLanguage, Mode=TwoWay}"
-                          Style="{StaticResource ComboBoxSettingStyle}">
-                    <ComboBox.ItemTemplate>
-                        <DataTemplate x:DataType="x:String">
-                            <TextBlock Text="{x:Bind local:LaunchViewModel.LanguageDisplayConverter((x:String))}" />
-                        </DataTemplate>
-                    </ComboBox.ItemTemplate>
-                </ComboBox>
-            </local:SettingContainer>
-
-            <!--  Language  -->
-            <local:SettingContainer x:Uid="Globals_DefaultInputScope">
-                <ComboBox AutomationProperties.AccessibilityView="Content"
-                          ItemTemplate="{StaticResource EnumComboBoxTemplate}"
-                          ItemsSource="{x:Bind ViewModel.DefaultInputScopeList}"
-                          SelectedItem="{x:Bind ViewModel.CurrentDefaultInputScope, Mode=TwoWay}"
-                          Style="{StaticResource ComboBoxSettingStyle}" />
-            </local:SettingContainer>
-
             <!--  Start on User Login  -->
             <local:SettingContainer x:Uid="Globals_StartOnUserLogin">
                 <ToggleSwitch IsOn="{x:Bind ViewModel.StartOnUserLogin, Mode=TwoWay}"

src/cascadia/TerminalSettingsEditor/LaunchViewModel.cpp

@@ -5,9 +5,7 @@
 #include "LaunchViewModel.h"
 #include "LaunchViewModel.g.cpp"
 #include "EnumEntry.h"
-
 #include <LibraryResources.h>
-#include <WtExeUtils.h>
 
 using namespace winrt::Windows::UI::Xaml::Navigation;
 using namespace winrt::Windows::Foundation;
@@ -16,34 +14,11 @@ using namespace winrt::Windows::UI::Xaml::Data;
 
 namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 {
-    // For ComboBox an empty SelectedItem string denotes no selection.
-    // What we want instead is for "Use system language" to be selected by default.
-    // --> "und" is synonymous for "Use system language".
-    constexpr std::wstring_view systemLanguageTag{ L"und" };
-
-    static constexpr std::array appLanguageTags{
-        L"en-US",
-        L"de-DE",
-        L"es-ES",
-        L"fr-FR",
-        L"it-IT",
-        L"ja",
-        L"ko",
-        L"pt-BR",
-        L"qps-PLOC",
-        L"qps-PLOCA",
-        L"qps-PLOCM",
-        L"ru",
-        L"zh-Hans",
-        L"zh-Hant",
-    };
-
     LaunchViewModel::LaunchViewModel(Model::CascadiaSettings settings) :
         _Settings{ settings }
     {
         _useDefaultLaunchPosition = isnan(InitialPosX()) && isnan(InitialPosY());
 
-        INITIALIZE_BINDABLE_ENUM_SETTING(DefaultInputScope, DefaultInputScope, winrt::Microsoft::Terminal::Control::DefaultInputScope, L"Globals_DefaultInputScope", L"Content");
         INITIALIZE_BINDABLE_ENUM_SETTING(FirstWindowPreference, FirstWindowPreference, FirstWindowPreference, L"Globals_FirstWindowPreference", L"Content");
         INITIALIZE_BINDABLE_ENUM_SETTING(LaunchMode, LaunchMode, LaunchMode, L"Globals_LaunchMode", L"Content");
         // More options were added to the JSON mapper when the enum was made into [Flags]
@@ -65,146 +40,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         });
     }
 
-    winrt::hstring LaunchViewModel::LanguageDisplayConverter(const winrt::hstring& tag)
-    {
-        if (tag == systemLanguageTag)
-        {
-            return RS_(L"Globals_LanguageDefault");
-        }
-
-        winrt::Windows::Globalization::Language language{ tag };
-        return language.NativeName();
-    }
-
-    // Returns whether the language selector is available/shown.
-    //
-    // winrt::Windows::Globalization::ApplicationLanguages::PrimaryLanguageOverride()
-    // doesn't work for unpackaged applications. The corresponding code in TerminalApp is disabled.
-    // It would be confusing for our users if we presented a dysfunctional language selector.
-    bool LaunchViewModel::LanguageSelectorAvailable()
-    {
-        return IsPackaged();
-    }
-
-    // Returns the list of languages the user may override the application language with.
-    // The returned list are BCP 47 language tags like {"und", "en-US", "de-DE", "es-ES", ...}.
-    // "und" is short for "undefined" and is synonymous for "Use system language" in this code.
-    winrt::Windows::Foundation::Collections::IObservableVector<winrt::hstring> LaunchViewModel::LanguageList()
-    {
-        if (_languageList)
-        {
-            return _languageList;
-        }
-
-        if (!LanguageSelectorAvailable())
-        {
-            _languageList = {};
-            return _languageList;
-        }
-
-        // In order to return the language list this code does the following:
-        // [1] Get all possible languages we want to allow the user to choose.
-        //     We have to acquire languages from multiple sources, creating duplicates. See below at [1].
-        // [2] Sort languages by their ASCII tags, forcing the UI in a consistent/stable order.
-        //     I wanted to sort the localized language names initially, but it turned out to be complex.
-        // [3] Remove potential duplicates in our language list from [1].
-        //     We don't want to have en-US twice in the list, do we?
-        // [4] Optionally remove unwanted language tags (like pseudo-localizations).
-
-        std::vector<winrt::hstring> tags;
-
-        // [1]:
-        {
-            // ManifestLanguages contains languages the app ships with.
-            // Unfortunately, we cannot use this source. Our manifest must contain the
-            // ~100 languages that are localized for the shell extension and start menu
-            // presentation so we align with Windows display languages for those surfaces.
-            // However, the actual content of our application is limited to a much smaller
-            // subset of approximately 14 languages. As such, we will code the limited
-            // subset of languages that we support for selection within the Settings
-            // dropdown to steer users towards the ones that we can display in the app.
-
-            // As per the function definition, the first item
-            // is always "Use system language" ("und").
-            tags.emplace_back(systemLanguageTag);
-
-            // Add our hard-coded languages after the system definition.
-            for (const auto& v : appLanguageTags)
-            {
-                tags.push_back(v);
-            }
-        }
-
-        // NOTE: The size of tags is always >0, due to tags[0] being hard-coded to "und".
-        const auto tagsBegin = ++tags.begin();
-        const auto tagsEnd = tags.end();
-
-        // [2]:
-        std::sort(tagsBegin, tagsEnd);
-
-        // I'd love for both, std::unique and std::remove_if, to occur in a single loop,
-        // but the code turned out to be complex and even less maintainable, so I gave up.
-        {
-            // [3] part 1:
-            auto it = std::unique(tagsBegin, tagsEnd);
-
-            // The qps- languages are useful for testing ("pseudo-localization").
-            // --> Leave them in if debug features are enabled.
-            if (!_Settings.GlobalSettings().DebugFeaturesEnabled())
-            {
-                // [4] part 1:
-                it = std::remove_if(tagsBegin, it, [](const winrt::hstring& tag) -> bool {
-                    return til::starts_with(tag, L"qps-");
-                });
-            }
-
-            // [3], [4] part 2 (completing the so called "erase-remove idiom"):
-            tags.erase(it, tagsEnd);
-        }
-
-        _languageList = winrt::single_threaded_observable_vector(std::move(tags));
-        return _languageList;
-    }
-
-    winrt::Windows::Foundation::IInspectable LaunchViewModel::CurrentLanguage()
-    {
-        if (_currentLanguage)
-        {
-            return _currentLanguage;
-        }
-
-        if (!LanguageSelectorAvailable())
-        {
-            _currentLanguage = {};
-            return _currentLanguage;
-        }
-
-        // NOTE: PrimaryLanguageOverride throws if this instance is unpackaged.
-        auto currentLanguage = winrt::Windows::Globalization::ApplicationLanguages::PrimaryLanguageOverride();
-        if (currentLanguage.empty())
-        {
-            currentLanguage = systemLanguageTag;
-        }
-
-        _currentLanguage = winrt::box_value(currentLanguage);
-        return _currentLanguage;
-    }
-
-    void LaunchViewModel::CurrentLanguage(const winrt::Windows::Foundation::IInspectable& tag)
-    {
-        _currentLanguage = tag;
-
-        const auto currentLanguage = winrt::unbox_value<winrt::hstring>(_currentLanguage);
-        if (currentLanguage == systemLanguageTag)
-        {
-            _Settings.GlobalSettings().ClearLanguage();
-        }
-        else
-        {
-            _Settings.GlobalSettings().Language(currentLanguage);
-        }
-    }
-
     winrt::hstring LaunchViewModel::LaunchParametersCurrentValue()
     {
         const auto launchModeString = CurrentLaunchMode().as<EnumEntry>()->EnumName();

src/cascadia/TerminalSettingsEditor/LaunchViewModel.h

@@ -14,16 +14,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
     public:
         LaunchViewModel(Model::CascadiaSettings settings);
 
-        // LanguageDisplayConverter maps the given BCP 47 tag to a localized string.
-        // For instance "en-US" produces "English (United States)", while "de-DE" produces
-        // "Deutsch (Deutschland)". This works independently of the user's locale.
-        static winrt::hstring LanguageDisplayConverter(const winrt::hstring& tag);
-
-        bool LanguageSelectorAvailable();
-        winrt::Windows::Foundation::Collections::IObservableVector<winrt::hstring> LanguageList();
-        winrt::Windows::Foundation::IInspectable CurrentLanguage();
-        void CurrentLanguage(const winrt::Windows::Foundation::IInspectable& tag);
-
         winrt::hstring LaunchParametersCurrentValue();
         double InitialPosX();
         double InitialPosY();
@@ -45,7 +35,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         void CurrentLaunchMode(const winrt::Windows::Foundation::IInspectable& enumEntry);
         winrt::Windows::Foundation::Collections::IObservableVector<winrt::Microsoft::Terminal::Settings::Editor::EnumEntry> LaunchModeList();
 
-        GETSET_BINDABLE_ENUM_SETTING(DefaultInputScope, winrt::Microsoft::Terminal::Control::DefaultInputScope, _Settings.GlobalSettings().DefaultInputScope);
         GETSET_BINDABLE_ENUM_SETTING(FirstWindowPreference, Model::FirstWindowPreference, _Settings.GlobalSettings().FirstWindowPreference);
         GETSET_BINDABLE_ENUM_SETTING(WindowingBehavior, Model::WindowingMode, _Settings.GlobalSettings().WindowingBehavior);
 
@@ -56,8 +45,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
     private:
         Model::CascadiaSettings _Settings;
-        winrt::Windows::Foundation::Collections::IObservableVector<winrt::hstring> _languageList;
-        winrt::Windows::Foundation::IInspectable _currentLanguage;
         bool _useDefaultLaunchPosition;
 
         winrt::Windows::Foundation::Collections::IObservableVector<winrt::Microsoft::Terminal::Settings::Editor::EnumEntry> _LaunchModeList;

src/cascadia/TerminalSettingsEditor/LaunchViewModel.idl

@@ -11,14 +11,6 @@ namespace Microsoft.Terminal.Settings.Editor
     {
         LaunchViewModel(Microsoft.Terminal.Settings.Model.CascadiaSettings settings);
 
-        static String LanguageDisplayConverter(String tag);
-        Boolean LanguageSelectorAvailable { get; };
-        Windows.Foundation.Collections.IObservableVector<String> LanguageList { get; };
-        IInspectable CurrentLanguage;
-
-        IInspectable CurrentDefaultInputScope;
-        IObservableVector<Microsoft.Terminal.Settings.Editor.EnumEntry> DefaultInputScopeList { get; };
-
         String LaunchParametersCurrentValue { get; };
         Double InitialPosX;
         Double InitialPosY;

src/cascadia/TerminalSettingsEditor/MainPage.cpp

@@ -6,7 +6,6 @@
 #include "MainPage.g.cpp"
 #include "Launch.h"
 #include "Interaction.h"
-#include "Compatibility.h"
 #include "Rendering.h"
 #include "RenderingViewModel.h"
 #include "Actions.h"
@@ -40,7 +39,6 @@ using namespace winrt::Windows::Foundation::Collections;
 static const std::wstring_view launchTag{ L"Launch_Nav" };
 static const std::wstring_view interactionTag{ L"Interaction_Nav" };
 static const std::wstring_view renderingTag{ L"Rendering_Nav" };
-static const std::wstring_view compatibilityTag{ L"Compatibility_Nav" };
 static const std::wstring_view actionsTag{ L"Actions_Nav" };
 static const std::wstring_view globalProfileTag{ L"GlobalProfile_Nav" };
 static const std::wstring_view addProfileTag{ L"AddProfile" };
@@ -341,13 +339,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
                     _breadcrumbs.Append(crumb);
                     SettingsMainPage_ScrollViewer().ScrollToVerticalOffset(0);
                 }
-                else if (currentPage == ProfileSubPage::Terminal)
-                {
-                    contentFrame().Navigate(xaml_typename<Editor::Profiles_Terminal>(), profile);
-                    const auto crumb = winrt::make<Breadcrumb>(breadcrumbTag, RS_(L"Profile_Terminal/Header"), BreadcrumbSubPage::Profile_Terminal);
-                    _breadcrumbs.Append(crumb);
-                    SettingsMainPage_ScrollViewer().ScrollToVerticalOffset(0);
-                }
                 else if (currentPage == ProfileSubPage::Advanced)
                 {
                     contentFrame().Navigate(xaml_typename<Editor::Profiles_Advanced>(), profile);
@@ -381,12 +372,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
             const auto crumb = winrt::make<Breadcrumb>(box_value(clickedItemTag), RS_(L"Nav_Rendering/Content"), BreadcrumbSubPage::None);
             _breadcrumbs.Append(crumb);
         }
-        else if (clickedItemTag == compatibilityTag)
-        {
-            contentFrame().Navigate(xaml_typename<Editor::Compatibility>(), winrt::make<CompatibilityViewModel>(_settingsClone.GlobalSettings()));
-            const auto crumb = winrt::make<Breadcrumb>(box_value(clickedItemTag), RS_(L"Nav_Compatibility/Content"), BreadcrumbSubPage::None);
-            _breadcrumbs.Append(crumb);
-        }
         else if (clickedItemTag == actionsTag)
         {
             contentFrame().Navigate(xaml_typename<Editor::Actions>(), winrt::make<ActionsViewModel>(_settingsClone));
@@ -410,10 +395,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
             {
                 profileVM.CurrentPage(ProfileSubPage::Appearance);
             }
-            else if (subPage == BreadcrumbSubPage::Profile_Terminal)
-            {
-                profileVM.CurrentPage(ProfileSubPage::Terminal);
-            }
             else if (subPage == BreadcrumbSubPage::Profile_Advanced)
             {
                 profileVM.CurrentPage(ProfileSubPage::Advanced);
@@ -471,10 +452,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         {
             profile.CurrentPage(ProfileSubPage::Appearance);
         }
-        else if (subPage == BreadcrumbSubPage::Profile_Terminal)
-        {
-            profile.CurrentPage(ProfileSubPage::Terminal);
-        }
         else if (subPage == BreadcrumbSubPage::Profile_Advanced)
         {
             profile.CurrentPage(ProfileSubPage::Advanced);

src/cascadia/TerminalSettingsEditor/MainPage.idl

@@ -17,7 +17,6 @@ namespace Microsoft.Terminal.Settings.Editor
     {
         None = 0,
         Profile_Appearance,
-        Profile_Terminal,
         Profile_Advanced,
         ColorSchemes_Edit
     };

src/cascadia/TerminalSettingsEditor/MainPage.xaml

@@ -135,13 +135,6 @@
                 </muxc:NavigationViewItem.Icon>
             </muxc:NavigationViewItem>
 
-            <muxc:NavigationViewItem x:Uid="Nav_Compatibility"
-                                     Tag="Compatibility_Nav">
-                <muxc:NavigationViewItem.Icon>
-                    <FontIcon Glyph="&#xEC7A;" />
-                </muxc:NavigationViewItem.Icon>
-            </muxc:NavigationViewItem>
-
             <muxc:NavigationViewItem x:Uid="Nav_Actions"
                                      Tag="Actions_Nav">
                 <muxc:NavigationViewItem.Icon>

src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj

@@ -64,9 +64,6 @@
     <ClInclude Include="Interaction.h">
       <DependentUpon>Interaction.xaml</DependentUpon>
     </ClInclude>
-    <ClInclude Include="Compatibility.h">
-      <DependentUpon>Compatibility.xaml</DependentUpon>
-    </ClInclude>
     <ClInclude Include="KeyChordListener.h">
       <DependentUpon>KeyChordListener.xaml</DependentUpon>
     </ClInclude>
@@ -121,10 +118,6 @@
       <DependentUpon>Profiles_Appearance.xaml</DependentUpon>
       <SubType>Code</SubType>
     </ClInclude>
-    <ClInclude Include="Profiles_Terminal.h">
-      <DependentUpon>Profiles_Terminal.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </ClInclude>
     <ClInclude Include="Appearances.h">
       <DependentUpon>Appearances.xaml</DependentUpon>
       <SubType>Code</SubType>
@@ -161,9 +154,6 @@
     <Page Include="Interaction.xaml">
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Compatibility.xaml">
-      <SubType>Designer</SubType>
-    </Page>
     <Page Include="KeyChordListener.xaml">
       <SubType>Designer</SubType>
     </Page>
@@ -182,9 +172,6 @@
     <Page Include="Profiles_Appearance.xaml">
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Profiles_Terminal.xaml">
-      <SubType>Designer</SubType>
-    </Page>
     <Page Include="Appearances.xaml">
       <SubType>Designer</SubType>
     </Page>
@@ -217,9 +204,6 @@
     <ClCompile Include="Interaction.cpp">
       <DependentUpon>Interaction.xaml</DependentUpon>
     </ClCompile>
-    <ClCompile Include="Compatibility.cpp">
-      <DependentUpon>Compatibility.xaml</DependentUpon>
-    </ClCompile>
     <ClCompile Include="KeyChordListener.cpp">
       <DependentUpon>KeyChordListener.xaml</DependentUpon>
     </ClCompile>
@@ -277,10 +261,6 @@
       <DependentUpon>Profiles_Appearance.xaml</DependentUpon>
       <SubType>Code</SubType>
     </ClCompile>
-    <ClCompile Include="Profiles_Terminal.cpp">
-      <DependentUpon>Profiles_Terminal.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </ClCompile>
     <ClCompile Include="Appearances.cpp">
       <DependentUpon>Appearances.xaml</DependentUpon>
       <SubType>Code</SubType>
@@ -331,10 +311,6 @@
       <DependentUpon>Interaction.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Midl>
-    <Midl Include="Compatibility.idl">
-      <DependentUpon>Compatibility.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Midl>
     <Midl Include="Rendering.idl">
       <DependentUpon>Rendering.xaml</DependentUpon>
       <SubType>Code</SubType>
@@ -362,10 +338,6 @@
       <DependentUpon>Profiles_Appearance.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Midl>
-    <Midl Include="Profiles_Terminal.idl">
-      <DependentUpon>Profiles_Terminal.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Midl>
     <Midl Include="Appearances.idl">
       <DependentUpon>Appearances.xaml</DependentUpon>
       <SubType>Code</SubType>

src/cascadia/TerminalSettingsEditor/ProfileViewModel.h

@@ -120,10 +120,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         OBSERVABLE_PROJECTED_SETTING(_profile, ShowMarks);
         OBSERVABLE_PROJECTED_SETTING(_profile, AutoMarkPrompts);
         OBSERVABLE_PROJECTED_SETTING(_profile, RepositionCursorWithMouse);
-        OBSERVABLE_PROJECTED_SETTING(_profile, ForceVTInput);
-        OBSERVABLE_PROJECTED_SETTING(_profile, AllowVtChecksumReport);
-        OBSERVABLE_PROJECTED_SETTING(_profile, AnswerbackMessage);
-        OBSERVABLE_PROJECTED_SETTING(_profile, RainbowSuggestions);
 
         WINRT_PROPERTY(bool, IsBaseLayer, false);
         WINRT_PROPERTY(bool, FocusDeleteButton, false);

src/cascadia/TerminalSettingsEditor/ProfileViewModel.idl

@@ -29,8 +29,7 @@ namespace Microsoft.Terminal.Settings.Editor
     {
         Base = 0,
         Appearance = 1,
-        Terminal = 2,
-        Advanced = 3
+        Advanced = 2
     };
 
     runtimeclass ProfileViewModel : Windows.UI.Xaml.Data.INotifyPropertyChanged
@@ -112,9 +111,5 @@ namespace Microsoft.Terminal.Settings.Editor
         OBSERVABLE_PROJECTED_PROFILE_SETTING(Boolean, ShowMarks);
         OBSERVABLE_PROJECTED_PROFILE_SETTING(Boolean, AutoMarkPrompts);
         OBSERVABLE_PROJECTED_PROFILE_SETTING(Boolean, RepositionCursorWithMouse);
-        OBSERVABLE_PROJECTED_PROFILE_SETTING(Boolean, ForceVTInput);
-        OBSERVABLE_PROJECTED_PROFILE_SETTING(Boolean, AllowVtChecksumReport);
-        OBSERVABLE_PROJECTED_PROFILE_SETTING(String, AnswerbackMessage);
-        OBSERVABLE_PROJECTED_PROFILE_SETTING(Boolean, RainbowSuggestions);
     }
 }

src/cascadia/TerminalSettingsEditor/Profiles_Advanced.xaml

@@ -37,6 +37,15 @@
                    Visibility="{x:Bind Profile.IsBaseLayer}" />
         <StackPanel Grid.Row="1"
                     Style="{StaticResource SettingsStackStyle}">
+            <!--  Suppress Application Title  -->
+            <local:SettingContainer x:Uid="Profile_SuppressApplicationTitle"
+                                    ClearSettingValue="{x:Bind Profile.ClearSuppressApplicationTitle}"
+                                    HasSettingValue="{x:Bind Profile.HasSuppressApplicationTitle, Mode=OneWay}"
+                                    SettingOverrideSource="{x:Bind Profile.SuppressApplicationTitleOverrideSource, Mode=OneWay}">
+                <ToggleSwitch IsOn="{x:Bind Profile.SuppressApplicationTitle, Mode=TwoWay}"
+                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+            </local:SettingContainer>
+
             <!--  Antialiasing Mode  -->
             <local:SettingContainer x:Uid="Profile_AntialiasingMode"
                                     ClearSettingValue="{x:Bind Profile.ClearAntialiasingMode}"
@@ -156,14 +165,6 @@
                               Style="{StaticResource ToggleSwitchInExpanderStyle}" />
             </local:SettingContainer>
 
-            <!--  RainbowSuggestions  -->
-            <local:SettingContainer x:Uid="Profile_RainbowSuggestions"
-                                    ClearSettingValue="{x:Bind Profile.ClearRainbowSuggestions}"
-                                    HasSettingValue="{x:Bind Profile.HasRainbowSuggestions, Mode=OneWay}"
-                                    SettingOverrideSource="{x:Bind Profile.RainbowSuggestionsOverrideSource, Mode=OneWay}">
-                <ToggleSwitch IsOn="{x:Bind Profile.RainbowSuggestions, Mode=TwoWay}"
-                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
         </StackPanel>
     </Grid>
 </Page>

src/cascadia/TerminalSettingsEditor/Profiles_Base.cpp

@@ -24,7 +24,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
         Automation::AutomationProperties::SetName(DeleteButton(), RS_(L"Profile_DeleteButton/Text"));
         AppearanceNavigator().Content(box_value(RS_(L"Profile_Appearance/Header")));
-        TerminalNavigator().Content(box_value(RS_(L"Profile_Terminal/Header")));
         AdvancedNavigator().Content(box_value(RS_(L"Profile_Advanced/Header")));
     }
 
@@ -67,11 +66,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         _Profile.CurrentPage(ProfileSubPage::Appearance);
     }
 
-    void Profiles_Base::Terminal_Click(const IInspectable& /*sender*/, const RoutedEventArgs& /*args*/)
-    {
-        _Profile.CurrentPage(ProfileSubPage::Terminal);
-    }
-
     void Profiles_Base::Advanced_Click(const IInspectable& /*sender*/, const RoutedEventArgs& /*args*/)
     {
         _Profile.CurrentPage(ProfileSubPage::Advanced);

src/cascadia/TerminalSettingsEditor/Profiles_Base.h

@@ -21,7 +21,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         safe_void_coroutine Icon_Click(const Windows::Foundation::IInspectable& sender, const Windows::UI::Xaml::RoutedEventArgs& e);
         safe_void_coroutine Commandline_Click(const Windows::Foundation::IInspectable& sender, const Windows::UI::Xaml::RoutedEventArgs& e);
         void Appearance_Click(const Windows::Foundation::IInspectable& sender, const Windows::UI::Xaml::RoutedEventArgs& e);
-        void Terminal_Click(const Windows::Foundation::IInspectable& sender, const Windows::UI::Xaml::RoutedEventArgs& e);
         void Advanced_Click(const Windows::Foundation::IInspectable& sender, const Windows::UI::Xaml::RoutedEventArgs& e);
         void DeleteConfirmation_Click(const Windows::Foundation::IInspectable& sender, const Windows::UI::Xaml::RoutedEventArgs& e);
 

src/cascadia/TerminalSettingsEditor/Profiles_Base.xaml

@@ -159,13 +159,16 @@
 
             <Button x:Name="AppearanceNavigator"
                     Click="Appearance_Click"
-                    Style="{StaticResource NavigatorButtonStyle}" />
-            <Button x:Name="TerminalNavigator"
-                    Click="Terminal_Click"
-                    Style="{StaticResource NavigatorButtonStyle}" />
+                    Style="{StaticResource NavigatorButtonStyle}">
+                Appearance
+            </Button>
             <Button x:Name="AdvancedNavigator"
                     Click="Advanced_Click"
-                    Style="{StaticResource NavigatorButtonStyle}" />
+                    Style="{StaticResource NavigatorButtonStyle}">
+                <TextBlock HorizontalAlignment="Left"
+                           VerticalAlignment="Center"
+                           Text="Advanced" />
+            </Button>
             <!--  Delete Button  -->
             <Border MaxWidth="{StaticResource StandardControlMaxWidth}">
                 <Button x:Name="DeleteButton"

src/cascadia/TerminalSettingsEditor/Profiles_Terminal.cpp

@@ -1,31 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-#include "pch.h"
-#include "Profiles_Terminal.h"
-#include "Profiles_Terminal.g.cpp"
-#include "ProfileViewModel.h"
-
-#include "EnumEntry.h"
-#include <LibraryResources.h>
-#include "..\WinRTUtils\inc\Utils.h"
-
-using namespace winrt::Windows::UI::Xaml::Navigation;
-
-namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
-{
-    Profiles_Terminal::Profiles_Terminal()
-    {
-        InitializeComponent();
-    }
-
-    void Profiles_Terminal::OnNavigatedTo(const NavigationEventArgs& e)
-    {
-        _Profile = e.Parameter().as<Editor::ProfileViewModel>();
-    }
-
-    void Profiles_Terminal::OnNavigatedFrom(const NavigationEventArgs& /*e*/)
-    {
-        _ViewModelChangedRevoker.revoke();
-    }
-}

src/cascadia/TerminalSettingsEditor/Profiles_Terminal.h

@@ -1,31 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-#pragma once
-
-#include "Profiles_Terminal.g.h"
-#include "ViewModelHelpers.h"
-#include "Utils.h"
-
-namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
-{
-    struct Profiles_Terminal : public HasScrollViewer<Profiles_Terminal>, Profiles_TerminalT<Profiles_Terminal>
-    {
-    public:
-        Profiles_Terminal();
-
-        void OnNavigatedTo(const Windows::UI::Xaml::Navigation::NavigationEventArgs& e);
-        void OnNavigatedFrom(const Windows::UI::Xaml::Navigation::NavigationEventArgs& e);
-
-        til::property_changed_event PropertyChanged;
-        WINRT_PROPERTY(Editor::ProfileViewModel, Profile, nullptr);
-
-    private:
-        Windows::UI::Xaml::Data::INotifyPropertyChanged::PropertyChanged_revoker _ViewModelChangedRevoker;
-    };
-};
-
-namespace winrt::Microsoft::Terminal::Settings::Editor::factory_implementation
-{
-    BASIC_FACTORY(Profiles_Terminal);
-}

src/cascadia/TerminalSettingsEditor/Profiles_Terminal.idl

@@ -1,13 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-import "ProfileViewModel.idl";
-
-namespace Microsoft.Terminal.Settings.Editor
-{
-    [default_interface] runtimeclass Profiles_Terminal : Windows.UI.Xaml.Controls.Page, Windows.UI.Xaml.Data.INotifyPropertyChanged
-    {
-        Profiles_Terminal();
-        ProfileViewModel Profile { get; };
-    }
-}

src/cascadia/TerminalSettingsEditor/Profiles_Terminal.xaml

@@ -1,75 +0,0 @@
-<!--
-    Copyright (c) Microsoft Corporation. All rights reserved. Licensed under
-    the MIT License. See LICENSE in the project root for license information.
--->
-<Page x:Class="Microsoft.Terminal.Settings.Editor.Profiles_Terminal"
-      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-      xmlns:local="using:Microsoft.Terminal.Settings.Editor"
-      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-      xmlns:model="using:Microsoft.Terminal.Settings.Model"
-      xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
-      mc:Ignorable="d">
-
-    <Page.Resources>
-        <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="CommonResources.xaml" />
-            </ResourceDictionary.MergedDictionaries>
-        </ResourceDictionary>
-    </Page.Resources>
-
-    <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="auto" />
-            <RowDefinition Height="*" />
-        </Grid.RowDefinitions>
-        <TextBlock x:Uid="Profile_BaseLayerDisclaimer"
-                   Grid.Row="0"
-                   Margin="{StaticResource StandardIndentMargin}"
-                   Style="{StaticResource DisclaimerStyle}"
-                   Visibility="{x:Bind Profile.IsBaseLayer}" />
-        <StackPanel Grid.Row="1"
-                    Style="{StaticResource SettingsStackStyle}">
-
-            <!--  Suppress Application Title  -->
-            <local:SettingContainer x:Uid="Profile_SuppressApplicationTitle"
-                                    ClearSettingValue="{x:Bind Profile.ClearSuppressApplicationTitle}"
-                                    HasSettingValue="{x:Bind Profile.HasSuppressApplicationTitle, Mode=OneWay}"
-                                    SettingOverrideSource="{x:Bind Profile.SuppressApplicationTitleOverrideSource, Mode=OneWay}">
-                <ToggleSwitch IsOn="{x:Bind Profile.SuppressApplicationTitle, Mode=TwoWay}"
-                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
-
-            <!--  Force VT Input  -->
-            <local:SettingContainer x:Uid="Profile_ForceVTInput"
-                                    ClearSettingValue="{x:Bind Profile.ClearForceVTInput}"
-                                    HasSettingValue="{x:Bind Profile.HasForceVTInput, Mode=OneWay}"
-                                    SettingOverrideSource="{x:Bind Profile.ForceVTInputOverrideSource, Mode=OneWay}">
-                <ToggleSwitch IsOn="{x:Bind Profile.ForceVTInput, Mode=TwoWay}"
-                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
-
-            <!--  Allow VT Checksum Report  -->
-            <local:SettingContainer x:Uid="Profile_AllowVtChecksumReport"
-                                    ClearSettingValue="{x:Bind Profile.ClearAllowVtChecksumReport}"
-                                    HasSettingValue="{x:Bind Profile.HasAllowVtChecksumReport, Mode=OneWay}"
-                                    SettingOverrideSource="{x:Bind Profile.AllowVtChecksumReportOverrideSource, Mode=OneWay}">
-                <ToggleSwitch IsOn="{x:Bind Profile.AllowVtChecksumReport, Mode=TwoWay}"
-                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
-
-            <!--  Answerback Message  -->
-            <local:SettingContainer x:Uid="Profile_AnswerbackMessage"
-                                    ClearSettingValue="{x:Bind Profile.ClearAnswerbackMessage}"
-                                    CurrentValue="{x:Bind Profile.AnswerbackMessage, Mode=OneWay}"
-                                    HasSettingValue="{x:Bind Profile.HasAnswerbackMessage, Mode=OneWay}"
-                                    SettingOverrideSource="{x:Bind Profile.AnswerbackMessageOverrideSource, Mode=OneWay}"
-                                    Style="{StaticResource ExpanderSettingContainerStyle}">
-                <TextBox Style="{StaticResource TextBoxSettingStyle}"
-                         Text="{x:Bind Profile.AnswerbackMessage, Mode=TwoWay}" />
-            </local:SettingContainer>
-        </StackPanel>
-    </Grid>
-</Page>

src/cascadia/TerminalSettingsEditor/Rendering.xaml

@@ -41,5 +41,13 @@
             <ToggleSwitch IsOn="{x:Bind ViewModel.SoftwareRendering, Mode=TwoWay}"
                           Style="{StaticResource ToggleSwitchInExpanderStyle}" />
         </local:SettingContainer>
+
+        <local:SettingContainer x:Uid="Globals_TextMeasurement">
+            <ComboBox AutomationProperties.AccessibilityView="Content"
+                      ItemTemplate="{StaticResource EnumComboBoxTemplate}"
+                      ItemsSource="{x:Bind ViewModel.TextMeasurementList}"
+                      SelectedItem="{x:Bind ViewModel.CurrentTextMeasurement, Mode=TwoWay}"
+                      Style="{StaticResource ComboBoxSettingStyle}" />
+        </local:SettingContainer>
     </StackPanel>
 </Page>

src/cascadia/TerminalSettingsEditor/RenderingViewModel.cpp

@@ -17,5 +17,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         _settings{ std::move(settings) }
     {
         INITIALIZE_BINDABLE_ENUM_SETTING(GraphicsAPI, GraphicsAPI, winrt::Microsoft::Terminal::Control::GraphicsAPI, L"Globals_GraphicsAPI_", L"Text");
+        INITIALIZE_BINDABLE_ENUM_SETTING(TextMeasurement, TextMeasurement, winrt::Microsoft::Terminal::Control::TextMeasurement, L"Globals_TextMeasurement_", L"Text");
     }
 }

src/cascadia/TerminalSettingsEditor/RenderingViewModel.h

@@ -16,6 +16,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         GETSET_BINDABLE_ENUM_SETTING(GraphicsAPI, winrt::Microsoft::Terminal::Control::GraphicsAPI, _settings.GlobalSettings().GraphicsAPI);
         PERMANENT_OBSERVABLE_PROJECTED_SETTING(_settings.GlobalSettings(), DisablePartialInvalidation);
         PERMANENT_OBSERVABLE_PROJECTED_SETTING(_settings.GlobalSettings(), SoftwareRendering);
+        GETSET_BINDABLE_ENUM_SETTING(TextMeasurement, winrt::Microsoft::Terminal::Control::TextMeasurement, _settings.GlobalSettings().TextMeasurement);
 
     private:
         Model::CascadiaSettings _settings{ nullptr };

src/cascadia/TerminalSettingsEditor/RenderingViewModel.idl

@@ -15,5 +15,7 @@ namespace Microsoft.Terminal.Settings.Editor
         Windows.Foundation.Collections.IObservableVector<Microsoft.Terminal.Settings.Editor.EnumEntry> GraphicsAPIList { get; };
         PERMANENT_OBSERVABLE_PROJECTED_SETTING(Boolean, DisablePartialInvalidation);
         PERMANENT_OBSERVABLE_PROJECTED_SETTING(Boolean, SoftwareRendering);
+        IInspectable CurrentTextMeasurement;
+        Windows.Foundation.Collections.IObservableVector<Microsoft.Terminal.Settings.Editor.EnumEntry> TextMeasurementList { get; };
     }
 }

src/cascadia/TerminalSettingsEditor/Resources/de-DE/Resources.resw

@@ -246,22 +246,9 @@
     <comment>A description explaining how this control changes the app's language. {Locked="Windows"}</comment>
   </data>
   <data name="Globals_LanguageDefault" xml:space="preserve">
-    <value>Standard</value>
+    <value>Systemstandard verwenden</value>
     <comment>The app contains a control allowing users to choose the app's language. If this value is chosen, the language preference list of the system settings is used instead.</comment>
   </data>
-  <data name="Globals_DefaultInputScope.Header" xml:space="preserve">
-    <value>Standard-IME-Eingabemodus</value>
-    <comment>The "input scope" of an IME tells it what type of characters should be available for input. A Chinese IME for instance may show English letters instead of Chinese ones. It's a technical term. We're using "input mode" instead of "input scope" to make it easier to understand for users.</comment>
-  </data>
-  <data name="Globals_DefaultInputScope.HelpText" xml:space="preserve">
-    <value>Informiert den IME, welche Sprache standardmäßig verwendet werden soll. Für Sprachen, die auf einem IME basieren und standardmäßig keine lateinischen Zeichen verwenden, kann diese Einstellung verwendet werden, um beim Start die Eingabe in Englisch zu erzwingen.</value>
-  </data>
-  <data name="Globals_DefaultInputScopeDefault.Content" xml:space="preserve">
-    <value>Standard</value>
-  </data>
-  <data name="Globals_DefaultInputScopeAlphanumericHalfWidth.Content" xml:space="preserve">
-    <value>Alphanumerische Halbbreite (Englisch)</value>
-  </data>
   <data name="Globals_AlwaysShowTabs.Header" xml:space="preserve">
     <value>Registerkarten immer anzeigen</value>
     <comment>Header for a control to toggle if the app should always show the tabs (similar to a website browser).</comment>
@@ -1552,10 +1539,6 @@
     <value>Text</value>
     <comment>Header for a group of settings that control the appearance of text in the app.</comment>
   </data>
-  <data name="Globals_WarningsHeader.Text" xml:space="preserve">
-    <value>Warnungen</value>
-    <comment>Header for a group of settings that control the warnings in the app.</comment>
-  </data>
   <data name="Profile_WindowHeader.Text" xml:space="preserve">
     <value>Fenster</value>
     <comment>Header for a group of settings that control the appearance of the window frame of the app.</comment>
@@ -1836,15 +1819,6 @@
     <value>Warnen, wenn mehrere Registerkarten geschlossen werden</value>
     <comment>Header for a control to toggle whether to show a confirm dialog box when closing the application with multiple tabs open.</comment>
   </data>
-  <data name="Globals_InputServiceWarning.Header" xml:space="preserve">
-    <value>Warnen, wenn „Dienst für Bildschirmtastatur und Handschrifteingabefeld“ deaktiviert ist</value>
-  </data>
-  <data name="Globals_WarnAboutLargePaste.Header" xml:space="preserve">
-    <value>Warnung beim Versuch, mehr als 5 KiB Zeichen einzufügen</value>
-  </data>
-  <data name="Globals_WarnAboutMultiLinePaste.Header" xml:space="preserve">
-    <value>Warnung beim Versuch, ein „Zeilenumbruch“-Zeichen einzufügen</value>
-  </data>
   <data name="Settings_PortableModeNote.Text" xml:space="preserve">
     <value>Windows-Terminal wird im portablen Modus ausgeführt.</value>
     <comment>A disclaimer that indicates that Terminal is running in a mode that saves settings to a different folder.</comment>

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

@@ -246,22 +246,9 @@
     <comment>A description explaining how this control changes the app's language. {Locked="Windows"}</comment>
   </data>
   <data name="Globals_LanguageDefault" xml:space="preserve">
-    <value>Default</value>
+    <value>Use system default</value>
     <comment>The app contains a control allowing users to choose the app's language. If this value is chosen, the language preference list of the system settings is used instead.</comment>
   </data>
-  <data name="Globals_DefaultInputScope.Header" xml:space="preserve">
-    <value>Default IME input mode</value>
-    <comment>The "input scope" of an IME tells it what type of characters should be available for input. A Chinese IME for instance may show English letters instead of Chinese ones. It's a technical term. We're using "input mode" instead of "input scope" to make it easier to understand for users.</comment>
-  </data>
-  <data name="Globals_DefaultInputScope.HelpText" xml:space="preserve">
-    <value>Informs the IME what language to use by default. For languages that rely on an IME and don't use Latin characters by default, this setting can be used to force English input on startup.</value>
-  </data>
-  <data name="Globals_DefaultInputScopeDefault.Content" xml:space="preserve">
-    <value>Default</value>
-  </data>
-  <data name="Globals_DefaultInputScopeAlphanumericHalfWidth.Content" xml:space="preserve">
-    <value>Alphanumeric Half-Width (English)</value>
-  </data>
   <data name="Globals_AlwaysShowTabs.Header" xml:space="preserve">
     <value>Always show tabs</value>
     <comment>Header for a control to toggle if the app should always show the tabs (similar to a website browser).</comment>
@@ -294,14 +281,6 @@
     <value>Automatically detect URLs and make them clickable</value>
     <comment>Header for a control to toggle whether the terminal should automatically detect URLs and make them clickable, or not.</comment>
   </data>
-  <data name="Globals_SearchWebDefaultQueryUrl.Header" xml:space="preserve">
-    <value>Default URL to use for the "Search web" action</value>
-    <comment>Header for a control to set the query URL when using the "search web" action.</comment>
-  </data>
-  <data name="Globals_SearchWebDefaultQueryUrl.HelpText" xml:space="preserve">
-    <value>The placeholder "%s" will replaced with the search query.</value>
-    <comment>{Locked="%s"} Additional text presented near "Globals_SearchWebDefaultQueryUrl.Header".</comment>
-  </data>
   <data name="Globals_TrimBlockSelection.Header" xml:space="preserve">
     <value>Remove trailing white-space in rectangular selection</value>
     <comment>Header for a control to toggle whether a text selected with block selection should be trimmed of white spaces when copied to the clipboard, or not.</comment>
@@ -560,42 +539,10 @@
     <value>Always on top</value>
     <comment>Header for a control to toggle if the app will always be presented on top of other windows, or is treated normally (when disabled).</comment>
   </data>
-  <data name="Profile_ForceVTInput.Header" xml:space="preserve">
-    <value>Use the legacy input encoding</value>
-    <comment>Header for a control to toggle legacy input encoding for the terminal.</comment>
-  </data>
-  <data name="Profile_AllowVtChecksumReport.Header" xml:space="preserve">
-    <value>Allow DECRQCRA (Request Checksum of Rectangular Area)</value>
-    <comment>{Locked="DECRQCRA"}{Locked="Request Checksum of Rectangular Area"}Header for a control to toggle support for the DECRQCRA control sequence.</comment>
-  </data>
-  <data name="Globals_AllowHeadless.Header" xml:space="preserve">
-    <value>Allow Windows Terminal to run in the background</value>
-    <comment>Header for a control to toggle support for Windows Terminal to run in the background.</comment>
-  </data>
-  <data name="Globals_IsolatedMode.Header" xml:space="preserve">
-    <value>Force each window to run in its own process</value>
-    <comment>Header for a control to toggle making each window be its own process.</comment>
-  </data>
-  <data name="Globals_DebugFeaturesEnabled.Header" xml:space="preserve">
-    <value>Enable debugging features</value>
-    <comment>Header for a control to toggle debug features.</comment>
-  </data>
   <data name="Globals_AlwaysOnTop.HelpText" xml:space="preserve">
     <value>Terminal will always be the topmost window on the desktop.</value>
     <comment>A description for what the "always on top" setting does. Presented near "Globals_AlwaysOnTop.Header".</comment>
   </data>
-  <data name="Profile_ForceVTInput.HelpText" xml:space="preserve">
-    <value>Certain keyboard input in some applications may stop working properly when this setting is enabled.</value>
-    <comment>Additional description for what the "force vt input" setting does. Presented near "Globals_ForceVTInput.Header".</comment>
-  </data>
-  <data name="Globals_AllowHeadless.HelpText" xml:space="preserve">
-    <value>This allows actions such as Global Summon and Quake Mode actions to work even when no windows are open.</value>
-    <comment>Additional description for what the "allow headless" setting does. Presented near "Globals_AllowHeadless.Header".</comment>
-  </data>
-  <data name="Globals_IsolatedMode.HelpText" xml:space="preserve">
-    <value>Certain features will not work properly, including—but not limited to—global hotkeys, tab drag and drop, and wt.exe window targeting.</value>
-    <comment>{Locked="wt.exe"} Additional description for what the "isolated mode" setting does. Presented near "Globals_IsolatedMode.Header".</comment>
-  </data>
   <data name="Globals_TabWidthMode.Header" xml:space="preserve">
     <value>Tab width mode</value>
     <comment>Header for a control to choose how wide the tabs are.</comment>
@@ -664,10 +611,6 @@
     <value>Interaction</value>
     <comment>Header for the "interaction" menu item. This navigates to a page that lets you see and modify settings related to the user's mouse and touch interactions with the app.</comment>
   </data>
-  <data name="Nav_Compatibility.Content" xml:space="preserve">
-    <value>Compatibility</value>
-    <comment>Header for the "compatibility" menu item. This navigates to a page that lets you see and modify settings related to compatibility with command line scenarios.</comment>
-  </data>
   <data name="Nav_Launch.Content" xml:space="preserve">
     <value>Startup</value>
     <comment>Header for the "startup" menu item. This navigates to a page that lets you see and modify settings related to the app's launch experience (i.e. screen position, mode, etc.)</comment>
@@ -704,10 +647,6 @@
     <value>Advanced</value>
     <comment>Header for a sub-page of profile settings focused on more advanced scenarios.</comment>
   </data>
-  <data name="Profile_Terminal.Header" xml:space="preserve">
-    <value>Terminal Emulation</value>
-    <comment>Header for a sub-page of profile settings focused on customizing the capabilities of the terminal.</comment>
-  </data>
   <data name="Profile_AltGrAliasing.Header" xml:space="preserve">
     <value>AltGr aliasing</value>
     <comment>Header for a control to toggle whether the app treats ctrl+alt as the AltGr (also known as the Alt Graph) modifier key found on keyboards. {Locked="AltGr"}</comment>
@@ -993,34 +932,18 @@
     <value>Line height</value>
     <comment>Header for a control that sets the text line height.</comment>
   </data>
-  <data name="Profile_CellWidth.Header" xml:space="preserve">
-    <value>Cell width</value>
-    <comment>Header for a control that sets the text character width.</comment>
-  </data>
   <data name="Profile_LineHeightBox.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Line height</value>
     <comment>Header for a control that sets the text line height.</comment>
   </data>
-  <data name="Profile_CellWidthBox.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>Cell width</value>
-    <comment>Header for a control that sets the text character width.</comment>
-  </data>
   <data name="Profile_LineHeight.HelpText" xml:space="preserve">
     <value>Override the line height of the terminal. Measured as a multiple of the font size. The default value depends on your font and is usually around 1.2.</value>
     <comment>A description for what the "line height" setting does. Presented near "Profile_LineHeight".</comment>
   </data>
-  <data name="Profile_CellWidth.HelpText" xml:space="preserve">
-    <value>Override the cell width of the terminal. Measured as a multiple of the font size. The default value depends on your font and is usually around 0.6.</value>
-    <comment>A description for what the "cell width" setting does. Presented near "Profile_CellWidth".</comment>
-  </data>
   <data name="Profile_LineHeightBox.PlaceholderText" xml:space="preserve">
     <value>1.2</value>
     <comment>"1.2" is a decimal number.</comment>
   </data>
-  <data name="Profile_CellWidthBox.PlaceholderText" xml:space="preserve">
-    <value>0.6</value>
-    <comment>"0.6" is a decimal number.</comment>
-  </data>
   <data name="Profile_EnableBuiltinGlyphs.Header" xml:space="preserve">
     <value>Builtin Glyphs</value>
     <comment>The main label of a toggle. When enabled, certain characters (glyphs) are replaced with better looking ones.</comment>
@@ -1616,10 +1539,6 @@
     <value>Text</value>
     <comment>Header for a group of settings that control the appearance of text in the app.</comment>
   </data>
-  <data name="Globals_WarningsHeader.Text" xml:space="preserve">
-    <value>Warnings</value>
-    <comment>Header for a group of settings that control the warnings in the app.</comment>
-  </data>
   <data name="Profile_WindowHeader.Text" xml:space="preserve">
     <value>Window</value>
     <comment>Header for a group of settings that control the appearance of the window frame of the app.</comment>
@@ -1900,15 +1819,6 @@
     <value>Warn when closing more than one tab</value>
     <comment>Header for a control to toggle whether to show a confirm dialog box when closing the application with multiple tabs open.</comment>
   </data>
-  <data name="Globals_InputServiceWarning.Header" xml:space="preserve">
-    <value>Warn when "Touch Keyboard and Handwriting Panel Service" is disabled</value>
-  </data>
-  <data name="Globals_WarnAboutLargePaste.Header" xml:space="preserve">
-    <value>Warn when trying to paste more than 5 KiB of characters</value>
-  </data>
-  <data name="Globals_WarnAboutMultiLinePaste.Header" xml:space="preserve">
-    <value>Warn when trying to paste a "new line" character</value>
-  </data>
   <data name="Settings_PortableModeNote.Text" xml:space="preserve">
     <value>Windows Terminal is running in portable mode.</value>
     <comment>A disclaimer that indicates that Terminal is running in a mode that saves settings to a different folder.</comment>
@@ -1929,36 +1839,4 @@
     <value>Non-monospace fonts:</value>
     <comment>This is a label that is followed by a list of proportional fonts.</comment>
   </data>
-  <data name="Profile_AnswerbackMessage.Header" xml:space="preserve">
-    <value>ENQ (Request Terminal Status) response</value>
-    <comment>{Locked=ENQ}{Locked="Request Terminal Status"} Header for a control to determine the response to the ENQ escape sequence. This is represented using a text box.</comment>
-  </data>
-  <data name="Profile_AnswerbackMessage.HelpText" xml:space="preserve">
-    <value>The response that is sent when an ENQ control sequence is received.</value>
-    <comment>{Locked=ENQ} A description for what the "ENQ response" setting does. Presented near "Profile_AnswerbackMessage".</comment>
-  </data>
-  <data name="Globals_DebugFeaturesEnabled.HelpText" xml:space="preserve">
-    <value>Useful for troubleshooting or developing Terminal.</value>
-    <comment>Additional description for what the "debug features enabled" setting does. Presented near "Globals_DebugFeaturesEnabled.Header".</comment>
-  </data>
-  <data name="Profile_RainbowSuggestions.Header" xml:space="preserve">
-    <value>Experimental: Display suggested input in rainbow colors</value>
-    <comment>This is a label for a setting that, when enabled, applies a rainbow coloring to the preview text from the suggestions UI.</comment>
-  </data>
-  <data name="Globals_EnableColorSelection.Header" xml:space="preserve">
-    <value>Experimental: Add key bindings to color selected text</value>
-    <comment>Header for a control to toggle adding a set of key bindings that can be used to apply coloring to selected text in a terminal session.</comment>
-  </data>
-  <data name="Globals_EnableColorSelection.HelpText" xml:space="preserve">
-    <value>These key bindings can highlight the selected text or all instances of the selected text with a specified color.</value>
-    <comment>Additional text for a control to toggle adding a set of key bindings that can be used to apply coloring to selected text in a terminal session. Presented near "Globals_EnableColorSelection.Header".</comment>
-  </data>
-  <data name="Globals_EnableUnfocusedAcrylic.Header" xml:space="preserve">
-    <value>Allow acrylic material in unfocused windows</value>
-    <comment>Header for a control to toggle allowing unfocused windows to have an acrylic background.</comment>
-  </data>
-  <data name="Globals_ShowAdminShield.Header" xml:space="preserve">
-    <value>Display a shield in the title bar when Windows Terminal is running as Administrator</value>
-    <comment>Header for a control to toggle displaying a shield in the title bar of the app. "Admin" refers to elevated sessions like "run as Admin"</comment>
-  </data>
 </root>

src/cascadia/TerminalSettingsEditor/Resources/es-ES/Resources.resw

@@ -246,22 +246,9 @@
     <comment>A description explaining how this control changes the app's language. {Locked="Windows"}</comment>
   </data>
   <data name="Globals_LanguageDefault" xml:space="preserve">
-    <value>Predeterminado</value>
+    <value>Usar los valores predeterminados del sistema</value>
     <comment>The app contains a control allowing users to choose the app's language. If this value is chosen, the language preference list of the system settings is used instead.</comment>
   </data>
-  <data name="Globals_DefaultInputScope.Header" xml:space="preserve">
-    <value>Modo de entrada IME predeterminado</value>
-    <comment>The "input scope" of an IME tells it what type of characters should be available for input. A Chinese IME for instance may show English letters instead of Chinese ones. It's a technical term. We're using "input mode" instead of "input scope" to make it easier to understand for users.</comment>
-  </data>
-  <data name="Globals_DefaultInputScope.HelpText" xml:space="preserve">
-    <value>Informa al IME qué idioma usar de forma predeterminada. Para los idiomas que dependen de un IME y no usan caracteres latinos de forma predeterminada, esta configuración se puede usar para forzar la entrada de inglés al iniciar.</value>
-  </data>
-  <data name="Globals_DefaultInputScopeDefault.Content" xml:space="preserve">
-    <value>Predeterminado</value>
-  </data>
-  <data name="Globals_DefaultInputScopeAlphanumericHalfWidth.Content" xml:space="preserve">
-    <value>Ancho medio alfanumérico (inglés)</value>
-  </data>
   <data name="Globals_AlwaysShowTabs.Header" xml:space="preserve">
     <value>Mostrar pestañas siempre</value>
     <comment>Header for a control to toggle if the app should always show the tabs (similar to a website browser).</comment>
@@ -1552,10 +1539,6 @@
     <value>Texto</value>
     <comment>Header for a group of settings that control the appearance of text in the app.</comment>
   </data>
-  <data name="Globals_WarningsHeader.Text" xml:space="preserve">
-    <value>Advertencias</value>
-    <comment>Header for a group of settings that control the warnings in the app.</comment>
-  </data>
   <data name="Profile_WindowHeader.Text" xml:space="preserve">
     <value>Ventana</value>
     <comment>Header for a group of settings that control the appearance of the window frame of the app.</comment>
@@ -1836,15 +1819,6 @@
     <value>Advertir al cerrar más de una pestaña</value>
     <comment>Header for a control to toggle whether to show a confirm dialog box when closing the application with multiple tabs open.</comment>
   </data>
-  <data name="Globals_InputServiceWarning.Header" xml:space="preserve">
-    <value>Advertir cuando el servicio "Panel de escritura a mano y teclado táctil" está deshabilitado</value>
-  </data>
-  <data name="Globals_WarnAboutLargePaste.Header" xml:space="preserve">
-    <value>Advertir al intentar pegar más de 5 KiB de caracteres</value>
-  </data>
-  <data name="Globals_WarnAboutMultiLinePaste.Header" xml:space="preserve">
-    <value>Advertir al intentar pegar un carácter de "nueva línea"</value>
-  </data>
   <data name="Settings_PortableModeNote.Text" xml:space="preserve">
     <value>Terminal Windows se ejecuta en modo portátil.</value>
     <comment>A disclaimer that indicates that Terminal is running in a mode that saves settings to a different folder.</comment>

src/cascadia/TerminalSettingsEditor/Resources/fr-FR/Resources.resw

@@ -246,22 +246,9 @@
     <comment>A description explaining how this control changes the app's language. {Locked="Windows"}</comment>
   </data>
   <data name="Globals_LanguageDefault" xml:space="preserve">
-    <value>Par défaut</value>
+    <value>Utiliser la valeur par défaut du système</value>
     <comment>The app contains a control allowing users to choose the app's language. If this value is chosen, the language preference list of the system settings is used instead.</comment>
   </data>
-  <data name="Globals_DefaultInputScope.Header" xml:space="preserve">
-    <value>Mode d’entrée IME par défaut</value>
-    <comment>The "input scope" of an IME tells it what type of characters should be available for input. A Chinese IME for instance may show English letters instead of Chinese ones. It's a technical term. We're using "input mode" instead of "input scope" to make it easier to understand for users.</comment>
-  </data>
-  <data name="Globals_DefaultInputScope.HelpText" xml:space="preserve">
-    <value>Indique à IME la langue à utiliser par défaut. Pour les langues qui s'appuient sur un IME et qui n'utilisent pas les caractères latins par défaut, ce paramètre peut être utilisé pour forcer la saisie de l'anglais au démarrage.</value>
-  </data>
-  <data name="Globals_DefaultInputScopeDefault.Content" xml:space="preserve">
-    <value>Par défaut</value>
-  </data>
-  <data name="Globals_DefaultInputScopeAlphanumericHalfWidth.Content" xml:space="preserve">
-    <value>Demi-largeur alphanumérique (anglais)</value>
-  </data>
   <data name="Globals_AlwaysShowTabs.Header" xml:space="preserve">
     <value>Toujours afficher les onglets</value>
     <comment>Header for a control to toggle if the app should always show the tabs (similar to a website browser).</comment>
@@ -1552,10 +1539,6 @@
     <value>Texte</value>
     <comment>Header for a group of settings that control the appearance of text in the app.</comment>
   </data>
-  <data name="Globals_WarningsHeader.Text" xml:space="preserve">
-    <value>Avertissements</value>
-    <comment>Header for a group of settings that control the warnings in the app.</comment>
-  </data>
   <data name="Profile_WindowHeader.Text" xml:space="preserve">
     <value>Fenêtre</value>
     <comment>Header for a group of settings that control the appearance of the window frame of the app.</comment>
@@ -1836,15 +1819,6 @@
     <value>M'avertir lorsque je ferme plusieurs onglets</value>
     <comment>Header for a control to toggle whether to show a confirm dialog box when closing the application with multiple tabs open.</comment>
   </data>
-  <data name="Globals_InputServiceWarning.Header" xml:space="preserve">
-    <value>Avertir lorsque le « service clavier tactile et volet d’écriture manuscrite » est désactivé</value>
-  </data>
-  <data name="Globals_WarnAboutLargePaste.Header" xml:space="preserve">
-    <value>Avertissement lors de la tentative de collage de plus de 5 Kio de caractères</value>
-  </data>
-  <data name="Globals_WarnAboutMultiLinePaste.Header" xml:space="preserve">
-    <value>Avertir lors de la tentative de collage d’un caractère « nouvelle ligne »</value>
-  </data>
   <data name="Settings_PortableModeNote.Text" xml:space="preserve">
     <value>Terminal Windows s’exécute en mode portable.</value>
     <comment>A disclaimer that indicates that Terminal is running in a mode that saves settings to a different folder.</comment>

src/cascadia/TerminalSettingsEditor/Resources/it-IT/Resources.resw

@@ -246,22 +246,9 @@
     <comment>A description explaining how this control changes the app's language. {Locked="Windows"}</comment>
   </data>
   <data name="Globals_LanguageDefault" xml:space="preserve">
-    <value>Impostazione predefinita</value>
+    <value>Usa impostazioni predefinite di sistema</value>
     <comment>The app contains a control allowing users to choose the app's language. If this value is chosen, the language preference list of the system settings is used instead.</comment>
   </data>
-  <data name="Globals_DefaultInputScope.Header" xml:space="preserve">
-    <value>Modalità di input IME predefinita</value>
-    <comment>The "input scope" of an IME tells it what type of characters should be available for input. A Chinese IME for instance may show English letters instead of Chinese ones. It's a technical term. We're using "input mode" instead of "input scope" to make it easier to understand for users.</comment>
-  </data>
-  <data name="Globals_DefaultInputScope.HelpText" xml:space="preserve">
-    <value>Informa l'IME della lingua da usare per impostazione predefinita. Per le lingue che si affidano a un IME e che non usano i caratteri latini per impostazione predefinita, questa impostazione può essere usata per forzare l'inserimento dell'inglese all'avvio.</value>
-  </data>
-  <data name="Globals_DefaultInputScopeDefault.Content" xml:space="preserve">
-    <value>Impostazione predefinita</value>
-  </data>
-  <data name="Globals_DefaultInputScopeAlphanumericHalfWidth.Content" xml:space="preserve">
-    <value>Mezza larghezza alfanumerica (inglese)</value>
-  </data>
   <data name="Globals_AlwaysShowTabs.Header" xml:space="preserve">
     <value>Mostra sempre le schede</value>
     <comment>Header for a control to toggle if the app should always show the tabs (similar to a website browser).</comment>
@@ -1552,10 +1539,6 @@
     <value>Testo</value>
     <comment>Header for a group of settings that control the appearance of text in the app.</comment>
   </data>
-  <data name="Globals_WarningsHeader.Text" xml:space="preserve">
-    <value>Avvisi</value>
-    <comment>Header for a group of settings that control the warnings in the app.</comment>
-  </data>
   <data name="Profile_WindowHeader.Text" xml:space="preserve">
     <value>Finestra</value>
     <comment>Header for a group of settings that control the appearance of the window frame of the app.</comment>
@@ -1836,15 +1819,6 @@
     <value>Avvisa in caso di chiusura di più schede</value>
     <comment>Header for a control to toggle whether to show a confirm dialog box when closing the application with multiple tabs open.</comment>
   </data>
-  <data name="Globals_InputServiceWarning.Header" xml:space="preserve">
-    <value>Avvisa quando il servizio "Tastiera virtuale e pannello per la grafia" è disabilitato</value>
-  </data>
-  <data name="Globals_WarnAboutLargePaste.Header" xml:space="preserve">
-    <value>Avvisa quando si tenta di incollare più di 5 KiB di caratteri</value>
-  </data>
-  <data name="Globals_WarnAboutMultiLinePaste.Header" xml:space="preserve">
-    <value>Avvisa quando si prova a incollare un carattere "nuova riga"</value>
-  </data>
   <data name="Settings_PortableModeNote.Text" xml:space="preserve">
     <value>Terminale Windows è in esecuzione in modalità portatile.</value>
     <comment>A disclaimer that indicates that Terminal is running in a mode that saves settings to a different folder.</comment>

src/cascadia/TerminalSettingsEditor/Resources/ja-JP/Resources.resw

@@ -246,22 +246,9 @@
     <comment>A description explaining how this control changes the app's language. {Locked="Windows"}</comment>
   </data>
   <data name="Globals_LanguageDefault" xml:space="preserve">
-    <value>既定値</value>
+    <value>システムの既定値を使用</value>
     <comment>The app contains a control allowing users to choose the app's language. If this value is chosen, the language preference list of the system settings is used instead.</comment>
   </data>
-  <data name="Globals_DefaultInputScope.Header" xml:space="preserve">
-    <value>既定の IME 入力モード</value>
-    <comment>The "input scope" of an IME tells it what type of characters should be available for input. A Chinese IME for instance may show English letters instead of Chinese ones. It's a technical term. We're using "input mode" instead of "input scope" to make it easier to understand for users.</comment>
-  </data>
-  <data name="Globals_DefaultInputScope.HelpText" xml:space="preserve">
-    <value>既定で使用する言語を IME に通知します。IME に依存し、既定ではラテン文字を使用しない言語では、スタートアップ時に英語入力を強制するためにこの設定を使用できます。</value>
-  </data>
-  <data name="Globals_DefaultInputScopeDefault.Content" xml:space="preserve">
-    <value>既定値</value>
-  </data>
-  <data name="Globals_DefaultInputScopeAlphanumericHalfWidth.Content" xml:space="preserve">
-    <value>半角英数字 (英語)</value>
-  </data>
   <data name="Globals_AlwaysShowTabs.Header" xml:space="preserve">
     <value>常にタブを表示する</value>
     <comment>Header for a control to toggle if the app should always show the tabs (similar to a website browser).</comment>
@@ -1552,10 +1539,6 @@
     <value>テキスト</value>
     <comment>Header for a group of settings that control the appearance of text in the app.</comment>
   </data>
-  <data name="Globals_WarningsHeader.Text" xml:space="preserve">
-    <value>警告</value>
-    <comment>Header for a group of settings that control the warnings in the app.</comment>
-  </data>
   <data name="Profile_WindowHeader.Text" xml:space="preserve">
     <value>ウィンドウ</value>
     <comment>Header for a group of settings that control the appearance of the window frame of the app.</comment>
@@ -1836,15 +1819,6 @@
     <value>複数のタブを閉じるときに警告する</value>
     <comment>Header for a control to toggle whether to show a confirm dialog box when closing the application with multiple tabs open.</comment>
   </data>
-  <data name="Globals_InputServiceWarning.Header" xml:space="preserve">
-    <value>[タッチ キーボードと手書きパネル サービス] が無効になっている場合に警告する</value>
-  </data>
-  <data name="Globals_WarnAboutLargePaste.Header" xml:space="preserve">
-    <value>5 KiB を超える文字を貼り付けようとしたときに警告する</value>
-  </data>
-  <data name="Globals_WarnAboutMultiLinePaste.Header" xml:space="preserve">
-    <value>"改行" 文字を貼り付けようとしたときに警告する</value>
-  </data>
   <data name="Settings_PortableModeNote.Text" xml:space="preserve">
     <value>Windows ターミナルはポータブル モードで実行されています。</value>
     <comment>A disclaimer that indicates that Terminal is running in a mode that saves settings to a different folder.</comment>

src/cascadia/TerminalSettingsEditor/Resources/ko-KR/Resources.resw

@@ -246,22 +246,9 @@
     <comment>A description explaining how this control changes the app's language. {Locked="Windows"}</comment>
   </data>
   <data name="Globals_LanguageDefault" xml:space="preserve">
-    <value>기본값</value>
+    <value>시스템 기본값 사용</value>
     <comment>The app contains a control allowing users to choose the app's language. If this value is chosen, the language preference list of the system settings is used instead.</comment>
   </data>
-  <data name="Globals_DefaultInputScope.Header" xml:space="preserve">
-    <value>기본 IME 입력 모드</value>
-    <comment>The "input scope" of an IME tells it what type of characters should be available for input. A Chinese IME for instance may show English letters instead of Chinese ones. It's a technical term. We're using "input mode" instead of "input scope" to make it easier to understand for users.</comment>
-  </data>
-  <data name="Globals_DefaultInputScope.HelpText" xml:space="preserve">
-    <value>기본적으로 사용할 언어를 IME에 알릴 수 있습니다. IME를 사용하고 기본적으로 라틴 문자를 사용하지 않는 언어의 경우 이 설정을 사용하여 시작할 때 영어 입력을 강제 적용할 수 있습니다.</value>
-  </data>
-  <data name="Globals_DefaultInputScopeDefault.Content" xml:space="preserve">
-    <value>기본값</value>
-  </data>
-  <data name="Globals_DefaultInputScopeAlphanumericHalfWidth.Content" xml:space="preserve">
-    <value>영숫자 반자(영어)</value>
-  </data>
   <data name="Globals_AlwaysShowTabs.Header" xml:space="preserve">
     <value>항상 탭 표시</value>
     <comment>Header for a control to toggle if the app should always show the tabs (similar to a website browser).</comment>
@@ -1552,10 +1539,6 @@
     <value>텍스트</value>
     <comment>Header for a group of settings that control the appearance of text in the app.</comment>
   </data>
-  <data name="Globals_WarningsHeader.Text" xml:space="preserve">
-    <value>경고</value>
-    <comment>Header for a group of settings that control the warnings in the app.</comment>
-  </data>
   <data name="Profile_WindowHeader.Text" xml:space="preserve">
     <value>창</value>
     <comment>Header for a group of settings that control the appearance of the window frame of the app.</comment>
@@ -1836,15 +1819,6 @@
     <value>두 개 이상의 탭을 닫을 때 경고</value>
     <comment>Header for a control to toggle whether to show a confirm dialog box when closing the application with multiple tabs open.</comment>
   </data>
-  <data name="Globals_InputServiceWarning.Header" xml:space="preserve">
-    <value>"터치 키보드 및 필기 패널 서비스"를 사용할 수 없는 경우 경고</value>
-  </data>
-  <data name="Globals_WarnAboutLargePaste.Header" xml:space="preserve">
-    <value>5KiB가 넘는 문자를 붙여넣으려고 할 때 경고</value>
-  </data>
-  <data name="Globals_WarnAboutMultiLinePaste.Header" xml:space="preserve">
-    <value>"줄 바꾸기" 문자를 붙여넣을 때 경고</value>
-  </data>
   <data name="Settings_PortableModeNote.Text" xml:space="preserve">
     <value>Windows 터미널이 이식 가능 모드에서 실행되고 있습니다.</value>
     <comment>A disclaimer that indicates that Terminal is running in a mode that saves settings to a different folder.</comment>

src/cascadia/TerminalSettingsEditor/Resources/pt-BR/Resources.resw

@@ -246,22 +246,9 @@
     <comment>A description explaining how this control changes the app's language. {Locked="Windows"}</comment>
   </data>
   <data name="Globals_LanguageDefault" xml:space="preserve">
-    <value>Padrão</value>
+    <value>Usar o padrão do sistema</value>
     <comment>The app contains a control allowing users to choose the app's language. If this value is chosen, the language preference list of the system settings is used instead.</comment>
   </data>
-  <data name="Globals_DefaultInputScope.Header" xml:space="preserve">
-    <value>Modo de entrada padrão do IME</value>
-    <comment>The "input scope" of an IME tells it what type of characters should be available for input. A Chinese IME for instance may show English letters instead of Chinese ones. It's a technical term. We're using "input mode" instead of "input scope" to make it easier to understand for users.</comment>
-  </data>
-  <data name="Globals_DefaultInputScope.HelpText" xml:space="preserve">
-    <value>Informa ao IME qual idioma usar por padrão. Para idiomas que dependem de um IME e não utilizam caracteres latinos por padrão, essa configuração pode forçar a entrada em inglês na inicialização.</value>
-  </data>
-  <data name="Globals_DefaultInputScopeDefault.Content" xml:space="preserve">
-    <value>Padrão</value>
-  </data>
-  <data name="Globals_DefaultInputScopeAlphanumericHalfWidth.Content" xml:space="preserve">
-    <value>Alfanumérico Meia-Largura (Inglês)</value>
-  </data>
   <data name="Globals_AlwaysShowTabs.Header" xml:space="preserve">
     <value>Sempre mostrar as guias</value>
     <comment>Header for a control to toggle if the app should always show the tabs (similar to a website browser).</comment>
@@ -1552,10 +1539,6 @@
     <value>Texto</value>
     <comment>Header for a group of settings that control the appearance of text in the app.</comment>
   </data>
-  <data name="Globals_WarningsHeader.Text" xml:space="preserve">
-    <value>Avisos</value>
-    <comment>Header for a group of settings that control the warnings in the app.</comment>
-  </data>
   <data name="Profile_WindowHeader.Text" xml:space="preserve">
     <value>Janela</value>
     <comment>Header for a group of settings that control the appearance of the window frame of the app.</comment>
@@ -1836,15 +1819,6 @@
     <value>Avisar ao fechar mais de uma guia</value>
     <comment>Header for a control to toggle whether to show a confirm dialog box when closing the application with multiple tabs open.</comment>
   </data>
-  <data name="Globals_InputServiceWarning.Header" xml:space="preserve">
-    <value>Avisar quando o "Serviço de Teclado Virtual e Painel de Manuscrito" estiver desabilitado</value>
-  </data>
-  <data name="Globals_WarnAboutLargePaste.Header" xml:space="preserve">
-    <value>Avisar ao tentar colar mais de 5 KiB de caracteres</value>
-  </data>
-  <data name="Globals_WarnAboutMultiLinePaste.Header" xml:space="preserve">
-    <value>Avisar ao tentar colar um caractere de "nova linha"</value>
-  </data>
   <data name="Settings_PortableModeNote.Text" xml:space="preserve">
     <value>O terminal do Windows está em execução no modo portátil.</value>
     <comment>A disclaimer that indicates that Terminal is running in a mode that saves settings to a different folder.</comment>

src/cascadia/TerminalSettingsEditor/Resources/qps-ploc/Resources.resw

@@ -246,22 +246,9 @@
     <comment>A description explaining how this control changes the app's language. {Locked="Windows"}</comment>
   </data>
   <data name="Globals_LanguageDefault" xml:space="preserve">
-    <value>Ďėƒąūļτ !!</value>
+    <value>Ůŝê ѕŷŝτėм đєƒāùľŧ !!! !!</value>
     <comment>The app contains a control allowing users to choose the app's language. If this value is chosen, the language preference list of the system settings is used instead.</comment>
   </data>
-  <data name="Globals_DefaultInputScope.Header" xml:space="preserve">
-    <value>Đέƒàųŀт ĨΜЗ ΐήрũŧ mоδę !!! !!! </value>
-    <comment>The "input scope" of an IME tells it what type of characters should be available for input. A Chinese IME for instance may show English letters instead of Chinese ones. It's a technical term. We're using "input mode" instead of "input scope" to make it easier to understand for users.</comment>
-  </data>
-  <data name="Globals_DefaultInputScope.HelpText" xml:space="preserve">
-    <value>Íŋƒбгмş ţђе ÎМЕ ẁћдŧ ļàņĝŭªġé ŧб üśе ьý ðěƒαűľŧ. ₣òѓ ļάņģųαģєś ţћáŧ ґ℮ŀу öŋ àи ĪΜÊ ǻйð δŏй'т цѕέ £âтĩŋ çħãѓâćтèřš ъγ ðėƒāџľŧ, ţнϊś ŝэťтĭñġ ċάń ье цѕёð τό ƒóřċε ∑ήģĺîѕħ îήρüт οŋ şŧªřťúр. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !</value>
-  </data>
-  <data name="Globals_DefaultInputScopeDefault.Content" xml:space="preserve">
-    <value>Ðеƒãϋĺţ !!</value>
-  </data>
-  <data name="Globals_DefaultInputScopeAlphanumericHalfWidth.Content" xml:space="preserve">
-    <value>Дĺρħăпυмегїç Ηâŀƒ-Щιδτĥ (Ęñģℓîšĥ) !!! !!! !!! </value>
-  </data>
   <data name="Globals_AlwaysShowTabs.Header" xml:space="preserve">
     <value>Άľώāŷš şђǿŵ тãвŝ !!! !</value>
     <comment>Header for a control to toggle if the app should always show the tabs (similar to a website browser).</comment>
@@ -1552,10 +1539,6 @@
     <value>Ţέхţ !</value>
     <comment>Header for a group of settings that control the appearance of text in the app.</comment>
   </data>
-  <data name="Globals_WarningsHeader.Text" xml:space="preserve">
-    <value>Ẅåŕⁿįņğѕ !!</value>
-    <comment>Header for a group of settings that control the warnings in the app.</comment>
-  </data>
   <data name="Profile_WindowHeader.Text" xml:space="preserve">
     <value>Щіňďош !</value>
     <comment>Header for a group of settings that control the appearance of the window frame of the app.</comment>
@@ -1836,15 +1819,6 @@
     <value>Ẃářй ẅђëπ ĉľôśĩήĝ mǿѓĕ тĥąπ òπё τάь !!! !!! !!! !</value>
     <comment>Header for a control to toggle whether to show a confirm dialog box when closing the application with multiple tabs open.</comment>
   </data>
-  <data name="Globals_InputServiceWarning.Header" xml:space="preserve">
-    <value>Ẃǻґņ ώћĕπ "Ŧõũčђ Κзγьοдгď ąʼnð Нáлđẅŕīťίńģ Ρàňεℓ Śεŕνîçé" íš đìşāъŀêδ !!! !!! !!! !!! !!! !!! !!</value>
-  </data>
-  <data name="Globals_WarnAboutLargePaste.Header" xml:space="preserve">
-    <value>Ẃăґи ẅнěπ тґўіήĝ τø рáŝťё mοřé ţħäή 5 ΚĩВ òƒ ĉħāґąćτєґѕ !!! !!! !!! !!! !!! !</value>
-  </data>
-  <data name="Globals_WarnAboutMultiLinePaste.Header" xml:space="preserve">
-    <value>Щāřπ ẃĥєи ťгýīлğ ţõ ρäşŧè ª "пėщ ľїл℮" ςћářǻ¢ţēř !!! !!! !!! !!! !!</value>
-  </data>
   <data name="Settings_PortableModeNote.Text" xml:space="preserve">
     <value>Ẅїηðσшѕ Ţеřmíńăľ īѕ ґϋййïʼnģ ĭņ рόѓťáъℓė mōďе. !!! !!! !!! !!! !</value>
     <comment>A disclaimer that indicates that Terminal is running in a mode that saves settings to a different folder.</comment>

src/cascadia/TerminalSettingsEditor/Resources/qps-ploca/Resources.resw

@@ -246,22 +246,9 @@
     <comment>A description explaining how this control changes the app's language. {Locked="Windows"}</comment>
   </data>
   <data name="Globals_LanguageDefault" xml:space="preserve">
-    <value>Ďėƒąūļτ !!</value>
+    <value>Ůŝê ѕŷŝτėм đєƒāùľŧ !!! !!</value>
     <comment>The app contains a control allowing users to choose the app's language. If this value is chosen, the language preference list of the system settings is used instead.</comment>
   </data>
-  <data name="Globals_DefaultInputScope.Header" xml:space="preserve">
-    <value>Đέƒàųŀт ĨΜЗ ΐήрũŧ mоδę !!! !!! </value>
-    <comment>The "input scope" of an IME tells it what type of characters should be available for input. A Chinese IME for instance may show English letters instead of Chinese ones. It's a technical term. We're using "input mode" instead of "input scope" to make it easier to understand for users.</comment>
-  </data>
-  <data name="Globals_DefaultInputScope.HelpText" xml:space="preserve">
-    <value>Íŋƒбгмş ţђе ÎМЕ ẁћдŧ ļàņĝŭªġé ŧб üśе ьý ðěƒαűľŧ. ₣òѓ ļάņģųαģєś ţћáŧ ґ℮ŀу öŋ àи ĪΜÊ ǻйð δŏй'т цѕέ £âтĩŋ çħãѓâćтèřš ъγ ðėƒāџľŧ, ţнϊś ŝэťтĭñġ ċάń ье цѕёð τό ƒóřċε ∑ήģĺîѕħ îήρüт οŋ şŧªřťúр. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !</value>
-  </data>
-  <data name="Globals_DefaultInputScopeDefault.Content" xml:space="preserve">
-    <value>Ðеƒãϋĺţ !!</value>
-  </data>
-  <data name="Globals_DefaultInputScopeAlphanumericHalfWidth.Content" xml:space="preserve">
-    <value>Дĺρħăпυмегїç Ηâŀƒ-Щιδτĥ (Ęñģℓîšĥ) !!! !!! !!! </value>
-  </data>
   <data name="Globals_AlwaysShowTabs.Header" xml:space="preserve">
     <value>Άľώāŷš şђǿŵ тãвŝ !!! !</value>
     <comment>Header for a control to toggle if the app should always show the tabs (similar to a website browser).</comment>
@@ -1552,10 +1539,6 @@
     <value>Ţέхţ !</value>
     <comment>Header for a group of settings that control the appearance of text in the app.</comment>
   </data>
-  <data name="Globals_WarningsHeader.Text" xml:space="preserve">
-    <value>Ẅåŕⁿįņğѕ !!</value>
-    <comment>Header for a group of settings that control the warnings in the app.</comment>
-  </data>
   <data name="Profile_WindowHeader.Text" xml:space="preserve">
     <value>Щіňďош !</value>
     <comment>Header for a group of settings that control the appearance of the window frame of the app.</comment>
@@ -1836,15 +1819,6 @@
     <value>Ẃářй ẅђëπ ĉľôśĩήĝ mǿѓĕ тĥąπ òπё τάь !!! !!! !!! !</value>
     <comment>Header for a control to toggle whether to show a confirm dialog box when closing the application with multiple tabs open.</comment>
   </data>
-  <data name="Globals_InputServiceWarning.Header" xml:space="preserve">
-    <value>Ẃǻґņ ώћĕπ "Ŧõũčђ Κзγьοдгď ąʼnð Нáлđẅŕīťίńģ Ρàňεℓ Śεŕνîçé" íš đìşāъŀêδ !!! !!! !!! !!! !!! !!! !!</value>
-  </data>
-  <data name="Globals_WarnAboutLargePaste.Header" xml:space="preserve">
-    <value>Ẃăґи ẅнěπ тґўіήĝ τø рáŝťё mοřé ţħäή 5 ΚĩВ òƒ ĉħāґąćτєґѕ !!! !!! !!! !!! !!! !</value>
-  </data>
-  <data name="Globals_WarnAboutMultiLinePaste.Header" xml:space="preserve">
-    <value>Щāřπ ẃĥєи ťгýīлğ ţõ ρäşŧè ª "пėщ ľїл℮" ςћářǻ¢ţēř !!! !!! !!! !!! !!</value>
-  </data>
   <data name="Settings_PortableModeNote.Text" xml:space="preserve">
     <value>Ẅїηðσшѕ Ţеřmíńăľ īѕ ґϋййïʼnģ ĭņ рόѓťáъℓė mōďе. !!! !!! !!! !!! !</value>
     <comment>A disclaimer that indicates that Terminal is running in a mode that saves settings to a different folder.</comment>

src/cascadia/TerminalSettingsEditor/Resources/qps-plocm/Resources.resw

@@ -246,22 +246,9 @@
     <comment>A description explaining how this control changes the app's language. {Locked="Windows"}</comment>
   </data>
   <data name="Globals_LanguageDefault" xml:space="preserve">
-    <value>Ďėƒąūļτ !!</value>
+    <value>Ůŝê ѕŷŝτėм đєƒāùľŧ !!! !!</value>
     <comment>The app contains a control allowing users to choose the app's language. If this value is chosen, the language preference list of the system settings is used instead.</comment>
   </data>
-  <data name="Globals_DefaultInputScope.Header" xml:space="preserve">
-    <value>Đέƒàųŀт ĨΜЗ ΐήрũŧ mоδę !!! !!! </value>
-    <comment>The "input scope" of an IME tells it what type of characters should be available for input. A Chinese IME for instance may show English letters instead of Chinese ones. It's a technical term. We're using "input mode" instead of "input scope" to make it easier to understand for users.</comment>
-  </data>
-  <data name="Globals_DefaultInputScope.HelpText" xml:space="preserve">
-    <value>Íŋƒбгмş ţђе ÎМЕ ẁћдŧ ļàņĝŭªġé ŧб üśе ьý ðěƒαűľŧ. ₣òѓ ļάņģųαģєś ţћáŧ ґ℮ŀу öŋ àи ĪΜÊ ǻйð δŏй'т цѕέ £âтĩŋ çħãѓâćтèřš ъγ ðėƒāџľŧ, ţнϊś ŝэťтĭñġ ċάń ье цѕёð τό ƒóřċε ∑ήģĺîѕħ îήρüт οŋ şŧªřťúр. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !</value>
-  </data>
-  <data name="Globals_DefaultInputScopeDefault.Content" xml:space="preserve">
-    <value>Ðеƒãϋĺţ !!</value>
-  </data>
-  <data name="Globals_DefaultInputScopeAlphanumericHalfWidth.Content" xml:space="preserve">
-    <value>Дĺρħăпυмегїç Ηâŀƒ-Щιδτĥ (Ęñģℓîšĥ) !!! !!! !!! </value>
-  </data>
   <data name="Globals_AlwaysShowTabs.Header" xml:space="preserve">
     <value>Άľώāŷš şђǿŵ тãвŝ !!! !</value>
     <comment>Header for a control to toggle if the app should always show the tabs (similar to a website browser).</comment>
@@ -1552,10 +1539,6 @@
     <value>Ţέхţ !</value>
     <comment>Header for a group of settings that control the appearance of text in the app.</comment>
   </data>
-  <data name="Globals_WarningsHeader.Text" xml:space="preserve">
-    <value>Ẅåŕⁿįņğѕ !!</value>
-    <comment>Header for a group of settings that control the warnings in the app.</comment>
-  </data>
   <data name="Profile_WindowHeader.Text" xml:space="preserve">
     <value>Щіňďош !</value>
     <comment>Header for a group of settings that control the appearance of the window frame of the app.</comment>
@@ -1836,15 +1819,6 @@
     <value>Ẃářй ẅђëπ ĉľôśĩήĝ mǿѓĕ тĥąπ òπё τάь !!! !!! !!! !</value>
     <comment>Header for a control to toggle whether to show a confirm dialog box when closing the application with multiple tabs open.</comment>
   </data>
-  <data name="Globals_InputServiceWarning.Header" xml:space="preserve">
-    <value>Ẃǻґņ ώћĕπ "Ŧõũčђ Κзγьοдгď ąʼnð Нáлđẅŕīťίńģ Ρàňεℓ Śεŕνîçé" íš đìşāъŀêδ !!! !!! !!! !!! !!! !!! !!</value>
-  </data>
-  <data name="Globals_WarnAboutLargePaste.Header" xml:space="preserve">
-    <value>Ẃăґи ẅнěπ тґўіήĝ τø рáŝťё mοřé ţħäή 5 ΚĩВ òƒ ĉħāґąćτєґѕ !!! !!! !!! !!! !!! !</value>
-  </data>
-  <data name="Globals_WarnAboutMultiLinePaste.Header" xml:space="preserve">
-    <value>Щāřπ ẃĥєи ťгýīлğ ţõ ρäşŧè ª "пėщ ľїл℮" ςћářǻ¢ţēř !!! !!! !!! !!! !!</value>
-  </data>
   <data name="Settings_PortableModeNote.Text" xml:space="preserve">
     <value>Ẅїηðσшѕ Ţеřmíńăľ īѕ ґϋййïʼnģ ĭņ рόѓťáъℓė mōďе. !!! !!! !!! !!! !</value>
     <comment>A disclaimer that indicates that Terminal is running in a mode that saves settings to a different folder.</comment>

src/cascadia/TerminalSettingsEditor/Resources/ru-RU/Resources.resw

@@ -246,22 +246,9 @@
     <comment>A description explaining how this control changes the app's language. {Locked="Windows"}</comment>
   </data>
   <data name="Globals_LanguageDefault" xml:space="preserve">
-    <value>По умолчанию</value>
+    <value>Использовать системные параметры по умолчанию</value>
     <comment>The app contains a control allowing users to choose the app's language. If this value is chosen, the language preference list of the system settings is used instead.</comment>
   </data>
-  <data name="Globals_DefaultInputScope.Header" xml:space="preserve">
-    <value>Режим ввода IME по умолчанию</value>
-    <comment>The "input scope" of an IME tells it what type of characters should be available for input. A Chinese IME for instance may show English letters instead of Chinese ones. It's a technical term. We're using "input mode" instead of "input scope" to make it easier to understand for users.</comment>
-  </data>
-  <data name="Globals_DefaultInputScope.HelpText" xml:space="preserve">
-    <value>Сообщает IME, какой язык нужно использовать по умолчанию. Для языков, которые применяют IME и не используют латинские символы по умолчанию, этот параметр можно использовать для принудительного ввода на английском языке при запуске.</value>
-  </data>
-  <data name="Globals_DefaultInputScopeDefault.Content" xml:space="preserve">
-    <value>По умолчанию</value>
-  </data>
-  <data name="Globals_DefaultInputScopeAlphanumericHalfWidth.Content" xml:space="preserve">
-    <value>Буквенно-цифровой полуширинный (английский)</value>
-  </data>
   <data name="Globals_AlwaysShowTabs.Header" xml:space="preserve">
     <value>Всегда отображать вкладки</value>
     <comment>Header for a control to toggle if the app should always show the tabs (similar to a website browser).</comment>
@@ -1552,10 +1539,6 @@
     <value>Текст</value>
     <comment>Header for a group of settings that control the appearance of text in the app.</comment>
   </data>
-  <data name="Globals_WarningsHeader.Text" xml:space="preserve">
-    <value>Предупреждения</value>
-    <comment>Header for a group of settings that control the warnings in the app.</comment>
-  </data>
   <data name="Profile_WindowHeader.Text" xml:space="preserve">
     <value>Окно</value>
     <comment>Header for a group of settings that control the appearance of the window frame of the app.</comment>
@@ -1836,15 +1819,6 @@
     <value>Предупреждать при закрытии нескольких вкладок</value>
     <comment>Header for a control to toggle whether to show a confirm dialog box when closing the application with multiple tabs open.</comment>
   </data>
-  <data name="Globals_InputServiceWarning.Header" xml:space="preserve">
-    <value>Предупреждать, если параметр "Служба сенсорной клавиатуры и панели рукописного ввода" отключен</value>
-  </data>
-  <data name="Globals_WarnAboutLargePaste.Header" xml:space="preserve">
-    <value>Предупреждать при попытке вставки более 5 КиБ символов</value>
-  </data>
-  <data name="Globals_WarnAboutMultiLinePaste.Header" xml:space="preserve">
-    <value>Предупреждать при попытке вставки символа "новая строка"</value>
-  </data>
   <data name="Settings_PortableModeNote.Text" xml:space="preserve">
     <value>Терминал Windows работает в переносном режиме.</value>
     <comment>A disclaimer that indicates that Terminal is running in a mode that saves settings to a different folder.</comment>

src/cascadia/TerminalSettingsEditor/Resources/zh-CN/Resources.resw

@@ -246,22 +246,9 @@
     <comment>A description explaining how this control changes the app's language. {Locked="Windows"}</comment>
   </data>
   <data name="Globals_LanguageDefault" xml:space="preserve">
-    <value>默认</value>
+    <value>使用系统默认值</value>
     <comment>The app contains a control allowing users to choose the app's language. If this value is chosen, the language preference list of the system settings is used instead.</comment>
   </data>
-  <data name="Globals_DefaultInputScope.Header" xml:space="preserve">
-    <value>默认输入法输入模式</value>
-    <comment>The "input scope" of an IME tells it what type of characters should be available for input. A Chinese IME for instance may show English letters instead of Chinese ones. It's a technical term. We're using "input mode" instead of "input scope" to make it easier to understand for users.</comment>
-  </data>
-  <data name="Globals_DefaultInputScope.HelpText" xml:space="preserve">
-    <value>告知输入法默认使用的语言。对于依赖于输入法且默认不使用拉丁字符的语言，此设置可用于在启动时强制进行英语输入。</value>
-  </data>
-  <data name="Globals_DefaultInputScopeDefault.Content" xml:space="preserve">
-    <value>默认</value>
-  </data>
-  <data name="Globals_DefaultInputScopeAlphanumericHalfWidth.Content" xml:space="preserve">
-    <value>字母数字半角(英语)</value>
-  </data>
   <data name="Globals_AlwaysShowTabs.Header" xml:space="preserve">
     <value>始终显示选项卡</value>
     <comment>Header for a control to toggle if the app should always show the tabs (similar to a website browser).</comment>
@@ -1170,7 +1157,7 @@
     <comment>Header for a control to determine the title of the tab. This is represented using a text box.</comment>
   </data>
   <data name="Profile_TabTitle.HelpText" xml:space="preserve">
-    <value>将配置文件名称替换为标题，以在启动时传递给 shell。</value>
+    <value>将配置文件名称替换为标题，以在启动时传递给外壳。</value>
     <comment>A description for what the "tab title" setting does. Presented near "Profile_TabTitle".</comment>
   </data>
   <data name="Profile_UnfocusedAppearanceTextBlock.Text" xml:space="preserve">
@@ -1552,10 +1539,6 @@
     <value>文本</value>
     <comment>Header for a group of settings that control the appearance of text in the app.</comment>
   </data>
-  <data name="Globals_WarningsHeader.Text" xml:space="preserve">
-    <value>警告</value>
-    <comment>Header for a group of settings that control the warnings in the app.</comment>
-  </data>
   <data name="Profile_WindowHeader.Text" xml:space="preserve">
     <value>窗口</value>
     <comment>Header for a group of settings that control the appearance of the window frame of the app.</comment>
@@ -1836,15 +1819,6 @@
     <value>关闭多个选项卡时发出警告</value>
     <comment>Header for a control to toggle whether to show a confirm dialog box when closing the application with multiple tabs open.</comment>
   </data>
-  <data name="Globals_InputServiceWarning.Header" xml:space="preserve">
-    <value>禁用“触摸键盘和手写面板服务”时发出警告</value>
-  </data>
-  <data name="Globals_WarnAboutLargePaste.Header" xml:space="preserve">
-    <value>尝试粘贴超过 5 KiB 字符时发出警告</value>
-  </data>
-  <data name="Globals_WarnAboutMultiLinePaste.Header" xml:space="preserve">
-    <value>尝试粘贴“新行”字符时发出警告</value>
-  </data>
   <data name="Settings_PortableModeNote.Text" xml:space="preserve">
     <value>Windows 终端正在便携模式下运行。</value>
     <comment>A disclaimer that indicates that Terminal is running in a mode that saves settings to a different folder.</comment>

src/cascadia/TerminalSettingsEditor/Resources/zh-TW/Resources.resw

@@ -246,22 +246,9 @@
     <comment>A description explaining how this control changes the app's language. {Locked="Windows"}</comment>
   </data>
   <data name="Globals_LanguageDefault" xml:space="preserve">
-    <value>預設</value>
+    <value>使用系統預設值</value>
     <comment>The app contains a control allowing users to choose the app's language. If this value is chosen, the language preference list of the system settings is used instead.</comment>
   </data>
-  <data name="Globals_DefaultInputScope.Header" xml:space="preserve">
-    <value>預設 IME 輸入模式</value>
-    <comment>The "input scope" of an IME tells it what type of characters should be available for input. A Chinese IME for instance may show English letters instead of Chinese ones. It's a technical term. We're using "input mode" instead of "input scope" to make it easier to understand for users.</comment>
-  </data>
-  <data name="Globals_DefaultInputScope.HelpText" xml:space="preserve">
-    <value>通知 IME 預設使用的語言。對於依賴 IME 且預設不使用拉丁字元的語言，此設定可用來強制啟動英文輸入。</value>
-  </data>
-  <data name="Globals_DefaultInputScopeDefault.Content" xml:space="preserve">
-    <value>預設</value>
-  </data>
-  <data name="Globals_DefaultInputScopeAlphanumericHalfWidth.Content" xml:space="preserve">
-    <value>英數字元半寬 (英文)</value>
-  </data>
   <data name="Globals_AlwaysShowTabs.Header" xml:space="preserve">
     <value>永遠顯示索引標籤</value>
     <comment>Header for a control to toggle if the app should always show the tabs (similar to a website browser).</comment>
@@ -1552,10 +1539,6 @@
     <value>文字</value>
     <comment>Header for a group of settings that control the appearance of text in the app.</comment>
   </data>
-  <data name="Globals_WarningsHeader.Text" xml:space="preserve">
-    <value>警告</value>
-    <comment>Header for a group of settings that control the warnings in the app.</comment>
-  </data>
   <data name="Profile_WindowHeader.Text" xml:space="preserve">
     <value>視窗</value>
     <comment>Header for a group of settings that control the appearance of the window frame of the app.</comment>
@@ -1836,15 +1819,6 @@
     <value>關閉多個索引標籤時發出警告</value>
     <comment>Header for a control to toggle whether to show a confirm dialog box when closing the application with multiple tabs open.</comment>
   </data>
-  <data name="Globals_InputServiceWarning.Header" xml:space="preserve">
-    <value>停用「觸控式鍵盤和手寫面板服務」時發出警告</value>
-  </data>
-  <data name="Globals_WarnAboutLargePaste.Header" xml:space="preserve">
-    <value>嘗試貼上超過 5 個 KiB 字元時發出警告</value>
-  </data>
-  <data name="Globals_WarnAboutMultiLinePaste.Header" xml:space="preserve">
-    <value>嘗試貼上「新行」字元時發出警告</value>
-  </data>
   <data name="Settings_PortableModeNote.Text" xml:space="preserve">
     <value>Windows 終端機正以可攜式模式執行。</value>
     <comment>A disclaimer that indicates that Terminal is running in a mode that saves settings to a different folder.</comment>

src/cascadia/TerminalSettingsEditor/SettingContainerStyle.xaml

@@ -44,9 +44,6 @@
             <StaticResource x:Key="SettingContainerMessageForeground"
                             ResourceKey="TextFillColorPrimaryBrush" />
 
-            <StaticResource x:Key="SettingContainerResetButtonIconForeground"
-                            ResourceKey="SystemAccentColorDark2" />
-
         </ResourceDictionary>
         <ResourceDictionary x:Key="HighContrast">
             <Style x:Key="SecondaryTextBlockStyle"
@@ -76,9 +73,6 @@
                             ResourceKey="SystemColorWindowTextColorBrush" />
             <StaticResource x:Key="SettingContainerMessageForeground"
                             ResourceKey="SystemColorWindowTextColorBrush" />
-
-            <StaticResource x:Key="SettingContainerResetButtonIconForeground"
-                            ResourceKey="SystemAccentColorLight1" />
         </ResourceDictionary>
         <ResourceDictionary x:Key="Dark">
             <Style x:Key="SecondaryTextBlockStyle"
@@ -112,9 +106,6 @@
                             ResourceKey="TextFillColorPrimaryBrush" />
             <StaticResource x:Key="SettingContainerMessageForeground"
                             ResourceKey="TextFillColorPrimaryBrush" />
-
-            <StaticResource x:Key="SettingContainerResetButtonIconForeground"
-                            ResourceKey="SystemAccentColorLight2" />
         </ResourceDictionary>
     </ResourceDictionary.ThemeDictionaries>
 
@@ -145,7 +136,7 @@
 
     <Style x:Key="SettingContainerFontIconStyle"
            TargetType="FontIcon">
-        <Setter Property="Foreground" Value="{ThemeResource SettingContainerResetButtonIconForeground}" />
+        <Setter Property="Foreground" Value="{StaticResource SystemAccentColor}" />
         <Setter Property="FontSize" Value="11" />
         <Setter Property="FontFamily" Value="{ThemeResource SymbolThemeFontFamily}" />
     </Style>

src/cascadia/TerminalSettingsModel/CascadiaSettings.cpp

@@ -531,9 +531,7 @@ void CascadiaSettings::_validateMediaResources()
         // Explicitly just use the Icon here, not the EvaluatedIcon. We don't
         // want to blow up if we fell back to the commandline and the
         // commandline _isn't an icon_.
-        // GH #17943: "none" is a special value interpreted as "remove the icon"
-        static constexpr std::wstring_view HideIconValue{ L"none" };
-        if (const auto icon = profile.Icon(); icon.size() > 2 && icon != HideIconValue)
+        if (const auto icon = profile.Icon(); icon.size() > 2)
         {
             const auto iconPath{ wil::ExpandEnvironmentStringsW<std::wstring>(icon.c_str()) };
             try

src/cascadia/TerminalSettingsModel/CascadiaSettingsSerialization.cpp

@@ -524,15 +524,6 @@ bool SettingsLoader::FixupUserSettings()
         fixedUp = true;
     }
 
-    // Terminal 1.23: Migrate the global
-    // `experimental.input.forceVT` to being a per-profile setting.
-    if (userSettings.globals->LegacyForceVTInput())
-    {
-        // migrate the user's opt-out to the profiles.defaults
-        userSettings.baseLayerProfile->ForceVTInput(true);
-        fixedUp = true;
-    }
-
     return fixedUp;
 }
 

src/cascadia/TerminalSettingsModel/EnumMappings.cpp

@@ -33,7 +33,6 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
     DEFINE_ENUM_MAP(winrt::Windows::UI::Xaml::ElementTheme, ElementTheme);
     DEFINE_ENUM_MAP(Model::NewTabPosition, NewTabPosition);
     DEFINE_ENUM_MAP(winrt::Microsoft::UI::Xaml::Controls::TabViewWidthMode, TabViewWidthMode);
-    DEFINE_ENUM_MAP(Microsoft::Terminal::Control::DefaultInputScope, DefaultInputScope);
     DEFINE_ENUM_MAP(Model::FirstWindowPreference, FirstWindowPreference);
     DEFINE_ENUM_MAP(Model::LaunchMode, LaunchMode);
     DEFINE_ENUM_MAP(Model::TabSwitcherMode, TabSwitcherMode);

src/cascadia/TerminalSettingsModel/EnumMappings.h

@@ -29,7 +29,6 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
         static winrt::Windows::Foundation::Collections::IMap<winrt::hstring, winrt::Windows::UI::Xaml::ElementTheme> ElementTheme();
         static winrt::Windows::Foundation::Collections::IMap<winrt::hstring, NewTabPosition> NewTabPosition();
         static winrt::Windows::Foundation::Collections::IMap<winrt::hstring, winrt::Microsoft::UI::Xaml::Controls::TabViewWidthMode> TabViewWidthMode();
-        static winrt::Windows::Foundation::Collections::IMap<winrt::hstring, winrt::Microsoft::Terminal::Control::DefaultInputScope> DefaultInputScope();
         static winrt::Windows::Foundation::Collections::IMap<winrt::hstring, FirstWindowPreference> FirstWindowPreference();
         static winrt::Windows::Foundation::Collections::IMap<winrt::hstring, LaunchMode> LaunchMode();
         static winrt::Windows::Foundation::Collections::IMap<winrt::hstring, TabSwitcherMode> TabSwitcherMode();

src/cascadia/TerminalSettingsModel/EnumMappings.idl

@@ -11,7 +11,6 @@ namespace Microsoft.Terminal.Settings.Model
         static Windows.Foundation.Collections.IMap<String, Windows.UI.Xaml.ElementTheme> ElementTheme { get; };
         static Windows.Foundation.Collections.IMap<String, Microsoft.Terminal.Settings.Model.NewTabPosition> NewTabPosition { get; };
         static Windows.Foundation.Collections.IMap<String, Microsoft.UI.Xaml.Controls.TabViewWidthMode> TabViewWidthMode { get; };
-        static Windows.Foundation.Collections.IMap<String, Microsoft.Terminal.Control.DefaultInputScope> DefaultInputScope { get; };
         static Windows.Foundation.Collections.IMap<String, Microsoft.Terminal.Settings.Model.FirstWindowPreference> FirstWindowPreference { get; };
         static Windows.Foundation.Collections.IMap<String, Microsoft.Terminal.Settings.Model.LaunchMode> LaunchMode { get; };
         static Windows.Foundation.Collections.IMap<String, Microsoft.Terminal.Settings.Model.TabSwitcherMode> TabSwitcherMode { get; };

src/cascadia/TerminalSettingsModel/GlobalAppSettings.cpp

@@ -23,11 +23,6 @@ static constexpr std::string_view ThemeKey{ "theme" };
 static constexpr std::string_view DefaultProfileKey{ "defaultProfile" };
 static constexpr std::string_view LegacyUseTabSwitcherModeKey{ "useTabSwitcher" };
 static constexpr std::string_view LegacyReloadEnvironmentVariablesKey{ "compatibility.reloadEnvironmentVariables" };
-static constexpr std::string_view LegacyForceVTInputKey{ "experimental.input.forceVT" };
-static constexpr std::string_view LegacyInputServiceWarningKey{ "inputServiceWarning" };
-static constexpr std::string_view LegacyWarnAboutLargePasteKey{ "largePasteWarning" };
-static constexpr std::string_view LegacyWarnAboutMultiLinePasteKey{ "multiLinePasteWarning" };
-static constexpr std::string_view LegacyConfirmCloseAllTabsKey{ "confirmCloseAllTabs" };
 
 // Method Description:
 // - Copies any extraneous data from the parent before completing a CreateChild call
@@ -137,12 +132,7 @@ void GlobalAppSettings::LayerJson(const Json::Value& json, const OriginTag origi
     // GH#8076 - when adding enum values to this key, we also changed it from
     // "useTabSwitcher" to "tabSwitcherMode". Continue supporting
     // "useTabSwitcher", but prefer "tabSwitcherMode"
-    _fixupsAppliedDuringLoad = JsonUtils::GetValueForKey(json, LegacyUseTabSwitcherModeKey, _TabSwitcherMode) || _fixupsAppliedDuringLoad;
-
-    _fixupsAppliedDuringLoad = JsonUtils::GetValueForKey(json, LegacyInputServiceWarningKey, _InputServiceWarning) || _fixupsAppliedDuringLoad;
-    _fixupsAppliedDuringLoad = JsonUtils::GetValueForKey(json, LegacyWarnAboutLargePasteKey, _WarnAboutLargePaste) || _fixupsAppliedDuringLoad;
-    _fixupsAppliedDuringLoad = JsonUtils::GetValueForKey(json, LegacyWarnAboutMultiLinePasteKey, _WarnAboutMultiLinePaste) || _fixupsAppliedDuringLoad;
-    _fixupsAppliedDuringLoad = JsonUtils::GetValueForKey(json, LegacyConfirmCloseAllTabsKey, _ConfirmCloseAllTabs) || _fixupsAppliedDuringLoad;
+    JsonUtils::GetValueForKey(json, LegacyUseTabSwitcherModeKey, _TabSwitcherMode);
 
 #define GLOBAL_SETTINGS_LAYER_JSON(type, name, jsonKey, ...) \
     JsonUtils::GetValueForKey(json, jsonKey, _##name);       \
@@ -164,20 +154,12 @@ void GlobalAppSettings::LayerJson(const Json::Value& json, const OriginTag origi
     }
     LayerActionsFrom(json, origin, true);
 
-    // No need to update _fixupsAppliedDuringLoad here.
-    // We already handle this in SettingsLoader::FixupUserSettings().
     JsonUtils::GetValueForKey(json, LegacyReloadEnvironmentVariablesKey, _legacyReloadEnvironmentVariables);
     if (json[LegacyReloadEnvironmentVariablesKey.data()])
     {
         _logSettingSet(LegacyReloadEnvironmentVariablesKey);
     }
 
-    JsonUtils::GetValueForKey(json, LegacyForceVTInputKey, _legacyForceVTInput);
-    if (json[LegacyForceVTInputKey.data()])
-    {
-        _logSettingSet(LegacyForceVTInputKey);
-    }
-
     // Remove settings included in userDefaults
     static constexpr std::array<std::pair<std::string_view, std::string_view>, 2> userDefaultSettings{ { { "copyOnSelect", "false" },
                                                                                                          { "copyFormatting", "false" } } };
@@ -287,10 +269,6 @@ Json::Value GlobalAppSettings::ToJson()
     {
         _TextMeasurement.reset();
     }
-    if (_DefaultInputScope == Control::DefaultInputScope::Default)
-    {
-        _DefaultInputScope.reset();
-    }
 
     if (_DisablePartialInvalidation == false)
     {
@@ -318,7 +296,7 @@ Json::Value GlobalAppSettings::ToJson()
 
 bool GlobalAppSettings::FixupsAppliedDuringLoad()
 {
-    return _fixupsAppliedDuringLoad || _actionMap->FixupsAppliedDuringLoad();
+    return _actionMap->FixupsAppliedDuringLoad();
 }
 
 winrt::Microsoft::Terminal::Settings::Model::Theme GlobalAppSettings::CurrentTheme() noexcept

src/cascadia/TerminalSettingsModel/GlobalAppSettings.h

@@ -71,7 +71,6 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
                             const Windows::Foundation::Collections::IMapView<winrt::hstring, Model::ColorScheme>& schemes);
 
         bool LegacyReloadEnvironmentVariables() const noexcept { return _legacyReloadEnvironmentVariables; }
-        bool LegacyForceVTInput() const noexcept { return _legacyForceVTInput; }
 
         void LogSettingChanges(std::set<std::string>& changes, const std::string_view& context) const;
 
@@ -90,9 +89,7 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
 #endif
 
         winrt::guid _defaultProfile{};
-        bool _fixupsAppliedDuringLoad{ false };
         bool _legacyReloadEnvironmentVariables{ true };
-        bool _legacyForceVTInput{ false };
         winrt::com_ptr<implementation::ActionMap> _actionMap{ winrt::make_self<implementation::ActionMap>() };
         std::set<std::string> _changeLog;
 

src/cascadia/TerminalSettingsModel/GlobalAppSettings.idl

@@ -73,7 +73,6 @@ namespace Microsoft.Terminal.Settings.Model
         INHERITABLE_SETTING(Boolean, TrimPaste);
         INHERITABLE_SETTING(LaunchPosition, InitialPosition);
         INHERITABLE_SETTING(Boolean, CenterOnLaunch);
-        INHERITABLE_SETTING(Microsoft.Terminal.Control.DefaultInputScope, DefaultInputScope);
         INHERITABLE_SETTING(FirstWindowPreference, FirstWindowPreference);
         INHERITABLE_SETTING(LaunchMode, LaunchMode);
         INHERITABLE_SETTING(Boolean, SnapToGridOnResize);
@@ -82,6 +81,7 @@ namespace Microsoft.Terminal.Settings.Model
         INHERITABLE_SETTING(Boolean, SoftwareRendering);
         INHERITABLE_SETTING(Microsoft.Terminal.Control.TextMeasurement, TextMeasurement);
         INHERITABLE_SETTING(Boolean, UseBackgroundImageForWindow);
+        INHERITABLE_SETTING(Boolean, ForceVTInput);
         INHERITABLE_SETTING(Boolean, DebugFeaturesEnabled);
         INHERITABLE_SETTING(Boolean, StartOnUserLogin);
         INHERITABLE_SETTING(Boolean, AlwaysOnTop);

src/cascadia/TerminalSettingsModel/MTSMSettings.h

@@ -28,23 +28,23 @@ Author(s):
     X(bool, DisablePartialInvalidation, "rendering.disablePartialInvalidation", false)                                                                                                                \
     X(bool, SoftwareRendering, "rendering.software", false)                                                                                                                                           \
     X(winrt::Microsoft::Terminal::Control::TextMeasurement, TextMeasurement, "compatibility.textMeasurement")                                                                                         \
-    X(winrt::Microsoft::Terminal::Control::DefaultInputScope, DefaultInputScope, "defaultInputScope")                                                                                                 \
     X(bool, UseBackgroundImageForWindow, "experimental.useBackgroundImageForWindow", false)                                                                                                           \
+    X(bool, ForceVTInput, "experimental.input.forceVT", false)                                                                                                                                        \
     X(bool, TrimBlockSelection, "trimBlockSelection", true)                                                                                                                                           \
     X(bool, DetectURLs, "experimental.detectURLs", true)                                                                                                                                              \
     X(bool, AlwaysShowTabs, "alwaysShowTabs", true)                                                                                                                                                   \
     X(Model::NewTabPosition, NewTabPosition, "newTabPosition", Model::NewTabPosition::AfterLastTab)                                                                                                   \
     X(bool, ShowTitleInTitlebar, "showTerminalTitleInTitlebar", true)                                                                                                                                 \
-    X(bool, ConfirmCloseAllTabs, "warning.confirmCloseAllTabs", true)                                                                                                                                 \
+    X(bool, ConfirmCloseAllTabs, "confirmCloseAllTabs", true)                                                                                                                                         \
     X(Model::ThemePair, Theme, "theme")                                                                                                                                                               \
     X(hstring, Language, "language")                                                                                                                                                                  \
     X(winrt::Microsoft::UI::Xaml::Controls::TabViewWidthMode, TabWidthMode, "tabWidthMode", winrt::Microsoft::UI::Xaml::Controls::TabViewWidthMode::Equal)                                            \
     X(bool, UseAcrylicInTabRow, "useAcrylicInTabRow", false)                                                                                                                                          \
     X(bool, ShowTabsInTitlebar, "showTabsInTitlebar", true)                                                                                                                                           \
-    X(bool, InputServiceWarning, "warning.inputService", true)                                                                                                                                        \
+    X(bool, InputServiceWarning, "inputServiceWarning", true)                                                                                                                                         \
     X(winrt::Microsoft::Terminal::Control::CopyFormat, CopyFormatting, "copyFormatting", 0)                                                                                                           \
-    X(bool, WarnAboutLargePaste, "warning.largePaste", true)                                                                                                                                          \
-    X(bool, WarnAboutMultiLinePaste, "warning.multiLinePaste", true)                                                                                                                                  \
+    X(bool, WarnAboutLargePaste, "largePasteWarning", true)                                                                                                                                           \
+    X(bool, WarnAboutMultiLinePaste, "multiLinePasteWarning", true)                                                                                                                                   \
     X(Model::LaunchPosition, InitialPosition, "initialPosition", nullptr, nullptr)                                                                                                                    \
     X(bool, CenterOnLaunch, "centerOnLaunch", false)                                                                                                                                                  \
     X(Model::FirstWindowPreference, FirstWindowPreference, "firstWindowPreference", FirstWindowPreference::DefaultProfile)                                                                            \
@@ -92,17 +92,14 @@ Author(s):
     X(hstring, TabTitle, "tabTitle")                                                                                                                           \
     X(Model::BellStyle, BellStyle, "bellStyle", BellStyle::Audible)                                                                                            \
     X(IEnvironmentVariableMap, EnvironmentVariables, "environment", nullptr)                                                                                   \
-    X(bool, RightClickContextMenu, "rightClickContextMenu", false)                                                                                             \
+    X(bool, RightClickContextMenu, "experimental.rightClickContextMenu", false)                                                                                \
     X(Windows::Foundation::Collections::IVector<winrt::hstring>, BellSound, "bellSound", nullptr)                                                              \
     X(bool, Elevate, "elevate", false)                                                                                                                         \
     X(bool, AutoMarkPrompts, "autoMarkPrompts", true)                                                                                                          \
     X(bool, ShowMarks, "showMarksOnScrollbar", false)                                                                                                          \
     X(bool, RepositionCursorWithMouse, "experimental.repositionCursorWithMouse", false)                                                                        \
     X(bool, ReloadEnvironmentVariables, "compatibility.reloadEnvironmentVariables", true)                                                                      \
-    X(bool, RainbowSuggestions, "experimental.rainbowSuggestions", false)                                                                                      \
-    X(bool, ForceVTInput, "compatibility.input.forceVT", false)                                                                                                \
-    X(bool, AllowVtChecksumReport, "compatibility.allowDECRQCRA", false)                                                                                       \
-    X(bool, AllowKeypadMode, "compatibility.allowDECNKM", false)
+    X(bool, RainbowSuggestions, "experimental.rainbowSuggestions", false)
 
 // Intentionally omitted Profile settings:
 // * Name

src/cascadia/TerminalSettingsModel/Profile.cpp

@@ -36,7 +36,6 @@ static constexpr std::string_view UnfocusedAppearanceKey{ "unfocusedAppearance"
 
 static constexpr std::string_view LegacyAutoMarkPromptsKey{ "experimental.autoMarkPrompts" };
 static constexpr std::string_view LegacyShowMarksKey{ "experimental.showMarksOnScrollbar" };
-static constexpr std::string_view LegacyRightClickContextMenuKey{ "experimental.rightClickContextMenu" };
 
 Profile::Profile(guid guid) noexcept :
     _Guid(guid)
@@ -197,7 +196,6 @@ void Profile::LayerJson(const Json::Value& json)
     // Done _before_ the MTSM_PROFILE_SETTINGS, which have the updated keys.
     JsonUtils::GetValueForKey(json, LegacyShowMarksKey, _ShowMarks);
     JsonUtils::GetValueForKey(json, LegacyAutoMarkPromptsKey, _AutoMarkPrompts);
-    JsonUtils::GetValueForKey(json, LegacyRightClickContextMenuKey, _RightClickContextMenu);
 
 #define PROFILE_SETTINGS_LAYER_JSON(type, name, jsonKey, ...) \
     JsonUtils::GetValueForKey(json, jsonKey, _##name);        \

src/cascadia/TerminalSettingsModel/Profile.idl

@@ -89,8 +89,6 @@ namespace Microsoft.Terminal.Settings.Model
 
         INHERITABLE_PROFILE_SETTING(Boolean, ReloadEnvironmentVariables);
         INHERITABLE_PROFILE_SETTING(Boolean, RainbowSuggestions);
-        INHERITABLE_PROFILE_SETTING(Boolean, ForceVTInput);
-        INHERITABLE_PROFILE_SETTING(Boolean, AllowVtChecksumReport);
-        INHERITABLE_PROFILE_SETTING(Boolean, AllowKeypadMode);
+
     }
 }

src/cascadia/TerminalSettingsModel/TerminalSettings.cpp

@@ -347,8 +347,6 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
         _RepositionCursorWithMouse = profile.RepositionCursorWithMouse();
         _ReloadEnvironmentVariables = profile.ReloadEnvironmentVariables();
         _RainbowSuggestions = profile.RainbowSuggestions();
-        _ForceVTInput = profile.ForceVTInput();
-        _AllowVtChecksumReport = profile.AllowVtChecksumReport();
     }
 
     // Method Description:
@@ -370,8 +368,8 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
         _DisablePartialInvalidation = globalSettings.DisablePartialInvalidation();
         _SoftwareRendering = globalSettings.SoftwareRendering();
         _TextMeasurement = globalSettings.TextMeasurement();
-        _DefaultInputScope = globalSettings.DefaultInputScope();
         _UseBackgroundImageForWindow = globalSettings.UseBackgroundImageForWindow();
+        _ForceVTInput = globalSettings.ForceVTInput();
         _TrimBlockSelection = globalSettings.TrimBlockSelection();
         _DetectURLs = globalSettings.DetectURLs();
         _EnableUnfocusedAcrylic = globalSettings.EnableUnfocusedAcrylic();

src/cascadia/TerminalSettingsModel/TerminalSettings.h

@@ -94,7 +94,6 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
         INHERITABLE_SETTING(Model::TerminalSettings, bool, CopyOnSelect, false);
         INHERITABLE_SETTING(Model::TerminalSettings, Microsoft::Terminal::Control::CopyFormat, CopyFormatting, 0);
         INHERITABLE_SETTING(Model::TerminalSettings, bool, FocusFollowMouse, false);
-        INHERITABLE_SETTING(Model::TerminalSettings, bool, AllowVtChecksumReport, false);
         INHERITABLE_SETTING(Model::TerminalSettings, bool, TrimBlockSelection, true);
         INHERITABLE_SETTING(Model::TerminalSettings, bool, DetectURLs, true);
 
@@ -162,7 +161,6 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
         INHERITABLE_SETTING(Model::TerminalSettings, bool, DisablePartialInvalidation, false);
         INHERITABLE_SETTING(Model::TerminalSettings, bool, SoftwareRendering, false);
         INHERITABLE_SETTING(Model::TerminalSettings, Microsoft::Terminal::Control::TextMeasurement, TextMeasurement);
-        INHERITABLE_SETTING(Model::TerminalSettings, Microsoft::Terminal::Control::DefaultInputScope, DefaultInputScope);
         INHERITABLE_SETTING(Model::TerminalSettings, bool, UseBackgroundImageForWindow, false);
         INHERITABLE_SETTING(Model::TerminalSettings, bool, ForceVTInput, false);
 

src/cascadia/TerminalSettingsModel/TerminalSettingsSerializationHelpers.h

@@ -782,11 +782,3 @@ JSON_ENUM_MAPPER(::winrt::Microsoft::Terminal::Control::TextMeasurement)
         pair_type{ "console", ValueType::Console },
     };
 };
-
-JSON_ENUM_MAPPER(::winrt::Microsoft::Terminal::Control::DefaultInputScope)
-{
-    JSON_MAPPINGS(2) = {
-        pair_type{ "default", ValueType::Default },
-        pair_type{ "alphanumericHalfWidth", ValueType::AlphanumericHalfWidth },
-    };
-};

src/cascadia/TerminalSettingsModel/defaults.json

@@ -306,50 +306,50 @@
             "brightWhite": "#e5e5e5"
         },
         {
-            "background": "#000000",
-            "black": "#000000",
-            "blue": "#0000AA",
-            "brightBlack": "#555555",
-            "brightBlue": "#5555FF",
-            "brightCyan": "#55FFFF",
-            "brightGreen": "#55FF55",
-            "brightPurple": "#FF55FF",
-            "brightRed": "#FF5555",
-            "brightWhite": "#FFFFFF",
-            "brightYellow": "#FFFF55",
-            "cursorColor": "#00AA00",
-            "cyan": "#00AAAA",
-            "foreground": "#AAAAAA",
-            "green": "#00AA00",
             "name": "CGA",
-            "purple": "#AA00AA",
-            "red": "#AA0000",
+            "foreground": "#AAAAAA",
+            "background": "#000000",
+            "cursorColor": "#00AA00",
             "selectionBackground": "#FFFFFF",
+            "black": "#000000",
+            "red": "#AA0000",
+            "green": "#00AA00",
+            "yellow": "#AA5500",
+            "blue": "#0000AA",
+            "purple": "#AA00AA",
+            "cyan": "#00AAAA",
             "white": "#AAAAAA",
-            "yellow": "#AA5500"
+            "brightBlack": "#555555",
+            "brightRed": "#FF5555",
+            "brightGreen": "#55FF55",
+            "brightYellow": "#FFFF55",
+            "brightBlue": "#5555FF",
+            "brightPurple": "#FF55FF",
+            "brightCyan": "#55FFFF",
+            "brightWhite": "#FFFFFF"
         },
         {
-            "background": "#000000",
-            "black": "#000000",
-            "blue": "#0000AA",
-            "brightBlack": "#555555",
-            "brightBlue": "#5555FF",
-            "brightCyan": "#55FFFF",
-            "brightGreen": "#55FF55",
-            "brightPurple": "#FF55FF",
-            "brightRed": "#FF5555",
-            "brightWhite": "#FFFFFF",
-            "brightYellow": "#FFFF55",
-            "cursorColor": "#00AA00",
-            "cyan": "#00AAAA",
-            "foreground": "#AAAAAA",
-            "green": "#00AA00",
             "name": "IBM 5153",
-            "purple": "#AA00AA",
-            "red": "#AA0000",
+            "foreground": "#AAAAAA",
+            "background": "#000000",
+            "cursorColor": "#00AA00",
             "selectionBackground": "#FFFFFF",
+            "black": "#000000",
+            "red": "#AA0000",
+            "green": "#00AA00",
+            "yellow": "#C47E00",
+            "blue": "#0000AA",
+            "purple": "#AA00AA",
+            "cyan": "#00AAAA",
             "white": "#AAAAAA",
-            "yellow": "#C47E00"
+            "brightBlack": "#555555",
+            "brightRed": "#FF5555",
+            "brightGreen": "#55FF55",
+            "brightYellow": "#FFFF55",
+            "brightBlue": "#5555FF",
+            "brightPurple": "#FF55FF",
+            "brightCyan": "#55FFFF",
+            "brightWhite": "#FFFFFF"
         }
     ],
     "themes": [

src/cascadia/UnitTests_Control/ControlCoreTests.cpp

@@ -304,9 +304,9 @@ namespace ControlUnitTests
 
         Log::Comment(L"Check the buffer after the clear");
         VERIFY_ARE_EQUAL(20, core->_terminal->GetViewport().Height());
-        VERIFY_ARE_EQUAL(41, core->ScrollOffset());
+        VERIFY_ARE_EQUAL(21, core->ScrollOffset());
         VERIFY_ARE_EQUAL(20, core->ViewHeight());
-        VERIFY_ARE_EQUAL(61, core->BufferHeight());
+        VERIFY_ARE_EQUAL(41, core->BufferHeight());
 
         // In this test, we can't actually check if we cleared the buffer
         // contents. ConPTY will handle the actual clearing of the buffer

src/cascadia/UnitTests_SettingsModel/SerializationTests.cpp

@@ -107,6 +107,7 @@ namespace SettingsModelUnitTests
                 "initialPosition": ",",
                 "launchMode": "default",
                 "alwaysOnTop": false,
+                "inputServiceWarning": true,
                 "copyOnSelect": false,
                 "copyFormatting": "all",
                 "wordDelimiters": " /\\()\"'-.,:;<>~!@#$%^&*|+=[]{}~?\u2502",
@@ -122,12 +123,12 @@ namespace SettingsModelUnitTests
                 "snapToGridOnResize": true,
                 "disableAnimations": false,
 
+                "confirmCloseAllTabs": true,
+                "largePasteWarning": true,
+                "multiLinePasteWarning": true,
                 "trimPaste": true,
 
-                "warning.confirmCloseAllTabs" : true,
-                "warning.inputService" : true,
-                "warning.largePaste" : true,
-                "warning.multiLinePaste" : true,
+                "experimental.input.forceVT": false,
 
                 "actions": [],
                 "keybindings": []

src/cascadia/UnitTests_TerminalCore/UnitTests.vcxproj

@@ -57,7 +57,7 @@
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>WindowsApp.lib;winmm.Lib;imm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>WindowsApp.lib;WinMM.Lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->

src/cascadia/WinRTUtils/inc/WtExeUtils.h

@@ -1,26 +1,22 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-#pragma once
-
 constexpr std::wstring_view WtExe{ L"wt.exe" };
 constexpr std::wstring_view WtdExe{ L"wtd.exe" };
 constexpr std::wstring_view WindowsTerminalExe{ L"WindowsTerminal.exe" };
 constexpr std::wstring_view LocalAppDataAppsPath{ L"%LOCALAPPDATA%\\Microsoft\\WindowsApps\\" };
 constexpr std::wstring_view ElevateShimExe{ L"elevate-shim.exe" };
 
-// Forward declared from appmodel.h so that we don't need to pull in that header everywhere.
-extern "C" {
-WINBASEAPI LONG WINAPI GetCurrentPackageId(UINT32* bufferLength, BYTE* buffer);
-}
-
 #ifdef WINRT_Windows_ApplicationModel_H
 _TIL_INLINEPREFIX bool IsPackaged()
 {
-    static const auto isPackaged = []() {
-        UINT32 bufferLength = 0;
-        const auto hr = GetCurrentPackageId(&bufferLength, nullptr);
-        return hr != APPMODEL_ERROR_NO_PACKAGE;
+    static const auto isPackaged = []() -> bool {
+        try
+        {
+            const auto package = winrt::Windows::ApplicationModel::Package::Current();
+            return true;
+        }
+        catch (...)
+        {
+            return false;
+        }
     }();
     return isPackaged;
 }