Skip to content

Commit

Permalink
Update xterm and integrate new scroll bars
Browse files Browse the repository at this point in the history
  • Loading branch information
Tyriar committed Jul 11, 2024
1 parent 067c430 commit 4f13098
Show file tree
Hide file tree
Showing 15 changed files with 249 additions and 250 deletions.
16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -82,14 +82,14 @@
"@vscode/windows-mutex": "^0.5.0",
"@vscode/windows-process-tree": "^0.6.0",
"@vscode/windows-registry": "^1.1.0",
"@xterm/addon-clipboard": "0.2.0-beta.19",
"@xterm/addon-image": "0.9.0-beta.36",
"@xterm/addon-search": "0.16.0-beta.36",
"@xterm/addon-serialize": "0.14.0-beta.36",
"@xterm/addon-unicode11": "0.9.0-beta.36",
"@xterm/addon-webgl": "0.19.0-beta.36",
"@xterm/headless": "5.6.0-beta.36",
"@xterm/xterm": "5.6.0-beta.36",
"@xterm/addon-clipboard": "0.2.0-beta.28",
"@xterm/addon-image": "0.9.0-beta.45",
"@xterm/addon-search": "0.16.0-beta.45",
"@xterm/addon-serialize": "0.14.0-beta.45",
"@xterm/addon-unicode11": "0.9.0-beta.45",
"@xterm/addon-webgl": "0.19.0-beta.45",
"@xterm/headless": "5.6.0-beta.45",
"@xterm/xterm": "5.6.0-beta.45",
"http-proxy-agent": "^7.0.0",
"https-proxy-agent": "^7.0.2",
"jschardet": "3.1.3",
Expand Down
16 changes: 8 additions & 8 deletions remote/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@
"@vscode/vscode-languagedetection": "1.0.21",
"@vscode/windows-process-tree": "^0.6.0",
"@vscode/windows-registry": "^1.1.0",
"@xterm/addon-clipboard": "0.2.0-beta.19",
"@xterm/addon-image": "0.9.0-beta.36",
"@xterm/addon-search": "0.16.0-beta.36",
"@xterm/addon-serialize": "0.14.0-beta.36",
"@xterm/addon-unicode11": "0.9.0-beta.36",
"@xterm/addon-webgl": "0.19.0-beta.36",
"@xterm/headless": "5.6.0-beta.36",
"@xterm/xterm": "5.6.0-beta.36",
"@xterm/addon-clipboard": "0.2.0-beta.28",
"@xterm/addon-image": "0.9.0-beta.45",
"@xterm/addon-search": "0.16.0-beta.45",
"@xterm/addon-serialize": "0.14.0-beta.45",
"@xterm/addon-unicode11": "0.9.0-beta.45",
"@xterm/addon-webgl": "0.19.0-beta.45",
"@xterm/headless": "5.6.0-beta.45",
"@xterm/xterm": "5.6.0-beta.45",
"cookie": "^0.4.0",
"http-proxy-agent": "^7.0.0",
"https-proxy-agent": "^7.0.2",
Expand Down
14 changes: 7 additions & 7 deletions remote/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
"@microsoft/1ds-post-js": "^3.2.13",
"@vscode/iconv-lite-umd": "0.7.0",
"@vscode/vscode-languagedetection": "1.0.21",
"@xterm/addon-clipboard": "0.2.0-beta.19",
"@xterm/addon-image": "0.9.0-beta.36",
"@xterm/addon-search": "0.16.0-beta.36",
"@xterm/addon-serialize": "0.14.0-beta.36",
"@xterm/addon-unicode11": "0.9.0-beta.36",
"@xterm/addon-webgl": "0.19.0-beta.36",
"@xterm/xterm": "5.6.0-beta.36",
"@xterm/addon-clipboard": "0.2.0-beta.28",
"@xterm/addon-image": "0.9.0-beta.45",
"@xterm/addon-search": "0.16.0-beta.45",
"@xterm/addon-serialize": "0.14.0-beta.45",
"@xterm/addon-unicode11": "0.9.0-beta.45",
"@xterm/addon-webgl": "0.19.0-beta.45",
"@xterm/xterm": "5.6.0-beta.45",
"jschardet": "3.1.3",
"tas-client-umd": "0.2.0",
"vscode-oniguruma": "1.7.0",
Expand Down
66 changes: 33 additions & 33 deletions remote/web/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -48,42 +48,42 @@
resolved "https://registry.yarnpkg.com/@vscode/vscode-languagedetection/-/vscode-languagedetection-1.0.21.tgz#89b48f293f6aa3341bb888c1118d16ff13b032d3"
integrity sha512-zSUH9HYCw5qsCtd7b31yqkpaCU6jhtkKLkvOOA8yTrIRfBSOFb8PPhgmMicD7B/m+t4PwOJXzU1XDtrM9Fd3/g==

"@xterm/addon-clipboard@0.2.0-beta.19":
version "0.2.0-beta.19"
resolved "https://registry.yarnpkg.com/@xterm/addon-clipboard/-/addon-clipboard-0.2.0-beta.19.tgz#da2ea7a0d6e51383d4a21cbb04fb7fbd9db7d853"
integrity sha512-A/NxJQoOq21kE1ykZ07Cw3IxD5cQFxba1iMxnSFvWGVC71ZdHGwUveLeY8nHWEL8PfLsZxAgIzlMTfWgfkQ+CA==
"@xterm/addon-clipboard@0.2.0-beta.28":
version "0.2.0-beta.28"
resolved "https://registry.yarnpkg.com/@xterm/addon-clipboard/-/addon-clipboard-0.2.0-beta.28.tgz#f6e386b918318fe81479f10fed1bb83e2600e979"
integrity sha512-v3SZuDZat0nFWhz6X+Yr8kB6V+krPv0Hr2FlB29zsKZt1j4NlE58RvhneJesIQ2+/C4Wo4wD/T1Hjz42J2yy9A==
dependencies:
js-base64 "^3.7.5"

"@xterm/addon-image@0.9.0-beta.36":
version "0.9.0-beta.36"
resolved "https://registry.yarnpkg.com/@xterm/addon-image/-/addon-image-0.9.0-beta.36.tgz#79024103c48f4e401ca15afe49fad4f3834c023c"
integrity sha512-m8c5OfJBzPYfv90mSgc0bX/P+qUsgczVajHW+kE59UoC311ng13IlCg6a4bJHb2EHqGsq19fIrYCn6+JsMdRsQ==

"@xterm/addon-search@0.16.0-beta.36":
version "0.16.0-beta.36"
resolved "https://registry.yarnpkg.com/@xterm/addon-search/-/addon-search-0.16.0-beta.36.tgz#22deda3250552f24de05f8112299d15f3fe90f01"
integrity sha512-lN66vYpKvNBxbvtJXLbuidirirmIzySXnl8JvarcrDaw4HlqluOvvjEdVYKofWV5ZGSaPfIAijwJW1f0KjUhJw==

"@xterm/addon-serialize@0.14.0-beta.36":
version "0.14.0-beta.36"
resolved "https://registry.yarnpkg.com/@xterm/addon-serialize/-/addon-serialize-0.14.0-beta.36.tgz#1407c13fe1bd869ad4f26e7b7da4e7fa87442021"
integrity sha512-6KpzHlQIuHakPv70dKhQp8f6e9hk4q1fNuuTD1rEzDg8DeKRfUDjorw1vPkKTB/DD+3zaMUBtg7DFVVEi+/+Cw==

"@xterm/addon-unicode11@0.9.0-beta.36":
version "0.9.0-beta.36"
resolved "https://registry.yarnpkg.com/@xterm/addon-unicode11/-/addon-unicode11-0.9.0-beta.36.tgz#158dcdd707a466958a256a960e5d9a967a97a9dc"
integrity sha512-BKP2ml0fYOHnfaTp0LorSluNXjHRSEwf3yrD3K6jEZfYTBePhee1TAxOdNH/TdqwNYZYaYHaK87A5mSuYpKPBQ==

"@xterm/addon-webgl@0.19.0-beta.36":
version "0.19.0-beta.36"
resolved "https://registry.yarnpkg.com/@xterm/addon-webgl/-/addon-webgl-0.19.0-beta.36.tgz#8926a0434e5ce74eee12a965c06cd5f601391f18"
integrity sha512-bJA1enVNlIMRkBU9i7i8qX26Zs2/CrGedREW5WI0NZUAn0IHlatWlj3aOfTuI2MYWUPGE8ul30PyipYP6P+fmA==

"@xterm/xterm@5.6.0-beta.36":
version "5.6.0-beta.36"
resolved "https://registry.yarnpkg.com/@xterm/xterm/-/xterm-5.6.0-beta.36.tgz#fd0fd598b67e3bcba61a59bb1a33b131ad86eea3"
integrity sha512-YtFKQIggbvV2brWifksZAtLi447j0DFdoSRoq4vQi/N7KFC0pguGdG3YzYkDOyqoeLMPu569e2b5oevMe6d2aQ==
"@xterm/addon-image@0.9.0-beta.45":
version "0.9.0-beta.45"
resolved "https://registry.yarnpkg.com/@xterm/addon-image/-/addon-image-0.9.0-beta.45.tgz#a414e50d69082eecbf036ec3ee3f59a72ae4a147"
integrity sha512-p35WvXBjARn2EwmIiINIgQLSL83qCIcTuDv/h6RHokYzDM72xmQ4I0hs5+7zZXTRXcSjATRLf2yA5Y7Kd4wxBQ==

"@xterm/addon-search@0.16.0-beta.45":
version "0.16.0-beta.45"
resolved "https://registry.yarnpkg.com/@xterm/addon-search/-/addon-search-0.16.0-beta.45.tgz#2bcbea97634e150f40907f9bdeaaefbf43dfff9a"
integrity sha512-c0qc8v+xTeHgXLV1t7YzCbkVfakMJbK4tzQDGtHwPPOUWf98YZK/l8KrF61cQpmHzjuuqu+2DvquG+WuaHxLlA==

"@xterm/addon-serialize@0.14.0-beta.45":
version "0.14.0-beta.45"
resolved "https://registry.yarnpkg.com/@xterm/addon-serialize/-/addon-serialize-0.14.0-beta.45.tgz#c87b271700ada63a9db4a440c4576f1c9429650e"
integrity sha512-cpICPGaekJVtbRK0/KFUhsjT9EPHJq3oGdOXnSGsDawqpam0m8iu1gNzUpscq693v9BisDy80YqSdgdGu/iVMw==

"@xterm/addon-unicode11@0.9.0-beta.45":
version "0.9.0-beta.45"
resolved "https://registry.yarnpkg.com/@xterm/addon-unicode11/-/addon-unicode11-0.9.0-beta.45.tgz#879b478efa13fdda7608f23a20033e124b578f15"
integrity sha512-oRJ/W6AA0FwSXDkSkbE3/v4UEmqrXv4NjHEmPPrdaenk0JcuNCfuB+iNZbz3BH6ErRxgCx+6QMq+A2NW1EqQdQ==

"@xterm/addon-webgl@0.19.0-beta.45":
version "0.19.0-beta.45"
resolved "https://registry.yarnpkg.com/@xterm/addon-webgl/-/addon-webgl-0.19.0-beta.45.tgz#d239170f22b5782cb4a765d4c4a8a2356d6a8390"
integrity sha512-6dw4ZC5nAU+ODDXlB1bVJizTuR4yyaxcwJLBH8YI4FM2/SOcgdVl5MEKoTpRrVnG1HtPfeHoiw+0k61d92/zkQ==

"@xterm/xterm@5.6.0-beta.45":
version "5.6.0-beta.45"
resolved "https://registry.yarnpkg.com/@xterm/xterm/-/xterm-5.6.0-beta.45.tgz#382dd244c365f5a1cea5e164effc1e4f7814cd7b"
integrity sha512-PtPJYHhuKgyFZQTc5jgvxtQ79yW5cRBgc5R7+xFdOOhnZAOog/CqUWXAHVIPG8T7uzhSatRStbW6K4pGGeiNSw==

js-base64@^3.7.5:
version "3.7.7"
Expand Down
76 changes: 38 additions & 38 deletions remote/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -122,47 +122,47 @@
resolved "https://registry.yarnpkg.com/@vscode/windows-registry/-/windows-registry-1.1.0.tgz#03dace7c29c46f658588b9885b9580e453ad21f9"
integrity sha512-5AZzuWJpGscyiMOed0IuyEwt6iKmV5Us7zuwCDCFYMIq7tsvooO9BUiciywsvuthGz6UG4LSpeDeCxvgMVhnIw==

"@xterm/addon-clipboard@0.2.0-beta.19":
version "0.2.0-beta.19"
resolved "https://registry.yarnpkg.com/@xterm/addon-clipboard/-/addon-clipboard-0.2.0-beta.19.tgz#da2ea7a0d6e51383d4a21cbb04fb7fbd9db7d853"
integrity sha512-A/NxJQoOq21kE1ykZ07Cw3IxD5cQFxba1iMxnSFvWGVC71ZdHGwUveLeY8nHWEL8PfLsZxAgIzlMTfWgfkQ+CA==
"@xterm/addon-clipboard@0.2.0-beta.28":
version "0.2.0-beta.28"
resolved "https://registry.yarnpkg.com/@xterm/addon-clipboard/-/addon-clipboard-0.2.0-beta.28.tgz#f6e386b918318fe81479f10fed1bb83e2600e979"
integrity sha512-v3SZuDZat0nFWhz6X+Yr8kB6V+krPv0Hr2FlB29zsKZt1j4NlE58RvhneJesIQ2+/C4Wo4wD/T1Hjz42J2yy9A==
dependencies:
js-base64 "^3.7.5"

"@xterm/addon-image@0.9.0-beta.36":
version "0.9.0-beta.36"
resolved "https://registry.yarnpkg.com/@xterm/addon-image/-/addon-image-0.9.0-beta.36.tgz#79024103c48f4e401ca15afe49fad4f3834c023c"
integrity sha512-m8c5OfJBzPYfv90mSgc0bX/P+qUsgczVajHW+kE59UoC311ng13IlCg6a4bJHb2EHqGsq19fIrYCn6+JsMdRsQ==

"@xterm/addon-search@0.16.0-beta.36":
version "0.16.0-beta.36"
resolved "https://registry.yarnpkg.com/@xterm/addon-search/-/addon-search-0.16.0-beta.36.tgz#22deda3250552f24de05f8112299d15f3fe90f01"
integrity sha512-lN66vYpKvNBxbvtJXLbuidirirmIzySXnl8JvarcrDaw4HlqluOvvjEdVYKofWV5ZGSaPfIAijwJW1f0KjUhJw==

"@xterm/addon-serialize@0.14.0-beta.36":
version "0.14.0-beta.36"
resolved "https://registry.yarnpkg.com/@xterm/addon-serialize/-/addon-serialize-0.14.0-beta.36.tgz#1407c13fe1bd869ad4f26e7b7da4e7fa87442021"
integrity sha512-6KpzHlQIuHakPv70dKhQp8f6e9hk4q1fNuuTD1rEzDg8DeKRfUDjorw1vPkKTB/DD+3zaMUBtg7DFVVEi+/+Cw==

"@xterm/addon-unicode11@0.9.0-beta.36":
version "0.9.0-beta.36"
resolved "https://registry.yarnpkg.com/@xterm/addon-unicode11/-/addon-unicode11-0.9.0-beta.36.tgz#158dcdd707a466958a256a960e5d9a967a97a9dc"
integrity sha512-BKP2ml0fYOHnfaTp0LorSluNXjHRSEwf3yrD3K6jEZfYTBePhee1TAxOdNH/TdqwNYZYaYHaK87A5mSuYpKPBQ==

"@xterm/addon-webgl@0.19.0-beta.36":
version "0.19.0-beta.36"
resolved "https://registry.yarnpkg.com/@xterm/addon-webgl/-/addon-webgl-0.19.0-beta.36.tgz#8926a0434e5ce74eee12a965c06cd5f601391f18"
integrity sha512-bJA1enVNlIMRkBU9i7i8qX26Zs2/CrGedREW5WI0NZUAn0IHlatWlj3aOfTuI2MYWUPGE8ul30PyipYP6P+fmA==

"@xterm/headless@5.6.0-beta.36":
version "5.6.0-beta.36"
resolved "https://registry.yarnpkg.com/@xterm/headless/-/headless-5.6.0-beta.36.tgz#cf3e690024019eac2e22d87e0e9f04da6e99cfa9"
integrity sha512-X0Te4ssxcVZ3/YlYEjzN+4w5e4f3Ni/kdjBUKoyZSRpA1+Er54HC/I3t1jc4amqI9xysnVwhq+Ey+LjygIfALw==

"@xterm/xterm@5.6.0-beta.36":
version "5.6.0-beta.36"
resolved "https://registry.yarnpkg.com/@xterm/xterm/-/xterm-5.6.0-beta.36.tgz#fd0fd598b67e3bcba61a59bb1a33b131ad86eea3"
integrity sha512-YtFKQIggbvV2brWifksZAtLi447j0DFdoSRoq4vQi/N7KFC0pguGdG3YzYkDOyqoeLMPu569e2b5oevMe6d2aQ==
"@xterm/addon-image@0.9.0-beta.45":
version "0.9.0-beta.45"
resolved "https://registry.yarnpkg.com/@xterm/addon-image/-/addon-image-0.9.0-beta.45.tgz#a414e50d69082eecbf036ec3ee3f59a72ae4a147"
integrity sha512-p35WvXBjARn2EwmIiINIgQLSL83qCIcTuDv/h6RHokYzDM72xmQ4I0hs5+7zZXTRXcSjATRLf2yA5Y7Kd4wxBQ==

"@xterm/addon-search@0.16.0-beta.45":
version "0.16.0-beta.45"
resolved "https://registry.yarnpkg.com/@xterm/addon-search/-/addon-search-0.16.0-beta.45.tgz#2bcbea97634e150f40907f9bdeaaefbf43dfff9a"
integrity sha512-c0qc8v+xTeHgXLV1t7YzCbkVfakMJbK4tzQDGtHwPPOUWf98YZK/l8KrF61cQpmHzjuuqu+2DvquG+WuaHxLlA==

"@xterm/addon-serialize@0.14.0-beta.45":
version "0.14.0-beta.45"
resolved "https://registry.yarnpkg.com/@xterm/addon-serialize/-/addon-serialize-0.14.0-beta.45.tgz#c87b271700ada63a9db4a440c4576f1c9429650e"
integrity sha512-cpICPGaekJVtbRK0/KFUhsjT9EPHJq3oGdOXnSGsDawqpam0m8iu1gNzUpscq693v9BisDy80YqSdgdGu/iVMw==

"@xterm/addon-unicode11@0.9.0-beta.45":
version "0.9.0-beta.45"
resolved "https://registry.yarnpkg.com/@xterm/addon-unicode11/-/addon-unicode11-0.9.0-beta.45.tgz#879b478efa13fdda7608f23a20033e124b578f15"
integrity sha512-oRJ/W6AA0FwSXDkSkbE3/v4UEmqrXv4NjHEmPPrdaenk0JcuNCfuB+iNZbz3BH6ErRxgCx+6QMq+A2NW1EqQdQ==

"@xterm/addon-webgl@0.19.0-beta.45":
version "0.19.0-beta.45"
resolved "https://registry.yarnpkg.com/@xterm/addon-webgl/-/addon-webgl-0.19.0-beta.45.tgz#d239170f22b5782cb4a765d4c4a8a2356d6a8390"
integrity sha512-6dw4ZC5nAU+ODDXlB1bVJizTuR4yyaxcwJLBH8YI4FM2/SOcgdVl5MEKoTpRrVnG1HtPfeHoiw+0k61d92/zkQ==

"@xterm/headless@5.6.0-beta.45":
version "5.6.0-beta.45"
resolved "https://registry.yarnpkg.com/@xterm/headless/-/headless-5.6.0-beta.45.tgz#0e387cab4750c1d37206c5111e287941c17ed1f3"
integrity sha512-kzYnl2zJUtRTfmrAso7dAu7g+hroA0sE98gZQGyAl8G6dmtH2qJdKZnn9B67ON7n3Drgv9QPRD606/Y44JfRlw==

"@xterm/xterm@5.6.0-beta.45":
version "5.6.0-beta.45"
resolved "https://registry.yarnpkg.com/@xterm/xterm/-/xterm-5.6.0-beta.45.tgz#382dd244c365f5a1cea5e164effc1e4f7814cd7b"
integrity sha512-PtPJYHhuKgyFZQTc5jgvxtQ79yW5cRBgc5R7+xFdOOhnZAOog/CqUWXAHVIPG8T7uzhSatRStbW6K4pGGeiNSw==

agent-base@^7.0.1, agent-base@^7.0.2, agent-base@^7.1.0:
version "7.1.0"
Expand Down
45 changes: 0 additions & 45 deletions src/vs/workbench/contrib/terminal/browser/media/scrollbar.css

This file was deleted.

43 changes: 14 additions & 29 deletions src/vs/workbench/contrib/terminal/browser/media/terminal.css
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,16 @@
}

.monaco-workbench .xterm {
/* All terminals have at least 20px left, 10px right edge padding and 2 padding on the bottom (so underscores on last line are visible) */
padding: 0 10px 2px 20px;
/* All terminals have at least 20px left padding for the gutter */
padding-left: 20px;
}

.monaco-workbench .xterm .xterm-scrollable-element {
/* Offset the scrollable element such that:
* - The terminal grid will be positioned to the right of the gutter
* - Elements are not hidden in the gutter */
margin-left: -20px;
padding-left: 20px;
}

.monaco-workbench .terminal-editor .xterm,
Expand Down Expand Up @@ -130,10 +138,10 @@
.xterm.xterm-cursor-pointer .xterm-screen { cursor: pointer; }
.xterm.column-select.focus .xterm-screen { cursor: crosshair; }

.monaco-workbench .terminal-editor .terminal-group .monaco-split-view2.horizontal .split-view-view:last-child .xterm,
/* .monaco-workbench .terminal-editor .terminal-group .monaco-split-view2.horizontal .split-view-view:last-child .xterm,
.monaco-workbench .pane-body.integrated-terminal .terminal-group .monaco-split-view2.horizontal .split-view-view:last-child .xterm {
padding-right: 20px;
}
} */

.monaco-workbench .terminal-editor .xterm a:not(.xterm-invalid-link),
.monaco-workbench .pane-body.integrated-terminal .xterm a:not(.xterm-invalid-link) {
Expand All @@ -159,8 +167,8 @@

.monaco-workbench .terminal-editor .terminal-wrapper:not(.fixed-dims) .xterm-viewport,
.monaco-workbench .pane-body.integrated-terminal .terminal-wrapper:not(.fixed-dims) .xterm-viewport {
/* Override xterm.js' width as we want to size the viewport to fill the panel so the scrollbar is on the right edge */
width: auto !important;
/* Override xterm.js' position so the area that accepts mouse events extends to the edge of the scroll bar */
right: 14px;
}

.monaco-workbench .pane-body.integrated-terminal {
Expand Down Expand Up @@ -520,29 +528,6 @@
background-color: var(--vscode-terminal-hoverHighlightBackground);
}

.force-scrollbar .xterm .xterm-viewport,
.monaco-workbench .xterm.focus .xterm-viewport,
.monaco-workbench .xterm:focus .xterm-viewport,
.monaco-workbench .xterm:hover .xterm-viewport {
background-color: var(--vscode-scrollbarSlider-background) !important;
}

.monaco-workbench .xterm-viewport {
scrollbar-color: var(--vscode-scrollbarSlider-background) transparent;
}

.monaco-workbench .xterm .xterm-viewport::-webkit-scrollbar-thumb:hover {
background-color: var(--vscode-scrollbarSlider-hoverBackground);
}

.monaco-workbench .xterm-viewport:hover {
scrollbar-color: var(--vscode-scrollbarSlider-hoverBackground) transparent;
}

.monaco-workbench .xterm .xterm-viewport::-webkit-scrollbar-thumb:active {
background-color: var(--vscode-scrollbarSlider-activeBackground);
}

.monaco-workbench .xterm.terminal.hide {
visibility: hidden;
}
Loading

0 comments on commit 4f13098

Please sign in to comment.