From: Jason Woofenden Date: Wed, 30 Jan 2013 22:13:24 +0000 (-0500) Subject: stop pretending what fg white is 0 X-Git-Tag: v1.0~36 X-Git-Url: https://jasonwoof.com/gitweb/?p=watch-my-terminal.git;a=commitdiff_plain;h=99c236235ea97b892efd200506f7c20463a5be46 stop pretending what fg white is 0 --- diff --git a/index.html b/index.html index 738d7d7..a7f1978 100644 --- a/index.html +++ b/index.html @@ -283,7 +283,7 @@ return 'background-' + color_to_css((i&0x10000) | ((i&0xff00) >> 8)); }; var stylize = function (txt, style) { - if (txt.length == 0 || style == 0) { + if (txt.length == 0 || style == 0x000007) { return txt } css = '' @@ -302,7 +302,7 @@ for (i in term.text) { div = $('
'); txt = '' - a = 0; + a = 0x000007; for (j in term.text[i]) { if (term.attributes[i][j] != a) { if (txt.length) { diff --git a/terminal.coffee b/terminal.coffee index 7f80a76..e9cf540 100644 --- 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 @@ -113,7 +113,7 @@ class Terminal # remove all style/color when '' # leading zeros are removed (even if that's all of them) - @set_attribute_bits 0xffffff, 0 + @set_attribute_bits 0xffffff, 0x000007 # style attributes when '1' # bold @@ -137,6 +137,9 @@ 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