X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=terminal.coffee;h=d371476211fea5315282b427a82bebcb9b64769b;hb=469415c385464dc424c37f4602bf59233bbaa738;hp=d6838da968afac1d832847d8650bb9179ad108d0;hpb=6360b697a9933ab36a683b0f443acfe227fc89ec;p=watch-my-terminal.git

diff --git a/terminal.coffee b/terminal.coffee
index d6838da..d371476 100644
--- a/terminal.coffee
+++ b/terminal.coffee
@@ -19,6 +19,7 @@ class Terminal
 		@a = 0x000007 # cursor attributes
 		@partial = ''
 		@saved_normal_screen = null
+		@cursor_visible = true
 		@resize width, height
 
 	resize: (width, height) ->
@@ -32,7 +33,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) ->
@@ -56,7 +57,7 @@ class Terminal
 		# clear top line
 		for i in [0...@width]
 			@text[0][i] = ' '
-			@attributes[0][i] = 0
+			@attributes[0][i] = 0x07
 		# move (newly cleared) top line to the bottom
 		tmp = @text.shift()
 		@text.push(tmp)
@@ -112,11 +113,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 +219,10 @@ class Terminal
 	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"
@@ -201,12 +235,17 @@ 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}"
 	# 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"
@@ -216,6 +255,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: ->
@@ -241,7 +282,7 @@ class Terminal
 					@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