diff options
| author | Felix Domke <tmbinc@elitedvb.net> | 2005-04-15 18:00:24 +0000 |
|---|---|---|
| committer | Felix Domke <tmbinc@elitedvb.net> | 2005-04-15 18:00:24 +0000 |
| commit | 44433f650cd3e5f9f66253b74d194fcb01578595 (patch) | |
| tree | c67ea0df64ff9bfdd500abd4a641a7aae7450a84 /main | |
| parent | 77c45c9d2cabd3c1dc028c41d26573ac62147a34 (diff) | |
| download | enigma2-44433f650cd3e5f9f66253b74d194fcb01578595.tar.gz enigma2-44433f650cd3e5f9f66253b74d194fcb01578595.zip | |
- sdl is now default output
- added skinned window style
- added background colors
- some RGB color support (but still not how i like it)
- some minor bugfixes
Diffstat (limited to 'main')
| -rw-r--r-- | main/Makefile.am | 4 | ||||
| -rw-r--r-- | main/enigma.cpp | 13 |
2 files changed, 15 insertions, 2 deletions
diff --git a/main/Makefile.am b/main/Makefile.am index 1fdf8c32..ad838f5f 100644 --- a/main/Makefile.am +++ b/main/Makefile.am @@ -27,8 +27,10 @@ enigma2_LDADD = \ @MAD_LIBS@ \ @PNG_LIBS@ \ @SIGC_LIBS@ \ + @SDL_LIBS@ \ -ldl -lpthread -lcrypt -lresolv -lpython2.3 enigma2$(EXEEXT): $(enigma2_OBJECTS) $(enigma2_DEPENDENCIES) $(enigma2_LDADD_WHOLE) @rm -f enigma2$(EXEEXT) - $(CXXLINK) $(enigma2_LDFLAGS) $(enigma2_OBJECTS) -Wl,--export-dynamic -Wl,--whole-archive $(enigma2_LDADD_WHOLE) -Wl,--no-whole-archive $(enigma2_LDADD) $(LIBS) +# $(CXXLINK) $(enigma2_LDFLAGS) $(enigma2_OBJECTS) -Wl,--export-dynamic -Wl,--whole-archive $(enigma2_LDADD_WHOLE) -Wl,--no-whole-archive $(enigma2_LDADD) $(LIBS) + g++ -o enigma2$(EXEEXT) $(enigma2_LDFLAGS) $(enigma2_OBJECTS) -Wl,--export-dynamic -Wl,--whole-archive $(enigma2_LDADD_WHOLE) -Wl,--no-whole-archive $(enigma2_LDADD) $(LIBS) diff --git a/main/enigma.cpp b/main/enigma.cpp index 6bf0bb97..222bdebc 100644 --- a/main/enigma.cpp +++ b/main/enigma.cpp @@ -1,3 +1,4 @@ +#define SDLDC #include <stdio.h> #include <libsig_comp.h> #include <lib/base/ebase.h> @@ -9,6 +10,7 @@ #include <lib/gdi/grc.h> #include <lib/gdi/gfbdc.h> +#include <lib/gdi/sdl.h> #include <lib/gdi/font.h> #include <lib/gui/ewidget.h> @@ -132,8 +134,13 @@ int main(int argc, char **argv) eMain main; #if 1 +#ifdef SDLDC + ePtr<gSDLDC> my_dc; + gSDLDC::getInstance(my_dc); +#else ePtr<gFBDC> my_dc; gFBDC::getInstance(my_dc); +#endif gPainter p(my_dc); @@ -151,9 +158,13 @@ int main(int argc, char **argv) pal[a | 0x30] = (0x110011 * a) | 0xFF00; for (int a=0; a<0x10; ++a) pal[a | 0x40] = (0x001111 * a) | 0xFF0000; + + pal[0x50] = 0x586D88; + pal[0x51] = 0x4075a7; + p.setPalette(pal, 0, 256); - fontRenderClass::getInstance()->AddFont("/dbox2/cdkroot/share/fonts/arial.ttf", "Arial", 100); + fontRenderClass::getInstance()->AddFont("/home/tmbinc/enigma2/fonts/arial.ttf", "Arial", 100); eWidgetDesktop dsk(eSize(720, 576)); |