git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
i've meant: before.
[enigma2.git]
/
main
/
enigma.cpp
diff --git
a/main/enigma.cpp
b/main/enigma.cpp
index 96b4cef1c43e15a8874b2c696359295d06befdb2..cc9781cc4b32c3e6d83ec7b2fc64bd3cf789bbe3 100644
(file)
--- a/
main/enigma.cpp
+++ b/
main/enigma.cpp
@@
-8,6
+8,7
@@
#include <lib/actions/action.h>
#include <lib/driver/rc.h>
#include <lib/actions/action.h>
#include <lib/driver/rc.h>
+#include <lib/base/ioprio.h>
#include <lib/base/ebase.h>
#include <lib/base/eerror.h>
#include <lib/base/init.h>
#include <lib/base/ebase.h>
#include <lib/base/eerror.h>
#include <lib/base/init.h>
@@
-46,13
+47,6
@@
void object_dump()
static eWidgetDesktop *wdsk, *lcddsk;
static eWidgetDesktop *wdsk, *lcddsk;
-PSignal1<void,int> keyPressed;
-
-PSignal1<void,int> &keyPressedSignal()
-{
- return keyPressed;
-}
-
static int prev_ascii_code;
int getPrevAsciiCode()
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;
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
}
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));
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.");
/* 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();
printf("executing main\n");
bsodCatchSignals();
-
+
+ setIoPrio(IOPRIO_CLASS_BE, 3);
+
python.execute("mytest", "__main__");
if (exit_code == 5) /* python crash */
python.execute("mytest", "__main__");
if (exit_code == 5) /* python crash */
@@
-239,10
+236,3
@@
void quitMainloop(int exitCode)
exit_code = exitCode;
eApp->quit(0);
}
exit_code = exitCode;
eApp->quit(0);
}
-
-void addFont(const char *filename, const char *alias, int scale_factor, int is_replacement)
-{
- fontRenderClass::getInstance()->AddFont(filename, alias, scale_factor);
- if (is_replacement)
- eTextPara::setReplacementFont(alias);
-}