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

Allow to stop history by double ctrl-c.

Browse Source
This commit is contained in:
Florian Mounier
2014-02-14 17:43:39 +01:00
parent 35838a600b
commit cd44280877
2 changed files with 32 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -87,9 +87,8 @@ class Terminal
@convertEol = false
@termName = 'xterm'
@cursorBlink = true
@screenKeys = false
@cursorState = 0
@last_cc = 0
@reset_vars()
# Draw screen
@@ -476,13 +475,13 @@ class Terminal
startBlink: ->
return unless @cursorBlink
@_blinker = => @_cursorBlink()
@_blink = setInterval(@_blinker, 500)
@t_blink = setInterval(@_blinker, 500)
refreshBlink: ->
return unless @cursorBlink
clearInterval @_blink
@_blink = setInterval(@_blinker, 500)
clearInterval @t_blink
@t_blink = setInterval(@_blinker, 500)
scroll: ->
@@ -1271,26 +1270,13 @@ class Terminal
# a-z and space
if ev.ctrlKey
if ev.keyCode >= 65 and ev.keyCode <= 90
# Ctrl-A
if @screenKeys
if not @prefixMode and not @selectMode and ev.keyCode is 65
@enterPrefix()
return cancel(ev)
# Ctrl-V
if @prefixMode and ev.keyCode is 86
@leavePrefix()
return
# Ctrl-C
if (@prefixMode or @selectMode) and ev.keyCode is 67
if @visualMode
setTimeout (=>
@leaveVisual()
return
), 1
return
if ev.keyCode is 67
t = (new Date()).getTime()
if (t - @last_cc) < 150
id = (setTimeout ->) - 6 # Let the end write
@write '\r\n --8<------8<-- Sectioned --8<------8<-- \r\n\r\n'
(clearTimeout id if id not in [@t_bell, @t_queue, @t_blink]) while id--
@last_cc = t
key = String.fromCharCode(ev.keyCode - 64)
else if ev.keyCode is 32
@@ -1376,10 +1362,9 @@ class Terminal
send: (data) ->
unless @queue
setTimeout (=>
@t_queue = setTimeout (=>
@handler @queue
@queue = ""
return
), 1
@queue += data
@@ -1387,7 +1372,7 @@ class Terminal
bell: ->
return unless @visualBell
@element.classList.add "bell"
setTimeout (=>
@t_bell = setTimeout (=>
@element.classList.remove "bell"
), @visualBell

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

@@ -62,8 +62,8 @@ Terminal = (function() {
this.convertEol = false;
this.termName = 'xterm';
this.cursorBlink = true;
this.screenKeys = false;
this.cursorState = 0;
this.last_cc = 0;
this.reset_vars();
this.refresh(0, this.rows - 1);
this.focus();
@@ -476,15 +476,15 @@ Terminal = (function() {
this._blinker = function() {
return _this._cursorBlink();
};
return this._blink = setInterval(this._blinker, 500);
return this.t_blink = setInterval(this._blinker, 500);
};
Terminal.prototype.refreshBlink = function() {
if (!this.cursorBlink) {
return;
}
clearInterval(this._blink);
return this._blink = setInterval(this._blinker, 500);
clearInterval(this.t_blink);
return this.t_blink = setInterval(this._blinker, 500);
};
Terminal.prototype.scroll = function() {
@@ -1024,8 +1024,7 @@ Terminal = (function() {
};
Terminal.prototype.keyDown = function(ev) {
var key,
_this = this;
var id, key, t;
if (ev.keyCode > 15 && ev.keyCode < 19) {
return true;
}
@@ -1187,23 +1186,18 @@ Terminal = (function() {
default:
if (ev.ctrlKey) {
if (ev.keyCode >= 65 && ev.keyCode <= 90) {
if (this.screenKeys) {
if (!this.prefixMode && !this.selectMode && ev.keyCode === 65) {
this.enterPrefix();
return cancel(ev);
if (ev.keyCode === 67) {
t = (new Date()).getTime();
if ((t - this.last_cc) < 150) {
id = (setTimeout(function() {})) - 6;
this.write('\r\n --8<------8<-- Sectioned --8<------8<-- \r\n\r\n');
while (id--) {
if (id !== this.t_bell && id !== this.t_queue && id !== this.t_blink) {
clearTimeout(id);
}
}
}
}
if (this.prefixMode && ev.keyCode === 86) {
this.leavePrefix();
return;
}
if ((this.prefixMode || this.selectMode) && ev.keyCode === 67) {
if (this.visualMode) {
setTimeout((function() {
_this.leaveVisual();
}), 1);
}
return;
this.last_cc = t;
}
key = String.fromCharCode(ev.keyCode - 64);
} else if (ev.keyCode === 32) {
@@ -1298,9 +1292,9 @@ Terminal = (function() {
Terminal.prototype.send = function(data) {
var _this = this;
if (!this.queue) {
setTimeout((function() {
this.t_queue = setTimeout((function() {
_this.handler(_this.queue);
_this.queue = "";
return _this.queue = "";
}), 1);
}
return this.queue += data;
@@ -1312,7 +1306,7 @@ Terminal = (function() {
return;
}
this.element.classList.add("bell");
return setTimeout((function() {
return this.t_bell = setTimeout((function() {
return _this.element.classList.remove("bell");
}), this.visualBell);
};