X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=terminal.coffee;h=19296bf0b028c30159e927836c149756a75b4c24;hb=639264f34589d0637860ffbd47d788e03c48c76a;hp=7f80a76d2e548f61257d5e4004c1de59d0f02c90;hpb=862f2bc18b59cf4481e6b6609bea537b2a349f4b;p=watch-my-terminal.git

diff --git a/terminal.coffee b/terminal.coffee
index 7f80a76..19296bf 100644
--- a/terminal.coffee
+++ b/terminal.coffee
@@ -16,10 +16,11 @@ class Terminal
 		@attributes = []
 		@x = 0
 		@y = 0
-		@a = 0 # cursor attributes
+		@a = 0x000007 # cursor attributes
 		@partial = ''
+		@saved_normal_screen = null
 		@resize width, height
-	
+
 	resize: (width, height) ->
 		# FIXME: write a version that retains some of the data
 		@width = width
@@ -50,12 +51,7 @@ class Terminal
 				else
 					@update_sequence_then_text parts[i]
 		return
-	
-	clear_rest_of_line: ->
-		for i in [@x...@width]
-			@text[@y][i] = ' '
-			@attributes[@y][i] = @a
-	
+
 	add_new_line: ->
 		# clear top line
 		for i in [0...@width]
@@ -68,7 +64,7 @@ class Terminal
 		@attributes.push(tmp)
 		# slide cursor up with rest of text
 		@y -= 1
-	
+
 	wrap_to_next_line: ->
 		if @y is @height - 1
 			@add_new_line()
@@ -87,33 +83,147 @@ 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) ->
 		@a = (@a & ~mask) | value
 
-	csi_m: default: "0", go: ->
+	# we're supposed to ignore leeding zeros, and while we're at it, lets swap
+	# in the default for blank or missing values
+	fix_esc_arg: (value, deef_alt) ->
+		if value? and value != ''
+			while value[0] is '0' and value.length > 1
+				value = value.substr 1
+			return value
+		else
+			return deef_alt
+
+	# set cursor position (one based)
+	csi_H: (row, column) ->
+		row = 0 + @fix_esc_arg row, 1
+		column = 0 + @fix_esc_arg column, 1
+
+		# convert to 0 base
+		column -= 1
+
+		#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) ->
+		switch @fix_esc_arg direction, '0'
+			when '0' # erase to right
+				for i in [@x...@width]
+					@text[@y][i] = ' '
+					@attributes[@y][i] = @a
+			when '1' # erase to left
+				for i in [0..@x]
+					@text[@y][i] = ' '
+					@attributes[@y][i] = @a
+			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: ->
+		args = []
 		for i in arguments
-			fixed = i
-			while fixed[0] is '0'
-				fixed = fixed.substr 1
-			switch fixed
+			args.push @fix_esc_arg i, 0
+
+		while args.length > 0
+			switch args.shift()
 
 				# remove all style/color
-				when '' # leading zeros are removed (even if that's all of them)
-					@set_attribute_bits 0xffffff, 0
+				when '0'
+					@set_attribute_bits 0xffffff, 0x000007
 
 				# style attributes
 				when '1' # bold
@@ -124,7 +234,7 @@ class Terminal
 					@set_attribute_bits 0x40000, 0x40000
 				when '8' # invisible
 					@set_attribute_bits 0x80000, 0x80000
-				
+
 				# disable style attributes
 				when '22' # not bold... according to a page
 					@set_attribute_bits 0x10000, 0
@@ -137,6 +247,9 @@ class Terminal
 				when '28' # not invisible
 					@set_attribute_bits 0x80000, 0
 
+				when '100' # reset colors but not other attributes
+					@set_attribute_bits 0xffff, 0x0007
+
 				# 8 fg colors
 				when '30' # fg black
 					@set_attribute_bits 0xff, 0x00
@@ -155,6 +268,13 @@ class Terminal
 				when '37', '39' # fg white  (39 is default)
 					@set_attribute_bits 0xff, 0x07
 
+				when '38'
+					if args.length >= 2 and args[0] is '5'
+						args.shift()
+						@set_attribute_bits 0xff, (0xff & args.shift())
+					else
+						@set_attribute_bits 0x20000, 0x20000
+
 				# 8 bg colors
 				when '40' # bg black
 					@set_attribute_bits 0xff00, 0x0000
@@ -175,6 +295,13 @@ class Terminal
 				when '49' # bg default
 					@set_attribute_bits 0xff00, 0x0000
 
+				when '48'
+					if args.length >= 2 and args[0] is '5'
+						args.shift()
+						@set_attribute_bits 0xff00, ((0xff & args.shift()) << 8)
+					else
+						@set_attribute_bits 0x20000, 0x20000
+
 				# bright fg colors
 				when '90' # fg bright black
 					@set_attribute_bits 0xff, 0x08
@@ -219,13 +346,16 @@ class Terminal
 
 	# str is the whole escape sequence (minus the esc[ prefix)
 	update_sequence: (str) ->
-		command = @["csi_#{str.substr str.length - 1}"]
-		return unless command?
+		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
 		args = str.substr(0, str.length - 1).split ';'
-		for i in [0...args.length]
-			if args[i] is ''
-				args[i] = command.default
-		command.go.call this, args...
+		command.call this, args...
 
 	update_sequence_then_text: (str) ->
 		len = @escape_sequence_length str