X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fmain.h;h=654aa09a8504b13551cb48cdedd30e7159002924;hp=bd43c12ec60710b50c15bef39905b8355a7abb78;hb=667281b828c8515e995c0000706157cee180fa08;hpb=180d764223a3568f734434a15d56f18e9ddc012b

diff --git a/src/main.h b/src/main.h
index bd43c12..654aa09 100644
--- a/src/main.h
+++ b/src/main.h
@@ -77,16 +77,25 @@ void RatCatcher(int x, int y, int buttons, int wheel, Screen * scr, View * view)
 void MainLoop(Document & doc, Screen & scr, View & view, int max_frames = -1)
 {
 	// order is important... segfaults occur when screen (which inits GL) is not constructed first -_-
-	DebugScript script;
+	
 
-	scr.DebugFontInit("fonts/DejaVuSansMono.ttf", 12);
-	//scr.DebugFontInit("fonts/DejaVuSansMono.ttf", 18);
+	//scr.DebugFontInit("fonts/DejaVuSansMono.ttf", 12);
+	scr.DebugFontInit("fonts/DejaVuSansMono.ttf", 18);
 	scr.SetMouseHandler(RatCatcher);
 
-	if (script_filename)
+	ifstream tmp;
+	istream * script_input = NULL;
+	if (script_filename != NULL)
 	{
-		script.Load(script_filename);
+		if (strcmp(script_filename, "stdin") == 0)
+			script_input = &cin;
+		else
+		{
+			tmp.open(script_filename);
+			script_input = &tmp;
+		}
 	}
+	DebugScript script(script_input);
 
 	double total_cpu_time = 0;
 	double total_gpu_time = 0;
@@ -152,14 +161,14 @@ void MainLoop(Document & doc, Screen & scr, View & view, int max_frames = -1)
 		scr.DebugFontPrintF("Zoom: %s %%\n", Str(VReal(100)/VReal(view.GetBounds().w)).c_str());
 		//scr.DebugFontPrintF("Similar size: %s\n", HumanScale(view.GetBounds().w * VReal(22e-3)));
 		
-		#if 1
+		#if 0
 		scr.DebugFontPrintF("Rendered frame %lu\n", (uint64_t)frames);
 		scr.DebugFontPrintF("Lazy Rendering = %d\n", view.UsingLazyRendering());
-		/*if (cpu_frame > 0 && total_cpu_time > 0)
+		if (cpu_frame > 0 && total_cpu_time > 0)
 			scr.DebugFontPrintF("[CPU] Render took %lf ms (%lf FPS) (total %lf s, avg FPS %lf)\n", cpu_frame*1e3, 1.0/cpu_frame, total_cpu_time,frames/total_cpu_time);
 		if (gpu_frame > 0 && total_gpu_time > 0)
 			scr.DebugFontPrintF("[GPU] Render took %lf ms (%lf FPS) (total %lf s, avg FPS %lf)\n", gpu_frame*1e3, 1.0/gpu_frame, total_gpu_time, frames/total_gpu_time);
-			*/
+		
 		if (real_frame > 0 && total_real_time > 0)
 			scr.DebugFontPrintF("[REALTIME] Render took %lf ms (%lf FPS) (total %lf s, avg FPS %lf)\n", real_frame*1e3, 1.0/real_frame, total_real_time,frames/total_real_time);