X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fio%2Fconsole.cpp;h=a7417edcee8f186263c965363f4942d9b1f82768;hp=9db77377f0c2267ea2997808764b607d36ffcbea;hb=ea8bf8f588310b0d7fd3297d74907602705bba1d;hpb=c7afef88380ebebc8c2b04e48664d73281ec8848

diff --git a/source/io/console.cpp b/source/io/console.cpp
index 9db7737..a7417ed 100644
--- a/source/io/console.cpp
+++ b/source/io/console.cpp
@@ -1,187 +1,76 @@
-#ifndef WIN32
-#include <errno.h>
-#include <fcntl.h>
-#include <termios.h>
-#include <sys/ioctl.h>
-#endif
-#include <msp/core/except.h>
 #include "console.h"
 
-namespace {
-
-#ifndef WIN32
-termios orig_attr;
-#endif
-
-} // namespace
+using namespace std;
 
 namespace Msp {
 namespace IO {
 
-Console::Console(unsigned n)
+Console::Console(Stream s):
+	stream(s)
 {
-	if(n>2)
-		throw InvalidParameterValue("Invalid parameter for Console::Console");
-
-	mode = (n==0 ? M_READ : M_WRITE);
-
-#ifdef WIN32
-	switch(n)
-	{
-	case 0: handle = GetStdHandle(STD_INPUT_HANDLE); break;
-	case 1: handle = GetStdHandle(STD_OUTPUT_HANDLE); break;
-	case 2: handle = GetStdHandle(STD_ERROR_HANDLE); break;
-	}
-#else
-	handle = n;
+	mode = (stream==CIN ? M_READ : M_WRITE);
 
-	if(handle==0)
-		tcgetattr(handle, &orig_attr);
-#endif
+	platform_init();
 
-	if(n==0)
+	if(stream==CIN)
 		set_events(P_INPUT);
 }
 
-Console::~Console()
-{
-#ifndef WIN32
-	if(handle==0)
-		tcsetattr(handle, TCSADRAIN, &orig_attr);
-#endif
-}
-
 void Console::set_block(bool b)
 {
-#ifdef WIN32
-	// XXX Dunno how to do this in win32
-	(void)b;
-#else
-	int flags = fcntl(0, F_GETFL);
-	flags = (flags&~O_NONBLOCK) | (b?0:O_NONBLOCK);
-	fcntl(0, F_SETFL, flags);
-#endif
+	adjust_mode(mode, M_NONBLOCK, !b);
+	sys_set_blocking(handle, b);
 }
 
-void Console::set_local_echo(bool e)
+void Console::set_inherit(bool i)
 {
-	if(!(mode&M_READ))
-		throw InvalidState("Local echo can only be set on input console");
-
-#ifdef WIN32
-	DWORD m;
-	GetConsoleMode(handle, &m);
-	SetConsoleMode(handle, (m&~ENABLE_ECHO_INPUT) | (e?ENABLE_ECHO_INPUT:0));
-#else
-	termios t;
-	tcgetattr(0, &t);
-	t.c_lflag = (t.c_lflag&~ECHO) | (e?ECHO:0);
-	tcsetattr(0, TCSADRAIN, &t);
-#endif
-}
-
-void Console::set_line_buffer(bool l)
-{
-	if(!(mode&M_READ))
-		throw InvalidState("Line buffering can only be set on input console");
-
-#ifdef WIN32
-	DWORD m;
-	GetConsoleMode(handle, &m);
-	SetConsoleMode(handle, (m&~ENABLE_LINE_INPUT) | (l?ENABLE_LINE_INPUT:0));
-#else
-	// XXX ICANON does more than just set line buffering, may need a bit more thought
-	termios t;
-	tcgetattr(0, &t);
-	t.c_lflag = (t.c_lflag&~ICANON) | (l?ICANON:0);
-	tcsetattr(0, TCSADRAIN, &t);
-#endif
-}
-
-void Console::get_size(unsigned &rows, unsigned &cols)
-{
-	if(!(mode&M_WRITE))
-		throw InvalidState("Size can only be queried from an output console");
-
-#ifdef WIN32
-	// XXX Figure out how to do this
-	rows = 24;
-	cols = 80;
-#else
-	struct winsize wsz;
-	ioctl(handle, TIOCGWINSZ, &wsz);
-	rows = wsz.ws_row;
-	cols = wsz.ws_col;
-#endif
+	adjust_mode(mode, M_INHERIT, i);
+	sys_set_inherit(handle, i);
 }
 
 unsigned Console::do_write(const char *buf, unsigned len)
 {
-	if(!(mode&M_WRITE))
-		throw InvalidState("Console is not writable");
-
-#ifdef WIN32
-	DWORD ret;
-	if(!WriteFile(handle, buf, len, &ret, 0))
-		throw SystemError("Writing to console failed", GetLastError());
-#else
-	int ret = ::write(handle, buf, len);
-	if(ret==-1)
-		throw SystemError("Writing to console failed", errno);
-#endif
+	check_access(M_WRITE);
 
-	return ret;
+	return sys_write(handle, buf, len);
 }
 
 unsigned Console::do_read(char *buf, unsigned len)
 {
-	if(!(mode&M_READ))
-		throw InvalidState("Console is not readable");
-
-#ifdef WIN32
-	DWORD ret;
-	if(!ReadFile(handle, buf, len, &ret, 0))
-		throw SystemError("Reading from console failed", GetLastError());
-#else
-	int ret = ::read(handle, buf, len);
-	if(ret==-1)
-	{
-		if(errno==EAGAIN)
-			return 0;
-		else
-			throw SystemError("Reading from console failed", errno);
-	}
-	else if(ret==0)
-		eof_flag = true;
-#endif
+	check_access(M_READ);
+
+	unsigned ret = sys_read(handle, buf, len);
+	if(ret==0)
+		set_eof();
 
 	return ret;
 }
 
-Handle Console::get_event_handle()
+const Handle &Console::get_handle(Mode m)
 {
-	return 0;
+	check_access(m);
+	return handle;
 }
 
-Console &Console::instance(unsigned n)
+Console &Console::instance(Stream s)
 {
-	static Console in(0);
-	static Console out(1);
-	static Console err(2);
+	static Console in(CIN);
+	static Console out(COUT);
+	static Console err(CERR);
 
-	switch(n)
+	switch(s)
 	{
-	case 0: return in;
-	case 1: return out;
-	case 2: return err;
+	case CIN: return in;
+	case COUT: return out;
+	case CERR: return err;
 	}
 
-	throw InvalidParameterValue("Unknown Console instance requested");
+	throw invalid_argument("Console::instance");
 }
 
-Console &cin = Console::instance(0);
-Console &cout = Console::instance(1);
-Console &cerr = Console::instance(2);
+Console &cin = Console::instance(Console::CIN);
+Console &cout = Console::instance(Console::COUT);
+Console &cerr = Console::instance(Console::CERR);
 
 } // namespace IO
 } // namespace Msp