X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/5d26224540dac9315066c52dc37197dbc8e0b24e..c5245596a287e0519d0684eb10ea111da75b9360:/main/enigma.cpp

diff --git a/main/enigma.cpp b/main/enigma.cpp
index 65ba4050..1260a104 100644
--- a/main/enigma.cpp
+++ b/main/enigma.cpp
@@ -1,7 +1,4 @@
-#undef WITH_SDL
-
 #ifdef WITH_SDL
-#error
 #define SDLDC
 #endif
 
@@ -19,7 +16,6 @@
 #include <lib/gdi/glcddc.h>
 
 #ifdef WITH_SDL
-#error
 #include <lib/gdi/sdl.h>
 #endif
 #include <lib/gdi/font.h> 
@@ -139,8 +135,6 @@ public:
 
 /************************************************/
 
-eLabel *lcd_label, *lcd_clock;
-
 int exit_code;
 
 int main(int argc, char **argv)
@@ -157,8 +151,6 @@ int main(int argc, char **argv)
 	ePython python;
 	eMain main;
 	
-	int double_buffer = 0;
-
 #if 1
 #ifdef SDLDC
 	ePtr<gSDLDC> my_dc;
@@ -167,7 +159,7 @@ int main(int argc, char **argv)
 	ePtr<gFBDC> my_dc;
 	gFBDC::getInstance(my_dc);
 	
-	double_buffer = my_dc->haveDoubleBuffering();
+	int double_buffer = my_dc->haveDoubleBuffering();
 #endif
 
 	ePtr<gLCDDC> my_lcd_dc;
@@ -215,43 +207,21 @@ int main(int argc, char **argv)
 	dsk.setRedrawTask(main);
 	dsk_lcd.setRedrawTask(main);
 
-	eWindow *lcd_win = new eWindow(&dsk_lcd);
-	
-	lcd_win->setFlag(eWindow::wfNoBorder);
-	
-	lcd_win->move(ePoint(0, 0));
-	lcd_win->resize(eSize(132, 64));
-	
-	lcd_label = new eLabel(lcd_win);
-	lcd_label->move(ePoint(0, 4));
-	lcd_label->resize(eSize(132, 42));
-	ePtr<gFont> font = new gFont("Regular", 19);
-	//ePtr<gFont> font = new gFont("Regular", 16);
-	lcd_label->setFont(font);
-
-	lcd_clock = new eLabel(lcd_win);
-	lcd_clock->move(ePoint(50, 46));
-	lcd_clock->resize(eSize(132, 18));
-	ePtr<gFont> clkfont = new gFont("Regular", 16);
-	lcd_clock->setFont(clkfont);
-
-	//lcd_label->setText("bla bla bla, this lcd\nSUCKS!");
-	//lcd_clock->setText("88:88:88");
-
-	lcd_win->show();
-	
 	eRCInput::getInstance()->keyEvent.connect(slot(keyEvent));
 	
 	printf("executing main\n");
 
 	python.execute("mytest", "__main__");
+	
+	dsk.paint();
+	dsk_lcd.paint();
 
 	return exit_code;
 }
 
-eWidgetDesktop *getDesktop()
+eWidgetDesktop *getDesktop(int which)
 {
-	return wdsk;
+	return which ? lcddsk : wdsk;
 }
 
 eApplication *getApplication()
@@ -261,20 +231,19 @@ eApplication *getApplication()
 
 void runMainloop()
 {
-	exit_code = eApp->runLoop();
+	eApp->runLoop();
 }
 
 void quitMainloop(int exitCode)
 {
-	eApp->quit(exitCode);
+	exit_code = exitCode;
+	eApp->quit(0);
 }
 
 void setLCD(const char *string)
 {
-	lcd_label->setText(string);
 }
 
 void setLCDClock(const char *string)
 {
-	lcd_clock->setText(string);
 }