Got questions, comments, patches, etc.?
Contact Jason Woofenden
gitweb
/
watch-my-terminal.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
db9a0f3
)
esc_* support, implement esc_M
author
Jason Woofenden
<jason@jasonwoof.com>
Fri, 1 Feb 2013 02:56:19 +0000
(21:56 -0500)
committer
Jason Woofenden
<jason@jasonwoof.com>
Fri, 1 Feb 2013 02:56:19 +0000
(21:56 -0500)
terminal.coffee
patch
|
blob
|
history
diff --git
a/terminal.coffee
b/terminal.coffee
index
8e87bb6
..
8b7879b
100644
(file)
--- a/
terminal.coffee
+++ b/
terminal.coffee
@@
-49,16
+49,15
@@
class Terminal
if @partial.length > 0
data = @partial + data
@partial = ''
if @partial.length > 0
data = @partial + data
@partial = ''
- parts = data.split(/\x1b\[/)
+ parts = data.split(/\x1b/)
if parts.length > 1
if -1 is @escape_sequence_length parts[parts.length - 1]
@partial = parts.pop()
if parts.length > 1
if -1 is @escape_sequence_length parts[parts.length - 1]
@partial = parts.pop()
- if parts.length > 0
- for i in [0...parts.length]
- if i is 0
- @update_text parts[i]
- else
- @update_sequence_then_text parts[i]
+ for i in [0...parts.length]
+ if i is 0
+ @update_text parts[i]
+ else
+ @update_sequence_then_text parts[i]
return
add_new_line: ->
return
add_new_line: ->
@@
-233,7
+232,7
@@
class Terminal
else
log "confusing arg for csi_K: #{direction}"
return
else
log "confusing arg for csi_K: #{direction}"
return
-
+
# move lines downwards (arg is how far)
csi_L: (lines) ->
lines = parseInt @fix_esc_arg lines, '1'
# move lines downwards (arg is how far)
csi_L: (lines) ->
lines = parseInt @fix_esc_arg lines, '1'
@@
-473,32
+472,50
@@
class Terminal
@scroll_bottom = bottom
return
@scroll_bottom = bottom
return
+ # move cursor up one line, if it's at the top, scroll everything down
+ esc_M: ->
+ if @y > 0
+ @csi_A '1'
+ else
+ @csi_L '1'
+
# str is the whole escape sequence (minus the esc[ prefix)
update_sequence: (str) ->
# str is the whole escape sequence (minus the esc[ prefix)
update_sequence: (str) ->
- prefix = 'csi_'
- if str[0] is '?'
- prefix = 'csiq_'
- str = str.substr 1
+ if str[0] is '['
+ prefix = 'csi_'
+ if str[1] is '?'
+ prefix = 'csiq_'
+ str = str.substr 1
+ args = str.substr(1, str.length - 2).split ';'
+ else
+ prefix = 'esc_'
+ args = [str.substr(0, str.length - 1)]
command = @[prefix + str.substr(str.length - 1)]
if not command?
log "Unrecognized sequence: ESC[#{str}"
return
command = @[prefix + str.substr(str.length - 1)]
if not command?
log "Unrecognized sequence: ESC[#{str}"
return
- args = str.substr(0, str.length - 1).split ';'
command.call this, args...
update_sequence_then_text: (str) ->
len = @escape_sequence_length str
if len is -1
log "couldn't find escape sequence here: #{str.substr 0, 25}"
command.call this, args...
update_sequence_then_text: (str) ->
len = @escape_sequence_length str
if len is -1
log "couldn't find escape sequence here: #{str.substr 0, 25}"
- @update_text "ESC[" + str
+ @update_text "ESC" + str
else
@update_sequence str.substr 0, len
@update_text str.substr len
escape_sequence_length: (str) ->
else
@update_sequence str.substr 0, len
@update_text str.substr len
escape_sequence_length: (str) ->
- parts = str.match(/^[0-9;?]{0,25}./)
- return -1 unless parts?
- return parts[0].length
+ if str[0] is '['
+ parts = str.match(/^\[[0-9;?]{0,25}./)
+ return -1 unless parts?
+ return parts[0].length
+ else
+ log "non[: ESC#{str.substr 0, 10}"
+ if str.length >= 1
+ return 1
+ else
+ return -1
my_exports.new = (width, height) ->
return new Terminal width, height
my_exports.new = (width, height) ->
return new Terminal width, height