From 1fc2700e351c0297089925aba6c3a7b890dfb077 Mon Sep 17 00:00:00 2001 From: ghost Date: Sat, 13 Feb 2010 18:47:15 +0100 Subject: [PATCH 1/1] lib/driver/rc.cpp,rcinput.cpp: only do EVIOCGRAB when event bit 0x1E is set in event device evbits --- lib/driver/rc.cpp | 5 ++++- lib/driver/rcinput.cpp | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/driver/rc.cpp b/lib/driver/rc.cpp index c56fde4..c1ff13e 100644 --- a/lib/driver/rc.cpp +++ b/lib/driver/rc.cpp @@ -129,8 +129,11 @@ void eRCInputEventDriver::setExclusive(bool b) { if (handle >= 0) { + long evbits; int grab = b; - if (::ioctl(handle, EVIOCGRAB, grab) < 0) + if (::ioctl(handle, EVIOCGBIT(0, EV_MAX+1), &evbits) < 0) + perror("EVIOCGBIT"); + else if ((evbits & (1 << 0x1E)) && ::ioctl(handle, EVIOCGRAB, grab) < 0) perror("EVIOCGRAB"); } } diff --git a/lib/driver/rcinput.cpp b/lib/driver/rcinput.cpp index e593087..2bfeefa 100644 --- a/lib/driver/rcinput.cpp +++ b/lib/driver/rcinput.cpp @@ -89,7 +89,8 @@ eRCDeviceInputDev::eRCDeviceInputDev(eRCInputEventDriver *driver) void eRCDeviceInputDev::setExclusive(bool b) { - driver->setExclusive(!iskeyboard && b); + if (!iskeyboard) + driver->setExclusive(b); } const char *eRCDeviceInputDev::getDescription() const -- 2.7.4