X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=terminal.coffee;h=19296bf0b028c30159e927836c149756a75b4c24;hb=639264f34589d0637860ffbd47d788e03c48c76a;hp=11c79e06fc5ddd5b2cbdb11756ec6717c5bd18ad;hpb=0c0854b7eb687c20b5857c00665cbb9cd0673177;p=watch-my-terminal.git

diff --git a/terminal.coffee b/terminal.coffee
index 11c79e0..19296bf 100644
--- a/terminal.coffee
+++ b/terminal.coffee
@@ -18,6 +18,7 @@ class Terminal
 		@y = 0
 		@a = 0x000007 # cursor attributes
 		@partial = ''
+		@saved_normal_screen = null
 		@resize width, height
 
 	resize: (width, height) ->
@@ -82,18 +83,20 @@ class Terminal
 				when '\x0d' # cr
 					@x = 0
 				when '\x08' # backspace
-					if @x > 0
+					if @x is 0
+						@x = @width - 1
+						if @y > 0
+							@y -= 1
+					else
 						@x -= 1
-						@text[@y][@x] = ' '
-						# should this set the attribute too?
 				when '\x0a', '\x0b' # lf, vertical tab (same thing)
 					@wrap_to_next_line()
 				else
+					if @x >= @width
+						@wrap_to_next_line()
 					@text[@y][@x] = c
 					@attributes[@y][@x] = @a
 					@x += 1
-					if @x is @width
-						@wrap_to_next_line()
 		return
 
 	set_attribute_bits: (mask, value) ->
@@ -113,17 +116,50 @@ class Terminal
 	csi_H: (row, column) ->
 		row = 0 + @fix_esc_arg row, 1
 		column = 0 + @fix_esc_arg column, 1
+
 		# convert to 0 base
 		column -= 1
-		if 0 <= column < @width
-			@x = column
-		else
-			console.log "tried to move cursor to invalid column: #{column}"
-		row -= 1
-		if 0 <= row < @height
-			@y = row
-		else
-			console.log "tried to move cursor to invalid row: #{row}"
+
+		#clamp values
+		if column < 0
+			column = 0
+		else if column >= @width
+			column = @width - 1
+		if row < 0
+			row = 0
+		if row >= @height
+			row = @height - 1
+
+		#move the cursor
+		@x = column
+		@y = row
+
+	# clear to screen edge(es)
+	csi_J: (direction) ->
+		switch @fix_esc_arg direction, '0'
+			when '0' # erase down
+				# rest of current line
+				@csi_K direction
+				# rest of lines
+				for row in [@y...@height]
+					for i in [0...@width]
+						@text[row][i] = ' '
+						@attributes[row][i] = @a
+			when '1' # erase up
+				# beginning of current line
+				@csi_K direction
+				# all previous lines
+				for row in [0..@y]
+					for i in [0...@width]
+						@text[row][i] = ' '
+						@attributes[row][i] = @a
+			when '2' # erase everything
+				for row in [0...@height]
+					for i in [0...@width]
+						@text[row][i] = ' '
+						@attributes[row][i] = @a
+			else
+				console.log "confusing arg for csi_J: #{direction}"
 
 	# clear (some or all of) current line
 	csi_K: (direction) ->
@@ -133,13 +169,48 @@ class Terminal
 					@text[@y][i] = ' '
 					@attributes[@y][i] = @a
 			when '1' # erase to left
-				for i in [0...@x]
+				for i in [0..@x]
 					@text[@y][i] = ' '
 					@attributes[@y][i] = @a
-			when '0' # erase whole line
+			when '2' # erase whole line
 				for i in [0...@width]
 					@text[@y][i] = ' '
 					@attributes[@y][i] = @a
+			else
+				console.log "confusing arg for csi_K: #{direction}"
+	
+	# misc
+	csiq_h: ->
+		args = []
+		for i in arguments
+			switch @fix_esc_arg i, ''
+				when '1049'
+					if @saved_normal_screen?
+						console.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]
+					@text = []
+					@attributes = []
+					for y in [0...@height]
+						@text[y] = []
+						@attributes[y] = []
+						for x in [0...@width]
+							@text[y].push ' '
+							@attributes[y].push 0
+	# unmisc
+	csiq_l: ->
+		args = []
+		for i in arguments
+			switch @fix_esc_arg i, ''
+				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"
+						return
+					@x = @saved_normal_screen[0]
+					@y = @saved_normal_screen[1]
+					@text = @saved_normal_screen[2]
+					@attributes = @saved_normal_screen[3]
+					@saved_normal_screen = null
 
 	# set color, bold, underline, etc
 	csi_m: ->
@@ -275,7 +346,11 @@ class Terminal
 
 	# str is the whole escape sequence (minus the esc[ prefix)
 	update_sequence: (str) ->
-		command = @["csi_#{str.substr str.length - 1}"]
+		prefix = 'csi_'
+		if str[0] is '?'
+			prefix = 'csiq_'
+			str = str.substr 1
+		command = @[prefix + str.substr(str.length - 1)]
 		if not command?
 			console.log "Unrecognized sequence: ESC[#{str}"
 			return