From: Michael Brown <mcb30@ipxe.org>
Date: Mon, 2 Dec 2013 17:20:36 +0000 (+0000)
Subject: [console] Allow '?' as an intermediate byte in ANSI escape sequences
X-Git-Tag: v1.20.1~1341
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=135bf35b1189a4402dcca13685331c3fb2d901f5;p=thirdparty%2Fipxe.git

[console] Allow '?' as an intermediate byte in ANSI escape sequences

The ANSI escape sequences to show and hide the cursor take the form
"<ESC>[?25h" and "<ESC>[?25l" respectively.  iPXE currently treats the
'?' character as the final byte.  Fix by explicitly treating '?' as an
intermediate byte.

Signed-off-by: Michael Brown <mcb30@ipxe.org>
---

diff --git a/src/core/ansiesc.c b/src/core/ansiesc.c
index 68e7061b3..ca9a73ce0 100644
--- a/src/core/ansiesc.c
+++ b/src/core/ansiesc.c
@@ -99,7 +99,8 @@ int ansiesc_process ( struct ansiesc_context *ctx, int c ) {
 				DBG ( "Too many parameters in ANSI escape "
 				      "sequence\n" );
 			}
-		} else if ( ( c >= 0x20 ) && ( c <= 0x2f ) ) {
+		} else if ( ( ( c >= 0x20 ) && ( c <= 0x2f ) ) ||
+			    ( c == '?' ) ) {
 			/* Intermediate Byte */
 			ctx->function <<= 8;
 			ctx->function |= c;
diff --git a/src/include/ipxe/ansiesc.h b/src/include/ipxe/ansiesc.h
index e84545769..c1c74481d 100644
--- a/src/include/ipxe/ansiesc.h
+++ b/src/include/ipxe/ansiesc.h
@@ -124,6 +124,12 @@ struct ansiesc_context {
  */
 #define ANSIESC_LOG_PRIORITY 'p'
 
+/** Show cursor */
+#define ANSIESC_DECTCEM_SET ( ( '?' << 8 ) | 'h' )
+
+/** Hide cursor */
+#define ANSIESC_DECTCEM_RESET ( ( '?' << 8 ) | 'l' )
+
 /** @} */
 
 extern int ansiesc_process ( struct ansiesc_context *ctx, int c );