use a color palette sorta from tango

diff --git a/index.html b/index.html
index 6fb1473..718479e 100644 (file)
--- a/index.html
+++ b/index.html
@@ -6,14 +6,23 @@
        <script src="/socket.io/socket.io.js"></script>
        <script>
                $(function() {
+                       var palette = [
+                               '2e3436',
+                               'a40000',
+                               '4e9a06',
+                               'c4a000',
+                               '3465a4',
+                               '75507b',
+                               'ce5c00',
+                               'babdb6',
+                       ];
                        var $body = $('body');
                        var socket = io.connect('http://localhost');
                        var color_to_css = function(i) {
-                               return 'color: #' +
-                                       ((i & 0xe0) ? 'ff' : '00') +
-                                       ((i & 0x1c) ? 'ff' : '00') +
-                                       ((i & 0x03) ? 'ff' : '00') +
-                                       '; ';
+                               return 'color: #' + palette[i] + '; ';
+                       }
+                       var bg_color_to_css = function(i) {
+                               return 'background-' + color_to_css(i);
                        }
                        var stylize = function (txt, style) {
                                if(txt.length == 0 || style == 0) {
@@ -25,7 +34,7 @@
                                if(style & 0x40000) css += 'text-decoration: underline; '; // blink
                                if(style & 0x80000) css += 'text-decoration: line-through; '; // invisible
                                if(style & 0x000ff) css += color_to_css(style & 0xff);
-                               if(style & 0x0ff00) css += 'background-' + color_to_css((style & 0xff00) >> 8);
+                               if(style & 0x0ff00) css += bg_color_to_css((style & 0xff00) >> 8);
                                return $('<span style="'+css+'"></span>').text(txt);
                        }
                        socket.on('init', function (v) {
@@ -54,8 +63,8 @@
        </script>
        <style>
                body {
-                       color: white;
-                       background: black;
+                       color: #babdb6;
+                       background: #2e3436;
                        font-family: monospace;
                        font-size: 12px;
                        line-height: 14px;

diff --git a/terminal.coffee b/terminal.coffee
index 42732f4..34c7515 100644 (file)
--- a/terminal.coffee
+++ b/terminal.coffee
@@ -127,38 +127,40 @@ class Terminal
                                        @set_attribute_bits 0x80000, 0
 
                                when '30' # fg black
-                                       @set_attribute_bits 0xff, 0
+                                       @set_attribute_bits 0xff, 0x00
                                when '31' # fg red
-                                       @set_attribute_bits 0xff, 0xe0
+                                       @set_attribute_bits 0xff, 0x01
                                when '32' # fg green
-                                       @set_attribute_bits 0xff, 0x1c
+                                       @set_attribute_bits 0xff, 0x02
                                when '33' # fg yellow
-                                       @set_attribute_bits 0xff, 0xfc
-                               when '34' # fg blue
                                        @set_attribute_bits 0xff, 0x03
+                               when '34' # fg blue
+                                       @set_attribute_bits 0xff, 0x04
                                when '35' # fg magenta
-                                       @set_attribute_bits 0xff, 0xe2
+                                       @set_attribute_bits 0xff, 0x05
                                when '36' # fg cyan
-                                       @set_attribute_bits 0xff, 0x1f
+                                       @set_attribute_bits 0xff, 0x06
                                when '37', '39' # fg white  (39 is default)
-                                       @set_attribute_bits 0xff, 0xff
+                                       @set_attribute_bits 0xff, 0x07
 
                                when '40' # bg black
-                                       @set_attribute_bits 0xff00, 0
+                                       @set_attribute_bits 0xff00, 0x0000
                                when '41' # bg red
-                                       @set_attribute_bits 0xff00, 0xe000
+                                       @set_attribute_bits 0xff00, 0x0100
                                when '42' # bg green
-                                       @set_attribute_bits 0xff00, 0x1c00
+                                       @set_attribute_bits 0xff00, 0x0200
                                when '43' # bg yellow
-                                       @set_attribute_bits 0xff00, 0xfc00
-                               when '44' # bg blue
                                        @set_attribute_bits 0xff00, 0x0300
+                               when '44' # bg blue
+                                       @set_attribute_bits 0xff00, 0x0400
                                when '45' # bg magenta
-                                       @set_attribute_bits 0xff00, 0xe200
+                                       @set_attribute_bits 0xff00, 0x0500
                                when '46' # bg cyan
-                                       @set_attribute_bits 0xff00, 0x1f00
-                               when '47', '49' # bg white  (49 is default)
-                                       @set_attribute_bits 0xff00, 0xff
+                                       @set_attribute_bits 0xff00, 0x0600
+                               when '47' # bg white
+                                       @set_attribute_bits 0xff00, 0x0700
+                               when '49' # bg default
+                                       @set_attribute_bits 0xff00, 0x0000
 
                                else
                                        # if we don't recognize the style, go back to default