GitHub/butterfly
1
0
Fork 0
mirror of https://github.com/paradoxxxzero/butterfly.git synced 2026-06-05 20:09:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Reverse Index and do some compat

Browse Source
This commit is contained in:
Florian Mounier
2015-04-21 17:14:45 +02:00
parent 9a58059c1d
commit 13cc6b52e7
3 changed files with 171 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

133
butterfly/static/main.js
View File

@@ -180,7 +180,11 @@
addEventListener('keypress', this.keyPress.bind(this));
addEventListener('focus', this.focus.bind(this));
addEventListener('blur', this.blur.bind(this));
addEventListener('resize', this.resize.bind(this));
addEventListener('resize', (function(_this) {
return function() {
return _this.resize();
};
})(this));
if (typeof InstallTrigger !== "undefined") {
this.body.contentEditable = 'true';
}
@@ -663,8 +667,8 @@
Terminal.prototype.scroll = function() {
var i, k, ref, ref1, results;
if (this.normal || this.scrollTop !== 0 || this.scrollBottom !== this.rows - 1) {
this.screen.splice(this.scrollBottom + 1, 0, [this.blank_line(), true]);
this.screen.splice(this.scrollTop, 1);
this.screen.splice(this.shift + this.scrollBottom + 1, 0, [this.blank_line(), true]);
this.screen.splice(this.shift + this.scrollTop, 1);
results = [];
for (i = k = ref = this.scrollTop, ref1 = this.scrollBottom; ref <= ref1 ? k <= ref1 : k >= ref1; i = ref <= ref1 ? ++k : --k) {
results.push(this.screen[i + this.shift][1] = true);
@@ -676,6 +680,17 @@
}
};
Terminal.prototype.unscroll = function() {
var i, k, ref, ref1, results;
this.screen.splice(this.shift + this.scrollTop, 0, [this.blank_line(true), true]);
this.screen.splice(this.shift + this.scrollBottom + 1, 1);
results = [];
for (i = k = ref = this.scrollTop, ref1 = this.scrollBottom; ref <= ref1 ? k <= ref1 : k >= ref1; i = ref <= ref1 ? ++k : --k) {
results.push(this.screen[i + this.shift][1] = true);
}
return results;
};
Terminal.prototype.native_scroll_to = function(scroll) {
if (scroll == null) {
scroll = 2000000000;
@@ -695,8 +710,16 @@
}
};
Terminal.prototype.prev_line = function() {
this.y--;
if (this.y < this.scrollTop) {
this.y++;
return this.unscroll();
}
};
Terminal.prototype.write = function(data) {
var attr, ch, content, cs, i, l, pt, ref, ref1, type, valid;
var attr, c, ch, content, cs, i, k, l, len, line, m, num, pt, ref, ref1, ref2, ref3, type, valid;
i = 0;
l = data.length;
while (i < l) {
@@ -710,9 +733,6 @@
case "\n":
case "\x0b":
case "\x0c":
if (this.convertEol) {
this.x = 0;
}
this.next_line();
break;
case "\r":
@@ -858,6 +878,27 @@
case "#":
this.state = State.normal;
i++;
num = data.charAt(i);
switch (num) {
case "3":
break;
case "4":
break;
case "5":
break;
case "6":
break;
case "8":
ref1 = this.screen;
for (k = 0, len = ref1.length; k < len; k++) {
line = ref1[k];
line[1] = true;
for (c = m = 0, ref2 = line[0].length; 0 <= ref2 ? m <= ref2 : m >= ref2; c = 0 <= ref2 ? ++m : --m) {
line[0][c] = this.cloneAttr(this.curAttr, "E");
}
}
this.x = this.y = 0;
}
break;
case "H":
this.tabSet();
@@ -1111,7 +1152,7 @@
break;
}
pt = pt.slice(1);
ref1 = pt.split('|', 2), type = ref1[0], content = ref1[1];
ref3 = pt.split('|', 2), type = ref3[0], content = ref3[1];
if (!content) {
console.error("No type for inline DECUDK: " + pt);
break;
@@ -1124,14 +1165,14 @@
}
attr = this.cloneAttr(this.curAttr);
attr.html = "<div class=\"inline-html\">" + content + "</div>";
this.screen[this.y][0][this.x] = attr;
this.screen[this.y][1] = true;
this.screen[this.y + this.shift][0][this.x] = attr;
this.screen[this.y + this.shift][1] = true;
break;
case "IMAGE":
attr = this.cloneAttr(this.curAttr);
attr.html = "<img class=\"inline-image\" src=\"data:image;base64," + content + "\" />";
this.screen[this.y][0][this.x] = attr;
this.screen[this.y][1] = true;
this.screen[this.y + this.shift][0][this.x] = attr;
this.screen[this.y + this.shift][1] = true;
break;
case "PROMPT":
this.send(content);
@@ -1199,7 +1240,7 @@
}
i++;
}
this.screen[this.y][1] = true;
this.screen[this.y + this.shift][1] = true;
return this.refresh();
};
@@ -1483,16 +1524,22 @@
})(this)), this.visualBell);
};
Terminal.prototype.resize = function() {
Terminal.prototype.resize = function(x, y) {
var el, i, j, line, old_cols, old_rows, px;
if (x == null) {
x = null;
}
if (y == null) {
y = null;
}
old_cols = this.cols;
old_rows = this.rows;
this.compute_char_size();
this.cols = Math.floor(this.element.clientWidth / this.char_size.width);
this.rows = Math.floor(window.innerHeight / this.char_size.height);
this.cols = x || Math.floor(this.element.clientWidth / this.char_size.width);
this.rows = y || Math.floor(window.innerHeight / this.char_size.height);
px = window.innerHeight % this.char_size.height;
this.element.style['padding-bottom'] = px + "px";
if (old_cols === this.cols && old_rows === this.rows) {
if ((!x && !y) && old_cols === this.cols && old_rows === this.rows) {
return;
}
this.ctl('Resize', this.cols, this.rows);
@@ -1548,7 +1595,10 @@
this.scrollTop = 0;
this.scrollBottom = this.rows - 1;
this.refresh(true);
return this.normal = null;
this.normal = null;
if (x || y) {
return this.reset();
}
};
Terminal.prototype.setupStops = function(i) {
@@ -1665,12 +1715,7 @@
};
Terminal.prototype.reverseIndex = function() {
var i, k, ref, ref1;
this.screen.splice(this.scrollBottom, 1);
this.screen.splice(this.scrollTop, 0, [this.blank_line(true), true]);
for (i = k = ref = this.scrollTop, ref1 = this.scrollBottom; ref <= ref1 ? k <= ref1 : k >= ref1; i = ref <= ref1 ? ++k : --k) {
this.screen[i + this.shift][1] = true;
}
this.prev_line();
return this.state = State.normal;
};
@@ -2113,6 +2158,16 @@
}
return;
}
if (!this.prefix) {
switch (params) {
case 4:
this.insertMode = true;
break;
case 20:
this.convertEol = true;
}
return;
}
if (this.prefix === "?") {
switch (params) {
case 1:
@@ -2182,6 +2237,16 @@
}
return;
}
if (!this.prefix) {
switch (params) {
case 4:
this.insertMode = false;
break;
case 20:
this.convertEol = false;
}
return;
}
if (this.prefix === "?") {
switch (params) {
case 1:
@@ -2377,8 +2442,8 @@
attr = params[4];
results = [];
while (t < b + 1) {
line = this.screen[t][0];
this.screen[t][1] = true;
line = this.screen[t + this.shift][0];
this.screen[t + this.shift][1] = true;
i = l;
while (i < r) {
line[i] = this.cloneAttr(attr, line[i].ch);
@@ -2418,8 +2483,8 @@
r = params[4];
results = [];
while (t < b + 1) {
line = this.screen[t][0];
this.screen[t][1] = true;
line = this.screen[t + this.shift][0];
this.screen[t + this.shift][1] = true;
i = l;
while (i < r) {
line[i] = this.cloneAttr(line[i][0], String.fromCharCode(ch));
@@ -2443,8 +2508,8 @@
r = params[3];
results = [];
while (t < b + 1) {
line = this.screen[t][0];
this.screen[t][1] = true;
line = this.screen[t + this.shift][0];
this.screen[t + this.shift][1] = true;
i = l;
while (i < r) {
line[i] = this.eraseAttr();
@@ -2464,9 +2529,9 @@
Terminal.prototype.insertColumns = function() {
var i, l, param;
param = params[0];
l = this.rows;
l = this.rows + this.shift;
while (param--) {
i = 0;
i = this.shift;
while (i < l) {
this.screen[i][0].splice(this.x + 1, 0, this.eraseAttr());
this.screen[i][0].pop();
@@ -2479,9 +2544,9 @@
Terminal.prototype.deleteColumns = function() {
var i, l, param;
param = params[0];
l = this.rows;
l = this.rows + this.shift;
while (param--) {
i = 0;
i = this.shift;
while (i < l) {
this.screen[i][0].splice(this.x, 1);
this.screen[i][0].push(this.eraseAttr());

5
butterfly/static/main.min.js vendored
View File

File diff suppressed because one or more lines are too long

97
coffees/term.coffee
View File

@@ -93,7 +93,7 @@ class Terminal
addEventListener 'keypress', @keyPress.bind(@)
addEventListener 'focus', @focus.bind(@)
addEventListener 'blur', @blur.bind(@)
addEventListener 'resize', @resize.bind(@)
addEventListener 'resize', => @resize()
# # Horrible Firefox paste workaround
if typeof InstallTrigger isnt "undefined"
@@ -523,8 +523,8 @@ class Terminal
# Use emulated scroll in alternate buffer or when scroll region is defined
if @normal or @scrollTop isnt 0 or @scrollBottom isnt @rows - 1
# inner scroll
@screen.splice @scrollBottom + 1, 0, [@blank_line(), true]
@screen.splice @scrollTop, 1
@screen.splice @shift + @scrollBottom + 1, 0, [@blank_line(), true]
@screen.splice @shift + @scrollTop, 1
for i in [@scrollTop..@scrollBottom]
@screen[i + @shift][1] = true
@@ -532,6 +532,14 @@ class Terminal
@screen.push [@blank_line(), true]
@shift++
unscroll: ->
@screen.splice @shift + @scrollTop , 0, [@blank_line(true), true]
@screen.splice @shift + @scrollBottom + 1, 1
for i in [@scrollTop..@scrollBottom]
@screen[i + @shift][1] = true
native_scroll_to: (scroll=2000000000) -> # ~ Max ff number
window.scrollTo 0, scroll
@@ -544,6 +552,12 @@ class Terminal
@y--
@scroll()
prev_line: ->
@y--
if @y < @scrollTop
@y++
@unscroll()
write: (data) ->
i = 0
l = data.length
@@ -559,7 +573,7 @@ class Terminal
# '\n', '\v', '\f'
when "\n", "\x0b", "\x0c"
@x = 0 if @convertEol
# @x = 0 if @convertEol
@next_line()
# '\r'
@@ -723,6 +737,22 @@ class Terminal
when "#"
@state = State.normal
i++
num = data.charAt(i)
switch num
when "3" # DECDHL
break
when "4" # DECDHL
break
when "5" # DECSWL
break
when "6" # DECDWL
break
when "8" # DECALN
for line in @screen
line[1] = true
for c in [0..line[0].length]
line[0][c] = @cloneAttr @curAttr, "E"
@x = @y = 0
# ESC H Tab Set (HTS is 0x88).
when "H"
@@ -1041,16 +1071,16 @@ class Terminal
attr = @cloneAttr @curAttr
attr.html = (
"<div class=\"inline-html\">#{content}</div>")
@screen[@y][0][@x] = attr
@screen[@y][1] = true
@screen[@y + @shift][0][@x] = attr
@screen[@y + @shift][1] = true
when "IMAGE"
attr = @cloneAttr @curAttr
attr.html = (
"<img class=\"inline-image\" src=\"data:image;base64,#{
content}\" />")
@screen[@y][0][@x] = attr
@screen[@y][1] = true
@screen[@y + @shift][0][@x] = attr
@screen[@y + @shift][1] = true
when "PROMPT"
@send content
@@ -1119,7 +1149,7 @@ class Terminal
@state = State.normal
i++
@screen[@y][1] = true
@screen[@y + @shift][1] = true
@refresh()
writeln: (data) ->
@@ -1409,16 +1439,16 @@ class Terminal
@element.classList.remove cls
), @visualBell
resize: ->
resize: (x=null, y=null) ->
old_cols = @cols
old_rows = @rows
@compute_char_size()
@cols = Math.floor(@element.clientWidth / @char_size.width)
@rows = Math.floor(window.innerHeight / @char_size.height)
@cols = x or Math.floor(@element.clientWidth / @char_size.width)
@rows = y or Math.floor(window.innerHeight / @char_size.height)
px = window.innerHeight % @char_size.height
@element.style['padding-bottom'] = "#{px}px"
if old_cols == @cols and old_rows == @rows
if (not x and not y) and old_cols == @cols and old_rows == @rows
return
@ctl 'Resize', @cols, @rows
@@ -1468,6 +1498,7 @@ class Terminal
# screen buffer. just set it
# to null for now.
@normal = null
@reset() if x or y
setupStops: (i) ->
if i?
@@ -1540,11 +1571,7 @@ class Terminal
# ESC M Reverse Index (RI is 0x8d).
reverseIndex: ->
@screen.splice @scrollBottom, 1
@screen.splice @scrollTop, 0, [@blank_line(true), true]
for i in [@scrollTop..@scrollBottom]
@screen[i + @shift][1] = true
@prev_line()
@state = State.normal
# ESC c Full Reset (RIS).
@@ -2154,6 +2181,13 @@ class Terminal
@setMode params[i]
i++
return
if not @prefix
switch params
when 4
@insertMode = true
when 20
@convertEol = true
return
if @prefix is "?"
switch params
when 1
@@ -2310,6 +2344,13 @@ class Terminal
@resetMode params[i]
i++
return
if not @prefix
switch params
when 4
@insertMode = false
when 20
@convertEol = false
return
if @prefix is "?"
switch params
@@ -2615,8 +2656,8 @@ class Terminal
r = params[3]
attr = params[4]
while t < b + 1
line = @screen[t][0]
@screen[t][1] = true
line = @screen[t + @shift][0]
@screen[t + @shift][1] = true
i = l
while i < r
line[i] = @cloneAttr attr, line[i].ch
@@ -2772,8 +2813,8 @@ class Terminal
b = params[3]
r = params[4]
while t < b + 1
line = @screen[t][0]
@screen[t][1] = true
line = @screen[t + @shift][0]
@screen[t + @shift][1] = true
i = l
while i < r
line[i] = @cloneAttr line[i][0], String.fromCharCode(ch)
@@ -2807,8 +2848,8 @@ class Terminal
b = params[2]
r = params[3]
while t < b + 1
line = @screen[t][0]
@screen[t][1] = true
line = @screen[t + @shift][0]
@screen[t + @shift][1] = true
i = l
while i < r
line[i] = @eraseAttr()
@@ -2883,9 +2924,9 @@ class Terminal
# NOTE: xterm doesn't enable this code by default.
insertColumns: ->
param = params[0]
l = @rows
l = @rows + @shift
while param--
i = 0
i = @shift
while i < l
@screen[i][0].splice @x + 1, 0, @eraseAttr()
@screen[i][0].pop()
@@ -2898,9 +2939,9 @@ class Terminal
# NOTE: xterm doesn't enable this code by default.
deleteColumns: ->
param = params[0]
l = @rows
l = @rows + @shift
while param--
i = 0
i = @shift
while i < l
@screen[i][0].splice @x, 1
@screen[i][0].push @eraseAttr()