set default colors from palette

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

diff --git a/terminal.coffee b/terminal.coffee
index c7dbd7f..75afdc5 100644 (file)
--- a/terminal.coffee
+++ b/terminal.coffee
@@ -16,7 +16,7 @@ class Terminal
                @attributes = []
                @x = 0
                @y = 0
-               @a = 0 # cursor attributes
+               @a = 0x000007 # cursor attributes
                @partial = ''
                @resize width, height
        
@@ -105,13 +105,23 @@ class Terminal
                @a = (@a & ~mask) | value
 
        csi_m: default: "0", go: ->
+               args = []
                for i in arguments
-                       fixed = i
+                       args.push i
+
+               while args.length > 0
+                       fixed = args.shift()
                        while fixed[0] is '0'
                                fixed = fixed.substr 1
+                       if fixed is ''
+                               fixed = '0'
                        switch fixed
-                               when ''
-                                       @set_attribute_bits 0xffffff, 0
+
+                               # remove all style/color
+                               when '0'
+                                       @set_attribute_bits 0xffffff, 0x000007
+
+                               # style attributes
                                when '1' # bold
                                        @set_attribute_bits 0x10000, 0x10000
                                when '4' # underline
@@ -121,6 +131,7 @@ class Terminal
                                when '8' # invisible
                                        @set_attribute_bits 0x80000, 0x80000
                                
+                               # 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"
@@ -132,6 +143,10 @@ class Terminal
                                when '28' # not invisible
                                        @set_attribute_bits 0x80000, 0
 
+                               when '100' # reset colors but not other attributes
+                                       @set_attribute_bits 0xffff, 0x0007
+
+                               # 8 fg colors
                                when '30' # fg black
                                        @set_attribute_bits 0xff, 0x00
                                when '31' # fg red
@@ -149,6 +164,14 @@ class Terminal
                                when '37', '39' # fg white  (39 is default)
                                        @set_attribute_bits 0xff, 0x07
 
+                               when '38'
+                                       if args.length >= 2 and args[0] is '5'
+                                               args.shift()
+                                               @set_attribute_bits 0xff, (0xff & args.shift())
+                                       else
+                                               @set_attribute_bits 0x20000, 0x20000
+
+                               # 8 bg colors
                                when '40' # bg black
                                        @set_attribute_bits 0xff00, 0x0000
                                when '41' # bg red
@@ -168,6 +191,50 @@ class Terminal
                                when '49' # bg default
                                        @set_attribute_bits 0xff00, 0x0000
 
+                               when '48'
+                                       if args.length >= 2 and args[0] is '5'
+                                               args.shift()
+                                               @set_attribute_bits 0xff00, ((0xff & args.shift()) << 8)
+                                       else
+                                               @set_attribute_bits 0x20000, 0x20000
+
+                               # bright fg colors
+                               when '90' # fg bright black
+                                       @set_attribute_bits 0xff, 0x08
+                               when '91' # fg bright red
+                                       @set_attribute_bits 0xff, 0x09
+                               when '92' # fg bright green
+                                       @set_attribute_bits 0xff, 0x0a
+                               when '93' # fg bright yellow
+                                       @set_attribute_bits 0xff, 0x0b
+                               when '94' # fg bright blue
+                                       @set_attribute_bits 0xff, 0x0c
+                               when '95' # fg bright magenta
+                                       @set_attribute_bits 0xff, 0x0d
+                               when '96' # fg bright cyan
+                                       @set_attribute_bits 0xff, 0x0e
+                               when '97' # fg bright white
+                                       @set_attribute_bits 0xff, 0x0f
+
+                               # bright bg colors
+                               when '100' # bg bright black
+                                       @set_attribute_bits 0xff, 0x08
+                               when '101' # bg bright red
+                                       @set_attribute_bits 0xff, 0x09
+                               when '102' # bg bright green
+                                       @set_attribute_bits 0xff, 0x0a
+                               when '103' # bg bright yellow
+                                       @set_attribute_bits 0xff, 0x0b
+                               when '104' # bg bright blue
+                                       @set_attribute_bits 0xff, 0x0c
+                               when '105' # bg bright magenta
+                                       @set_attribute_bits 0xff, 0x0d
+                               when '106' # bg bright cyan
+                                       @set_attribute_bits 0xff, 0x0e
+                               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