X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fmain.cpp;h=d65dc6018945cfb0157723c33f158772da04650c;hp=8942a9c690fca985a0e56acb6ba65f8a492b8c5c;hb=888817a67a9d840be66b52811b01eb77f10ff3e6;hpb=255065a607d82846c4a8b730000d547b3f080d0c

diff --git a/src/main.cpp b/src/main.cpp
index 8942a9c..d65dc60 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,16 +1,30 @@
 #include "main.h"
 #include <unistd.h> // Because we can.
 
+#include "controlpanel.h"
+
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+#include <fenv.h>
+
+
 int main(int argc, char ** argv)
 {	
+	#if REALTYPE == REAL_IRRAM
+	  iRRAM_initialize(argc,argv);
+	#endif
+	
 	#ifndef __STDC_IEC_559__
        	Warn("__STDC_IEC_559__ not defined. IEEE 754 floating point not fully supported.\n");
 	#endif
 
+	// We want to crash if we ever get a NaN.
+	feenableexcept(FE_DIVBYZERO | FE_INVALID | FE_OVERFLOW);
 
-	Debug("Compiled with REAL = %d => \"%s\" sizeof(Real) == %d bytes", REAL, g_real_name[REAL], sizeof(Real));
+	Debug("Compiled with REAL = %d => \"%s\" sizeof(Real) == %d bytes", REALTYPE, g_real_name[REALTYPE], sizeof(Real));
 
-	Document doc;
+	Document doc("","fonts/ComicSans.ttf");
 	srand(time(NULL));
 
 	enum {OUTPUT_TO_BMP, LOOP} mode = LOOP;
@@ -42,22 +56,6 @@ int main(int argc, char ** argv)
 				output_bmp = argv[i];
 
 				break;
-			case 'c':
-			{
-				Debug("Reading paint colour");
-				for (int j = 1; j <= 4; ++j)
-				{
-					if (i+j >= argc)
-						Fatal("No %d colour component following -c switch", j);
-					char * e;
-					float * comp = (j == 1) ? (&c.r) : ((j == 2) ? (&c.g) : ((j == 3) ? (&c.b) : &(c.a)));
-					*comp = strtof(argv[i+j], &e);
-					if (*e != '\0')
-						Fatal("Colour component %d not a valid float", j); 
-				}
-				i += 4;
-				break;
-			}
 			case 'b':
 			{
 				Debug("Reading view bounds");
@@ -82,36 +80,38 @@ int main(int argc, char ** argv)
 	}
 	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));*/
-		
+		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]);
 	
-		
-		doc.AddText("abcde", 0.5, Real(0), Real(1));
+	Screen scr;
+	View view(doc,scr, bounds);
 
-		for(int x = 0; x < 8; ++x)
+	#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)
 		{
-			
-			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);
-			}
+			Error("Couldn't create ControlPanel thread: %s", SDL_GetError());
 		}
-	/*	doc.Add(BEZIER, Rect(0.1,0.1,0.8,0.8), 0);
-		doc.Add(BEZIER, Rect(0.1,0.1,0.8,0.8), 1);
-		doc.Add(BEZIER, Rect(0.1,0.1,0.8,0.8), 2);
-		doc.Add(BEZIER, Rect(0.1,0.1,0.8,0.8), 3);*/
-		//doc.Add(CIRCLE_FILLED, Rect(0.1,0.1,0.8,0.8), 0);
-	}
-	Debug("Start!");
-	Rect bounds(b[0],b[1],b[2],b[3]);
+	#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;
 }