X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/41ede5ef8052385661577e28e2f3c96c9377c4ee..e6ca11b5b7c734505f84206b196701828136f81a:/lib/driver/rcinput.cpp

diff --git a/lib/driver/rcinput.cpp b/lib/driver/rcinput.cpp
index ad2d3f61..d10d94f3 100644
--- a/lib/driver/rcinput.cpp
+++ b/lib/driver/rcinput.cpp
@@ -11,12 +11,51 @@
 #include <lib/base/init_num.h>
 #include <lib/driver/input_fake.h>
 
-void eRCDeviceInputDev::handleCode(int rccode)
+void eRCDeviceInputDev::handleCode(long 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);
+
+//	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:
+			case KEY_INSERT:
+			case KEY_DELETE:
+			case KEY_MUTE:
+				filtered=false;
+			default:
+				break;
+		}
+		if (filtered)
+			return;
+//		eDebug("passed!");
+	}
+
 	switch (ev->value)
 	{
 	case 0:
@@ -31,8 +70,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-8)
+	{
+		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