git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
for all non-ts files, display error message when trying to burn to dvd
[enigma2.git]
/
lib
/
driver
/
rcconsole.cpp
diff --git
a/lib/driver/rcconsole.cpp
b/lib/driver/rcconsole.cpp
index 0c70244a6e942639875fa409facae84a02fa684d..bcce56016a36f761d6761cb2c9ad53b35cecff6a 100644
(file)
--- a/
lib/driver/rcconsole.cpp
+++ b/
lib/driver/rcconsole.cpp
@@
-14,7
+14,7
@@
eRCConsoleDriver::eRCConsoleDriver(const char *filename): eRCDriver(eRCInput::ge
sn=0;
} else
{
sn=0;
} else
{
- sn=
new eSocketNotifier
(eApp, handle, eSocketNotifier::Read);
+ sn=
eSocketNotifier::create
(eApp, handle, eSocketNotifier::Read);
CONNECT(sn->activated, eRCConsoleDriver::keyPressed);
eRCInput::getInstance()->setFile(handle);
}
CONNECT(sn->activated, eRCConsoleDriver::keyPressed);
eRCInput::getInstance()->setFile(handle);
}
@@
-32,22
+32,23
@@
eRCConsoleDriver::~eRCConsoleDriver()
tcsetattr(handle,TCSANOW, &ot);
if (handle>=0)
close(handle);
tcsetattr(handle,TCSANOW, &ot);
if (handle>=0)
close(handle);
- if (sn)
- delete sn;
}
void eRCConsoleDriver::keyPressed(int)
{
}
void eRCConsoleDriver::keyPressed(int)
{
- char data[16];
- char *d = data;
+
unsigned
char data[16];
+
unsigned
char *d = data;
int num = read(handle, data, 16);
int code=-1;
int km = input->getKeyboardMode();
int num = read(handle, data, 16);
int code=-1;
int km = input->getKeyboardMode();
+ if (km == eRCInput::kmNone)
+ return;
+
while (num--)
{
while (num--)
{
-// eDebug("console code %0
2x\n", *d++
);
+// eDebug("console code %0
8x\n", *d
);
if (km == eRCInput::kmAll)
code = *d++;
else
if (km == eRCInput::kmAll)
code = *d++;
else
@@
-67,20
+68,26
@@
void eRCConsoleDriver::keyPressed(int)
if (code < 32) /* control characters */
code = -1;
if (code < 32) /* control characters */
code = -1;
- if (code == 0x7F) /* delete */
- code = -1;
+ else switch(code)
+ {
+ case 0x7E: // mute, einfg, entf
+ case 0x7F: // backspace
+ code = -1;
+ default:
+ break;
+ }
}
if (code != -1)
for (std::list<eRCDevice*>::iterator i(listeners.begin()); i!=listeners.end(); ++i)
{
// eDebug("ascii %08x", code);
}
if (code != -1)
for (std::list<eRCDevice*>::iterator i(listeners.begin()); i!=listeners.end(); ++i)
{
// eDebug("ascii %08x", code);
- (*i)->handleCode(
/*0x8000|*/
code);
+ (*i)->handleCode(code);
}
}
}
}
}
}
-void eRCConsole::handleCode(
int
code)
+void eRCConsole::handleCode(
long
code)
{
input->keyPressed(eRCKey(this, code, eRCKey::flagAscii));
}
{
input->keyPressed(eRCKey(this, code, eRCKey::flagAscii));
}