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

diff --git a/source/io/console.cpp b/source/io/console.cpp
index 9db7737..b695e3c 100644
--- a/source/io/console.cpp
+++ b/source/io/console.cpp
@@ -4,8 +4,11 @@
 #include <termios.h>
 #include <sys/ioctl.h>
 #endif
-#include <msp/core/except.h>
+#include <msp/core/systemerror.h>
 #include "console.h"
+#include "handle_private.h"
+
+using namespace std;
 
 namespace {
 
@@ -21,22 +24,22 @@ namespace IO {
 Console::Console(unsigned n)
 {
 	if(n>2)
-		throw InvalidParameterValue("Invalid parameter for Console::Console");
+		throw invalid_argument("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;
+	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;
+	*handle = n;
 
-	if(handle==0)
-		tcgetattr(handle, &orig_attr);
+	if(n==0)
+		tcgetattr(*handle, &orig_attr);
 #endif
 
 	if(n==0)
@@ -47,7 +50,7 @@ Console::~Console()
 {
 #ifndef WIN32
 	if(handle==0)
-		tcsetattr(handle, TCSADRAIN, &orig_attr);
+		tcsetattr(*handle, TCSADRAIN, &orig_attr);
 #endif
 }
 
@@ -57,51 +60,48 @@ void Console::set_block(bool b)
 	// XXX Dunno how to do this in win32
 	(void)b;
 #else
-	int flags = fcntl(0, F_GETFL);
+	int flags = fcntl(*handle, F_GETFL);
 	flags = (flags&~O_NONBLOCK) | (b?0:O_NONBLOCK);
-	fcntl(0, F_SETFL, flags);
+	fcntl(*handle, F_SETFL, flags);
 #endif
 }
 
 void Console::set_local_echo(bool e)
 {
-	if(!(mode&M_READ))
-		throw InvalidState("Local echo can only be set on input console");
+	check_access(M_READ);
 
 #ifdef WIN32
 	DWORD m;
-	GetConsoleMode(handle, &m);
-	SetConsoleMode(handle, (m&~ENABLE_ECHO_INPUT) | (e?ENABLE_ECHO_INPUT:0));
+	GetConsoleMode(*handle, &m);
+	SetConsoleMode(*handle, (m&~ENABLE_ECHO_INPUT) | (e?ENABLE_ECHO_INPUT:0));
 #else
 	termios t;
-	tcgetattr(0, &t);
+	tcgetattr(*handle, &t);
 	t.c_lflag = (t.c_lflag&~ECHO) | (e?ECHO:0);
-	tcsetattr(0, TCSADRAIN, &t);
+	tcsetattr(*handle, 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");
+	check_access(M_READ);
 
 #ifdef WIN32
 	DWORD m;
-	GetConsoleMode(handle, &m);
-	SetConsoleMode(handle, (m&~ENABLE_LINE_INPUT) | (l?ENABLE_LINE_INPUT:0));
+	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);
+	tcgetattr(*handle, &t);
 	t.c_lflag = (t.c_lflag&~ICANON) | (l?ICANON:0);
-	tcsetattr(0, TCSADRAIN, &t);
+	tcsetattr(*handle, 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");
+	check_access(M_WRITE);
 
 #ifdef WIN32
 	// XXX Figure out how to do this
@@ -109,7 +109,7 @@ void Console::get_size(unsigned &rows, unsigned &cols)
 	cols = 80;
 #else
 	struct winsize wsz;
-	ioctl(handle, TIOCGWINSZ, &wsz);
+	ioctl(*handle, TIOCGWINSZ, &wsz);
 	rows = wsz.ws_row;
 	cols = wsz.ws_col;
 #endif
@@ -117,52 +117,22 @@ void Console::get_size(unsigned &rows, unsigned &cols)
 
 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");
+	check_access(M_READ);
 
-#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)
+	unsigned ret = sys_read(handle, buf, len);
+	if(ret==0)
 		eof_flag = true;
-#endif
 
 	return ret;
 }
 
-Handle Console::get_event_handle()
-{
-	return 0;
-}
-
 Console &Console::instance(unsigned n)
 {
 	static Console in(0);
@@ -176,7 +146,7 @@ Console &Console::instance(unsigned n)
 	case 2: return err;
 	}
 
-	throw InvalidParameterValue("Unknown Console instance requested");
+	throw invalid_argument("Console::instance");
 }
 
 Console &cin = Console::instance(0);