Skip to content

Commit

Permalink
Merge pull request #53 from npezza93/xterm
Browse files Browse the repository at this point in the history
Upgrade Xterm to 3.5
  • Loading branch information
npezza93 committed Jul 12, 2018
2 parents 7c9897b + e4b21e0 commit 7bacc12
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 3 deletions.
4 changes: 3 additions & 1 deletion app/renderer/session.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ class Session
allowTransparency: @setting('allowTransparency')
rightClickSelectsWord: @setting('rightClickSelectsWord')
macOptionIsMeta: @setting('macOptionIsMeta')
macOptionClickForcesSelection: @setting('macOptionClickForcesSelection')
theme: @setting('theme'),
experimentalCharAtlas: @setting('experimentalCharAtlas')
useFlowControl: @setting('useFlowControl')
Expand Down Expand Up @@ -148,6 +149,7 @@ class Session
['fontFamily', 'fontWeight', 'fontWeightBold', 'cursorStyle', 'cursorBlink',
'scrollback', 'tabStopWidth', 'fontSize', 'letterSpacing',
'allowTransparency', 'rightClickSelectsWord', 'macOptionIsMeta',
'lineHeight', 'bellSound', 'bellStyle', 'theme'].forEach (field) =>
'lineHeight', 'bellSound', 'bellStyle', 'theme',
'macOptionClickForcesSelection'].forEach (field) =>
@subscriptions.add archipelago.config.onDidChange field, (newValue) =>
@xterm.setOption(field, newValue)
9 changes: 9 additions & 0 deletions app/schema.cson
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,15 @@ useFlowControl:
title: 'shell'
group: 1
order: 10
macOptionClickForcesSelection:
title: 'Mac - Click forces selection'
type: 'boolean'
default: true
enabledOn: ['darwin']
settings:
title: 'shell'
group: 1
order: 11
vibrancy:
type: 'string'
default: null
Expand Down
4 changes: 2 additions & 2 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5087,8 +5087,8 @@ xtend@~2.1.1:
object-keys "~0.4.0"

xterm@^3.4.1:
version "3.4.1"
resolved "https://registry.yarnpkg.com/xterm/-/xterm-3.4.1.tgz#12452979ea2db3371f8195832d7407abba988980"
version "3.5.0"
resolved "https://registry.yarnpkg.com/xterm/-/xterm-3.5.0.tgz#ba3f464bc5730c9d259ebe62131862224db9ddcc"

y18n@^3.2.0:
version "3.2.1"
Expand Down

0 comments on commit 7bacc12

Please sign in to comment.