git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use 'l'-flag for seekBackManual, and remove timer
[enigma2.git]
/
lib
/
driver
/
rcconsole.cpp
diff --git
a/lib/driver/rcconsole.cpp
b/lib/driver/rcconsole.cpp
index 3b5397b1b42f4456d65bdf02539c3328cf4d5d8c..7a625ffcfdc7312ca5bf22d9faacc03d07404517 100644
(file)
--- a/
lib/driver/rcconsole.cpp
+++ b/
lib/driver/rcconsole.cpp
@@
-38,23
+38,21
@@
eRCConsoleDriver::~eRCConsoleDriver()
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 num = read(handle, data, 16);
- int code;
-#if 0
+ int code
=-1
;
+
int km = input->getKeyboardMode();
if (km == eRCInput::kmNone)
return;
int km = input->getKeyboardMode();
if (km == eRCInput::kmNone)
return;
-#endif
+
while (num--)
{
while (num--)
{
-#if 0
+// eDebug("console code %08x\n", *d);
if (km == eRCInput::kmAll)
if (km == eRCInput::kmAll)
-#endif
code = *d++;
code = *d++;
-#if 0
else
{
if (*d == 27) // escape code
else
{
if (*d == 27) // escape code
@@
-69,22
+67,32
@@
void eRCConsoleDriver::keyPressed(int)
} else
code = *d;
++d;
} else
code = *d;
++d;
-
+
if (code < 32) /* control characters */
code = -1;
if (code < 32) /* control characters */
code = -1;
- if (code == 0x7F) /* delete */
- code = -1;
+ else switch(code)
+ {
+ case 0x35: // mute
+ case 0x7E: // mute, einfg, entf
+ case 0x7F: // backspace
+ code = -1;
+ default:
+ break;
+ }
}
}
-#endif
+
if (code != -1)
for (std::list<eRCDevice*>::iterator i(listeners.begin()); i!=listeners.end(); ++i)
if (code != -1)
for (std::list<eRCDevice*>::iterator i(listeners.begin()); i!=listeners.end(); ++i)
- (*i)->handleCode(code | 0x8000);
+ {
+// eDebug("ascii %08x", code);
+ (*i)->handleCode(code);
+ }
}
}
void eRCConsole::handleCode(int code)
{
}
}
void eRCConsole::handleCode(int code)
{
- input->keyPressed(eRCKey(this, code,
0
));
+ input->keyPressed(eRCKey(this, code,
eRCKey::flagAscii
));
}
eRCConsole::eRCConsole(eRCDriver *driver)
}
eRCConsole::eRCConsole(eRCDriver *driver)
@@
-104,7
+112,7
@@
const char *eRCConsole::getKeyDescription(const eRCKey &key) const
int eRCConsole::getKeyCompatibleCode(const eRCKey &key) const
{
int eRCConsole::getKeyCompatibleCode(const eRCKey &key) const
{
- return key.code;
// | KEY_ASCII;
+ return key.code;
}
class eRCConsoleInit
}
class eRCConsoleInit