From b8dd2901f9e205f330fca47cbd3984270b5d60b1 Mon Sep 17 00:00:00 2001
From: Thomas White <taw@physics.org>
Date: Sat, 3 Mar 2018 16:01:50 +0100
Subject: Remove text_run offsets and lengths

Keeping these up to date was becoming a gigantic headache.  So instead
of storing the values, routines which are interested in these lengths
and offsets can calculate them themselves.
---
 src/debugger.c | 27 +++------------------------
 1 file changed, 3 insertions(+), 24 deletions(-)

(limited to 'src/debugger.c')

diff --git a/src/debugger.c b/src/debugger.c
index c5aaa1f..cdf6caa 100644
--- a/src/debugger.c
+++ b/src/debugger.c
@@ -43,9 +43,7 @@ struct run_debug
 	enum para_type para_type;
 
 	int np;
-	size_t len;
 	void *scblock; /* Don't you dare try to dereference this */
-	size_t para_offs;
 };
 
 
@@ -116,25 +114,13 @@ static void debug_text_para(Paragraph *para, cairo_t *cr, double *ypos,
 	plot_text(cr, ypos, fontdesc, tmp);
 
 	for ( i=0; i<nrun; i++ ) {
-		size_t para_offs, len;
 		SCBlock *scblock;
-		if ( para_debug_run_info(para, i, &len, &scblock, &para_offs) ) {
+		if ( para_debug_run_info(para, i, &scblock) ) {
 			plot_text(cr, ypos, fontdesc, "Error");
 		} else {
 
-			snprintf(tmp, 255, "  Run %i: len %li, SCBlock %p, para offs %li",
-			         i, len, scblock, para_offs);
+			snprintf(tmp, 255, "  Run %i: SCBlock %p", i, scblock);
 			plot_text(cr, ypos, fontdesc, tmp);
-			if ( len != rd[*dpos].len ) {
-				snprintf(tmp, 255, "   (len was %li)", rd[*dpos].len);
-				plot_text(cr, ypos, fontdesc, tmp);
-				(*changesig) += i*(*dpos)*len*(*ypos);
-			}
-			if ( para_offs != rd[*dpos].para_offs ) {
-				snprintf(tmp, 255, "   (para offs was %li)", rd[*dpos].para_offs);
-				plot_text(cr, ypos, fontdesc, tmp);
-				(*changesig) += i*(*dpos)*para_offs*(*ypos);
-			}
 			(*dpos)++;
 
 		}
@@ -166,19 +152,12 @@ static void record_runs(struct debugwindow *dbgw)
 
 		for ( j=0; j<nrun; j++ ) {
 
-			size_t para_offs, len;
 			SCBlock *scblock;
 
-			if ( para_debug_run_info(para, j, &len, &scblock,
-			                         &para_offs) )
-			{
-				continue;
-			}
+			if ( para_debug_run_info(para, j, &scblock) ) continue;
 
 			dbgw->runs[n].np = i;
-			dbgw->runs[n].len = len;
 			dbgw->runs[n].scblock = scblock;
-			dbgw->runs[n].para_offs = para_offs;
 			n++;
 
 			if ( n == MAX_DEBUG_RUNS ) {
-- 
cgit v1.2.3