add cursor incrementals movement: csi_[ABCD]

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

diff --git a/terminal.coffee b/terminal.coffee
index 0ba72f4..12d8a74 100644 (file)
--- a/terminal.coffee
+++ b/terminal.coffee
@@ -112,11 +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) ->
                # handle blank/missing args and convert to 0 base
-               row = @fix_esc_arg(row, 1) - 1
-               column = @fix_esc_arg(column, 1) - 1
+               row = -1 + parseInt @fix_esc_arg row, '1'
+               column = -1 + parseInt @fix_esc_arg column, '1'
 
                #clamp values
                if column < 0
@@ -188,7 +218,8 @@ class Terminal
        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"
@@ -202,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"
@@ -216,6 +250,8 @@ 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: ->
@@ -228,26 +264,29 @@ class Terminal
                        switch arg
                                # remove all style/color
                                when '0'
-                                       @a = 0
+                                       @a = 0x07
 
                                # style attributes
                                when '1' # bold
                                        @set_attribute_bits 0x010000, 0x010000
-                               # FIXME add '3' for italic ('23' to turn it off)
+                               when '3' # italic (rare)
+                                       @set_attribute_bits 0x200000, 0x200000
                                when '4' # underline
                                        @set_attribute_bits 0x020000, 0x020000
                                when '5' # blink
                                        @set_attribute_bits 0x040000, 0x040000
                                when '7' # inverse
                                        @set_attribute_bits 0x080000, 0x080000
-                               when '8' # invisible
+                               when '8' # invisible. urivt ignores this
                                        @set_attribute_bits 0x100000, 0x100000
 
                                # disable style attributes
-                               when '22' # not bold... according to a page
+                               when '21' # not bold (rare)
                                        @set_attribute_bits 0x010000, 0
-                               when '21' # ... though this would make more sense for "not bold"
+                               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 0x020000, 0
                                when '25' # not blink