git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove improper print
[enigma2.git]
/
main
/
enigma.cpp
diff --git
a/main/enigma.cpp
b/main/enigma.cpp
index 5a22110e4e15280050d223d51284559707fae6ea..cc9781cc4b32c3e6d83ec7b2fc64bd3cf789bbe3 100644
(file)
--- a/
main/enigma.cpp
+++ b/
main/enigma.cpp
@@
-63,10
+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);
+ ptr->keyPressed(
key.producer->getIdentifier()
, key.code, key.flags);
}
/************************************************/
}
/************************************************/
@@
-160,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.");
@@
-233,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);
-}