X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/3550753caccf5f770598d67f9f8093978534a1f9..2ec2a5e39a19d0de97fbe88b25ddfb4ded77f492:/main/enigma.cpp diff --git a/main/enigma.cpp b/main/enigma.cpp index f9b88e7f..4799a5cf 100644 --- a/main/enigma.cpp +++ b/main/enigma.cpp @@ -8,6 +8,7 @@ #include #include +#include #include #include #include @@ -46,20 +47,26 @@ void object_dump() static eWidgetDesktop *wdsk, *lcddsk; -PSignal1 keyPressed; +static int prev_ascii_code; -PSignal1 &keyPressedSignal() +int getPrevAsciiCode() { - return keyPressed; + int ret = prev_ascii_code; + prev_ascii_code = 0; + return ret; } void keyEvent(const eRCKey &key) { ePtr ptr; eActionMap::getInstance(ptr); - ptr->keyPressed(0, key.code, key.flags); -// if (!key.flags) -// keyPressed(key.code); + if (key.flags & eRCKey::flagAscii) + { + prev_ascii_code = key.code; + ptr->keyPressed(key.producer->getIdentifier(), 510 /* faked KEY_ASCII */, 0); + } + else + ptr->keyPressed(key.producer->getIdentifier(), key.code, key.flags); } /************************************************/ @@ -153,6 +160,9 @@ int main(int argc, char **argv) eWidgetDesktop dsk(eSize(720, 576)); eWidgetDesktop dsk_lcd(eSize(132, 64)); + dsk.setStyleID(0); + dsk_lcd.setStyleID(1); + /* if (double_buffer) { eDebug(" - double buffering found, enable buffered graphics mode."); @@ -185,7 +195,9 @@ int main(int argc, char **argv) printf("executing main\n"); bsodCatchSignals(); - + + setIoPrio(IOPRIO_CLASS_BE, 3); + python.execute("mytest", "__main__"); if (exit_code == 5) /* python crash */