X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fdriver%2Frcinput.cpp;h=669d1c4ca5bd650b2162acc0a05428e706d91493;hp=e593087d7cfd158480f7724040cfa9e590cd4452;hb=c694ef66a65139b788d08c7db1f26889cb7c9a37;hpb=a913fcf03e60167b0cb05a47bbfb98d623337682

diff --git a/lib/driver/rcinput.cpp b/lib/driver/rcinput.cpp
index e593087..669d1c4 100644
--- a/lib/driver/rcinput.cpp
+++ b/lib/driver/rcinput.cpp
@@ -11,17 +11,101 @@
 #include <lib/base/init_num.h>
 #include <lib/driver/input_fake.h>
 
+#ifdef VUPLUS_USE_RCKBD	
+#include <lib/driver/rcconsole.h>
+extern eRCConsole* g_ConsoleDevice;
+#define CODE_RC    0
+#define CODE_ASCII 1
+
+#define KEY_LALT 	56
+#define KEY_RALT 	100
+#define KEY_LSHIFT 	42
+static int special_key_mode = 0;
+
+int getType(int code)
+{
+	switch(code)
+	{
+	case 2:   // 1
+	case 3:   // 2
+	case 4:   // 3
+	case 5:   // 4
+	case 6:   // 5
+	case 7:   // 6
+	case 8:   // 7
+	case 9:   // 8
+	case 10:  // 9
+	case 11:  // 0
+	case 14:  // backspace
+	case 103: // up
+	case 105: // left
+	case 106: // right
+	case 108: // down
+	case 113: // mute
+	case 114: // volume down
+	case 115: // vulume up
+	case 116: // power
+	case 128: // stop
+	case 138: // help
+	case 139: // menu
+	case 163: // FF
+	case 164: // pause
+	case 165: // RF
+	case 167: // record
+	case 174: // exit
+	case 207: // play
+	case 352: // ok
+	case 358: // epg
+	case 370: // _subtitle selection
+	case 377: // tv
+	case 385: // radio
+	case 388: // =text
+	case 392: // audio
+	case 393: // =recorded files
+	case 398: // red
+	case 399: // green
+	case 400: // yellow
+	case 401: // blue
+	case 402: // channel up
+	case 403: // channel down
+	case 407: // >
+	case 412: // <
+		return CODE_RC;
+	}
+	return CODE_ASCII;
+}
+#endif /*VUPLUS_USE_RCKBD*/
+
 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);
-
-	if (ev->type!=EV_KEY)
+#ifdef VUPLUS_USE_RCKBD
+	//eDebug("value : %d, code : %d, type : %d, type : %s", ev->value, ev->code, ev->type, getType(ev->code)?"ASCII":"RC");
+	if(getType(ev->code) || special_key_mode)
+	{
+		switch(ev->value)
+		{
+			case 0:
+				if(ev->code == KEY_RALT || ev->code == KEY_LSHIFT || ev->code == KEY_LALT)
+				{
+					special_key_mode = 0;
+					g_ConsoleDevice->handleCode(0);
+				}
+				break;
+			case 1: 
+				if(ev->code == KEY_RALT || ev->code == KEY_LSHIFT || ev->code == KEY_LALT)
+					special_key_mode = 1;
+				g_ConsoleDevice->handleCode(ev->code);
+				break;
+			case 2: break;
+		}
 		return;
+	}
+#endif /*VUPLUS_USE_RCKBD*/
 
+//	eDebug("%x %x %x", ev->value, ev->code, ev->type);
 	int km = iskeyboard ? input->getKeyboardMode() : eRCInput::kmNone;
 
 //	eDebug("keyboard mode %d", km);
@@ -73,23 +157,16 @@ void eRCDeviceInputDev::handleCode(long rccode)
 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;
-		}
-	}
+	if (strcasestr(id.c_str(), "keyboard") != NULL)
+		iskeyboard = true;
 	setExclusive(true);
 	eDebug("Input device \"%s\" is %sa keyboard.", id.c_str(), iskeyboard ? "" : "not ");
 }
 
 void eRCDeviceInputDev::setExclusive(bool b)
 {
-	driver->setExclusive(!iskeyboard && b);
+	if (!iskeyboard)
+		driver->setExclusive(b);
 }
 
 const char *eRCDeviceInputDev::getDescription() const