X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/fce04ebed510a97e17f019a35c327dce78b6d916..2ec2a5e39a19d0de97fbe88b25ddfb4ded77f492:/main/enigma.cpp diff --git a/main/enigma.cpp b/main/enigma.cpp index 96b4cef1..4799a5cf 100644 --- a/main/enigma.cpp +++ b/main/enigma.cpp @@ -8,6 +8,7 @@ #include #include +#include #include #include #include @@ -46,13 +47,6 @@ void object_dump() static eWidgetDesktop *wdsk, *lcddsk; -PSignal1 keyPressed; - -PSignal1 &keyPressedSignal() -{ - return keyPressed; -} - static int prev_ascii_code; int getPrevAsciiCode() @@ -69,12 +63,10 @@ void keyEvent(const eRCKey &key) if (key.flags & eRCKey::flagAscii) { prev_ascii_code = key.code; - ptr->keyPressed(0, 510 /* faked KEY_ASCII */, 0); + ptr->keyPressed(key.producer->getIdentifier(), 510 /* faked KEY_ASCII */, 0); } else - ptr->keyPressed(0, key.code, key.flags); - if (!key.flags) - keyPressed(key.code); + ptr->keyPressed(key.producer->getIdentifier(), key.code, key.flags); } /************************************************/ @@ -168,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."); @@ -200,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 */