Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
6e14e824
V
vscode
项目概览
xxadev
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
6e14e824
编写于
2月 16, 2017
作者:
D
Daniel Imms
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Set pty process dimensions on terminal start
Fixes #6733
上级
878181f7
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
52 addition
and
19 deletion
+52
-19
src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
...bench/parts/terminal/electron-browser/terminalInstance.ts
+52
-19
未找到文件。
src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
浏览文件 @
6e14e824
...
...
@@ -104,6 +104,7 @@ export class TerminalInstance implements ITerminalInstance {
this
.
_onProcessIdReady
=
new
Emitter
<
TerminalInstance
>
();
this
.
_onTitleChanged
=
new
Emitter
<
string
>
();
this
.
_initDimensions
();
this
.
_createProcess
(
this
.
_contextService
.
getWorkspace
(),
this
.
_shellLaunchConfig
);
this
.
_createXterm
();
...
...
@@ -117,6 +118,54 @@ export class TerminalInstance implements ITerminalInstance {
this
.
_instanceDisposables
.
push
(
disposable
);
}
private
_initDimensions
():
void
{
// The terminal panel needs to have been created
if
(
!
this
.
_container
)
{
return
;
}
const
computedStyle
=
window
.
getComputedStyle
(
this
.
_container
);
const
width
=
parseInt
(
computedStyle
.
getPropertyValue
(
'
width
'
).
replace
(
'
px
'
,
''
),
10
);
const
height
=
parseInt
(
computedStyle
.
getPropertyValue
(
'
height
'
).
replace
(
'
px
'
,
''
),
10
);
this
.
_evaluateColsAndRows
(
width
,
height
);
}
/**
* Evaluates and sets the cols and rows of the terminal if possible.
* @param width The width of the container.
* @param height The height of the container.
* @return Whether cols and rows were set.
*/
private
_evaluateColsAndRows
(
width
:
number
,
height
:
number
):
boolean
{
// The font needs to have been initialized
const
font
=
this
.
_configHelper
.
getFont
();
if
(
!
font
||
!
font
.
charWidth
||
!
font
.
charHeight
)
{
return
false
;
}
// TODO: Fetch size from panel so initial size is correct
// The panel is minimized
if
(
!
height
)
{
return
false
;
}
else
{
// Trigger scroll event manually so that the viewport's scroll area is synced. This
// needs to happen otherwise its scrollTop value is invalid when the panel is toggled as
// it gets removed and then added back to the DOM (resetting scrollTop to 0).
// Upstream issue: https://github.com/sourcelair/xterm.js/issues/291
if
(
this
.
_xterm
)
{
this
.
_xterm
.
emit
(
'
scroll
'
,
this
.
_xterm
.
ydisp
);
}
}
const
padding
=
parseInt
(
getComputedStyle
(
document
.
querySelector
(
'
.terminal-outer-container
'
)).
paddingLeft
.
split
(
'
px
'
)[
0
],
10
);
// Use left padding as right padding, right padding is not defined in CSS just in case
// xterm.js causes an unexpected overflow.
const
innerWidth
=
width
-
padding
*
2
;
this
.
_cols
=
Math
.
floor
(
innerWidth
/
font
.
charWidth
);
this
.
_rows
=
Math
.
floor
(
height
/
font
.
charHeight
);
return
true
;
}
/**
* Create xterm.js instance and attach data listeners.
*/
...
...
@@ -632,31 +681,15 @@ export class TerminalInstance implements ITerminalInstance {
private
_setScrollback
(
lineCount
:
number
):
void
{
if
(
this
.
_xterm
&&
this
.
_xterm
.
getOption
(
'
scrollback
'
)
!==
lineCount
)
{
console
.
log
(
'
set scrollback to:
'
+
lineCount
);
this
.
_xterm
.
setOption
(
'
scrollback
'
,
lineCount
);
}
}
public
layout
(
dimension
:
{
width
:
number
,
height
:
number
}):
void
{
const
font
=
this
.
_configHelper
.
getFont
();
if
(
!
font
||
!
font
.
charWidth
||
!
font
.
charHeight
)
{
return
;
}
if
(
!
dimension
.
height
)
{
// Minimized
public
layout
(
dimension
:
Dimension
):
void
{
const
needsLayout
=
this
.
_evaluateColsAndRows
(
dimension
.
width
,
dimension
.
height
);
if
(
!
needsLayout
)
{
return
;
}
else
{
// Trigger scroll event manually so that the viewport's scroll area is synced. This
// needs to happen otherwise its scrollTop value is invalid when the panel is toggled as
// it gets removed and then added back to the DOM (resetting scrollTop to 0).
// Upstream issue: https://github.com/sourcelair/xterm.js/issues/291
this
.
_xterm
.
emit
(
'
scroll
'
,
this
.
_xterm
.
ydisp
);
}
const
padding
=
parseInt
(
getComputedStyle
(
document
.
querySelector
(
'
.terminal-outer-container
'
)).
paddingLeft
.
split
(
'
px
'
)[
0
],
10
);
// Use left padding as right padding, right padding is not defined in CSS just in case
// xterm.js causes an unexpected overflow.
const
innerWidth
=
dimension
.
width
-
padding
*
2
;
this
.
_cols
=
Math
.
floor
(
innerWidth
/
font
.
charWidth
);
this
.
_rows
=
Math
.
floor
(
dimension
.
height
/
font
.
charHeight
);
if
(
this
.
_xterm
)
{
this
.
_xterm
.
resize
(
this
.
_cols
,
this
.
_rows
);
this
.
_xterm
.
element
.
style
.
width
=
innerWidth
+
'
px
'
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录