Skip site navigation (1)Skip section navigation (2) 
Date:      Tue, 27 Feb 2018 21:52:22 +0000 (UTC)
From:      Kyle Evans <kevans@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r330084 - head/stand/lua
Message-ID:  <201802272152.w1RLqMmW037179@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: kevans
Date: Tue Feb 27 21:52:22 2018
New Revision: 330084
URL: https://svnweb.freebsd.org/changeset/base/330084

Log:
  lualoader: Replace instances of \027 with KEYSTR_ESCAPE
  
  With exception to drawing bits, which should probably be kept as-is to not
  make a mess out of things.
  
  Reported by:	rpokala (a while ago)

Modified:
  head/stand/lua/color.lua
  head/stand/lua/screen.lua

Modified: head/stand/lua/color.lua
==============================================================================
--- head/stand/lua/color.lua	Tue Feb 27 21:30:24 2018	(r330083)
+++ head/stand/lua/color.lua	Tue Feb 27 21:52:22 2018	(r330084)
@@ -62,14 +62,14 @@ function color.escapef(color_value)
 	if color.disabled then
 		return color_value
 	end
-	return "\027[3" .. color_value .. "m"
+	return core.KEYSTR_ESCAPE .. "[3" .. color_value .. "m"
 end
 
 function color.escapeb(color_value)
 	if color.disabled then
 		return color_value
 	end
-	return "\027[4" .. color_value .. "m"
+	return core.KEYSTR_ESCAPE .. "[4" .. color_value .. "m"
 end
 
 function color.escape(fg_color, bg_color, attribute)
@@ -81,7 +81,7 @@ function color.escape(fg_color, bg_color, attribute)
 	else
 		attribute = attribute .. ";"
 	end
-	return "\027[" .. attribute ..
+	return core.KEYSTR_ESCAPE .. "[" .. attribute ..
 	    "3" .. fg_color .. ";4" .. bg_color .. "m"
 end
 
@@ -89,14 +89,14 @@ function color.default()
 	if color.disabled then
 		return ""
 	end
-	return "\027[0;37;40m"
+	return core.KEYSTR_ESCAPE .. "[0;37;40m"
 end
 
 function color.highlight(str)
 	if color.disabled then
 		return str
 	end
-	return "\027[1m" .. str .. "\027[0m"
+	return core.KEYSTR_ESCAPE .. "[1m" .. str .. core.KEYSTR_ESCAPE .. "[0m"
 end
 
 return color

Modified: head/stand/lua/screen.lua
==============================================================================
--- head/stand/lua/screen.lua	Tue Feb 27 21:30:24 2018	(r330083)
+++ head/stand/lua/screen.lua	Tue Feb 27 21:52:22 2018	(r330084)
@@ -38,7 +38,7 @@ function screen.clear()
 	if core.isSerialBoot() then
 		return
 	end
-	loader.printc("\027[H\027[J")
+	loader.printc(core.KEYSTR_ESCAPE .. "[H" .. core.KEYSTR_ESCAPE .. "[J")
 end
 
 function screen.setcursor(x, y)
@@ -46,7 +46,7 @@ function screen.setcursor(x, y)
 		return
 	end
 
-	loader.printc("\027[" .. y .. ";" .. x .. "H")
+	loader.printc(core.KEYSTR_ESCAPE .. "[" .. y .. ";" .. x .. "H")
 end
 
 function screen.movecursor(dx, dy)
@@ -55,15 +55,15 @@ function screen.movecursor(dx, dy)
 	end
 
 	if dx < 0 then
-		loader.printc("\027[" .. -dx .. "D")
+		loader.printc(core.KEYSTR_ESCAPE .. "[" .. -dx .. "D")
 	elseif dx > 0 then
-		loader.printc("\027[" .. dx .. "C")
+		loader.printc(core.KEYSTR_ESCAPE .. "[" .. dx .. "C")
 	end
 
 	if dy < 0 then
-		loader.printc("\027[" .. -dy .. "A")
+		loader.printc(core.KEYSTR_ESCAPE .. "[" .. -dy .. "A")
 	elseif dy > 0 then
-		loader.printc("\027[" .. dy .. "B")
+		loader.printc(core.KEYSTR_ESCAPE .. "[" .. dy .. "B")
 	end
 end
 
@@ -89,7 +89,7 @@ function screen.defcursor()
 	if core.isSerialBoot() then
 		return
 	end
-	loader.printc("\027[25;0H")
+	loader.printc(core.KEYSTR_ESCAPE .. "[25;0H")
 end
 
 return screen

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201802272152.w1RLqMmW037179>