Wrapping and rendering fixes

2 files changed, 12 insertions, 9 deletions

diff --git a/src/render.c b/src/render.c
index 3aa3d05..0aaee64 100644
--- a/src/render.c
+++ b/src/render.c
@@ -106,24 +106,27 @@ static void render_lines(struct frame *fr, cairo_t *cr)
 
 	for ( i=0; i<fr->n_lines; i++ ) {
 
-		double asc = pango_units_to_double(fr->lines[i].ascent);
+		cairo_save(cr);
+
+		/* Move to beginning of the line */
+		cairo_translate(cr, 0.0, y_pos);
 
-		cairo_move_to(cr, 0, y_pos+asc+0.5);
+		cairo_move_to(cr, 0.0,
+		                0.5+pango_units_to_double(fr->lines[i].ascent));
 		cairo_line_to(cr, pango_units_to_double(fr->lines[i].width),
-		                  y_pos+asc+0.5);
+		                0.5+pango_units_to_double(fr->lines[i].ascent));
 		cairo_set_source_rgb(cr, 0.0, 0.0, 1.0);
 		cairo_set_line_width(cr, 1.0);
 		cairo_stroke(cr);
 
-		/* Move to beginning of the line */
-		cairo_move_to(cr, 0.0, asc+y_pos);
-
 		/* Render the line */
 		render_boxes(&fr->lines[i], cr);
 
 		/* FIXME: line spacing */
 		y_pos += pango_units_to_double(fr->lines[i].height) + 0.0;
 
+		cairo_restore(cr);
+
 	}
 }
 
diff --git a/src/wrap.c b/src/wrap.c
index 5ecee08..10c225d 100644
--- a/src/wrap.c
+++ b/src/wrap.c
@@ -468,7 +468,7 @@ static void output(int a, int i, int *p, struct frame *fr,
 
 		l->max_boxes = s-q;
 		alloc_boxes(l);
-		for ( j=q+1; j<=s; j++ ) {
+		for ( j=q; j<s; j++ ) {
 			l->boxes[l->n_boxes++] = boxes->boxes[j];
 		}
 
@@ -528,13 +528,13 @@ static void knuth_suboptimal_fit(struct wrap_line *boxes, double line_length,
 	}
 	if ( reject ) return;
 
-	p = malloc(boxes->n_boxes*sizeof(int));
+	p = calloc(boxes->n_boxes, sizeof(int));
 	if ( p == NULL ) {
 		fprintf(stderr, "Failed to allocate p_k\n");
 		return;
 	}
 
-	s = malloc(boxes->n_boxes*sizeof(double));
+	s = calloc(boxes->n_boxes, sizeof(double));
 	if ( s == NULL ) {
 		fprintf(stderr, "Failed to allocate s_k\n");
 		return;