X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=terminal.coffee;h=174c005bc4ffe1a705e0cf0d575c072af263c87a;hb=5ea471be49d98517725f2017d274c030ac482111;hp=4aa522c924649cd8b29db97aeb423d98379060d3;hpb=76783fcb11598fc03ae5cc8381bb4df5811f7ffd;p=watch-my-terminal.git diff --git a/terminal.coffee b/terminal.coffee index 4aa522c..174c005 100644 --- a/terminal.coffee +++ b/terminal.coffee @@ -7,6 +7,11 @@ else window.terminal = {} my_exports = window.terminal +if console?.log? + log = -> console.log arguments... +else + log = -> null + class Terminal # public: constructor: (width, height) -> @@ -44,16 +49,15 @@ class Terminal if @partial.length > 0 data = @partial + data @partial = '' - parts = data.split(/\x1b\[/) + parts = data.split(/\x1b/) if parts.length > 1 if -1 is @escape_sequence_length parts[parts.length - 1] @partial = parts.pop() - if parts.length > 0 - for i in [0...parts.length] - if i is 0 - @update_text parts[i] - else - @update_sequence_then_text parts[i] + for i in [0...parts.length] + if i is 0 + @update_text parts[i] + else + @update_sequence_then_text parts[i] return add_new_line: -> @@ -62,19 +66,15 @@ class Terminal @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 - ] + rearrange = (a) => + return [ + a[0...@scroll_top]..., # up to but not including scroll top + a[@scroll_top + 1 .. @scroll_bottom]..., # scroll region except top line of it + a[@scroll_top], # top line of scroll region (already cleared) + a[@scroll_bottom + 1 ... @height]... # rest of screen + ] + @text = rearrange @text + @attributes = rearrange @attributes # slide cursor up with rest of text @y -= 1 @@ -206,7 +206,7 @@ class Terminal @text[row][i] = ' ' @attributes[row][i] = @a else - console.log "confusing arg for csi_J: #{direction}" + log "confusing arg for csi_J: #{direction}" return # clear (some or all of) current line @@ -230,26 +230,22 @@ class Terminal @text[@y][i] = ' ' @attributes[@y][i] = @a else - console.log "confusing arg for csi_K: #{direction}" + log "confusing arg for csi_K: #{direction}" return - + # move lines downwards (arg is how far) csi_L: (lines) -> lines = parseInt @fix_esc_arg lines, '1' - # move (newly cleared) top line to the bottom of the scrolling region - @text = [ - @text[0...@y]..., # keep everything above cursor - @text[@scroll_bottom - lines + 1 .. @scroll_bottom]..., # we'll clear these shortly - @text[@y..@scroll_bottom - lines]..., # lines that are moving down - @text[@scroll_bottom + 1 ... @height]... # rest of screen - ] - @attributes = [ - @attributes[0...@y]..., # keep everything above cursor - @attributes[@scroll_bottom - lines + 1 .. @scroll_bottom]..., # we'll clear these shortly - @attributes[@y..@scroll_bottom - lines]..., # lines that are moving down - @attributes[@scroll_bottom + 1 ... @height]... # rest of screen - ] + rearrange = (a) => + return [ + a[0...@y]..., # keep everything above cursor + a[@scroll_bottom - lines + 1 .. @scroll_bottom]..., # we'll clear these shortly + a[@y..@scroll_bottom - lines]..., # lines that are moving down + a[@scroll_bottom + 1 ... @height]... # rest of screen + ] + @text = rearrange @text + @attributes = rearrange @attributes # clear the lines we scrolled off (and put back in as "new") for y in [@y...@y+lines] @@ -257,6 +253,27 @@ class Terminal @text[y][x] = ' ' @attributes[y][x] = 0x07 + # move lines upwards (arg is how far) + # this obliterates the line under the cursor and arg-1 following it + csi_M: (lines) -> + lines = parseInt @fix_esc_arg lines, '1' + + rearrange = (a) => + return [ + a[0 ... @y]..., # keep everything above cursor + a[@y + lines .. @scroll_bottom]..., # lines we're moving up + a[@y ... @y + lines]..., # recycle these + a[@scroll_bottom + 1 ... @height]... # keep the rest + ] + @text = rearrange @text + @attributes = rearrange @attributes + + # clear the lines we're recycling + for y in [@scroll_bottom - lines + 1 .. @scroll_bottom] + for x in [0...@width] + @text[y][x] = ' ' + @attributes[y][x] = 0x07 + # misc csiq_h: -> args = [] @@ -267,9 +284,9 @@ class Terminal @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" + 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] + @saved_normal_screen = x: @x, y: @y, text: @text, attributes: @attributes @text = [] @attributes = [] for y in [0...@height] @@ -279,7 +296,7 @@ class Terminal @text[y].push ' ' @attributes[y].push 0x07 else - console.log "confusing arg for csiq_h: #{arg}" + log "confusing arg for csiq_h: #{arg}" return # unmisc @@ -292,15 +309,15 @@ class Terminal @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" + 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] + @x = @saved_normal_screen.x + @y = @saved_normal_screen.y + @text = @saved_normal_screen.text + @attributes = @saved_normal_screen.attributes @saved_normal_screen = null else - console.log "confusing arg for csiq_l: #{arg}" + log "confusing arg for csiq_l: #{arg}" return # set color, bold, underline, etc @@ -439,11 +456,11 @@ class Terminal else # if we don't recognize the style, go back to default - console.log "unrecognized csi_m arg: \"#{arg}\"" + log "unrecognized csi_m arg: \"#{arg}\"" @a = 0 return - # set scrolling region + # set scroll region csi_r: (top, bottom) -> top = -1 + parseInt @fix_esc_arg top, '1' bottom = -1 + parseInt @fix_esc_arg bottom, '10000' @@ -455,32 +472,50 @@ class Terminal @scroll_bottom = bottom return + # move cursor up one line, if it's at the top, scroll everything down + esc_M: -> + if @y > 0 + @csi_A '1' + else + @csi_L '1' + # str is the whole escape sequence (minus the esc[ prefix) update_sequence: (str) -> - prefix = 'csi_' - if str[0] is '?' - prefix = 'csiq_' - str = str.substr 1 + if str[0] is '[' + prefix = 'csi_' + if str[1] is '?' + prefix = 'csiq_' + str = str.substr 1 + args = str.substr(1, str.length - 2).split ';' + else + prefix = 'esc_' + args = [str.substr(0, str.length - 1)] command = @[prefix + str.substr(str.length - 1)] if not command? - console.log "Unrecognized sequence: ESC[#{str}" + log "Unrecognized sequence: ESC[#{str}" return - args = str.substr(0, str.length - 1).split ';' command.call this, args... update_sequence_then_text: (str) -> len = @escape_sequence_length str if len is -1 - console.log "couldn't find escape sequence here: #{str.substr 0, 25}" - @update_text "ESC[" + str + log "couldn't find escape sequence here: #{str.substr 0, 25}" + @update_text "ESC" + str else @update_sequence str.substr 0, len @update_text str.substr len escape_sequence_length: (str) -> - parts = str.match(/^[0-9;?]{0,25}./) - return -1 unless parts? - return parts[0].length + if str[0] is '[' + parts = str.match(/^\[[0-9;?]{0,25}./) + return -1 unless parts? + return parts[0].length + else + log "non[: ESC#{str.substr 0, 10}" + if str.length >= 1 + return 1 + else + return -1 my_exports.new = (width, height) -> return new Terminal width, height