From 738bb44f393edf2a58eef973f7f5a01c2e2bbaa3 Mon Sep 17 00:00:00 2001
From: ghost <andreas.monzner@multimedia-labs.de>
Date: Wed, 23 Dec 2009 19:25:36 +0100
Subject: fix EVIOCGRAB ioctl switch to non exclusive access on input devices
 when call eRCInput::lock (i.e. this fixes no more working Tuxtxt plugin)
 remove some incorrect code eRCInput::lock now no more returns a device handle
 .. this is not possible this way..

---
 lib/driver/rc.cpp | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

(limited to 'lib/driver/rc.cpp')

diff --git a/lib/driver/rc.cpp b/lib/driver/rc.cpp
index 8dab0201..c56fde44 100644
--- a/lib/driver/rc.cpp
+++ b/lib/driver/rc.cpp
@@ -81,7 +81,6 @@ eRCShortDriver::eRCShortDriver(const char *filename): eRCDriver(eRCInput::getIns
 	{
 		sn=eSocketNotifier::create(eApp, handle, eSocketNotifier::Read);
 		CONNECT(sn->activated, eRCShortDriver::keyPressed);
-		eRCInput::getInstance()->setFile(handle);
 	}
 }
 
@@ -115,7 +114,6 @@ eRCInputEventDriver::eRCInputEventDriver(const char *filename): eRCDriver(eRCInp
 	{
 		sn=eSocketNotifier::create(eApp, handle, eSocketNotifier::Read);
 		CONNECT(sn->activated, eRCInputEventDriver::keyPressed);
-		eRCInput::getInstance()->setFile(handle);
 	}
 }
 
@@ -132,7 +130,7 @@ void eRCInputEventDriver::setExclusive(bool b)
 	if (handle >= 0)
 	{
 		int grab = b;
-		if (::ioctl(handle, EVIOCGRAB, &grab) < 0)
+		if (::ioctl(handle, EVIOCGRAB, grab) < 0)
 			perror("EVIOCGRAB");
 	}
 }
@@ -175,7 +173,6 @@ eRCInput::eRCInput()
 {
 	ASSERT( !instance);
 	instance=this;
-	handle = -1;
 	locked = 0;
 	keyboardMode = kmNone;
 }
@@ -193,21 +190,18 @@ bool eRCInput::open()
 	return false;
 }
 
-int eRCInput::lock()
+void eRCInput::lock()
 {
 	locked=1;
-	return handle;
+	for (std::map<std::string,eRCDevice*>::iterator i=devices.begin(); i != devices.end(); ++i)
+		i->second->setExclusive(false);
 }
 
 void eRCInput::unlock()
 {
-	if (locked)
-		locked=0;
-}
-
-void eRCInput::setFile(int newh)
-{
-	handle=newh;
+	locked=0;
+	for (std::map<std::string,eRCDevice*>::iterator i=devices.begin(); i != devices.end(); ++i)
+		i->second->setExclusive(true);
 }
 
 void eRCInput::addDevice(const std::string &id, eRCDevice *dev)
@@ -226,7 +220,7 @@ eRCDevice *eRCInput::getDevice(const std::string &id)
 	if (i == devices.end())
 	{
 		eDebug("failed, possible choices are:");
-		for (std::map<std::string,eRCDevice*>::iterator i=devices.begin(); i != devices.end(); ++i)	
+		for (std::map<std::string,eRCDevice*>::iterator i=devices.begin(); i != devices.end(); ++i)
 			eDebug("%s", i->first.c_str());
 		return 0;
 	}
-- 
cgit v1.2.3