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

diff --git a/terminal.coffee b/terminal.coffee
index d371476..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) ->
@@ -20,10 +25,13 @@ class Terminal
 		@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 = []
@@ -54,20 +62,26 @@ 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] = 0x07
-		# 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
+
+		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
 
 	wrap_to_next_line: ->
-		if @y is @height - 1
+		if @y is @scroll_bottom
 			@add_new_line()
 		@y += 1
 		@x = 0
@@ -121,6 +135,7 @@ class Terminal
 		@y -= lines
 		if @y < 0
 			@y = 0
+		return
 
 	# move cursor down
 	csi_B: (lines) ->
@@ -128,6 +143,7 @@ class Terminal
 		@y += lines
 		if @y >= @height
 			@y = @height - 1
+		return
 
 	# move cursor right
 	csi_C: (cols) ->
@@ -135,6 +151,7 @@ class Terminal
 		@x += cols
 		if @x >= @width
 			@x = @width - 1
+		return
 
 	# move cursor left
 	csi_D: (cols) ->
@@ -142,6 +159,7 @@ class Terminal
 		@x -= cols
 		if @x < 0
 			@x = 0
+		return
 
 	# set cursor position (one based)
 	csi_H: (row, column) ->
@@ -162,6 +180,7 @@ class Terminal
 		#move the cursor
 		@x = column
 		@y = row
+		return
 
 	# clear to screen edge(es)
 	csi_J: (direction) ->
@@ -188,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
@@ -212,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 = []
@@ -225,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 = []
@@ -237,7 +297,9 @@ 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
 	csiq_l: ->
 		args = []
@@ -248,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]
@@ -256,7 +318,8 @@ 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
 	csi_m: ->
@@ -394,10 +457,22 @@ 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
 
+	# 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_'
@@ -406,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...
@@ -414,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