Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-09-20 02:34:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9458 from Microsoft/tyriar/7045_integrated_terminal_ime_support

Browse Source 
Support IMEs in integrated terminal
This commit is contained in:
Daniel Imms
2016-07-22 05:03:32 -07:00
committed by GitHub
parent 5da541a16d 3a90fe1c89
commit ba0150707d
3 changed files with 46 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
npm-shrinkwrap.json
Generated
+2 -2
View File
@@ -429,8 +429,8 @@
},
"xterm": {
"version": "1.0.0",
"from": "git+https://github.com/sourcelair/xterm.js.git#55fb5db",
"resolved": "git+https://github.com/sourcelair/xterm.js.git#55fb5dbcb5353d6fb2a00617be4b1c5de84c6c80"
"from": "git+https://github.com/sourcelair/xterm.js.git#5e662d0",
"resolved": "git+https://github.com/sourcelair/xterm.js.git#5e662d0eb7c2e8b5100f96b45b1110b8f85ba8df"
},
"yauzl": {
"version": "2.3.1",
package.json
+1 -1
View File
@@ -30,7 +30,7 @@
"vscode-debugprotocol": "1.10.0",
"vscode-textmate": "2.0.1",
"winreg": "1.2.0",
"xterm": "git+https://github.com/sourcelair/xterm.js.git#55fb5db",
"xterm": "git+https://github.com/sourcelair/xterm.js.git#5e662d0",
"yauzl": "2.3.1"
},
"devDependencies": {
src/vs/workbench/parts/terminal/electron-browser/media/xterm.css
+43 -11
View File
@@ -16,41 +16,59 @@
position: relative;
}
.monaco-workbench .panel.integrated-terminal .xterm:focus {
.monaco-workbench .panel.integrated-terminal .xterm.focus {
outline: none;
}
.hc-black .monaco-workbench .panel.integrated-terminal .xterm:focus {
.hc-black .monaco-workbench .panel.integrated-terminal .xterm.focus {
outline: 2px solid #f38518;
}
.monaco-workbench .panel.integrated-terminal .xterm .xterm-helpers {
position: absolute;
top: 0;
}
.monaco-workbench .panel.integrated-terminal .xterm .xterm-helper-textarea {
position: absolute;
/*
* HACK: to fix IE's blinking cursor
* Move textarea out of the screen to the far left, so that the cursor is not visible.
*/
left: -9999em;
opacity: 0;
width: 0;
height: 0;
z-index: -10;
}
.monaco-workbench .panel.integrated-terminal .reverse-video { color: #1e1e1e; }
.vs-dark .monaco-workbench .panel.integrated-terminal .reverse-video { color: #CCC; }
.hc-black .monaco-workbench .panel.integrated-terminal .reverse-video { color: #FFF; }
.monaco-workbench .panel.integrated-terminal .xterm:focus .terminal-cursor { background-color: #333; }
.vs-dark .monaco-workbench .panel.integrated-terminal .xterm:focus .terminal-cursor { background-color: #CCC; }
.hc-black .monaco-workbench .panel.integrated-terminal .xterm:focus .terminal-cursor { background-color: #FFF; }
.monaco-workbench .panel.integrated-terminal .xterm.focus .terminal-cursor { background-color: #333; }
.vs-dark .monaco-workbench .panel.integrated-terminal .xterm.focus .terminal-cursor { background-color: #CCC; }
.hc-black .monaco-workbench .panel.integrated-terminal .xterm.focus .terminal-cursor { background-color: #FFF; }
.monaco-workbench .panel.integrated-terminal .xterm:not(:focus) .terminal-cursor {
.monaco-workbench .panel.integrated-terminal .xterm:not(.focus) .terminal-cursor {
background-color: transparent;
outline: 1px solid #333;
outline-offset: -1px;
}
.vs-dark .monaco-workbench .panel.integrated-terminal .xterm:not(:focus) .terminal-cursor {
.vs-dark .monaco-workbench .panel.integrated-terminal .xterm:not(.focus) .terminal-cursor {
background-color: transparent;
outline: 1px solid #CCC;
outline-offset: -1px;
}
.hc-black .monaco-workbench .panel.integrated-terminal .xterm:not(:focus) .terminal-cursor {
.hc-black .monaco-workbench .panel.integrated-terminal .xterm:not(.focus) .terminal-cursor {
background-color: transparent;
outline: 1px solid #FFF;
outline-offset: -1px;
}
.monaco-workbench .panel.integrated-terminal .xterm:focus .terminal-cursor.blinking { animation: blink-cursor 1.2s infinite step-end; }
.vs-dark .monaco-workbench .panel.integrated-terminal .xterm:focus .terminal-cursor.blinking { animation: blink-cursor-dark 1.2s infinite step-end; }
.hc-black .monaco-workbench .panel.integrated-terminal .xterm:focus .terminal-cursor.blinking { animation: blink-cursor-hc-black 1.2s infinite step-end; }
.monaco-workbench .panel.integrated-terminal .xterm.focus .terminal-cursor.blinking { animation: blink-cursor 1.2s infinite step-end; }
.vs-dark .monaco-workbench .panel.integrated-terminal .xterm.focus .terminal-cursor.blinking { animation: blink-cursor-dark 1.2s infinite step-end; }
.hc-black .monaco-workbench .panel.integrated-terminal .xterm.focus .terminal-cursor.blinking { animation: blink-cursor-hc-black 1.2s infinite step-end; }
@keyframes blink-cursor {
0% {
@@ -101,6 +119,20 @@
visibility: hidden;
}
/* Composition view */
.terminal .composition-view {
background: #000;
color: #FFF;
display: none;
position: absolute;
white-space: nowrap;
}
.terminal .composition-view.active {
display: block;
}
/* Base selection colors */
.monaco-workbench .panel.integrated-terminal .xterm *::selection {