more work on keyboard support

3 files changed, 60 insertions, 12 deletions

diff --git a/lib/driver/rcconsole.cpp b/lib/driver/rcconsole.cpp
index eaeeb586..0c70244a 100644
--- a/lib/driver/rcconsole.cpp
+++ b/lib/driver/rcconsole.cpp
@@ -41,32 +41,30 @@ void eRCConsoleDriver::keyPressed(int)
 	char data[16];
 	char *d = data;
 	int num = read(handle, data, 16);
-	int code;
+	int code=-1;
 	
 	int km = input->getKeyboardMode();
 
 	while (num--)
 	{
+//		eDebug("console code %02x\n", *d++);
 		if (km == eRCInput::kmAll)
 			code = *d++;
 		else
 		{
 			if (*d == 27) // escape code
 			{
-					/* skip all this stuff */
-				return;
-
-/*				while (num)
+				while (num)
 				{
 					num--;
 					if (*++d != '[')
 						break;
 				}
-				code = -1; */
+				code = -1;
 			} else
 				code = *d;
 			++d;
-			
+
 			if (code < 32)			/* control characters */
 				code = -1;
 			if (code == 0x7F)		/* delete */
@@ -76,15 +74,15 @@ void eRCConsoleDriver::keyPressed(int)
 		if (code != -1)
 			for (std::list<eRCDevice*>::iterator i(listeners.begin()); i!=listeners.end(); ++i)
 			{
-				eDebug("ascii %08x", code);
-				(*i)->handleCode(code | 0x8000);
+//				eDebug("ascii %08x", code);
+				(*i)->handleCode(/*0x8000|*/code);
 			}
 	}
 }
 
 void eRCConsole::handleCode(int code)
 {
-	input->keyPressed(eRCKey(this, code, 0));
+	input->keyPressed(eRCKey(this, code, eRCKey::flagAscii));
 }
 
 eRCConsole::eRCConsole(eRCDriver *driver)
@@ -112,7 +110,7 @@ class eRCConsoleInit
 	eRCConsoleDriver driver;
 	eRCConsole device;
 public:
-	eRCConsoleInit(): driver("/dev/stdin"), device(&driver)
+	eRCConsoleInit(): driver("/dev/vc/0"), device(&driver)
 	{
 	}
 };
diff --git a/lib/driver/rcinput.cpp b/lib/driver/rcinput.cpp
index a5b1c719..256d07e3 100644
--- a/lib/driver/rcinput.cpp
+++ b/lib/driver/rcinput.cpp
@@ -16,7 +16,43 @@ void eRCDeviceInputDev::handleCode(int rccode)
 	struct input_event *ev = (struct input_event *)rccode;
 	if (ev->type!=EV_KEY)
 		return;
+
 //	eDebug("%x %x %x", ev->value, ev->code, ev->type);
+
+	if (ev->type!=EV_KEY)
+		return;
+
+	int km = iskeyboard ? input->getKeyboardMode() : eRCInput::kmNone;
+
+//	eDebug("keyboard mode %d", km);
+	
+	if (km == eRCInput::kmAll)
+		return;
+
+	if (km == eRCInput::kmAscii)
+	{
+//		eDebug("filtering.. %d", ev->code);
+		bool filtered = ( ev->code > 0 && ev->code < 61 );
+		switch (ev->code)
+		{
+			case KEY_RESERVED:
+			case KEY_ESC:
+			case KEY_TAB:
+			case KEY_BACKSPACE:
+			case KEY_ENTER:
+			case KEY_LEFTCTRL:
+			case KEY_RIGHTSHIFT:
+			case KEY_LEFTALT:
+			case KEY_CAPSLOCK:
+				filtered=false;
+			default:
+				break;
+		}
+		if (filtered)
+			return;
+//		eDebug("passed!");
+	}
+
 	switch (ev->value)
 	{
 	case 0:
@@ -31,8 +67,21 @@ void eRCDeviceInputDev::handleCode(int rccode)
 	}
 }
 
-eRCDeviceInputDev::eRCDeviceInputDev(eRCInputEventDriver *driver): eRCDevice(driver->getDeviceName(), driver)
+eRCDeviceInputDev::eRCDeviceInputDev(eRCInputEventDriver *driver)
+	:eRCDevice(driver->getDeviceName(), driver), iskeyboard(false)
 {
+	int len=id.length();
+	int idx=0;
+	while(idx < len)
+	{
+		if (!strncasecmp(&id[idx++], "KEYBOARD", 8))
+		{
+			iskeyboard=true;
+			break;
+		}
+	}
+	eDebug("Input device \"%s\" is %sa keyboard.", id.c_str(), iskeyboard ? "" : "not ");
+
 }
 
 const char *eRCDeviceInputDev::getDescription() const
diff --git a/lib/driver/rcinput.h b/lib/driver/rcinput.h
index 6c180170..2e288baa 100644
--- a/lib/driver/rcinput.h
+++ b/lib/driver/rcinput.h
@@ -5,6 +5,7 @@
 
 class eRCDeviceInputDev: public eRCDevice
 {
+	int iskeyboard;
 public:
 	void handleCode(int code);
 	eRCDeviceInputDev(eRCInputEventDriver *driver);