Got questions, comments, patches, etc.?
Contact Jason Woofenden
gitweb
/
watch-my-terminal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
parse and render inverse attribute
[watch-my-terminal.git]
/
terminal.coffee
diff --git
a/terminal.coffee
b/terminal.coffee
index
913d874
..
0ba72f4
100644
(file)
--- a/
terminal.coffee
+++ b/
terminal.coffee
@@
-100,7
+100,7
@@
class Terminal
return
set_attribute_bits: (mask, value) ->
return
set_attribute_bits: (mask, value) ->
- @a = (@a & ~mask) | value
+ @a = ((@a & ~mask) | value)
# we're supposed to ignore leeding zeros, and while we're at it, lets swap
# in the default for blank or missing values
# we're supposed to ignore leeding zeros, and while we're at it, lets swap
# in the default for blank or missing values
@@
-114,11
+114,9
@@
class Terminal
# set cursor position (one based)
csi_H: (row, column) ->
# set cursor position (one based)
csi_H: (row, column) ->
- row = 0 + @fix_esc_arg row, 1
- column = 0 + @fix_esc_arg column, 1
-
- # convert to 0 base
- column -= 1
+ # handle blank/missing args and convert to 0 base
+ row = @fix_esc_arg(row, 1) - 1
+ column = @fix_esc_arg(column, 1) - 1
#clamp values
if column < 0
#clamp values
if column < 0
@@
-160,6
+158,7
@@
class Terminal
@attributes[row][i] = @a
else
console.log "confusing arg for csi_J: #{direction}"
@attributes[row][i] = @a
else
console.log "confusing arg for csi_J: #{direction}"
+ return
# clear (some or all of) current line
csi_K: (direction) ->
# clear (some or all of) current line
csi_K: (direction) ->
@@
-183,6
+182,7
@@
class Terminal
@attributes[@y][i] = @a
else
console.log "confusing arg for csi_K: #{direction}"
@attributes[@y][i] = @a
else
console.log "confusing arg for csi_K: #{direction}"
+ return
# misc
csiq_h: ->
# misc
csiq_h: ->
@@
-221,36
+221,41
@@
class Terminal
csi_m: ->
args = []
for i in arguments
csi_m: ->
args = []
for i in arguments
- args.push @fix_esc_arg i, 0
+ args.push @fix_esc_arg i, '0'
while args.length > 0
while args.length > 0
- switch args.shift()
-
+ arg = args.shift()
+ switch arg
# remove all style/color
when '0'
# remove all style/color
when '0'
- @set_attribute_bits 0xffffff, 0x000007
+ @a = 0
# style attributes
when '1' # bold
# style attributes
when '1' # bold
- @set_attribute_bits 0x10000, 0x10000
+ @set_attribute_bits 0x010000, 0x010000
+ # FIXME add '3' for italic ('23' to turn it off)
when '4' # underline
when '4' # underline
- @set_attribute_bits 0x20000, 0x20000
+ @set_attribute_bits 0x020000, 0x020000
when '5' # blink
when '5' # blink
- @set_attribute_bits 0x40000, 0x40000
+ @set_attribute_bits 0x040000, 0x040000
+ when '7' # inverse
+ @set_attribute_bits 0x080000, 0x080000
when '8' # invisible
when '8' # invisible
- @set_attribute_bits 0x80000, 0x80000
+ @set_attribute_bits 0x100000, 0x100000
# disable style attributes
when '22' # not bold... according to a page
# disable style attributes
when '22' # not bold... according to a page
- @set_attribute_bits 0x10000, 0
+ @set_attribute_bits 0x010000, 0
when '21' # ... though this would make more sense for "not bold"
when '21' # ... though this would make more sense for "not bold"
- @set_attribute_bits 0x10000, 0
+ @set_attribute_bits 0x010000, 0
when '24' # not underline
when '24' # not underline
- @set_attribute_bits 0x20000, 0
+ @set_attribute_bits 0x020000, 0
when '25' # not blink
when '25' # not blink
- @set_attribute_bits 0x40000, 0
+ @set_attribute_bits 0x040000, 0
+ when '27' # not inverse
+ @set_attribute_bits 0x080000, 0
when '28' # not invisible
when '28' # not invisible
- @set_attribute_bits 0x80000, 0
+ @set_attribute_bits 0x100000, 0
when '100' # reset colors but not other attributes
@set_attribute_bits 0xffff, 0x0007
when '100' # reset colors but not other attributes
@set_attribute_bits 0xffff, 0x0007
@@
-343,10
+348,10
@@
class Terminal
when '107' # bg bright white
@set_attribute_bits 0xff, 0x0f
when '107' # bg bright white
@set_attribute_bits 0xff, 0x0f
-
else
# if we don't recognize the style, go back to default
else
# if we don't recognize the style, go back to default
- @set_attribute_bits 0xffffff, 0
+ console.log "unrecognized csi_m arg: \"#{arg}\""
+ @a = 0
return
# str is the whole escape sequence (minus the esc[ prefix)
return
# str is the whole escape sequence (minus the esc[ prefix)