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

Various clean

Browse Source
This commit is contained in:
Florian Mounier
2014-02-12 15:53:26 +01:00
parent 9b2e4e9ce4
commit 6bae92edc9
7 changed files with 124 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bin/hr Executable file
View File

@@ -0,0 +1,4 @@
#!/usr/bin/env python
print('\x1b]99;<hr />\x07')

17
butterfly/static/coffees/backsel.coffee
View File

@@ -1,3 +1,20 @@
# *-* coding: utf-8 *-*
# This file is part of butterfly
#
# butterfly Copyright (C) 2014 Florian Mounier
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
state =
x: null
y: null

20
butterfly/static/coffees/main.coffee
View File

@@ -1,3 +1,21 @@
# *-* coding: utf-8 *-*
# This file is part of butterfly
#
# butterfly Copyright (C) 2014 Florian Mounier
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
term = ws = null
cols = rows = null
quit = false
@@ -21,8 +39,6 @@ ws.onerror = -> console.log "WebSocket error", arguments
ws.onmessage = (e) -> term.write e.data
ws.onclose = ->
if term
term.destroy()
console.log "WebSocket closed", arguments
quit = true
open('','_self').close()

125
butterfly/static/coffees/term.coffee
View File

@@ -1,3 +1,30 @@
# *-* coding: utf-8 *-*
# This file is part of butterfly
#
# butterfly Copyright (C) 2014 Florian Mounier
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# This has been forked from term.js
# Copyright (c) 2012-2013, Christopher Jeffrey (MIT License)
# https://github.com/chjj/term.js
# which has been forked from jslinux
# Copyright (c) 2011 Fabrice Bellard
# http://bellard.org/jslinux/
cancel = (ev) ->
ev.preventDefault() if ev.preventDefault
ev.stopPropagation() if ev.stopPropagation
@@ -25,12 +52,10 @@ class Terminal
@rows = 24
@scrollback = 100000
@visualBell = 100
@debug = not true
@convertEol = false
@termName = 'xterm'
@cursorBlink = true
@popOnBell = false
@screenKeys = false
@cursorState = 0
@init()
@@ -50,7 +75,6 @@ class Terminal
@applicationKeypad = false
@applicationCursor = false
@originMode = false
@insertMode = false
@wraparoundMode = false
@normal = null
@@ -61,14 +85,11 @@ class Terminal
@charsets = [null]
# stream
@readable = true
@writable = true
@defAttr = (0 << 18) | (257 << 9) | (256 << 0)
@curAttr = @defAttr
@params = []
@currentParam = 0
@prefix = ""
@postfix = ""
@lines = []
i = @rows
@lines.push @blankLine() while i--
@@ -93,9 +114,9 @@ class Terminal
paste: (ev) ->
if ev.clipboardData
@send(ev.clipboardData.getData('text/plain'))
@send ev.clipboardData.getData('text/plain')
else if @context.clipboardData
@send(@context.clipboardData.getData('Text'))
@send @context.clipboardData.getData('Text')
cancel(ev)
open: (parent) ->
@@ -208,20 +229,20 @@ class Terminal
pos.y -= 32
pos.x++
pos.y++
@send "\u001b[" + button + ";" + pos.x + ";" + pos.y + "M"
@send "\x1b[" + button + ";" + pos.x + ";" + pos.y + "M"
return
if @sgrMouse
pos.x -= 32
pos.y -= 32
@send "\u001b[<" + (if (button & 3) is 3 then button & ~3 else button) + ";" + pos.x + ";" + pos.y + (if (button & 3) is 3 then "m" else "M")
@send "\x1b[<" + (if (button & 3) is 3 then button & ~3 else button) + ";" + pos.x + ";" + pos.y + (if (button & 3) is 3 then "m" else "M")
return
data = []
encode data, button
encode data, pos.x
encode data, pos.y
@send "\u001b[M" + String.fromCharCode.apply(String, data)
@send "\x1b[M" + String.fromCharCode.apply(String, data)
getButton = (ev) =>
# two low bits:
@@ -319,22 +340,14 @@ class Terminal
addEventListener "wheel", (ev) =>
if @mouseEvents
return if @x10Mouse or @vt300Mouse or @decLocator
return if @x10Mouse
sendButton ev
else
return if @applicationKeypad
@scrollDisp ev.deltaY
@scrollDisp ev.deltaY | 0
cancel ev
destroy: ->
@readable = false
@writable = false
@element.parentNode?.removeChild @element
@write = ->
refresh: (start, end) ->
if end - start >= @rows / 2
parent = @element.parentNode
@@ -474,7 +487,7 @@ class Terminal
@ydisp = @ybase
@lines.splice @ybase + @scrollTop, 1
# this.maxRange();
# @maxRange();
@updateRange @scrollTop
@updateRange @scrollBottom
@@ -544,23 +557,23 @@ class Terminal
else
# ' '
if ch >= " "
ch = @charset[ch] if @charset and @charset[ch]
ch = @charset[ch] if @charset?[ch]
if @x >= @cols
@x = 0
@y++
if @y > @scrollBottom
@y--
@scroll()
@lines[@y + @ybase][@x] = [this.curAttr, ch]
@lines[@y + @ybase][@x] = [@curAttr, ch]
@x++
@updateRange @y
if isWide(ch)
j = @y + @ybase
if @cols < 2 or @x >= @cols
@lines[j][@x - 1] = [this.curAttr, " "]
@lines[j][@x - 1] = [@curAttr, " "]
break
@lines[j][@x] = [this.curAttr, " "]
@lines[j][@x] = [@curAttr, " "]
@x++
when State.escaped
@@ -596,9 +609,11 @@ class Terminal
@reset()
# ESC E Next Line ( NEL is 0x85).
# ESC D Index ( IND is 0x84).
when "E"
@x = 0
@index()
# ESC D Index ( IND is 0x84).
when "D"
@index()
@@ -620,16 +635,12 @@ class Terminal
switch ch
when "("
@gcharset = 0
when ")"
when ")", "-"
@gcharset = 1
when "*"
when "*", "."
@gcharset = 2
when "+"
@gcharset = 3
when "-"
@gcharset = 1
when "."
@gcharset = 2
@state = State.charset
# Designate G3 Character Set (VT300).
@@ -640,16 +651,6 @@ class Terminal
@state = State.charset
i--
# ESC N
# Single Shift Select of G2 Character Set
# ( SS2 is 0x8e). This affects next character only.
# ESC O
# Single Shift Select of G3 Character Set
# ( SS3 is 0x8f). This affects next character only.
when "N", "O"
break
# ESC n
# Invoke the G2 Character Set as GL (LS2).
when "n"
@@ -696,18 +697,17 @@ class Terminal
# ESC = Application Keypad (DECPAM).
when "="
@log "Serial port requested application keypad."
@applicationKeypad = true
@state = State.normal
# ESC > Normal Keypad (DECPNM).
when ">"
@log "Switching back to normal keypad."
@applicationKeypad = false
@state = State.normal
else
@state = State.normal
@error "Unknown ESC control: %s.", ch
when State.charset
switch ch
when "0" # DEC Special Character and Line Drawing Set.
@@ -765,7 +765,7 @@ class Terminal
# Custom escape to produce raw html
html = "<div class=\"inline-html\">" + @params[1] + "</div>"
@lines[@y + @ybase][@x] = [
this.curAttr
@curAttr
html
]
line = 0
@@ -805,7 +805,6 @@ class Terminal
# '$', '"', ' ', '\''
if ch is "$" or ch is "\"" or ch is " " or ch is "'"
@postfix = ch
break
@params.push @currentParam
@currentParam = 0
@@ -990,18 +989,12 @@ class Terminal
# Request DEC private mode (DECRQM).
# CSI Ps ; Ps " p
when "p"
switch @prefix
# case '>':
# this.setPointerMode(this.params);
# break;
when "!"
@softReset @params
if @prefix is '!'
@softReset @params
else
@error "Unknown CSI code: %s.", ch
@prefix = ""
@postfix = ""
when State.dcs
if ch is "\x1b" or ch is "\x07"
@@ -1367,7 +1360,6 @@ class Terminal
), 1
@queue += data
return
bell: ->
return unless @visualBell
@@ -1375,7 +1367,6 @@ class Terminal
setTimeout (=>
@element.classList.remove "bell"
), @visualBell
@focus() if @popOnBell
log: ->
return unless @debug
@@ -1505,7 +1496,7 @@ class Terminal
line
ch: (cur) ->
if cur then [@eraseAttr(), " "] else [this.defAttr, " "]
if cur then [@eraseAttr(), " "] else [@defAttr, " "]
isterm: (term) ->
"#{@termName}".indexOf(term) is 0
@@ -1539,7 +1530,7 @@ class Terminal
j = @rows - 1 - @scrollBottom
@lines.splice @rows - 1 + @ybase - j + 1, 1
# this.maxRange();
# @maxRange();
@updateRange @scrollTop
@updateRange @scrollBottom
@state = State.normal
@@ -2167,11 +2158,7 @@ class Terminal
@setMode params[i]
i++
return
unless @prefix
if params is 4
@insertMode = true
else if @prefix is "?"
if @prefix is "?"
switch params
when 1
@applicationCursor = true
@@ -2225,7 +2212,7 @@ class Terminal
when 25 # show cursor
@cursorHidden = false
# alt screen buffer cursor
#this.saveCursor();
#@saveCursor();
when 1049, 47, 1047 # alt screen buffer
unless @normal
normal =
@@ -2330,12 +2317,8 @@ class Terminal
@resetMode params[i]
i++
return
unless @prefix
switch params
when 4
@insertMode = false
else if @prefix is "?"
if @prefix is "?"
switch params
when 1
@applicationCursor = false
@@ -2468,7 +2451,7 @@ class Terminal
repeatPrecedingCharacter: (params) ->
param = params[0] or 1
line = @lines[@ybase + @y]
ch = line[@x - 1] or [this.defAttr, " "]
ch = line[@x - 1] or [@defAttr, " "]
line[@x++] = ch while param--

17
butterfly/static/coffees/virtual_input.coffee
View File

@@ -1,3 +1,20 @@
# *-* coding: utf-8 *-*
# This file is part of butterfly
#
# butterfly Copyright (C) 2014 Florian Mounier
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
try
document.createEvent("TouchEvent")
virtual_input = true

67
butterfly/static/javascripts/main.js
View File

@@ -214,11 +214,9 @@ Terminal = (function() {
this.rows = 24;
this.scrollback = 100000;
this.visualBell = 100;
this.debug = !true;
this.convertEol = false;
this.termName = 'xterm';
this.cursorBlink = true;
this.popOnBell = false;
this.screenKeys = false;
this.cursorState = 0;
this.init();
@@ -238,21 +236,17 @@ Terminal = (function() {
this.applicationKeypad = false;
this.applicationCursor = false;
this.originMode = false;
this.insertMode = false;
this.wraparoundMode = false;
this.normal = null;
this.charset = null;
this.gcharset = null;
this.glevel = 0;
this.charsets = [null];
this.readable = true;
this.writable = true;
this.defAttr = (0 << 18) | (257 << 9) | (256 << 0);
this.curAttr = this.defAttr;
this.params = [];
this.currentParam = 0;
this.prefix = "";
this.postfix = "";
this.lines = [];
i = this.rows;
while (i--) {
@@ -385,20 +379,20 @@ Terminal = (function() {
pos.y -= 32;
pos.x++;
pos.y++;
_this.send("\u001b[" + button + ";" + pos.x + ";" + pos.y + "M");
_this.send("\x1b[" + button + ";" + pos.x + ";" + pos.y + "M");
return;
}
if (_this.sgrMouse) {
pos.x -= 32;
pos.y -= 32;
_this.send("\u001b[<" + ((button & 3) === 3 ? button & ~3 : button) + ";" + pos.x + ";" + pos.y + ((button & 3) === 3 ? "m" : "M"));
_this.send("\x1b[<" + ((button & 3) === 3 ? button & ~3 : button) + ";" + pos.x + ";" + pos.y + ((button & 3) === 3 ? "m" : "M"));
return;
}
data = [];
encode(data, button);
encode(data, pos.x);
encode(data, pos.y);
return _this.send("\u001b[M" + String.fromCharCode.apply(String, data));
return _this.send("\x1b[M" + String.fromCharCode.apply(String, data));
};
getButton = function(ev) {
var button, meta, mod, shift;
@@ -503,16 +497,6 @@ Terminal = (function() {
});
};
Terminal.prototype.destroy = function() {
var _ref;
this.readable = false;
this.writable = false;
if ((_ref = this.element.parentNode) != null) {
_ref.removeChild(this.element);
}
return this.write = function() {};
};
Terminal.prototype.refresh = function(start, end) {
var attr, bg, ch, classes, data, fg, flags, i, line, out, parent, row, width, x, y;
if (end - start >= this.rows / 2) {
@@ -696,7 +680,7 @@ Terminal = (function() {
};
Terminal.prototype.write = function(data) {
var ch, cs, html, i, j, l, line, pt, valid;
var ch, cs, html, i, j, l, line, pt, valid, _ref;
this.refreshStart = this.y;
this.refreshEnd = this.y;
if (this.ybase !== this.ydisp) {
@@ -747,7 +731,7 @@ Terminal = (function() {
break;
default:
if (ch >= " ") {
if (this.charset && this.charset[ch]) {
if ((_ref = this.charset) != null ? _ref[ch] : void 0) {
ch = this.charset[ch];
}
if (this.x >= this.cols) {
@@ -801,6 +785,7 @@ Terminal = (function() {
break;
case "E":
this.x = 0;
this.index();
break;
case "D":
this.index();
@@ -825,19 +810,15 @@ Terminal = (function() {
this.gcharset = 0;
break;
case ")":
case "-":
this.gcharset = 1;
break;
case "*":
case ".":
this.gcharset = 2;
break;
case "+":
this.gcharset = 3;
break;
case "-":
this.gcharset = 1;
break;
case ".":
this.gcharset = 2;
}
this.state = State.charset;
break;
@@ -846,9 +827,6 @@ Terminal = (function() {
this.state = State.charset;
i--;
break;
case "N":
case "O":
break;
case "n":
this.setgLevel(2);
break;
@@ -880,12 +858,10 @@ Terminal = (function() {
this.tabSet();
break;
case "=":
this.log("Serial port requested application keypad.");
this.applicationKeypad = true;
this.state = State.normal;
break;
case ">":
this.log("Switching back to normal keypad.");
this.applicationKeypad = false;
this.state = State.normal;
break;
@@ -1004,7 +980,6 @@ Terminal = (function() {
break;
}
if (ch === "$" || ch === "\"" || ch === " " || ch === "'") {
this.postfix = ch;
break;
}
this.params.push(this.currentParam);
@@ -1123,16 +1098,14 @@ Terminal = (function() {
this.tabClear(this.params);
break;
case "p":
switch (this.prefix) {
case "!":
this.softReset(this.params);
if (this.prefix === '!') {
this.softReset(this.params);
}
break;
default:
this.error("Unknown CSI code: %s.", ch);
}
this.prefix = "";
this.postfix = "";
break;
case State.dcs:
if (ch === "\x1b" || ch === "\x07") {
@@ -1481,7 +1454,7 @@ Terminal = (function() {
_this.queue = "";
}), 1);
}
this.queue += data;
return this.queue += data;
};
Terminal.prototype.bell = function() {
@@ -1490,12 +1463,9 @@ Terminal = (function() {
return;
}
this.element.classList.add("bell");
setTimeout((function() {
return setTimeout((function() {
return _this.element.classList.remove("bell");
}), this.visualBell);
if (this.popOnBell) {
return this.focus();
}
};
Terminal.prototype.log = function() {
@@ -2182,11 +2152,7 @@ Terminal = (function() {
}
return;
}
if (!this.prefix) {
if (params === 4) {
return this.insertMode = true;
}
} else if (this.prefix === "?") {
if (this.prefix === "?") {
switch (params) {
case 1:
return this.applicationCursor = true;
@@ -2258,12 +2224,7 @@ Terminal = (function() {
}
return;
}
if (!this.prefix) {
switch (params) {
case 4:
return this.insertMode = false;
}
} else if (this.prefix === "?") {
if (this.prefix === "?") {
switch (params) {
case 1:
return this.applicationCursor = false;

1
setup.py
View File

@@ -29,7 +29,6 @@ options = dict(
'butterfly': [
'static/fonts/*',
'static/stylesheets/main.css',
'static/javascripts/term.js/src/term.js',
'static/javascripts/main.js',
'templates/index.html'
]