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

diff --git a/terminal.coffee b/terminal.coffee
index 721ed80..8e87bb6 100644
--- a/terminal.coffee
+++ b/terminal.coffee
@@ -7,6 +7,11 @@ else
 	window.terminal = {}
 	my_exports = window.terminal
 
+if console?.log?
+	log = -> console.log arguments...
+else
+	log = -> null
+
 class Terminal
 	# public:
 	constructor: (width, height) ->
@@ -62,19 +67,15 @@ class Terminal
 			@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
-		]
+		rearrange = (a) =>
+			return [
+				a[0...@scroll_top]..., # up to but not including scroll top
+				a[@scroll_top + 1 .. @scroll_bottom]..., # scroll region except top line of it
+				a[@scroll_top], # top line of scroll region (already cleared)
+				a[@scroll_bottom + 1 ... @height]... # rest of screen
+			]
+		@text = rearrange @text
+		@attributes = rearrange @attributes
 
 		# slide cursor up with rest of text
 		@y -= 1
@@ -206,7 +207,7 @@ class Terminal
 						@text[row][i] = ' '
 						@attributes[row][i] = @a
 			else
-				console.log "confusing arg for csi_J: #{direction}"
+				log "confusing arg for csi_J: #{direction}"
 		return
 
 	# clear (some or all of) current line
@@ -230,9 +231,50 @@ class Terminal
 					@text[@y][i] = ' '
 					@attributes[@y][i] = @a
 			else
-				console.log "confusing arg for csi_K: #{direction}"
+				log "confusing arg for csi_K: #{direction}"
 		return
 	
+	# move lines downwards (arg is how far)
+	csi_L: (lines) ->
+		lines = parseInt @fix_esc_arg lines, '1'
+
+		rearrange = (a) =>
+			return [
+				a[0...@y]..., # keep everything above cursor
+				a[@scroll_bottom - lines + 1 .. @scroll_bottom]..., # we'll clear these shortly
+				a[@y..@scroll_bottom - lines]..., # lines that are moving down
+				a[@scroll_bottom + 1 ... @height]... # rest of screen
+			]
+		@text = rearrange @text
+		@attributes = rearrange @attributes
+
+		# clear the lines we scrolled off (and put back in as "new")
+		for y in [@y...@y+lines]
+			for x in [0...@width]
+				@text[y][x] = ' '
+				@attributes[y][x] = 0x07
+
+	# move lines upwards (arg is how far)
+	# this obliterates the line under the cursor and arg-1 following it
+	csi_M: (lines) ->
+		lines = parseInt @fix_esc_arg lines, '1'
+
+		rearrange = (a) =>
+			return [
+				a[0 ... @y]..., # keep everything above cursor
+				a[@y + lines .. @scroll_bottom]..., # lines we're moving up
+				a[@y ... @y + lines]..., # recycle these
+				a[@scroll_bottom + 1 ... @height]... # keep the rest
+			]
+		@text = rearrange @text
+		@attributes = rearrange @attributes
+
+		# clear the lines we're recycling
+		for y in [@scroll_bottom - lines + 1 .. @scroll_bottom]
+			for x in [0...@width]
+				@text[y][x] = ' '
+				@attributes[y][x] = 0x07
+
 	# misc
 	csiq_h: ->
 		args = []
@@ -243,7 +285,7 @@ class Terminal
 					@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"
+						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 = []
@@ -255,7 +297,7 @@ class Terminal
 							@text[y].push ' '
 							@attributes[y].push 0x07
 				else
-					console.log "confusing arg for csiq_h: #{arg}"
+					log "confusing arg for csiq_h: #{arg}"
 		return
 
 	# unmisc
@@ -268,7 +310,7 @@ class Terminal
 					@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"
+						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]
@@ -276,7 +318,7 @@ class Terminal
 					@attributes = @saved_normal_screen[3]
 					@saved_normal_screen = null
 				else
-					console.log "confusing arg for csiq_l: #{arg}"
+					log "confusing arg for csiq_l: #{arg}"
 		return
 
 	# set color, bold, underline, etc
@@ -415,7 +457,7 @@ class Terminal
 
 				else
 					# if we don't recognize the style, go back to default
-					console.log "unrecognized csi_m arg: \"#{arg}\""
+					log "unrecognized csi_m arg: \"#{arg}\""
 					@a = 0
 		return
 
@@ -439,7 +481,7 @@ class Terminal
 			str = str.substr 1
 		command = @[prefix + str.substr(str.length - 1)]
 		if not command?
-			console.log "Unrecognized sequence: ESC[#{str}"
+			log "Unrecognized sequence: ESC[#{str}"
 			return
 		args = str.substr(0, str.length - 1).split ';'
 		command.call this, args...
@@ -447,7 +489,7 @@ class Terminal
 	update_sequence_then_text: (str) ->
 		len = @escape_sequence_length str
 		if len is -1
-			console.log "couldn't find escape sequence here: #{str.substr 0, 25}"
+			log "couldn't find escape sequence here: #{str.substr 0, 25}"
 			@update_text "ESC[" + str
 		else
 			@update_sequence str.substr 0, len