aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Monzner <andreas.monzner@multimedia-labs.de>2006-06-08 15:53:17 +0000
committerAndreas Monzner <andreas.monzner@multimedia-labs.de>2006-06-08 15:53:17 +0000
commitb35f481ef0ccd35ecfa9bcd610ad1e923e86a391 (patch)
tree8a731dbf2a4ec45761f75c82f72e73846b58605e
parent9fe975821792486e21350b365217717ed29ca9bb (diff)
downloadenigma2-b35f481ef0ccd35ecfa9bcd610ad1e923e86a391.tar.gz
enigma2-b35f481ef0ccd35ecfa9bcd610ad1e923e86a391.zip
fix keyboard
-rw-r--r--lib/driver/rcconsole.cpp11
-rw-r--r--lib/python/Screens/InputBox.py2
2 files changed, 8 insertions, 5 deletions
diff --git a/lib/driver/rcconsole.cpp b/lib/driver/rcconsole.cpp
index 0c70244a..d3235758 100644
--- a/lib/driver/rcconsole.cpp
+++ b/lib/driver/rcconsole.cpp
@@ -38,16 +38,19 @@ eRCConsoleDriver::~eRCConsoleDriver()
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();
+ if (km == eRCInput::kmNone)
+ return;
+
while (num--)
{
-// eDebug("console code %02x\n", *d++);
+// eDebug("console code %08x\n", *d);
if (km == eRCInput::kmAll)
code = *d++;
else
@@ -75,7 +78,7 @@ void eRCConsoleDriver::keyPressed(int)
for (std::list<eRCDevice*>::iterator i(listeners.begin()); i!=listeners.end(); ++i)
{
// eDebug("ascii %08x", code);
- (*i)->handleCode(/*0x8000|*/code);
+ (*i)->handleCode(code);
}
}
}
diff --git a/lib/python/Screens/InputBox.py b/lib/python/Screens/InputBox.py
index f3f97752..9d54135c 100644
--- a/lib/python/Screens/InputBox.py
+++ b/lib/python/Screens/InputBox.py
@@ -15,7 +15,7 @@ class InputBox(Screen):
self["text"] = Label(title)
self["input"] = Input(**kwargs)
- self["actions"] = NumberActionMap(["WizardActions", "InputBoxActions", "AsciiActions"],
+ self["actions"] = NumberActionMap(["WizardActions", "InputBoxActions", "InputAsciiActions"],
{
"gotAsciiCode": self.gotAsciiCode,
"ok": self.go,