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
check_access(M_WRITE);
#ifdef WIN32
- // XXX Figure out how to do this
- rows = 24;
- cols = 80;
+ CONSOLE_SCREEN_BUFFER_INFO sbi;
+ if(!GetConsoleScreenBufferInfo(*handle, &sbi))
+ throw system_error("GetConsoleScreenBufferInfo");
+ // Right/bottom coords are inclusive
+ rows = sbi.srWindow.Bottom+1-sbi.srWindow.Top;
+ cols = sbi.srWindow.Right+1-sbi.srWindow.Left;
#else
struct winsize wsz;
if(ioctl(*handle, TIOCGWINSZ, &wsz)==-1)