fix ESC[0m, implement italic, render invisible

[watch-my-terminal.git] / terminal.coffee

diff --git a/terminal.coffee b/terminal.coffee
index 751a53a..d6838da 100644 (file)
--- a/terminal.coffee
+++ b/terminal.coffee
@@ -83,22 +83,24 @@ class Terminal
                                when '\x0d' # cr
                                        @x = 0
                                when '\x08' # backspace
-                                       if @x > 0
+                                       if @x is 0
+                                               @x = @width - 1
+                                               if @y > 0
+                                                       @y -= 1
+                                       else
                                                @x -= 1
-                                               @text[@y][@x] = ' '
-                                               # should this set the attribute too?
                                when '\x0a', '\x0b' # lf, vertical tab (same thing)
                                        @wrap_to_next_line()
                                else
+                                       if @x >= @width
+                                               @wrap_to_next_line()
                                        @text[@y][@x] = c
                                        @attributes[@y][@x] = @a
                                        @x += 1
-                                       if @x is @width
-                                               @wrap_to_next_line()
                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
@@ -112,11 +114,9 @@ class Terminal
 
        # 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
@@ -158,6 +158,7 @@ class Terminal
                                                @attributes[row][i] = @a
                        else
                                console.log "confusing arg for csi_J: #{direction}"
+               return
 
        # clear (some or all of) current line
        csi_K: (direction) ->
@@ -167,7 +168,12 @@ class Terminal
                                        @text[@y][i] = ' '
                                        @attributes[@y][i] = @a
                        when '1' # erase to left
-                               for i in [0..@x]
+                               # @x can equal @width (after printing to right-most column)
+                               if @x < @width
+                                       max = @x
+                               else
+                                       max = @width - 1
+                               for i in [0..max]
                                        @text[@y][i] = ' '
                                        @attributes[@y][i] = @a
                        when '2' # erase whole line
@@ -176,6 +182,7 @@ class Terminal
                                        @attributes[@y][i] = @a
                        else
                                console.log "confusing arg for csi_K: #{direction}"
+               return
        
        # misc
        csiq_h: ->
@@ -214,36 +221,44 @@ class Terminal
        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
-                       switch args.shift()
-
+                       arg = args.shift()
+                       switch arg
                                # remove all style/color
                                when '0'
-                                       @set_attribute_bits 0xffffff, 0x000007
+                                       @a = 0x07
 
                                # style attributes
                                when '1' # bold
-                                       @set_attribute_bits 0x10000, 0x10000
+                                       @set_attribute_bits 0x010000, 0x010000
+                               when '3' # italic (rare)
+                                       @set_attribute_bits 0x200000, 0x200000
                                when '4' # underline
-                                       @set_attribute_bits 0x20000, 0x20000
+                                       @set_attribute_bits 0x020000, 0x020000
                                when '5' # blink
-                                       @set_attribute_bits 0x40000, 0x40000
+                                       @set_attribute_bits 0x040000, 0x040000
+                               when '7' # inverse
+                                       @set_attribute_bits 0x080000, 0x080000
                                when '8' # invisible
-                                       @set_attribute_bits 0x80000, 0x80000
+                                       @set_attribute_bits 0x100000, 0x100000
 
                                # disable style attributes
-                               when '22' # not bold... according to a page
-                                       @set_attribute_bits 0x10000, 0
-                               when '21' # ... though this would make more sense for "not bold"
-                                       @set_attribute_bits 0x10000, 0
+                               when '21' # not bold (rare)
+                                       @set_attribute_bits 0x010000, 0
+                               when '22' # not bold
+                                       @set_attribute_bits 0x010000, 0
+                               when '23' # not italic (rare)
+                                       @set_attribute_bits 0x200000, 0
                                when '24' # not underline
-                                       @set_attribute_bits 0x20000, 0
+                                       @set_attribute_bits 0x020000, 0
                                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
-                                       @set_attribute_bits 0x80000, 0
+                                       @set_attribute_bits 0x100000, 0
 
                                when '100' # reset colors but not other attributes
                                        @set_attribute_bits 0xffff, 0x0007
@@ -336,10 +351,10 @@ class Terminal
                                when '107' # bg bright white
                                        @set_attribute_bits 0xff, 0x0f
 
-
                                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)