bump version number to 1.0

[watch-my-terminal.git] / terminal.coffee

diff --git a/terminal.coffee b/terminal.coffee
index 8e87bb6..174c005 100644 (file)
--- a/terminal.coffee
+++ b/terminal.coffee
@@ -49,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: ->
@@ -233,7 +232,7 @@ class Terminal
                        else
                                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'
@@ -287,7 +286,7 @@ class Terminal
                                        if @saved_normal_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]
@@ -312,10 +311,10 @@ class Terminal
                                        if not @saved_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
                                        log "confusing arg for csiq_l: #{arg}"
@@ -461,7 +460,7 @@ class Terminal
                                        @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'
@@ -473,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?
                        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
                        log "couldn't find escape sequence here: #{str.substr 0, 25}"
-                       @update_text "ESC[" + str
+                       @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