espterm
/
espterm-front-end
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

added Solarized Dark High-Contrast, fix theme numbers for backcompat

Browse Source
box-drawing
Ondřej Hruška 7 years ago
parent c0aa3083ae
commit af723bf783
Signed by: MightyPork
GPG Key ID: 2C5FD5035250423D
3 changed files with 32 additions and 24 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      js/term/screen_parser.js
  2. 43
      js/term/themes.js
  3. 11
      pages/cfg_term.php

2
js/term/screen_parser.js
Unescape View File

@ -90,6 +90,8 @@ module.exports = class ScreenParser {
const defBg = du(strArray[ci++]) | (du(strArray[ci++]) << 12) const defBg = du(strArray[ci++]) | (du(strArray[ci++]) << 12)
const attributes = du(strArray[ci++]) const attributes = du(strArray[ci++])
console.log(`set colors ${defFg}, ${defBg}, theme ${theme}`)
// theming // theming
this.screen.renderer.loadTheme(theme) this.screen.renderer.loadTheme(theme)
this.screen.renderer.setDefaultColors(defFg, defBg) this.screen.renderer.setDefaultColors(defFg, defBg)

43
js/term/themes.js
Unescape View File

@ -24,40 +24,45 @@ const themes = exports.themes = [
'#073642', '#dc322f', '#859900', '#b58900', '#268bd2', '#d33682', '#2aa198', '#eee8d5', '#073642', '#dc322f', '#859900', '#b58900', '#268bd2', '#d33682', '#2aa198', '#eee8d5',
'#002b36', '#cb4b16', '#586e75', '#657b83', '#839496', '#6c71c4', '#93a1a1', '#fdf6e3' '#002b36', '#cb4b16', '#586e75', '#657b83', '#839496', '#6c71c4', '#93a1a1', '#fdf6e3'
], ],
[ // 6 - Solarized Light - https://github.com/sgerrand/xfce4-terminal-colors-solarized [ // 6 - CGA NTSC - wikipedia
'#eee8d5', '#dc322f', '#859900', '#b58900', '#268bd2', '#d33682', '#2aa198', '#073642',
'#fdf6e3', '#cb4b16', '#93a1a1', '#839496', '#657b83', '#6c71c4', '#586e75', '#002b36'
],
[ // 7 - CGA NTSC - wikipedia
'#000000', '#69001A', '#117800', '#769100', '#1A00A6', '#8019AB', '#289E76', '#A4A4A4', '#000000', '#69001A', '#117800', '#769100', '#1A00A6', '#8019AB', '#289E76', '#A4A4A4',
'#484848', '#C54E76', '#6DD441', '#D2ED46', '#765BFF', '#DC75FF', '#84FAD2', '#FFFFFF' '#484848', '#C54E76', '#6DD441', '#D2ED46', '#765BFF', '#DC75FF', '#84FAD2', '#FFFFFF'
], ],
[ // 8 - ZX Spectrum - wikipedia [ // 7 - ZX Spectrum - wikipedia
'#000000', '#aa0000', '#00aa00', '#aaaa00', '#0000aa', '#aa00aa', '#00aaaa', '#aaaaaa', '#000000', '#aa0000', '#00aa00', '#aaaa00', '#0000aa', '#aa00aa', '#00aaaa', '#aaaaaa',
'#000000', '#ff0000', '#00FF00', '#ffff00', '#0000ff', '#ff00ff', '#00ffff', '#ffffff' '#000000', '#ff0000', '#00FF00', '#ffff00', '#0000ff', '#ff00ff', '#00ffff', '#ffffff'
], ],
[ // 9 - Apple II - wikipedia [ // 8 - Apple II - wikipedia
'#000000', '#722640', '#0E5940', '#808080', '#40337F', '#E434FE', '#1B9AFE', '#BFB3FF', '#000000', '#722640', '#0E5940', '#808080', '#40337F', '#E434FE', '#1B9AFE', '#BFB3FF',
'#404C00', '#E46501', '#1BCB01', '#BFCC80', '#808080', '#F1A6BF', '#8DD9BF', '#ffffff' '#404C00', '#E46501', '#1BCB01', '#BFCC80', '#808080', '#F1A6BF', '#8DD9BF', '#ffffff'
], ],
[ // 10 - Commodore - wikipedia [ // 9 - Commodore - wikipedia
'#000000', '#8D3E37', '#55A049', '#AAB95D', '#40318D', '#80348B', '#72C1C8', '#D59F74', '#000000', '#8D3E37', '#55A049', '#AAB95D', '#40318D', '#80348B', '#72C1C8', '#D59F74',
'#8B5429', '#B86962', '#94E089', '#FFFFB2', '#8071CC', '#AA5FB6', '#87D6DD', '#ffffff' '#8B5429', '#B86962', '#94E089', '#FFFFB2', '#8071CC', '#AA5FB6', '#87D6DD', '#ffffff'
],
[ // 10 - Solarized Light - https://github.com/sgerrand/xfce4-terminal-colors-solarized
'#eee8d5', '#dc322f', '#859900', '#b58900', '#268bd2', '#d33682', '#2aa198', '#073642',
'#fdf6e3', '#cb4b16', '#93a1a1', '#839496', '#657b83', '#6c71c4', '#586e75', '#002b36'
],
[ // 11 - Solarized Dark High contrast - https://github.com/sgerrand/xfce4-terminal-colors-solarized
'#073642', '#dc322f', '#859900', '#b58900', '#268bd2', '#d33682', '#2aa198', '#fdf6e3',
'#002b36', '#cb4b16', '#657b83', '#839496', '#93a1a1', '#6c71c4', '#eee8d5', '#fdf6e3'
] ]
] ]
exports.fgbgThemes = [ exports.fgbgThemes = [
['#AAAAAA', '#000000', 'Lnx', 'Linux'], // GREY_ON_BLACK ['#AAAAAA', '#000000', 'Lnx', 'Linux'],
['#EFF0F1', '#31363B', 'Brz', 'Breeze'], // BREEZE ['#FFFFFF', '#000000', 'W+K', 'White on Black'],
['#FFFFFF', '#000000', 'W+K', 'White on Black'], // WHITE_ON_BLACK ['#00FF00', '#000000', 'Lim', 'Lime'],
['#00FF00', '#000000', 'Lim', 'Lime'], // GREEN_ON_BLACK ['#E53C00', '#000000', 'Nix', 'Nixie'],
['#E53C00', '#000000', 'Nix', 'Nixie'], // ORANGE_ON_BLACK ['#EFF0F1', '#31363B', 'Brz', 'Breeze'],
['#FFFFFF', '#300A24', 'Amb', 'Ambiance'], // AMBIENCE ['#FFFFFF', '#300A24', 'Amb', 'Ambiance'],
['#839496', '#002B36', 'SoD', 'Solarized Dark'], // SOLARIZED_DARK ['#839496', '#002B36', 'SoD', 'Solarized Dark'],
['#657B83', '#FDF6E3', 'SoL', 'Solarized Light'], // SOLARIZED_LIGHT ['#93a1a1', '#002b36', 'SoH', 'Solarized Dark (High Contrast)'],
['#000000', '#FFFFDD', 'K+Y', 'Black on Yellow'], // BLACK_ON_YELLOW ['#657B83', '#FDF6E3', 'SoL', 'Solarized Light'],
['#000000', '#FFFFFF', 'K+W', 'Black on White'], // BLACK_ON_WHITE ['#000000', '#FFD75F', 'Wsp', 'Wasp'],
['#000000', '#FFD75F', 'Wsp', 'Wasp'] // WASP ['#000000', '#FFFFDD', 'K+Y', 'Black on Yellow'],
['#000000', '#FFFFFF', 'K+W', 'Black on White']
] ]
let colorTable256 = null let colorTable256 = null

11
pages/cfg_term.php
Unescape View File

@ -19,11 +19,12 @@
<option value="3">Rxvt</option> <option value="3">Rxvt</option>
<option value="4">Ambience</option> <option value="4">Ambience</option>
<option value="5">Solarized Dark</option> <option value="5">Solarized Dark</option>
<option value="6">Solarized Light</option> <option value="11">Solarized Dark, high contrast</option>
<option value="7">CGA NTSC</option> <option value="10">Solarized Light</option>
<option value="8">ZX Spectrum</option> <option value="6">CGA NTSC</option>
<option value="9">Apple II</option> <option value="7">ZX Spectrum</option>
<option value="10">Commodore</option> <option value="8">Apple II</option>
<option value="9">Commodore</option>
</select> </select>
</div> </div>

Write Preview
Loading…
Cancel
Save