From dd780e6fe7cb5233648e70fae68d276f0cccbc43 Mon Sep 17 00:00:00 2001 From: CHaBou Date: Tue, 9 Jan 2018 17:33:24 +0100 Subject: [PATCH] Xterm v3 integration (#2573) --- app/config/config-default.js | 6 + lib/components/style-sheet.js | 2359 ++------------------------------- lib/components/term-group.js | 6 + lib/components/term.js | 91 +- lib/components/terms.js | 8 +- lib/containers/terms.js | 2 + lib/reducers/ui.js | 10 + package.json | 53 +- yarn.lock | 140 +- 9 files changed, 310 insertions(+), 2365 deletions(-) diff --git a/app/config/config-default.js b/app/config/config-default.js index d0190f6b..62779606 100644 --- a/app/config/config-default.js +++ b/app/config/config-default.js @@ -17,6 +17,9 @@ module.exports = { // terminal cursor background color and opacity (hex, rgb, hsl, hsv, hwb or cmyk) cursorColor: 'rgba(248,28,229,0.8)', + // terminal text color under BLOCK cursor + cursorAccentColor: '#000', + // `'BEAM'` for |, `'UNDERLINE'` for _, `'BLOCK'` for █ cursorShape: 'BLOCK', @@ -30,6 +33,9 @@ module.exports = { // opacity is only supported on macOS backgroundColor: '#000', + // terminal selection color + selectionColor: 'rgba(248,28,229,0.3)', + // border color (window, tabs) borderColor: '#333', diff --git a/lib/components/style-sheet.js b/lib/components/style-sheet.js index 4c90b394..a8ad760e 100644 --- a/lib/components/style-sheet.js +++ b/lib/components/style-sheet.js @@ -2,2267 +2,114 @@ import React from 'react'; export default class StyleSheet extends React.PureComponent { render() { - const { - customCSS, - colors, - backgroundColor, - cursorColor, - fontSize, - fontFamily, - fontSmoothing, - foregroundColor, - borderColor - } = this.props; + const {customCSS, backgroundColor, fontFamily, foregroundColor, borderColor} = this.props; return (