X-Git-Url: https://jasonwoof.com/gitweb/?p=watch-my-terminal.git;a=blobdiff_plain;f=terminal.coffee;h=721ed80dc4b9b3af49cc6bb423229023a71566a6;hp=3c8c9a9a317c01ab525d09982ec7358e2df9e916;hb=f864b5a4731e5ab5148b5fe20533e71691cf6955;hpb=f98881c2a5954799212ae89965f0886b7c2ad217 diff --git a/terminal.coffee b/terminal.coffee index 3c8c9a9..721ed80 100644 --- a/terminal.coffee +++ b/terminal.coffee @@ -19,10 +19,14 @@ class Terminal @a = 0x000007 # cursor attributes @partial = '' @saved_normal_screen = null + @cursor_visible = true + @scroll_top = 0 + @scroll_bottom = height - 1 @resize width, height resize: (width, height) -> # FIXME: write a version that retains some of the data + # FIXME: clamp variables (eg x, y, saved.*, scrolling region) if getting smaller @width = width @height = height @text = [] @@ -32,7 +36,7 @@ class Terminal @attributes[y] = [] for x in [0...width] @text[y].push ' ' - @attributes[y].push 0 + @attributes[y].push 0x07 # pass data from stdout update: (data) -> @@ -53,20 +57,30 @@ class Terminal return add_new_line: -> - # clear top line + # clear the line at the top of the scrolling region for i in [0...@width] - @text[0][i] = ' ' - @attributes[0][i] = 0 - # move (newly cleared) top line to the bottom - tmp = @text.shift() - @text.push(tmp) - tmp = @attributes.shift() - @attributes.push(tmp) + @text[@scroll_top][i] = ' ' + @attributes[@scroll_top][i] = 0x07 + + # move (newly cleared) top line to the bottom of the scrolling region + @text = [ + @text[0...@scroll_top]..., # up to but not including scroll top + @text[@scroll_top + 1 .. @scroll_bottom]..., # scroll region except top line of it + @text[@scroll_top], # top line of scroll region (already cleared) + @text[@scroll_bottom + 1 ... @height]... # rest of screen + ] + @attributes = [ + @attributes[0...@scroll_top]..., # up to but not including scroll top + @attributes[@scroll_top + 1 .. @scroll_bottom]..., # scroll region except top line of it + @attributes[@scroll_top], # top line of scroll region (already cleared) + @attributes[@scroll_bottom + 1 ... @height]... # rest of screen + ] + # slide cursor up with rest of text @y -= 1 wrap_to_next_line: -> - if @y is @height - 1 + if @y is @scroll_bottom @add_new_line() @y += 1 @x = 0 @@ -83,22 +97,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 @@ -110,13 +126,45 @@ 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 + return + + # move cursor down + csi_B: (lines) -> + lines = parseInt @fix_esc_arg lines, '1' + @y += lines + if @y >= @height + @y = @height - 1 + return + + # move cursor right + csi_C: (cols) -> + cols = parseInt @fix_esc_arg cols, '1' + @x += cols + if @x >= @width + @x = @width - 1 + return + + # move cursor left + csi_D: (cols) -> + cols = parseInt @fix_esc_arg cols, '1' + @x -= cols + if @x < 0 + @x = 0 + return + # 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 @@ -131,16 +179,23 @@ class Terminal #move the cursor @x = column @y = row + return - # clear lines (implemented inclusive of the current line) + # 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] = ' ' @@ -152,6 +207,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) -> @@ -161,7 +217,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 @@ -170,12 +231,16 @@ 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 '25' + @cursor_visible = true when '1049' if @saved_normal_screen? console.log "ignoring request to switch to the alt screen because we're already on the alt screen" @@ -188,12 +253,19 @@ class Terminal @attributes[y] = [] for x in [0...@width] @text[y].push ' ' - @attributes[y].push 0 + @attributes[y].push 0x07 + else + console.log "confusing arg for csiq_h: #{arg}" + return + # unmisc csiq_l: -> args = [] for i in arguments - switch @fix_esc_arg i, '' + arg = @fix_esc_arg i, '' + switch arg + when '25' + @cursor_visible = false 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" @@ -203,41 +275,52 @@ 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}" + return # 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 @@ -330,10 +413,22 @@ 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 + + # set scrolling region + csi_r: (top, bottom) -> + top = -1 + parseInt @fix_esc_arg top, '1' + bottom = -1 + parseInt @fix_esc_arg bottom, '10000' + if top < 0 + top = 0 + if bottom >= @height + bottom = @height - 1 + @scroll_top = top + @scroll_bottom = bottom return # str is the whole escape sequence (minus the esc[ prefix)