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

diff --git a/terminal.coffee b/terminal.coffee
index d6838da..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
@@ -112,11 +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) ->
 		# 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
@@ -131,6 +179,7 @@ class Terminal
 		#move the cursor
 		@x = column
 		@y = row
+		return
 
 	# clear to screen edge(es)
 	csi_J: (direction) ->
@@ -188,7 +237,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 +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"
@@ -216,6 +275,9 @@ 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: ->
@@ -241,7 +303,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
@@ -357,6 +419,18 @@ class Terminal
 					@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)
 	update_sequence: (str) ->
 		prefix = 'csi_'