X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=terminal.coffee;h=12d8a74a3fdc8d7c8571b5fbd326eecac2663ceb;hb=5a99a6ff19d3eed9231a9820bcd76bb824eb6d32;hp=37d3971b4fba9f787c9169b92bfae71d9d85e5a3;hpb=d9b7866716ffba8f58845b7b864d8a0ee1c3d4b1;p=watch-my-terminal.git diff --git a/terminal.coffee b/terminal.coffee index 37d3971..12d8a74 100644 --- a/terminal.coffee +++ b/terminal.coffee @@ -92,15 +92,15 @@ class Terminal 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 @@ -112,13 +112,41 @@ class Terminal else return deef_alt + # csi_@: rxvt does nothing I can detect + + # move cursor up + csi_A: (lines) -> + lines = parseInt @fix_esc_arg lines, '1' + @y -= lines + if @y < 0 + @y = 0 + + # move cursor down + csi_B: (lines) -> + lines = parseInt @fix_esc_arg lines, '1' + @y += lines + if @y >= @height + @y = @height - 1 + + # move cursor right + csi_C: (cols) -> + cols = parseInt @fix_esc_arg cols, '1' + @x += cols + if @x >= @width + @x = @width - 1 + + # move cursor left + csi_D: (cols) -> + cols = parseInt @fix_esc_arg cols, '1' + @x -= cols + if @x < 0 + @x = 0 + # 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 + # handle blank/missing args and convert to 0 base + row = -1 + parseInt @fix_esc_arg row, '1' + column = -1 + parseInt @fix_esc_arg column, '1' #clamp values if column < 0 @@ -160,6 +188,7 @@ class Terminal @attributes[row][i] = @a else console.log "confusing arg for csi_J: #{direction}" + return # clear (some or all of) current line csi_K: (direction) -> @@ -169,7 +198,12 @@ 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 '2' # erase whole line @@ -178,12 +212,14 @@ class Terminal @attributes[@y][i] = @a else console.log "confusing arg for csi_K: #{direction}" + return # misc csiq_h: -> args = [] for i in arguments - switch @fix_esc_arg i, '' + arg = @fix_esc_arg i, '' + switch arg when '1049' if @saved_normal_screen? console.log "ignoring request to switch to the alt screen because we're already on the alt screen" @@ -197,11 +233,14 @@ class Terminal for x in [0...@width] @text[y].push ' ' @attributes[y].push 0 + else + console.log "confusing arg for csiq_h: #{arg}" # unmisc csiq_l: -> args = [] for i in arguments - switch @fix_esc_arg i, '' + arg = @fix_esc_arg i, '' + switch arg 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" @@ -211,41 +250,51 @@ class Terminal @text = @saved_normal_screen[2] @attributes = @saved_normal_screen[3] @saved_normal_screen = null + else + console.log "confusing arg for csiq_l: #{arg}" # 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 = 0x07 # style attributes when '1' # bold - @set_attribute_bits 0x10000, 0x10000 + @set_attribute_bits 0x010000, 0x010000 + when '3' # italic (rare) + @set_attribute_bits 0x200000, 0x200000 when '4' # underline - @set_attribute_bits 0x20000, 0x20000 + @set_attribute_bits 0x020000, 0x020000 when '5' # blink - @set_attribute_bits 0x40000, 0x40000 - when '8' # invisible - @set_attribute_bits 0x80000, 0x80000 + @set_attribute_bits 0x040000, 0x040000 + when '7' # inverse + @set_attribute_bits 0x080000, 0x080000 + when '8' # invisible. urivt ignores this + @set_attribute_bits 0x100000, 0x100000 # 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" - @set_attribute_bits 0x10000, 0 + when '21' # not bold (rare) + @set_attribute_bits 0x010000, 0 + when '22' # not bold + @set_attribute_bits 0x010000, 0 + when '23' # not italic (rare) + @set_attribute_bits 0x200000, 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 @@ -338,10 +387,10 @@ 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)