X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fmain.cpp;h=848debc0ff7fedd8e25c48459444e375b48a2337;hp=718361fbc7720703e0007c2ce62b333d8a28ace8;hb=398e6b2732decd57cdb57deb3f91d3ff08669e8b;hpb=53579b1a949fa3e4e193f8dfba2064edbb123f57

diff --git a/src/main.cpp b/src/main.cpp
index 718361f..848debc 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,6 +1,10 @@
 #include "main.h"
 #include <unistd.h> // Because we can.
 
+#include "controlpanel.h"
+
+
+
 int main(int argc, char ** argv)
 {	
 	#ifndef __STDC_IEC_559__
@@ -10,7 +14,7 @@ int main(int argc, char ** argv)
 
 	Debug("Compiled with REAL = %d => \"%s\" sizeof(Real) == %d bytes", REAL, g_real_name[REAL], sizeof(Real));
 
-	Document doc;
+	Document doc("","fonts/ComicSans.ttf");
 	srand(time(NULL));
 
 	enum {OUTPUT_TO_BMP, LOOP} mode = LOOP;
@@ -82,15 +86,38 @@ int main(int argc, char ** argv)
 	}
 	else 
 	{
-		//doc.AddBezier(Bezier(0,0, 1,0.5, 0.5,1, 1,1));
-		doc.AddText("c",1,0,0);
+		doc.Add(RECT_OUTLINE, Rect(0,0,0,0),0); // hack to stop segfault if document is empty (:S)
 	}
 	Debug("Start!");
 	Rect bounds(b[0],b[1],b[2],b[3]);
+	
+	Screen scr;
+	View view(doc,scr, bounds);
+
+	#ifndef CONTROLPANEL_DISABLED
+		ControlPanel::RunArgs args = {argc, argv, view, doc, scr};
+		SDL_Thread * cp_thread = SDL_CreateThread(ControlPanel::Run, "ControlPanel", &args);
+		if (cp_thread == NULL)
+		{
+			Error("Couldn't create ControlPanel thread: %s", SDL_GetError());
+		}
+	#endif //CONTROLPANEL_DISABLED
 
 	if (mode == LOOP)
-		MainLoop(doc, bounds, c);
-	else if (mode == OUTPUT_TO_BMP)
+		MainLoop(doc, scr, view);
+	else if (mode == OUTPUT_TO_BMP) //TODO: Remove this shit
 		OverlayBMP(doc, input_bmp, output_bmp, bounds, c);
+		
+	#ifndef CONTROLPANEL_DISABLED
+		
+		if (cp_thread != NULL)
+		{
+			int cp_return;
+			qApp->quit(); // will close the control panel
+			// (seems to not explode if the qApp has already been quit)
+			SDL_WaitThread(cp_thread, &cp_return);
+			Debug("ControlPanel thread returned %d", cp_return);
+		}
+	#endif //CONTROLPANEL_DISABLED
 	return 0;
 }