From: Mikko Rasa Date: Tue, 10 Jul 2012 09:08:00 +0000 (+0300) Subject: Handle c_cc when toggling canonical mode X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=c750a22da0df0b54af78374fd66ad1a055327e34;p=libs%2Fcore.git Handle c_cc when toggling canonical mode --- diff --git a/source/io/console.cpp b/source/io/console.cpp index c846604..6ae9699 100644 --- a/source/io/console.cpp +++ b/source/io/console.cpp @@ -99,11 +99,21 @@ void Console::set_line_buffer(bool l) if(!SetConsoleMode(*handle, (m&~ENABLE_LINE_INPUT) | (l?ENABLE_LINE_INPUT:0))) throw system_error("SetConsoleMode"); #else - // XXX ICANON does more than just set line buffering, may need a bit more thought termios t; if(tcgetattr(*handle, &t)==-1) throw system_error("tcgetattr"); t.c_lflag = (t.c_lflag&~ICANON) | (l?ICANON:0); + // man termios warns that VMIN and VTIME may share indices with VEOF and VEOL + if(l) + { + t.c_cc[VEOF] = orig_attr.c_cc[VEOF]; + t.c_cc[VEOL] = orig_attr.c_cc[VEOL]; + } + else + { + t.c_cc[VMIN] = 1; + t.c_cc[VTIME] = 0; + } if(tcsetattr(*handle, TCSADRAIN, &t)==-1) throw system_error("tcsetattr"); #endif