From 13fcf8ce3ad2c1fbfc463da71d77b17d71dfc160 Mon Sep 17 00:00:00 2001
From: Werner Almesberger <werner@almesberger.net>
Date: Sat, 20 Aug 2016 08:26:01 -0300
Subject: [PATCH] eeshow/gfx/diff.c: export area creation and freeing

---
 eeshow/gfx/diff.c | 63 ++++++++++++++++++++++++++++-------------------
 eeshow/gfx/diff.h |  4 +++
 2 files changed, 42 insertions(+), 25 deletions(-)

diff --git a/eeshow/gfx/diff.c b/eeshow/gfx/diff.c
index c44f02c..05f4f18 100644
--- a/eeshow/gfx/diff.c
+++ b/eeshow/gfx/diff.c
@@ -182,34 +182,47 @@ fail_open:
 }
 
 
+void add_area(struct area **areas, int xa, int ya, int xb, int yb,
+    uint32_t color)
+{
+	struct area *area;
+
+	area = alloc_type(struct area);
+
+	area->xa = xa;
+	area->ya = ya;
+	area->xb = xb;
+	area->yb = yb;
+	area->color = color;
+
+	area->next = *areas;
+	*areas = area;
+}
+
+
 static void mark_area(struct diff *diff, int x, int y)
 {
 	struct area *area;
+	int xa = x - diff->frame_radius;
+	int ya = y - diff->frame_radius;
+	int xb = x + diff->frame_radius;
+	int yb = y + diff->frame_radius;
 
 	for (area = diff->areas; area; area = area->next)
 		if (x >= area->xa && x <= area->xb &&
 		    y >= area->ya && y <= area->yb) {
-			if (area->xa > x - diff->frame_radius)
-				area->xa = x - diff->frame_radius;
-			if (area->xb < x + diff->frame_radius)
-				area->xb = x + diff->frame_radius;
-			if (area->ya > y - diff->frame_radius)
-				area->ya = y - diff->frame_radius;
-			if (area->yb < y + diff->frame_radius)
-				area->yb = y + diff->frame_radius;
+			if (area->xa > xa)
+				area->xa = xa;
+			if (area->xb < xb)
+				area->xb = xb;
+			if (area->ya > ya)
+				area->ya = ya;
+			if (area->yb < yb)
+				area->yb = yb;
 			return;
 		}
 
-	area = alloc_type(struct area);
-
-	area->xa = x - diff->frame_radius;
-	area->xb = x + diff->frame_radius;
-	area->ya = y - diff->frame_radius;
-	area->yb = y + diff->frame_radius;
-	area->color = AREA_FILL;
-
-	area->next = diff->areas;
-	diff->areas = area;
+	add_area(&diff->areas, xa, ya, xb, yb, AREA_FILL);
 }
 
 
@@ -264,14 +277,14 @@ static void show_areas(struct diff *diff, uint32_t *a)
 }
 
 
-static void free_areas(struct diff *diff)
+void free_areas(struct area **areas)
 {
 	struct area *next;
 
-	while (diff->areas) {
-		next = diff->areas->next;
-		free(diff->areas);
-		diff->areas = next;
+	while (*areas) {
+		next = (*areas)->next;
+		free(*areas);
+		*areas = next;
 	}
 }
 
@@ -288,7 +301,7 @@ static void diff_end(void *ctx)
 
 	differences(diff, old_img, diff->new_img);
 	show_areas(diff, old_img);
-	free_areas(diff);
+	free_areas(&diff->areas);
 
 	cro_img_write(diff->cr_ctx, diff->output_name);
 }
@@ -374,7 +387,7 @@ void diff_to_canvas(cairo_t *cr, int cx, int cy, float scale,
 	cairo_surface_flush(s);
 	differences(&diff, img_old, img_new);
 	show_areas(&diff, img_old);
-	free_areas(&diff);
+	free_areas(&diff.areas);
 	if (areas) {
 		diff.areas = (struct area *) areas;
 		show_areas(&diff, img_old);
diff --git a/eeshow/gfx/diff.h b/eeshow/gfx/diff.h
index 5d7be8e..26bc062 100644
--- a/eeshow/gfx/diff.h
+++ b/eeshow/gfx/diff.h
@@ -32,6 +32,10 @@ struct area {
 };
 
 
+void add_area(struct area **areas, int xa, int ya, int xb, int yb,
+    uint32_t color);
+void free_areas(struct area **areas);
+
 void diff_to_canvas(cairo_t *cr, int cx, int cy, float scale, 
     struct cro_ctx *old, struct cro_ctx *new,
     const struct area *areas);