X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=print.c;h=16ac4d2bf07f547252c1caff48a9590465c32ff0;hb=740e7119cdaa0915280ba3b83c87300ce07560c9;hp=265a7e695e493f45a6cff3762a1a5df3f6b77e0a;hpb=3fd66cc69b89568199469b26e2ccf1afe4cc4bdb;p=ext%2Fsubsurface.git

diff --git a/print.c b/print.c
index 265a7e6..16ac4d2 100644
--- a/print.c
+++ b/print.c
@@ -7,76 +7,24 @@
 #include "display.h"
 #include "display-gtk.h"
 
-/* Why doesn't pango/gtk have these quoting functions? */
-static inline int add_char(char *buffer, size_t size, int len, char c)
-{
-	if (len < size)
-		buffer[len++] = c;
-	return len;
-}
-
-/* Add an escape string "atomically" - all or nothing */
-static int add_str(char *buffer, size_t size, int len, const char *s)
-{
-	int oldlen = len;
-	char c;
-	while ((c = *s++) != 0) {
-		if (len >= size)
-			return oldlen;
-		buffer[len++] = c;
-	}
-	return len;
-}
-
-static int add_quoted_string(char *buffer, size_t size, int len, const char *s)
-{
-	if (!s)
-		return len;
-
-	/* Room for '\0' */
-	size--;
-	for (;;) {
-		const char *escape;
-		unsigned char c = *s++;
-		switch(c) {
-		default:
-			len = add_char(buffer, size, len, c);
-			continue;
-		case 0:
-			escape = "\n";
-			break;
-		case '&':
-			escape = "&amp;";
-			break;
-		case '>':
-			escape = "&gt;";
-			break;
-		case '<':
-			escape = "&lt;";
-			break;
-		}
-		len = add_str(buffer, size, len, escape);
-		if (c)
-			continue;
-		buffer[len] = 0;
-		return len;
-	}
-}
-
 /*
  * You know what? Maybe somebody can do a real Pango layout thing.
  * This is hacky.
  */
-static void show_dive_text(struct dive *dive, cairo_t *cr, double w, double h)
+static void show_dive_text(struct dive *dive, cairo_t *cr, double w, double h, PangoFontDescription *font)
 {
-	int len;
+	int len, width, height, maxwidth, maxheight;
 	PangoLayout *layout;
 	struct tm *tm;
 	char buffer[1024], divenr[20];
 
+	maxwidth = w * PANGO_SCALE;
+	maxheight = h * PANGO_SCALE * 0.9;
+
 	layout = pango_cairo_create_layout(cr);
-	pango_layout_set_width(layout, w * PANGO_SCALE);
-	pango_layout_set_height(layout, h * PANGO_SCALE * 0.9);
+	pango_layout_set_font_description(layout, font);
+	pango_layout_set_width(layout, maxwidth);
+	pango_layout_set_height(layout, maxheight);
 	pango_layout_set_wrap(layout, PANGO_WRAP_WORD_CHAR);
 
 	*divenr = 0;
@@ -86,21 +34,58 @@ static void show_dive_text(struct dive *dive, cairo_t *cr, double w, double h)
 
 	tm = gmtime(&dive->when);
 	len = snprintf(buffer, sizeof(buffer),
-		"<span size=\"large\">%s%s, %s %d, %d   %d:%02d</span>\n",
+		"<span size=\"large\">"
+		"%s%s, %s %d, %d   %d:%02d"
+		"</span>",
 		divenr,
 		weekday(tm->tm_wday),
 		monthname(tm->tm_mon),
 		tm->tm_mday, tm->tm_year + 1900,
 		tm->tm_hour, tm->tm_min);
 
-	len = add_quoted_string(buffer, sizeof(buffer), len, dive->location);
-	len = add_quoted_string(buffer, sizeof(buffer), len, dive->notes);
+	pango_layout_set_justify(layout, 1);
+	pango_layout_set_ellipsize(layout, PANGO_ELLIPSIZE_END);
+	pango_layout_set_alignment(layout, PANGO_ALIGN_LEFT);
+
+	pango_layout_set_markup(layout, buffer, len);
+	pango_layout_get_size(layout, &width, &height);
+
+	cairo_move_to(cr, 0, 0);
+	pango_cairo_show_layout(cr, layout);
 
+	/*
+	 * This is still problematic: a long dive location will clash
+	 * with the depth/duration information. Need to mask that or
+	 * create a box or something.
+	 */
+	snprintf(buffer, sizeof(buffer),
+		"<span size=\"small\">"
+		"Max depth: %d ft\n"
+		"Duration: %d:%02d"
+		"</span>",
+		to_feet(dive->maxdepth),
+		dive->duration.seconds / 60,
+		dive->duration.seconds % 60);
+
+	pango_layout_set_alignment(layout, PANGO_ALIGN_RIGHT);
 	pango_layout_set_markup(layout, buffer, -1);
 
 	cairo_move_to(cr, 0, 0);
 	pango_cairo_show_layout(cr, layout);
 
+	len = snprintf(buffer, sizeof(buffer), "%s\n\n%s",
+		dive->location ? : "",
+		dive->notes ? : "");
+
+	maxheight -= height;
+	pango_layout_set_height(layout, maxheight);
+	pango_layout_set_attributes(layout, NULL);
+	pango_layout_set_alignment(layout, PANGO_ALIGN_LEFT);
+	pango_layout_set_text(layout, buffer, len);
+
+	cairo_move_to(cr, 0, height / (double) PANGO_SCALE);
+	pango_cairo_show_layout(cr, layout);
+
 	g_object_unref(layout);
 }
 
@@ -110,10 +95,12 @@ static void show_dive_profile(struct dive *dive, cairo_t *cr, double w, double h
 		.printer = 1,
 		.cr = cr
 	};
+	cairo_save(cr);
 	plot(&gc, w, h, dive);
+	cairo_restore(cr);
 }
 
-static void print(int divenr, cairo_t *cr, double x, double y, double w, double h)
+static void print(int divenr, cairo_t *cr, double x, double y, double w, double h, PangoFontDescription *font)
 {
 	struct dive *dive;
 
@@ -136,7 +123,7 @@ static void print(int divenr, cairo_t *cr, double x, double y, double w, double
 	/* Dive information in the lower third */
 	cairo_translate(cr, 0, h*1.33);
 
-	show_dive_text(dive, cr, w*2, h*0.67);
+	show_dive_text(dive, cr, w*2, h*0.67, font);
 
 	cairo_restore(cr);
 }
@@ -149,19 +136,23 @@ static void draw_page(GtkPrintOperation *operation,
 	int nr;
 	cairo_t *cr;
 	double w, h;
+	PangoFontDescription *font;
 
 	cr = gtk_print_context_get_cairo_context(context);
+	font = pango_font_description_from_string("Sans");
 
 	w = gtk_print_context_get_width(context)/2;
 	h = gtk_print_context_get_height(context)/3;
 
 	nr = page_nr*6;
-	print(nr+0, cr, 0,   0, w, h);
-	print(nr+1, cr, w,   0, w, h);
-	print(nr+2, cr, 0,   h, w, h);
-	print(nr+3, cr, w,   h, w, h);
-	print(nr+4, cr, 0, 2*h, w, h);
-	print(nr+5, cr, w, 2*h, w, h);
+	print(nr+0, cr, 0,   0, w, h, font);
+	print(nr+1, cr, w,   0, w, h, font);
+	print(nr+2, cr, 0,   h, w, h, font);
+	print(nr+3, cr, w,   h, w, h, font);
+	print(nr+4, cr, 0, 2*h, w, h, font);
+	print(nr+5, cr, w, 2*h, w, h, font);
+
+	pango_font_description_free(font);
 }
 
 static void begin_print(GtkPrintOperation *operation, gpointer user_data)