",c+="
",m.open(c)}),b.open("GET","/sessions/list.json"),b.send(),f(a)):!0}),c=function(a){var b;return document.getElementById("style").setAttribute("href",a),b=document.createElement("img"),b.onerror=function(){return setTimeout(function(){return"undefined"!=typeof butterfly&&null!==butterfly?butterfly.resize():void 0},250)},b.src=a},d="undefined"!=typeof localStorage&&null!==localStorage?localStorage.getItem("theme"):void 0,d&&c(d),this.set_theme=function(a){return d=a,"undefined"!=typeof localStorage&&null!==localStorage&&localStorage.setItem("theme",a),a?c(a):void 0},document.addEventListener("keydown",function(a){var b,e;return a.altKey&&83===a.keyCode?a.shiftKey?(e=document.getElementById("style").getAttribute("href"),e=e.split("?")[0],c(e+"?"+(new Date).getTime()),f(a)):(b=new XMLHttpRequest,b.addEventListener("load",function(){var a,b,c,e,f,g,h,i,j,k,l,n;if(i=JSON.parse(this.responseText),a=i.builtin_themes,l=i.themes,b='",m.open(b),k=document.getElementById("theme_list"),k.addEventListener("change",function(){return set_theme(k.value)})}),b.open("GET","/themes/list.json"),b.send(),f(a)):!0}),/Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent)&&(i=!1,e=!1,j=!0,q=document.createElement("input"),q.type="password",q.style.position="fixed",q.style.top=0,q.style.left=0,q.style.border="none",q.style.outline="none",q.style.opacity=0,q.value="0",document.body.appendChild(q),q.addEventListener("blur",function(){return setTimeout(function(a){return function(){return a.focus()}}(this),10)}),addEventListener("click",function(){return q.focus()}),addEventListener("touchstart",function(a){return 2===a.touches.length?i=!0:3===a.touches.length?(i=!1,e=!0):4===a.touches.length?(i=!0,e=!0):void 0}),q.addEventListener("keydown",function(a){return butterfly.keyDown(a),!0}),q.addEventListener("input",function(a){var b;return b=this.value.length,0===b?(a.keyCode=8,butterfly.keyDown(a),this.value="0",!0):(a.keyCode=this.value.charAt(1).charCodeAt(0),!i&&!e||j?(butterfly.keyPress(a),j=!1,this.value="0",!0):(a.keyCode=this.value.charAt(1).charCodeAt(0),a.ctrlKey=i,a.altKey=e,a.keyCode>=97&&a.keyCode<=122&&(a.keyCode-=32),butterfly.keyDown(a),this.value="0",i=e=!1,!0))}))}).call(this);
//# sourceMappingURL=ext.min.js.map
\ No newline at end of file
diff --git a/butterfly/static/main.js b/butterfly/static/main.js
index 2e655c8..641cd47 100644
--- a/butterfly/static/main.js
+++ b/butterfly/static/main.js
@@ -1,6 +1,5 @@
(function() {
var $, State, Terminal, cancel, cols, openTs, quit, rows, s, uuid, ws,
- slice = [].slice,
indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; };
cols = rows = null;
@@ -192,7 +191,7 @@
this.rows = Math.floor(window.innerHeight / this.charSize.height);
px = window.innerHeight % this.charSize.height;
this.body.style['padding-bottom'] = px + "px";
- this.scrollback = 1000000;
+ this.scrollback = 10000;
this.buffSize = 100000;
this.visualBell = 100;
this.convertEol = false;
@@ -226,11 +225,18 @@
};
})(this));
this.emit('load');
+ this.active = null;
+ Terminal.on('change', (function(_this) {
+ return function(line) {
+ if (line.classList.contains('active')) {
+ return _this.active = line;
+ }
+ };
+ })(this));
}
- Terminal.prototype.emit = function() {
- var args, fun, hook, k, len, ref, results;
- hook = arguments[0], args = 2 <= arguments.length ? slice.call(arguments, 1) : [];
+ Terminal.prototype.emit = function(hook, obj) {
+ var fun, k, len, ref, results;
if (Terminal.hooks[hook] == null) {
Terminal.hooks[hook] = [];
}
@@ -238,7 +244,11 @@
results = [];
for (k = 0, len = ref.length; k < len; k++) {
fun = ref[k];
- results.push(fun.apply(this, args));
+ results.push(setTimeout((function(f) {
+ return function() {
+ return f.call(this, obj);
+ };
+ })(fun), 10));
}
return results;
};
@@ -543,144 +553,162 @@
})(this));
};
- Terminal.prototype.refresh = function(force) {
- var active, attr, ch, classes, cls, cursor, data, fg, group, i, j, k, len, len1, len2, len3, len4, line, lines, m, modified, n, newOut, o, out, q, ref, ref1, ref2, ref3, ref4, ref5, skipnext, styles, u, x;
- if (force == null) {
- force = false;
+ Terminal.prototype._putChar = function(data, attr, i, x) {
+ var ch, classes, fg, out, skipnext, styles;
+ out = '';
+ ch = data.ch;
+ if (!this.equalAttr(data, attr)) {
+ if (!this.equalAttr(attr, this.defAttr)) {
+ out += "";
+ }
+ if (!this.equalAttr(data, this.defAttr)) {
+ classes = [];
+ styles = [];
+ out += "";
}
- ref1 = this.body.querySelectorAll(".line.active");
- for (m = 0, len1 = ref1.length; m < len1; m++) {
- active = ref1[m];
- active.classList.remove('active');
+ if (ch.length > 1) {
+ out += ch;
+ } else {
+ switch (ch) {
+ case "&":
+ out += "&";
+ break;
+ case "<":
+ out += "<";
+ break;
+ case ">":
+ out += ">";
+ break;
+ default:
+ if (ch === " ") {
+ out += '\u2007';
+ } else if (ch <= " ") {
+ out += " ";
+ } else if (!this.forceWidth || ch <= "~") {
+ out += ch;
+ } else if (("\uff00" < ch && ch < "\uffef")) {
+ skipnext = true;
+ out += "" + ch + "";
+ } else {
+ out += "" + ch + "";
+ }
+ }
}
- newOut = '';
- modified = [];
- ref2 = this.screen;
- for (j = n = 0, len2 = ref2.length; n < len2; j = ++n) {
- line = ref2[j];
+ if (i === x) {
+ out += "";
+ }
+ return out;
+ };
+
+ Terminal.prototype._putLine = function(x, j, outs, line) {
+ var cls;
+ this.screen[j].dirty = false;
+ if (this.children[j]) {
+ this.children[j].innerHTML = outs.join('');
+ this.emit('change', this.children[j]);
+ if (x !== null) {
+ this.children[j].classList.add('active');
+ }
+ if (line.extra) {
+ this.children[j].classList.add('extended');
+ }
+ return null;
+ } else {
+ cls = ['line'];
+ if (x !== null) {
+ cls.push('active');
+ }
+ if (line.extra) {
+ cls.push('extended');
+ }
+ return "Session list
",0===e.sessions.length)c+="No current session for user "+e.user;else{for(c+="- ",d=e.sessions,a=0,b=d.length;b>a;a++)f=d[a],c+='
- '+f+" ";c+="
" + (outs.join('')) + "
";
+ }
+ };
+
+ Terminal.prototype._replotScreen = function(force) {
+ var attr, data, group, groups, i, j, k, len, line, m, out, outs, ref, ref1, skipnext, x;
+ groups = [];
+ ref = this.screen;
+ for (j = k = 0, len = ref.length; k < len; j = ++k) {
+ line = ref[j];
if (!(line.dirty || force)) {
continue;
}
- out = "";
+ x = null;
if (j === this.y + this.shift && !this.cursorHidden) {
x = this.x;
- } else {
- x = -Infinity;
}
attr = this.cloneAttr(this.defAttr);
skipnext = false;
- for (i = o = 0, ref3 = this.cols - 1; 0 <= ref3 ? o <= ref3 : o >= ref3; i = 0 <= ref3 ? ++o : --o) {
+ outs = [];
+ for (i = m = 0, ref1 = this.cols - 1; 0 <= ref1 ? m <= ref1 : m >= ref1; i = 0 <= ref1 ? ++m : --m) {
data = line.chars[i];
if (data.html) {
- out += data.html;
+ outs.push(data.html);
break;
}
if (skipnext) {
skipnext = false;
continue;
}
- ch = data.ch;
- if (!this.equalAttr(data, attr)) {
- if (!this.equalAttr(attr, this.defAttr)) {
- out += "";
- }
- if (!this.equalAttr(data, this.defAttr)) {
- classes = [];
- styles = [];
- out += "";
- }
- if (ch.length > 1) {
- out += ch;
- } else {
- switch (ch) {
- case "&":
- out += "&";
- break;
- case "<":
- out += "<";
- break;
- case ">":
- out += ">";
- break;
- default:
- if (ch === " ") {
- out += '\u2007';
- } else if (ch <= " ") {
- out += " ";
- } else if (!this.forceWidth || ch <= "~") {
- out += ch;
- } else if (("\uff00" < ch && ch < "\uffef")) {
- skipnext = true;
- out += "" + ch + "";
- } else {
- out += "" + ch + "";
- }
- }
- }
- if (i === x) {
- out += "";
- }
+ outs.push(this._putChar(data, attr, i, x));
attr = data;
}
+ out = '';
if (!this.equalAttr(attr, this.defAttr)) {
out += "";
}
@@ -690,53 +718,59 @@
if (line.extra) {
out += '' + line.extra + '';
}
- if (this.children[j]) {
- this.children[j].innerHTML = out;
- modified.push(this.children[j]);
- if (x !== -Infinity) {
- this.children[j].classList.add('active');
- }
- if (line.extra) {
- this.children[j].classList.add('extended');
- }
- } else {
- cls = ['line'];
- if (x !== -Infinity) {
- cls.push('active');
- }
- if (line.extra) {
- cls.push('extended');
- }
- newOut += "" + out + "
";
+ outs.push(out);
+ group = this._putLine(x, j, outs, line);
+ if (group) {
+ groups.push(group);
}
- this.screen[j].dirty = false;
}
- if (newOut !== '') {
- group = this.document.createElement('div');
- group.className = 'group';
- group.innerHTML = newOut;
- modified.push(group);
- this.body.appendChild(group);
- this.screen = this.screen.slice(-this.rows);
- this.shift = 0;
- lines = document.querySelectorAll('.line');
- if (lines.length > this.scrollback) {
- ref4 = Array.prototype.slice.call(lines, 0, lines.length - this.scrollback);
- for (q = 0, len3 = ref4.length; q < len3; q++) {
- line = ref4[q];
- line.remove();
- }
- ref5 = document.querySelectorAll('.group:empty');
- for (u = 0, len4 = ref5.length; u < len4; u++) {
- group = ref5[u];
- group.remove();
- }
- lines = document.querySelectorAll('.line');
+ if (groups.length) {
+ return this._putGroup(groups);
+ }
+ };
+
+ Terminal.prototype._putGroup = function(groups) {
+ var group, i, k, len, m, node, nodes, ref;
+ group = this.document.createElement('div');
+ group.className = 'group';
+ group.innerHTML = groups.join('');
+ if (true || groups.length > 1) {
+ nodes = group.childNodes;
+ node = group;
+ } else {
+ nodes = [group.firstChild];
+ node = group.firstChild;
+ }
+ this.body.appendChild(node);
+ for (k = 0, len = nodes.length; k < len; k++) {
+ node = nodes[k];
+ if (this.children.length >= this.rows) {
+ this.children.pop();
}
- this.children = Array.prototype.slice.call(lines, -this.rows);
+ this.emit('change', node);
+ this.children.push(node);
}
- this.nativeScrollTo();
- return this.emit('change', modified);
+ this.screen = this.screen.slice(-this.rows);
+ this.shift = 0;
+ if (this.body.childElementCount > this.scrollback) {
+ this.body.style.display = 'none';
+ for (i = m = 0, ref = this.body.childElementCount - this.scrollback; 0 <= ref ? m <= ref : m >= ref; i = 0 <= ref ? ++m : --m) {
+ this.body.firstChild.remove();
+ }
+ return this.body.style.display = 'block';
+ }
+ };
+
+ Terminal.prototype.refresh = function(force) {
+ var ref;
+ if (force == null) {
+ force = false;
+ }
+ if ((ref = this.active) != null) {
+ ref.classList.remove('active');
+ }
+ this._replotScreen(force);
+ return this.nativeScrollTo();
};
Terminal.prototype._cursorBlink = function() {
@@ -1747,6 +1781,7 @@
j = oldRows;
if (j < this.rows) {
el = this.body;
+ this.body.style.display = 'none';
while (j++ < this.rows) {
if (this.screen.length < this.rows) {
this.screen.push(this.blankLine());
@@ -1757,6 +1792,7 @@
el.appendChild(line);
this.children.push(line);
}
+ this.body.style.display = 'block';
}
} else if (j > this.rows) {
while (j-- > this.rows) {
diff --git a/butterfly/static/main.min.js b/butterfly/static/main.min.js
index 775867a..8e531ea 100644
--- a/butterfly/static/main.min.js
+++ b/butterfly/static/main.min.js
@@ -1,5 +1,5 @@
-/*! butterfly 2016-10-11 */
+/*! butterfly 2016-10-12 */
-(function(){var a,b,c,d,e,f,g,h,i,j,k,l=[].slice,m=[].indexOf||function(a){for(var b=0,c=this.length;c>b;b++)if(b in this&&this[b]===a)return b;return-1};e=h=null,g=!1,f=(new Date).getTime(),k={shell:null,ctl:null},a=document.querySelectorAll.bind(document),j=function(){return"xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g,function(a){var b,c;return b=16*Math.random()|0,c="x"===a?b:3&b|8,c.toString(16)})},document.addEventListener("DOMContentLoaded",function(){var a,b,d,e,h,i,l,m,n,o,p,q,r;return o=null,r="https:"===location.protocol?"wss://":"ws://",n=document.body.getAttribute("data-root-path"),n.length&&(n="/"+n),r+=document.location.host+n,l=location.pathname,l.indexOf("/session")<0&&(l+="session/"+j()),l+=location.search,k.shell=new WebSocket(r+"/ws"+l),k.ctl=new WebSocket(r+"/ctl"+l),i=function(){return console.log("WebSocket open",arguments),o?(o.body.classList.remove("stopped"),o.out=k.shell.send.bind(k.shell),void o.out("\n")):(k.shell.readyState===WebSocket.OPEN&&k.ctl.readyState===WebSocket.OPEN&&(o=new c(document.body,k.shell.send.bind(k.shell),k.ctl.send.bind(k.ctl)),o.ws=k,window.butterfly=o,k.ctl.send(JSON.stringify({cmd:"open"})),k.ctl.send(JSON.stringify({cmd:"size",cols:o.cols,rows:o.rows})),f=(new Date).getTime()),console.log("WebSocket open end",arguments))},d=function(){return console.error("WebSocket error",arguments)},a=function(){return console.log("WebSocket closed",arguments),g?void 0:(g=!0,o.write("Closed"),o.skipNextKey=!0,o.body.classList.add("dead"),(new Date).getTime()-f>6e4?window.open("","_self").close():void 0)},m=function(){return setTimeout(function(){return g?void 0:(k.shell=new WebSocket(r+"/ws"+l),h())},100)},p=function(a){return o?o.write(a):void 0},q=function(a){return setTimeout(p,1,a.data)},b=function(a){var b;return b=JSON.parse(a.data),"size"===b.cmd?o.resize(b.cols,b.rows,!0):void 0},h=function(){return k.shell.addEventListener("open",i),k.shell.addEventListener("message",q),k.shell.addEventListener("error",d),k.shell.addEventListener("close",m)},e=function(){return k.ctl.addEventListener("open",i),k.ctl.addEventListener("message",b),k.ctl.addEventListener("error",d),k.ctl.addEventListener("close",a)},h(),e(),addEventListener("beforeunload",function(){return g?void 0:"This will exit the terminal session"})}),d=function(a){return a.preventDefault&&a.preventDefault(),a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0,!1},i=0,b={normal:i++,escaped:i++,csi:i++,osc:i++,charset:i++,dcs:i++,ignore:i++},c=function(){function a(a,b,c){var d,e;this.parent=a,this.out=b,this.ctl=null!=c?c:function(){},this.document=this.parent.ownerDocument,this.html=this.document.getElementsByTagName("html")[0],this.body=this.document.getElementsByTagName("body")[0],this.forceWidth="yes"===this.body.getAttribute("data-force-unicode-width"),this.body.className="terminal focus",this.body.style.outline="none",this.body.setAttribute("tabindex",0),this.body.setAttribute("spellcheck","false"),d=this.document.createElement("div"),d.className="line",this.body.appendChild(d),this.children=[d],this.computeCharSize(),this.cols=Math.floor(this.body.clientWidth/this.charSize.width),this.rows=Math.floor(window.innerHeight/this.charSize.height),e=window.innerHeight%this.charSize.height,this.body.style["padding-bottom"]=e+"px",this.scrollback=1e6,this.buffSize=1e5,this.visualBell=100,this.convertEol=!1,this.termName="xterm",this.cursorBlink=!0,this.cursorState=0,this.resetVars(),this.focus(),this.startBlink(),addEventListener("keydown",this.keyDown.bind(this)),addEventListener("keypress",this.keyPress.bind(this)),addEventListener("focus",this.focus.bind(this)),addEventListener("blur",this.blur.bind(this)),addEventListener("resize",function(a){return function(){return a.resize()}}(this)),this.body.addEventListener("load",function(a){return function(){return a.nativeScrollTo()}}(this),!0),"undefined"!=typeof InstallTrigger&&(this.body.contentEditable="true"),this.initmouse(),addEventListener("load",function(a){return function(){return a.resize()}}(this)),this.emit("load")}return a.hooks={},a.on=function(b,c){return null==a.hooks[b]&&(a.hooks[b]=[]),a.hooks[b].push(c)},a.off=function(b,c){return null==a.hooks[b]&&(a.hooks[b]=[]),a.hooks[b].pop(c)},a.prototype.emit=function(){var b,c,d,e,f,g,h;for(d=arguments[0],b=2<=arguments.length?l.call(arguments,1):[],null==a.hooks[d]&&(a.hooks[d]=[]),g=a.hooks[d],h=[],e=0,f=g.length;f>e;e++)c=g[e],h.push(c.apply(this,b));return h},a.prototype.cloneAttr=function(a,b){return null==b&&(b=null),{bg:a.bg,fg:a.fg,ch:null!==b?b:a.ch,bold:a.bold,underline:a.underline,blink:a.blink,inverse:a.inverse,invisible:a.invisible,italic:a.italic,faint:a.faint,crossed:a.crossed}},a.prototype.equalAttr=function(a,b){return a.bg===b.bg&&a.fg===b.fg&&a.bold===b.bold&&a.underline===b.underline&&a.blink===b.blink&&a.inverse===b.inverse&&a.invisible===b.invisible&&a.italic===b.italic&&a.faint===b.faint&&a.crossed===b.crossed},a.prototype.putChar=function(a){return this.insertMode?(this.screen[this.y+this.shift].chars.splice(this.x,0,this.cloneAttr(this.curAttr,a)),this.screen[this.y+this.shift].chars.pop()):this.screen[this.y+this.shift].chars[this.x]=this.cloneAttr(this.curAttr,a),this.screen[this.y+this.shift].dirty=!0},a.prototype.resetVars=function(){var a;for(this.x=0,this.y=0,this.cursorHidden=!1,this.state=b.normal,this.queue="",this.scrollTop=0,this.scrollBottom=this.rows-1,this.scrollLock=!1,this.applicationKeypad=!1,this.applicationCursor=!1,this.originMode=!1,this.autowrap=!0,this.horizontalWrap=!1,this.normal=null,this.charset=null,this.gcharset=null,this.glevel=0,this.charsets=[null],this.defAttr={bg:256,fg:257,ch:" ",bold:!1,underline:!1,blink:0,inverse:!1,invisible:!1,italic:!1,faint:!1,crossed:!1},this.curAttr=this.cloneAttr(this.defAttr),this.params=[],this.currentParam=0,this.prefix="",this.screen=[],a=this.rows,this.shift=0;a--;)this.screen.push(this.blankLine(!1,!1));return this.setupStops(),this.skipNextKey=null},a.prototype.computeCharSize=function(){var a;return a=document.createElement("span"),a.textContent="0123456789",this.children[0].appendChild(a),this.charSize={width:a.getBoundingClientRect().width/10,height:this.children[0].getBoundingClientRect().height},this.children[0].removeChild(a)},a.prototype.eraseAttr=function(){var a;return a=this.cloneAttr(this.defAttr),a.bg=this.curAttr.bg,a},a.prototype.focus=function(){var a;return a=this.scrollLock,this.scrollLock=!0,this.sendFocus&&this.send("[I"),this.showCursor(),this.body.classList.add("focus"),this.body.classList.remove("blur"),this.resize(),this.scrollLock=a},a.prototype.blur=function(){var a;return a=this.scrollLock,this.scrollLock=!0,this.cursorState=1,this.screen[this.y+this.shift].dirty=!0,this.refresh(),this.sendFocus&&this.send("[O"),this.body.classList.add("blur"),this.body.classList.remove("focus"),this.scrollLock=a},a.prototype.initmouse=function(){var a,b,c,e,f,g,h;return e=32,f=function(a){var d,f;return d=b(a),(f=c(a))?(g(d,f,a.type),e=d):void 0},h=function(a){var b,d;return b=e,(d=c(a))?(b+=32,g(b,d,a.type)):void 0},a=function(a){return function(b,c){return a.utfMouse?2047===c?b.push(0):127>c?b.push(c):(c>2047&&(c=2047),b.push(192|c>>6),b.push(128|63&c)):255===c?b.push(0):(c>127&&(c=127),b.push(c))}}(this),g=function(b){return function(c,d,e){var f;return b.urxvtMouse?(d.x-=32,d.y-=32,d.x++,d.y++,void b.send("["+c+";"+d.x+";"+d.y+"M")):b.sgrMouse?(d.x-=32,d.y-=32,c-=32,void b.send("[<"+c+";"+d.x+";"+d.y+("mouseup"===e?"m":"M"))):(f=[],a(f,c),a(f,d.x),a(f,d.y),b.send("[M"+String.fromCharCode.apply(String,f)))}}(this),b=function(a){return function(b){var c,d,e,f,g;switch(b.type){case"mousedown":c=null!=b.button?+b.button:null!=b.which?b.which-1:null;break;case"mouseup":c=3;break;case"wheel":c=b.deltaY<0?64:65}return g=b.shiftKey?4:0,e=b.metaKey?8:0,d=b.ctrlKey?16:0,f=g|e|d,a.vt200Mouse?f&=d:a.normalMouse||(f=0),32+(f<<2)+c}}(this),c=function(a){return function(b){var c,d,e,f;return e=b.pageX,f=b.pageY-window.scrollY,d=a.body.clientWidth,c=window.innerHeight,e=Math.ceil(e/d*a.cols),f=Math.ceil(f/c*a.rows),0>e&&(e=0),e>a.cols&&(e=a.cols),0>f&&(f=0),f>a.rows&&(f=a.rows),e+=32,f+=32,{x:e,y:f,type:b.type}}}(this),addEventListener("contextmenu",function(a){return function(b){return a.mouseEvents?d(b):void 0}}(this)),addEventListener("mousedown",function(a){return function(b){var c,e;if(a.mouseEvents)return f(b),c=h.bind(a),addEventListener("mousemove",c),a.x10Mouse||addEventListener("mouseup",e=function(a){return f(a),removeEventListener("mousemove",c),removeEventListener("mouseup",e),d(a)}),d(b)}}(this)),addEventListener("wheel",function(a){return function(b){if(a.mouseEvents){if(a.x10Mouse)return;return f(b),d(b)}}}(this))},a.prototype.refresh=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,A,B,C,D,E,F,G,H,I,J,K;for(null==a&&(a=!1),B=this.body.querySelectorAll(".cursor"),m=0,n=B.length;n>m;m++)g=B[m],g.parentNode.replaceChild(this.document.createTextNode(g.textContent),g);for(C=this.body.querySelectorAll(".line.active"),u=0,o=C.length;o>u;u++)b=C[u],b.classList.remove("active");for(x="",v=[],D=this.screen,l=w=0,p=D.length;p>w;l=++w)if(s=D[l],s.dirty||a){for(z="",K=l!==this.y+this.shift||this.cursorHidden?-(1/0):this.x,c=this.cloneAttr(this.defAttr),H=!1,k=y=0,E=this.cols-1;E>=0?E>=y:y>=E;k=E>=0?++y:--y){if(h=s.chars[k],h.html){z+=h.html;break}if(H)H=!1;else{if(d=h.ch,this.equalAttr(h,c)||(this.equalAttr(c,this.defAttr)||(z+=""),this.equalAttr(h,this.defAttr)||(e=[],I=[],z+="i&&(i+=8),e.push("fg-color-"+i)),"string"==typeof h.fg&&I.push("color: "+h.fg),"number"==typeof h.bg&&e.push("bg-color-"+h.bg),"string"==typeof h.bg&&I.push("background-color: "+h.bg),z+='class="',z+=e.join(" "),z+='"',I.length&&(z+=' style="'+I.join("; ")+'"'),z+=">")),k===K&&(z+=''),d.length>1)z+=d;else switch(d){case"&":z+="&";break;case"<":z+="<";break;case">":z+=">";break;default:" "===d?z+=' ':" ">=d?z+=" ":!this.forceWidth||"~">=d?z+=d:d>""&&"">d?(H=!0,z+=''+d+""):z+=''+d+""}k===K&&(z+=""),c=h}}this.equalAttr(c,this.defAttr)||(z+=""),s.wrap&&(z+="⏎"),s.extra&&(z+=''+s.extra+""),this.children[l]?(this.children[l].innerHTML=z,v.push(this.children[l]),K!==-(1/0)&&this.children[l].classList.add("active"),s.extra&&this.children[l].classList.add("extended")):(f=["line"],K!==-(1/0)&&f.push("active"),s.extra&&f.push("extended"),x+=''+z+"
"),this.screen[l].dirty=!1}if(""!==x){if(j=this.document.createElement("div"),j.className="group",j.innerHTML=x,v.push(j),this.body.appendChild(j),this.screen=this.screen.slice(-this.rows),this.shift=0,t=document.querySelectorAll(".line"),t.length>this.scrollback){for(F=Array.prototype.slice.call(t,0,t.length-this.scrollback),A=0,q=F.length;q>A;A++)s=F[A],s.remove();for(G=document.querySelectorAll(".group:empty"),J=0,r=G.length;r>J;J++)j=G[J],j.remove();t=document.querySelectorAll(".line")}this.children=Array.prototype.slice.call(t,-this.rows)}return this.nativeScrollTo(),this.emit("change",v)},a.prototype._cursorBlink=function(){var a;return this.cursorState^=1,(a=this.body.querySelector(".cursor"))?a.classList.contains("reverse-video")?a.classList.remove("reverse-video"):a.classList.add("reverse-video"):void 0},a.prototype.showCursor=function(){return this.cursorState?void 0:(this.cursorState=1,this.screen[this.y+this.shift].dirty=!0,this.refresh())},a.prototype.startBlink=function(){return this.cursorBlink?(this._blinker=function(a){return function(){return a._cursorBlink()}}(this),this.t_blink=setInterval(this._blinker,500)):void 0},a.prototype.refreshBlink=function(){return this.cursorBlink?(clearInterval(this.t_blink),this.t_blink=setInterval(this._blinker,500)):void 0},a.prototype.scroll=function(){var a,b,c,d,e;if(this.normal||0!==this.scrollTop||this.scrollBottom!==this.rows-1){for(this.screen.splice(this.shift+this.scrollBottom+1,0,this.blankLine()),this.screen.splice(this.shift+this.scrollTop,1),e=[],a=b=c=this.scrollTop,d=this.scrollBottom;d>=c?d>=b:b>=d;a=d>=c?++b:--b)e.push(this.screen[a+this.shift].dirty=!0);return e}return this.screen.push(this.blankLine()),this.shift++},a.prototype.unscroll=function(){var a,b,c,d,e;for(this.screen.splice(this.shift+this.scrollTop,0,this.blankLine(!0)),this.screen.splice(this.shift+this.scrollBottom+1,1),e=[],a=b=c=this.scrollTop,d=this.scrollBottom;d>=c?d>=b:b>=d;a=d>=c?++b:--b)e.push(this.screen[a+this.shift].dirty=!0);return e},a.prototype.nativeScrollTo=function(a){return null==a&&(a=2e9),this.scrollLock?void 0:window.scrollTo(0,a)},a.prototype.scrollDisplay=function(a){return this.nativeScrollTo(window.scrollY+a*this.charSize.height)},a.prototype.nextLine=function(){return this.y++,this.y>this.scrollBottom?(this.y--,this.scroll()):void 0},a.prototype.prevLine=function(){return this.y--,this.y'+w+"
",this.screen[this.y+this.shift].chars[this.x]=d,this.resetLine(this.screen[this.y+this.shift]),this.nextLine();break;case"IMAGE":h=encodeURI(h),h.indexOf(";")?(p=h.slice(0,h.indexOf(";")),e=h.slice(h.indexOf(";")+1)):(p="image",e=h),d=this.cloneAttr(this.curAttr),d.html=''+c.join("")+"
")},a.prototype._replotScreen=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p;for(l=this.screen,n=[],e=f=0,g=l.length;g>f;e=++f)if(h=l[e],h.dirty||a){for(p=null,e!==this.y+this.shift||this.cursorHidden||(p=this.x),b=this.cloneAttr(this.defAttr),o=!1,k=[],d=i=0,m=this.cols-1;m>=0?m>=i:i>=m;d=m>=0?++i:--i){if(c=h.chars[d],c.html){j+=c.html;break}o?o=!1:(k.push(this._putChar(c,b,d,p)),b=c)}j="",this.equalAttr(b,this.defAttr)||(j+=""),h.wrap&&(j+="⏎"),h.extra&&(j+=''+h.extra+""),k.push(j),n.push(this._putLine(p,e,k,h))}return n},a.prototype._putGroup=function(a){var b,c,d,e,f,g,h,i,j;if(b=this.document.createElement("div"),b.className="group",b.innerHTML=a,this.body.appendChild(b),this.emit("change",b),this.screen=this.screen.slice(-this.rows),this.shift=0,g=document.querySelectorAll(".line"),g.length>this.scrollback){for(i=Array.prototype.slice.call(g,0,g.length-this.scrollback),c=0,d=i.length;d>c;c++)f=i[c],f.remove();for(j=document.querySelectorAll(".group:empty"),h=0,e=j.length;e>h;h++)b=j[h],b.remove();g=document.querySelectorAll(".line")}return this.children=Array.prototype.slice.call(g,-this.rows)},a.prototype.refresh=function(a){var b;return null==a&&(a=!1),this._resetClasses(),b=this._replotScreen(a).join(""),b&&this._putGroup(b),this.nativeScrollTo()},a.prototype._cursorBlink=function(){var a;return this.cursorState^=1,(a=this.body.querySelector(".cursor"))?a.classList.contains("reverse-video")?a.classList.remove("reverse-video"):a.classList.add("reverse-video"):void 0},a.prototype.showCursor=function(){return this.cursorState?void 0:(this.cursorState=1,this.screen[this.y+this.shift].dirty=!0,this.refresh())},a.prototype.startBlink=function(){return this.cursorBlink?(this._blinker=function(a){return function(){return a._cursorBlink()}}(this),this.t_blink=setInterval(this._blinker,500)):void 0},a.prototype.refreshBlink=function(){return this.cursorBlink?(clearInterval(this.t_blink),this.t_blink=setInterval(this._blinker,500)):void 0},a.prototype.scroll=function(){var a,b,c,d,e;if(this.normal||0!==this.scrollTop||this.scrollBottom!==this.rows-1){for(this.screen.splice(this.shift+this.scrollBottom+1,0,this.blankLine()),this.screen.splice(this.shift+this.scrollTop,1),e=[],a=b=c=this.scrollTop,d=this.scrollBottom;d>=c?d>=b:b>=d;a=d>=c?++b:--b)e.push(this.screen[a+this.shift].dirty=!0);return e}return this.screen.push(this.blankLine()),this.shift++},a.prototype.unscroll=function(){var a,b,c,d,e;for(this.screen.splice(this.shift+this.scrollTop,0,this.blankLine(!0)),this.screen.splice(this.shift+this.scrollBottom+1,1),e=[],a=b=c=this.scrollTop,d=this.scrollBottom;d>=c?d>=b:b>=d;a=d>=c?++b:--b)e.push(this.screen[a+this.shift].dirty=!0);return e},a.prototype.nativeScrollTo=function(a){return null==a&&(a=2e9),this.scrollLock?void 0:window.scrollTo(0,a)},a.prototype.scrollDisplay=function(a){return this.nativeScrollTo(window.scrollY+a*this.charSize.height)},a.prototype.nextLine=function(){return this.y++,this.y>this.scrollBottom?(this.y--,this.scroll()):void 0},a.prototype.prevLine=function(){return this.y--,this.y'+w+"
",this.screen[this.y+this.shift].chars[this.x]=d,this.resetLine(this.screen[this.y+this.shift]),this.nextLine();break;case"IMAGE":h=encodeURI(h),h.indexOf(";")?(p=h.slice(0,h.indexOf(";")),e=h.slice(h.indexOf(";")+1)):(p="image",e=h),d=this.cloneAttr(this.curAttr),d.html='#{outs.join('')}
"
+
+ _replotScreen: (force) ->
+ groups = []
for line, j in @screen
continue unless line.dirty or force
- out = ""
-
- if j is @y + @shift and not @cursorHidden
- x = @x
- else
- x = -Infinity
+ x = null
+ x = @x if j is @y + @shift and not @cursorHidden
attr = @cloneAttr @defAttr
skipnext = false
+ outs = []
for i in [0..@cols - 1]
data = line.chars[i]
if data.html
- out += data.html
+ outs.push data.html
break
if skipnext
skipnext = false
continue
- ch = data.ch
- unless @equalAttr data, attr
- out += "" unless @equalAttr attr, @defAttr
- unless @equalAttr data, @defAttr
- classes = []
- styles = []
- out += "" if i is x
-
- # This is a temporary dirty hack for raw html insertion
- if ch.length > 1
- out += ch
- else
- switch ch
- when "&"
- out += "&"
- when "<"
- out += "<"
- when ">"
- out += ">"
- else
- if ch == " "
- out += '\u2007'
- else if ch <= " "
- out += " "
- else if not @forceWidth or ch <= "~" # Ascii chars
- out += ch
- else if "\uff00" < ch < "\uffef"
- skipnext = true
- out += "#{ch}"
- else
- out += "#{ch}"
-
- out += "" if i is x
+ outs.push @_putChar data, attr, i, x
attr = data
+
+ out = ''
out += "" unless @equalAttr attr, @defAttr
out += '\u23CE' if line.wrap
if line.extra
out += '' + line.extra + ''
- if @children[j]
- @children[j].innerHTML = out
- modified.push @children[j]
- if x isnt -Infinity
- @children[j].classList.add 'active'
- if line.extra
- @children[j].classList.add 'extended'
- else
- cls = ['line']
- if x isnt -Infinity
- cls.push 'active'
- if line.extra
- cls.push 'extended'
- newOut += "#{out}
"
- @screen[j].dirty = false
+ outs.push out
- if newOut isnt ''
- group = @document.createElement('div')
- group.className = 'group'
- group.innerHTML = newOut
- modified.push group
- @body.appendChild group
- @screen = @screen.slice(-@rows)
- @shift = 0
+ group = @_putLine x, j, outs, line
+ groups.push group if group
+ @_putGroup groups if groups.length
- lines = document.querySelectorAll('.line')
- if lines.length > @scrollback
- for line in Array.prototype.slice.call(
- lines, 0, lines.length - @scrollback)
- line.remove()
- for group in document.querySelectorAll('.group:empty')
- group.remove()
- lines = document.querySelectorAll('.line')
- @children = Array.prototype.slice.call(
- lines, -@rows)
+ _putGroup: (groups) ->
+ group = @document.createElement('div')
+ group.className = 'group'
+ group.innerHTML = groups.join('')
+ if true or groups.length > 1
+ nodes = group.childNodes
+ node = group
+ else
+ nodes = [group.firstChild]
+ node = group.firstChild
+ @body.appendChild node
+ for node in nodes
+ if @children.length >= @rows
+ @children.pop()
+ @emit 'change', node
+ @children.push node
+ @screen = @screen.slice(-@rows)
+ @shift = 0
+
+ if @body.childElementCount > @scrollback
+ @body.style.display = 'none'
+ for i in [0..@body.childElementCount - @scrollback]
+ @body.firstChild.remove()
+ @body.style.display = 'block'
+
+ refresh: (force=false) ->
+ @active?.classList.remove('active')
+ @_replotScreen(force)
@nativeScrollTo()
- @emit 'change', modified
_cursorBlink: ->
@cursorState ^= 1
@@ -1607,6 +1625,7 @@ class Terminal
j = oldRows
if j < @rows
el = @body
+ @body.style.display = 'none'
while j++ < @rows
@screen.push @blankLine() if @screen.length < @rows
if @children.length < @rows
@@ -1614,6 +1633,7 @@ class Terminal
line.className = 'line'
el.appendChild line
@children.push line
+ @body.style.display = 'block'
else if j > @rows
while j-- > @rows
@screen.pop() if @screen.length > @rows