X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fmain.cpp;h=848debc0ff7fedd8e25c48459444e375b48a2337;hp=91e362c1cfa7f5437d8fa29fa7a970937d2504c8;hb=d9c0c3792133f87cd224dc22be428be8ddc016d8;hpb=11d77365672a080a511cb83f3acaa3d879c96356

diff --git a/src/main.cpp b/src/main.cpp
index 91e362c..848debc 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,5 +1,10 @@
 #include "main.h"
 #include <unistd.h> // Because we can.
+
+#include "controlpanel.h"
+
+
+
 int main(int argc, char ** argv)
 {	
 	#ifndef __STDC_IEC_559__
@@ -9,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;
@@ -77,34 +82,42 @@ int main(int argc, char ** argv)
 
 	if (input_filename != NULL)
 	{
-		doc.Load(input_filename);
+		doc.LoadSVG(input_filename, Rect(0,0,Real(1)/Real(800),Real(1)/Real(600)));
 	}
 	else 
 	{
-		doc.AddBezierData(Bezier(0,0,0,1,1,0));
-		//doc.AddBezierData(Bezier(0,0,1,0,0,1));
-		//doc.AddBezierData(Bezier(0,0,1,1,1,0));
-		//doc.AddBezierData(Bezier(0,1,1,0,0,1));
-		
-		
-		
-		for(int x = 0; x < 8; ++x)
-		{
-			
-			for (int y = 0; y < 8; ++y)
-			{
-				//doc.Add(static_cast<IPDF::ObjectType>((x^y)%3), Rect(0.2+x-4.0,0.2+y-4.0,0.6,0.6));
-				//doc.Add(BEZIER, Rect(0.2+x-4.0, 0.2+y-4.0, 0.6,0.6), (x^y)%3);
-			}
-		}
-		doc.Add(BEZIER, Rect(0.1,0.1,0.8,0.8), 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;
 }