X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=terminal.coffee;h=0ba72f43bb28a8d1996ff6438640e258d6aeef0d;hb=39e9d94e9556527642a06b39b1d14e35c0533d23;hp=b66bf00898eb709ca84b1609310dc5aeaee72d2f;hpb=bd8f5b58663dd5870827c1d0dfa4f8eff8f6a5f0;p=watch-my-terminal.git diff --git a/terminal.coffee b/terminal.coffee index b66bf00..0ba72f4 100644 --- a/terminal.coffee +++ b/terminal.coffee @@ -18,6 +18,7 @@ class Terminal @y = 0 @a = 0x000007 # cursor attributes @partial = '' + @saved_normal_screen = null @resize width, height resize: (width, height) -> @@ -82,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 @@ -109,6 +112,54 @@ class Terminal else return deef_alt + # set cursor position (one based) + csi_H: (row, column) -> + # 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 + column = 0 + else if column >= @width + column = @width - 1 + if row < 0 + row = 0 + if row >= @height + row = @height - 1 + + #move the cursor + @x = column + @y = row + + # clear to screen edge(es) + csi_J: (direction) -> + switch @fix_esc_arg direction, '0' + when '0' # erase down + # rest of current line + @csi_K direction + # rest of lines + for row in [@y...@height] + for i in [0...@width] + @text[row][i] = ' ' + @attributes[row][i] = @a + when '1' # erase up + # beginning of current line + @csi_K direction + # all previous lines + for row in [0..@y] + for i in [0...@width] + @text[row][i] = ' ' + @attributes[row][i] = @a + when '2' # erase everything + for row in [0...@height] + for i in [0...@width] + @text[row][i] = ' ' + @attributes[row][i] = @a + else + console.log "confusing arg for csi_J: #{direction}" + return + # clear (some or all of) current line csi_K: (direction) -> switch @fix_esc_arg direction, '0' @@ -117,64 +168,94 @@ 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 '0' # erase whole line + when '2' # erase whole line for i in [0...@width] @text[@y][i] = ' ' @attributes[@y][i] = @a - - # 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}" + else + console.log "confusing arg for csi_K: #{direction}" + return + + # misc + csiq_h: -> + args = [] + for i in arguments + switch @fix_esc_arg i, '' + when '1049' + if @saved_normal_screen? + console.log "ignoring request to switch to the alt screen because we're already on the alt screen" + return + @saved_normal_screen = [@x, @y, @text, @attributes] + @text = [] + @attributes = [] + for y in [0...@height] + @text[y] = [] + @attributes[y] = [] + for x in [0...@width] + @text[y].push ' ' + @attributes[y].push 0 + # unmisc + csiq_l: -> + args = [] + for i in arguments + switch @fix_esc_arg i, '' + when '1049' + if not @saved_normal_screen? + console.log "ignoring request to switch to the normal screen because we're already on the normal screen" + return + @x = @saved_normal_screen[0] + @y = @saved_normal_screen[1] + @text = @saved_normal_screen[2] + @attributes = @saved_normal_screen[3] + @saved_normal_screen = null # set color, bold, underline, etc 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 = 0 # style attributes when '1' # bold - @set_attribute_bits 0x10000, 0x10000 + @set_attribute_bits 0x010000, 0x010000 + # FIXME add '3' for italic ('23' to turn it off) 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 + @set_attribute_bits 0x010000, 0 when '21' # ... though this would make more sense for "not bold" - @set_attribute_bits 0x10000, 0 + @set_attribute_bits 0x010000, 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 @@ -267,15 +348,19 @@ 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) update_sequence: (str) -> - command = @["csi_#{str.substr str.length - 1}"] + prefix = 'csi_' + if str[0] is '?' + prefix = 'csiq_' + str = str.substr 1 + command = @[prefix + str.substr(str.length - 1)] if not command? console.log "Unrecognized sequence: ESC[#{str}" return