X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=terminal.coffee;h=11c79e06fc5ddd5b2cbdb11756ec6717c5bd18ad;hb=0c0854b7eb687c20b5857c00665cbb9cd0673177;hp=34c75156359856245a1fa17253e94e1c64b5cc81;hpb=b7343be7e3013be9c5e5a794886337268408f581;p=watch-my-terminal.git diff --git a/terminal.coffee b/terminal.coffee index 34c7515..11c79e0 100644 --- a/terminal.coffee +++ b/terminal.coffee @@ -1,5 +1,11 @@ -async = require 'async' -fs = require 'fs' +# this file is used by the client and server. + +# work around lack of module system in the browser: +if exports? + my_exports = exports +else + window.terminal = {} + my_exports = window.terminal class Terminal # public: @@ -10,10 +16,10 @@ class Terminal @attributes = [] @x = 0 @y = 0 - @a = 0 # cursor attributes + @a = 0x000007 # cursor attributes @partial = '' @resize width, height - + resize: (width, height) -> # FIXME: write a version that retains some of the data @width = width @@ -44,12 +50,7 @@ class Terminal else @update_sequence_then_text parts[i] return - - clear_rest_of_line: -> - for i in [@x...@width] - @text[@y][i] = ' ' - @attributes[@y][i] = @a - + add_new_line: -> # clear top line for i in [0...@width] @@ -62,7 +63,7 @@ class Terminal @attributes.push(tmp) # slide cursor up with rest of text @y -= 1 - + wrap_to_next_line: -> if @y is @height - 1 @add_new_line() @@ -94,18 +95,66 @@ class Terminal if @x is @width @wrap_to_next_line() return - + set_attribute_bits: (mask, value) -> @a = (@a & ~mask) | value - csi_m: default: "0", go: -> + # we're supposed to ignore leeding zeros, and while we're at it, lets swap + # in the default for blank or missing values + fix_esc_arg: (value, deef_alt) -> + if value? and value != '' + while value[0] is '0' and value.length > 1 + value = value.substr 1 + return value + else + return deef_alt + + # 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 + if 0 <= column < @width + @x = column + else + console.log "tried to move cursor to invalid column: #{column}" + row -= 1 + if 0 <= row < @height + @y = row + else + console.log "tried to move cursor to invalid row: #{row}" + + # clear (some or all of) current line + csi_K: (direction) -> + switch @fix_esc_arg direction, '0' + when '0' # erase to right + for i in [@x...@width] + @text[@y][i] = ' ' + @attributes[@y][i] = @a + when '1' # erase to left + for i in [0...@x] + @text[@y][i] = ' ' + @attributes[@y][i] = @a + when '0' # erase whole line + for i in [0...@width] + @text[@y][i] = ' ' + @attributes[@y][i] = @a + + # set color, bold, underline, etc + csi_m: -> + args = [] for i in arguments - fixed = i - while fixed[0] is '0' - fixed = fixed.substr 1 - switch fixed - when '' - @set_attribute_bits 0xffffff, 0 + args.push @fix_esc_arg i, 0 + + while args.length > 0 + switch args.shift() + + # remove all style/color + when '0' + @set_attribute_bits 0xffffff, 0x000007 + + # style attributes when '1' # bold @set_attribute_bits 0x10000, 0x10000 when '4' # underline @@ -114,7 +163,8 @@ class Terminal @set_attribute_bits 0x40000, 0x40000 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" @@ -126,6 +176,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 @@ -143,6 +197,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 @@ -162,6 +224,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 @@ -170,12 +276,11 @@ class Terminal # str is the whole escape sequence (minus the esc[ prefix) update_sequence: (str) -> command = @["csi_#{str.substr str.length - 1}"] - return unless command? + if not command? + console.log "Unrecognized sequence: ESC[#{str}" + return args = str.substr(0, str.length - 1).split ';' - for i in [0...args.length] - if args[i] is '' - args[i] = command.default - command.go.call this, args... + command.call this, args... update_sequence_then_text: (str) -> len = @escape_sequence_length str @@ -191,5 +296,5 @@ class Terminal return -1 unless parts? return parts[0].length -exports.new = (width, height) -> +my_exports.new = (width, height) -> return new Terminal width, height