#endif
#include <msp/core/systemerror.h>
#include "console.h"
+#include "handle_private.h"
using namespace std;
#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)
{
#ifndef WIN32
if(handle==0)
- tcsetattr(handle, TCSADRAIN, &orig_attr);
+ tcsetattr(*handle, TCSADRAIN, &orig_attr);
#endif
}
// 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
}
#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
}
#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
}
cols = 80;
#else
struct winsize wsz;
- ioctl(handle, TIOCGWINSZ, &wsz);
+ ioctl(*handle, TIOCGWINSZ, &wsz);
rows = wsz.ws_row;
cols = wsz.ws_col;
#endif
#ifdef WIN32
DWORD ret;
- if(!WriteFile(handle, buf, len, &ret, 0))
+ if(!WriteFile(*handle, buf, len, &ret, 0))
throw system_error("WriteFile");
#else
- int ret = ::write(handle, buf, len);
+ int ret = ::write(*handle, buf, len);
if(ret==-1)
throw system_error("write");
#endif
#ifdef WIN32
DWORD ret;
- if(!ReadFile(handle, buf, len, &ret, 0))
+ if(!ReadFile(*handle, buf, len, &ret, 0))
throw system_error("ReadFile");
#else
- int ret = ::read(handle, buf, len);
+ int ret = ::read(*handle, buf, len);
if(ret==-1)
{
if(errno==EAGAIN)
return ret;
}
-Handle Console::get_event_handle()
-{
- return 0;
-}
-
Console &Console::instance(unsigned n)
{
static Console in(0);