diff options
| -rw-r--r-- | package.json | 4 | ||||
| -rw-r--r-- | remote/package.json | 4 | ||||
| -rw-r--r-- | remote/web/package.json | 2 | ||||
| -rw-r--r-- | remote/web/yarn.lock | 8 | ||||
| -rw-r--r-- | remote/yarn.lock | 18 | ||||
| -rw-r--r-- | src/vs/workbench/contrib/terminal/browser/media/xterm.css | 11 | ||||
| -rw-r--r-- | yarn.lock | 18 |
7 files changed, 34 insertions, 31 deletions
diff --git a/package.json b/package.json index 154b766bd59..4aff41bc17a 100644 --- a/package.json +++ b/package.json @@ -85,12 +85,12 @@ "vscode-proxy-agent": "^0.12.0", "vscode-regexpp": "^3.1.0", "vscode-textmate": "7.0.1", - "xterm": "4.19.0-beta.53", + "xterm": "4.19.0-beta.55", "xterm-addon-search": "0.9.0-beta.39", "xterm-addon-serialize": "0.7.0-beta.12", "xterm-addon-unicode11": "0.4.0-beta.3", "xterm-addon-webgl": "0.12.0-beta.36", - "xterm-headless": "4.19.0-beta.53", + "xterm-headless": "4.19.0-beta.55", "yauzl": "^2.9.2", "yazl": "^2.4.3" }, diff --git a/remote/package.json b/remote/package.json index 04a18a2c469..a8db5662bd2 100644 --- a/remote/package.json +++ b/remote/package.json @@ -24,12 +24,12 @@ "vscode-proxy-agent": "^0.12.0", "vscode-regexpp": "^3.1.0", "vscode-textmate": "7.0.1", - "xterm": "4.19.0-beta.53", + "xterm": "4.19.0-beta.55", "xterm-addon-search": "0.9.0-beta.39", "xterm-addon-serialize": "0.7.0-beta.12", "xterm-addon-unicode11": "0.4.0-beta.3", "xterm-addon-webgl": "0.12.0-beta.36", - "xterm-headless": "4.19.0-beta.53", + "xterm-headless": "4.19.0-beta.55", "yauzl": "^2.9.2", "yazl": "^2.4.3" }, diff --git a/remote/web/package.json b/remote/web/package.json index dec03446171..fb94acd664f 100644 --- a/remote/web/package.json +++ b/remote/web/package.json @@ -10,7 +10,7 @@ "tas-client-umd": "0.1.5", "vscode-oniguruma": "1.6.1", "vscode-textmate": "7.0.1", - "xterm": "4.19.0-beta.53", + "xterm": "4.19.0-beta.55", "xterm-addon-search": "0.9.0-beta.39", "xterm-addon-unicode11": "0.4.0-beta.3", "xterm-addon-webgl": "0.12.0-beta.36" diff --git a/remote/web/yarn.lock b/remote/web/yarn.lock index 37304374823..8c09aa42f62 100644 --- a/remote/web/yarn.lock +++ b/remote/web/yarn.lock @@ -128,7 +128,7 @@ xterm-addon-webgl@0.12.0-beta.36: resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.12.0-beta.36.tgz#460f80829a78c979a448d5b764699af3f0366ff1" integrity sha512-sgX7OHSGZQZE5b4xtPqd/5NEcll0Z+00tnTVxKZlXf5XEENcG0tnBF4I4f+k9K3cmjE1UIUVG2yYPrqWlYCdpA== -xterm@4.19.0-beta.53: - version "4.19.0-beta.53" - resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.19.0-beta.53.tgz#ddb555e032d5ff3a1450d9c4b0250bc3e3ccac99" - integrity sha512-WoJAux1FawCpgDBP9Gr5H+RQUY8H7djr+ZQTpD+D2A3nJTXmoHH5Q1lnu8XCsuPscjRAgqFSQCG+5oHQwBQIdA== +xterm@4.19.0-beta.55: + version "4.19.0-beta.55" + resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.19.0-beta.55.tgz#b2b4acca6ef5c7a4761098b5e1629b7f93deefc9" + integrity sha512-AGT7b6UYZ0o7jtyLZ8KwY8Rchdqv3Pi6Nkcs4YbxR0opbQjIovEc44jkGmudfVYcGaFWsA/bdxM6feJ7VXRAlg== diff --git a/remote/yarn.lock b/remote/yarn.lock index 283ecfb48b8..b8ad6057dd1 100644 --- a/remote/yarn.lock +++ b/remote/yarn.lock @@ -934,15 +934,15 @@ xterm-addon-webgl@0.12.0-beta.36: resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.12.0-beta.36.tgz#460f80829a78c979a448d5b764699af3f0366ff1" integrity sha512-sgX7OHSGZQZE5b4xtPqd/5NEcll0Z+00tnTVxKZlXf5XEENcG0tnBF4I4f+k9K3cmjE1UIUVG2yYPrqWlYCdpA== -xterm-headless@4.19.0-beta.53: - version "4.19.0-beta.53" - resolved "https://registry.yarnpkg.com/xterm-headless/-/xterm-headless-4.19.0-beta.53.tgz#bbcf2b9c3853fb96b642df6950d3b8fa37174be7" - integrity sha512-o3Hbe9zT918IIfHlREhVQolTdXrdOmQKyHtVsfT9x2CG4Z3TaD6A5koX6P0cIoeVwP/dc3R/WBnbXLYl9B0Jiw== - -xterm@4.19.0-beta.53: - version "4.19.0-beta.53" - resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.19.0-beta.53.tgz#ddb555e032d5ff3a1450d9c4b0250bc3e3ccac99" - integrity sha512-WoJAux1FawCpgDBP9Gr5H+RQUY8H7djr+ZQTpD+D2A3nJTXmoHH5Q1lnu8XCsuPscjRAgqFSQCG+5oHQwBQIdA== +xterm-headless@4.19.0-beta.55: + version "4.19.0-beta.55" + resolved "https://registry.yarnpkg.com/xterm-headless/-/xterm-headless-4.19.0-beta.55.tgz#0f8fafefef57cd033100f4ffa60a04e71ed5e122" + integrity sha512-LR2LyKLF/eo/m52qIlONnxNYr7a/Vp6X0M3CnaCFmYKXhjEMHqEOJOAUz/hhKG/R9j7apLgaNj/uw0mCdL780g== + +xterm@4.19.0-beta.55: + version "4.19.0-beta.55" + resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.19.0-beta.55.tgz#b2b4acca6ef5c7a4761098b5e1629b7f93deefc9" + integrity sha512-AGT7b6UYZ0o7jtyLZ8KwY8Rchdqv3Pi6Nkcs4YbxR0opbQjIovEc44jkGmudfVYcGaFWsA/bdxM6feJ7VXRAlg== yallist@^4.0.0: version "4.0.0" diff --git a/src/vs/workbench/contrib/terminal/browser/media/xterm.css b/src/vs/workbench/contrib/terminal/browser/media/xterm.css index 30ac0800d21..a7292928fbb 100644 --- a/src/vs/workbench/contrib/terminal/browser/media/xterm.css +++ b/src/vs/workbench/contrib/terminal/browser/media/xterm.css @@ -40,6 +40,7 @@ */ .xterm { + cursor: text; position: relative; user-select: none; -ms-user-select: none; @@ -128,10 +129,6 @@ line-height: normal; } -.xterm { - cursor: text; -} - .xterm.enable-mouse-events { /* When mouse events are enabled (eg. tmux), revert to the standard pointer cursor */ cursor: default; @@ -188,4 +185,10 @@ position: absolute; top: 0; right: 0; + pointer-events: none; +} + +.xterm-decoration-top { + z-index: 2; + position: relative; } diff --git a/yarn.lock b/yarn.lock index f04a6b2a243..bdda5fdfa88 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12218,15 +12218,15 @@ xterm-addon-webgl@0.12.0-beta.36: resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.12.0-beta.36.tgz#460f80829a78c979a448d5b764699af3f0366ff1" integrity sha512-sgX7OHSGZQZE5b4xtPqd/5NEcll0Z+00tnTVxKZlXf5XEENcG0tnBF4I4f+k9K3cmjE1UIUVG2yYPrqWlYCdpA== -xterm-headless@4.19.0-beta.53: - version "4.19.0-beta.53" - resolved "https://registry.yarnpkg.com/xterm-headless/-/xterm-headless-4.19.0-beta.53.tgz#bbcf2b9c3853fb96b642df6950d3b8fa37174be7" - integrity sha512-o3Hbe9zT918IIfHlREhVQolTdXrdOmQKyHtVsfT9x2CG4Z3TaD6A5koX6P0cIoeVwP/dc3R/WBnbXLYl9B0Jiw== - -xterm@4.19.0-beta.53: - version "4.19.0-beta.53" - resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.19.0-beta.53.tgz#ddb555e032d5ff3a1450d9c4b0250bc3e3ccac99" - integrity sha512-WoJAux1FawCpgDBP9Gr5H+RQUY8H7djr+ZQTpD+D2A3nJTXmoHH5Q1lnu8XCsuPscjRAgqFSQCG+5oHQwBQIdA== +xterm-headless@4.19.0-beta.55: + version "4.19.0-beta.55" + resolved "https://registry.yarnpkg.com/xterm-headless/-/xterm-headless-4.19.0-beta.55.tgz#0f8fafefef57cd033100f4ffa60a04e71ed5e122" + integrity sha512-LR2LyKLF/eo/m52qIlONnxNYr7a/Vp6X0M3CnaCFmYKXhjEMHqEOJOAUz/hhKG/R9j7apLgaNj/uw0mCdL780g== + +xterm@4.19.0-beta.55: + version "4.19.0-beta.55" + resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.19.0-beta.55.tgz#b2b4acca6ef5c7a4761098b5e1629b7f93deefc9" + integrity sha512-AGT7b6UYZ0o7jtyLZ8KwY8Rchdqv3Pi6Nkcs4YbxR0opbQjIovEc44jkGmudfVYcGaFWsA/bdxM6feJ7VXRAlg== y18n@^3.2.1: version "3.2.2" |