Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
615f633f25 | ||
|
|
567b39dc98 |
+40
-29
@@ -24,36 +24,47 @@
|
|||||||
fit(this.Xterm);
|
fit(this.Xterm);
|
||||||
}
|
}
|
||||||
})(function (Xterm) {
|
})(function (Xterm) {
|
||||||
|
Xterm.prototype.proposeGeometry = function () {
|
||||||
|
var container = this.rowContainer,
|
||||||
|
subjectRow = this.rowContainer.firstElementChild,
|
||||||
|
rows,
|
||||||
|
contentBuffer,
|
||||||
|
characterWidth,
|
||||||
|
cols;
|
||||||
|
|
||||||
|
subjectRow.style.display = 'inline';
|
||||||
|
|
||||||
|
contentBuffer = subjectRow.textContent;
|
||||||
|
|
||||||
|
subjectRow.innerHTML = ' '; /* Arbitrary character to calculate its dimensions */
|
||||||
|
characterWidth = parseInt(subjectRow.offsetWidth);
|
||||||
|
characterHeight = parseInt(subjectRow.offsetHeight);
|
||||||
|
|
||||||
|
subjectRow.style.display = '';
|
||||||
|
|
||||||
|
cols = container.offsetWidth / characterWidth;
|
||||||
|
cols = parseInt(cols);
|
||||||
|
|
||||||
|
var parentElementStyle = window.getComputedStyle(this.element.parentElement),
|
||||||
|
parentElementHeight = parseInt(parentElementStyle.getPropertyValue('height')),
|
||||||
|
elementStyle = window.getComputedStyle(this.element),
|
||||||
|
elementPadding = parseInt(elementStyle.getPropertyValue('padding-top')) + parseInt(elementStyle.getPropertyValue('padding-bottom')),
|
||||||
|
availableHeight = parentElementHeight - elementPadding,
|
||||||
|
rowHeight = this.rowContainer.firstElementChild.offsetHeight;
|
||||||
|
|
||||||
|
rows = parseInt(availableHeight / rowHeight);
|
||||||
|
|
||||||
|
var geometry = {
|
||||||
|
'cols': cols,
|
||||||
|
'rows': rowss
|
||||||
|
};
|
||||||
|
|
||||||
|
return geometry;
|
||||||
|
};
|
||||||
|
|
||||||
Xterm.prototype.fit = function () {
|
Xterm.prototype.fit = function () {
|
||||||
var container = this.rowContainer,
|
var geometry = this.proposeGeometry();
|
||||||
subjectRow = this.rowContainer.firstElementChild,
|
|
||||||
rows,
|
|
||||||
contentBuffer,
|
|
||||||
characterWidth,
|
|
||||||
cols;
|
|
||||||
|
|
||||||
subjectRow.style.display = 'inline';
|
this.resize(geometry.cols, geometry.rows);
|
||||||
|
|
||||||
contentBuffer = subjectRow.textContent;
|
|
||||||
|
|
||||||
subjectRow.innerHTML = ' '; /* Arbitrary character to calculate its dimensions */
|
|
||||||
characterWidth = parseInt(subjectRow.offsetWidth);
|
|
||||||
characterHeight = parseInt(subjectRow.offsetHeight);
|
|
||||||
|
|
||||||
subjectRow.style.display = '';
|
|
||||||
|
|
||||||
cols = container.offsetWidth / characterWidth;
|
|
||||||
cols = parseInt(cols);
|
|
||||||
|
|
||||||
var parentElementStyle = window.getComputedStyle(this.element.parentElement),
|
|
||||||
parentElementHeight = parseInt(parentElementStyle.getPropertyValue('height')),
|
|
||||||
elementStyle = window.getComputedStyle(this.element),
|
|
||||||
elementPadding = parseInt(elementStyle.getPropertyValue('padding-top')) + parseInt(elementStyle.getPropertyValue('padding-bottom')),
|
|
||||||
availableHeight = parentElementHeight - elementPadding,
|
|
||||||
rowHeight = this.rowContainer.firstElementChild.offsetHeight;
|
|
||||||
|
|
||||||
rows = parseInt(availableHeight / rowHeight);
|
|
||||||
|
|
||||||
this.resize(cols, rows);
|
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
+1
-1
@@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
"name": "xterm.js",
|
"name": "xterm.js",
|
||||||
"version": "0.22",
|
"version": "0.23",
|
||||||
"ignore": ["demo", "docs", "test", ".gitignore"]
|
"ignore": ["demo", "docs", "test", ".gitignore"]
|
||||||
}
|
}
|
||||||
|
|||||||
+10
-4
@@ -1,12 +1,13 @@
|
|||||||
var terminalContainer = document.getElementById('terminal-container'),
|
var terminalContainer = document.getElementById('terminal-container'),
|
||||||
term = new Terminal();
|
term = new Terminal(),
|
||||||
|
prompt = '> ';
|
||||||
|
|
||||||
term.open(terminalContainer);
|
term.open(terminalContainer);
|
||||||
term.fit();
|
term.fit();
|
||||||
|
|
||||||
term.prompt = function () {
|
term.prompt = function () {
|
||||||
term.write('\r\n> ');
|
term.write('\r\n' + prompt);
|
||||||
}
|
};
|
||||||
|
|
||||||
term.writeln('Welcome to xterm.js');
|
term.writeln('Welcome to xterm.js');
|
||||||
term.writeln('Just type some keys in the prompt below.');
|
term.writeln('Just type some keys in the prompt below.');
|
||||||
@@ -19,7 +20,12 @@ term.on('key', function (key, ev) {
|
|||||||
if (ev.keyIdentifier == 'Enter') {
|
if (ev.keyIdentifier == 'Enter') {
|
||||||
term.prompt();
|
term.prompt();
|
||||||
} else if (ev.keyCode == 8) {
|
} else if (ev.keyCode == 8) {
|
||||||
term.write('\b \b');
|
/*
|
||||||
|
* Do not delete the prompt
|
||||||
|
*/
|
||||||
|
if (term.x > 2) {
|
||||||
|
term.write('\b \b');
|
||||||
|
}
|
||||||
} else if (printable) {
|
} else if (printable) {
|
||||||
term.write(key);
|
term.write(key);
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-2
@@ -51,9 +51,9 @@ copyright = u'2014, SourceLair Limited'
|
|||||||
# built documents.
|
# built documents.
|
||||||
#
|
#
|
||||||
# The short X.Y version.
|
# The short X.Y version.
|
||||||
version = '0.22'
|
version = '0.23'
|
||||||
# The full version, including alpha/beta/rc tags.
|
# The full version, including alpha/beta/rc tags.
|
||||||
release = '0.22 Alpha'
|
release = '0.23 Alpha'
|
||||||
|
|
||||||
# The language for content autogenerated by Sphinx. Refer to documentation
|
# The language for content autogenerated by Sphinx. Refer to documentation
|
||||||
# for a list of supported languages.
|
# for a list of supported languages.
|
||||||
|
|||||||
Reference in New Issue
Block a user