From 55e9d358cf6050d0dfcc69f29bd425526a3ea198 Mon Sep 17 00:00:00 2001 From: Jonas 'Sortie' Termansen Date: Sun, 21 Aug 2011 20:31:17 +0200 Subject: [PATCH] Hello editor now doesn't require '[' in ANSI escape sequences. --- hello/hello.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/hello/hello.cpp b/hello/hello.cpp index ee143e05..16966412 100644 --- a/hello/hello.cpp +++ b/hello/hello.cpp @@ -8,9 +8,11 @@ int main(int argc, char* argv[]) "This program is a probably the worst text editor ever made.\n" "You are currently using the buggy USA keyboard layout.\n" "This terminal is controlled using ANSI Escape Sequences:\n" - " - Type \e[32mESC [ 2 J\e[m to clear the screen\n" + " - Type \e[32mESC 2 J\e[m to clear the screen\n" ); + bool lastwasesc = false; + while (true) { unsigned method = System::Keyboard::POLL; @@ -22,11 +24,13 @@ int main(int argc, char* argv[]) if ( codepoint == Maxsi::Keyboard::DOWN ) { printf("\e[B"); continue; } if ( codepoint == Maxsi::Keyboard::RIGHT ) { printf("\e[C"); continue; } if ( codepoint == Maxsi::Keyboard::LEFT ) { printf("\e[D"); continue; } - if ( codepoint == Maxsi::Keyboard::ESC ) { printf("\e"); continue; } + if ( codepoint == Maxsi::Keyboard::ESC ) { printf("\e["); lastwasesc = true; continue; } + if ( lastwasesc && codepoint == '[' ) { continue; } if ( codepoint >= 0x80 ) { continue; } char msg[2]; msg[0] = codepoint; msg[1] = '\0'; printf(msg); + lastwasesc = false; } return 0;