minor fixes.

This commit is contained in:
Christopher Jeffrey 2015-04-18 20:20:25 -07:00
parent 1ad3c0dcb2
commit 3ff31cf0c1

View File

@ -1621,11 +1621,11 @@ Screen.prototype.__defineSetter__('focused', function(el) {
return this.focusPush(el); return this.focusPush(el);
}); });
Screen.prototype.clearRegion = function(xi, xl, yi, yl) { Screen.prototype.clearRegion = function(xi, xl, yi, yl, override) {
return this.fillRegion(this.dattr, ' ', xi, xl, yi, yl); return this.fillRegion(this.dattr, ' ', xi, xl, yi, yl, override);
}; };
Screen.prototype.fillRegion = function(attr, ch, xi, xl, yi, yl) { Screen.prototype.fillRegion = function(attr, ch, xi, xl, yi, yl, override) {
var lines = this.lines var lines = this.lines
, cell , cell
, xx; , xx;
@ -1635,7 +1635,7 @@ Screen.prototype.fillRegion = function(attr, ch, xi, xl, yi, yl) {
for (xx = xi; xx < xl; xx++) { for (xx = xi; xx < xl; xx++) {
cell = lines[yi][xx]; cell = lines[yi][xx];
if (!cell) break; if (!cell) break;
if (attr !== cell[0] || ch !== cell[1]) { if (override || attr !== cell[0] || ch !== cell[1]) {
lines[yi][xx][0] = attr; lines[yi][xx][0] = attr;
lines[yi][xx][1] = ch; lines[yi][xx][1] = ch;
lines[yi].dirty = true; lines[yi].dirty = true;
@ -2822,13 +2822,14 @@ Element.prototype.setBack = function() {
return this.setIndex(0); return this.setIndex(0);
}; };
Element.prototype.clearPos = function(get) { Element.prototype.clearPos = function(get, override) {
if (this.detached) return; if (this.detached) return;
var lpos = this._getCoords(get); var lpos = this._getCoords(get);
if (!lpos) return; if (!lpos) return;
this.screen.clearRegion( this.screen.clearRegion(
lpos.xi, lpos.xl, lpos.xi, lpos.xl,
lpos.yi, lpos.yl); lpos.yi, lpos.yl,
override);
}; };
Element.prototype.setLabel = function(options) { Element.prototype.setLabel = function(options) {
@ -5207,6 +5208,10 @@ List.prototype.appendItem = function(item) {
}; };
}); });
if (this.style.transparent) {
options.transparent = true;
}
var item = new Box(options); var item = new Box(options);
this.items.push(item); this.items.push(item);
@ -8069,6 +8074,10 @@ Terminal.prototype.bootstrap = function() {
self.term.resize(self.width - self.iwidth, self.height - self.iheight); self.term.resize(self.width - self.iwidth, self.height - self.iheight);
}); });
if (this.handler) {
return;
}
this.pty = require('pty.js').fork(this.shell, this.args, { this.pty = require('pty.js').fork(this.shell, this.args, {
name: 'xterm', name: 'xterm',
cols: this.width - this.iwidth, cols: this.width - this.iwidth,